[Liblas-commits] hg: 3 new changesets
liblas-commits at liblas.org
liblas-commits at liblas.org
Tue Aug 10 16:31:06 EDT 2010
changeset 538ba44ffea7 in /Volumes/Data/www/liblas.org/hg
details: http://hg.liblas.orghg?cmd=changeset;node=538ba44ffea7
summary: support down to CMake 2.6.0, so we can catch Debian stable users. CTest does not work with 2.6, and an error message is still relayed if a user tries to enable that using old CMake
changeset 8ae4e586fc19 in /Volumes/Data/www/liblas.org/hg
details: http://hg.liblas.orghg?cmd=changeset;node=8ae4e586fc19
summary: *smooch* Good bye, autoconf. I hate you.
changeset fa6361579ee4 in /Volumes/Data/www/liblas.org/hg
details: http://hg.liblas.orghg?cmd=changeset;node=fa6361579ee4
summary: *smooch* Good bye, autoconf. I hate you.
diffstat:
CMakeLists.txt | 6 +-
Makefile.am | 30 ---
apps/Makefile.am | 60 -------
autogen.sh | 43 -----
configure.ac | 395 --------------------------------------------------
include/Makefile.am | 37 ----
src/Makefile.am | 62 -------
test/Makefile.am | 1 -
test/unit/Makefile.am | 35 ----
9 files changed, 1 insertions(+), 668 deletions(-)
diffs (truncated from 719 to 300 lines):
diff -r 632d5eff158b -r fa6361579ee4 CMakeLists.txt
--- a/CMakeLists.txt Tue Aug 10 10:34:36 2010 -0500
+++ b/CMakeLists.txt Tue Aug 10 15:30:54 2010 -0500
@@ -3,10 +3,6 @@
#
# Author: Mateusz Loskot <mateusz at loskot.net>
#
-# ************************************************************************
-# WARNING (mloskot): A PROTOTYPE - WORK IN PROGRESS
-# Here are details about this work: http://liblas.org/ticket/52
-# ************************************************************************
#
###############################################################################
# libLAS general settings
@@ -49,7 +45,7 @@
###############################################################################
# CMake settings
-cmake_minimum_required(VERSION 2.8.0)
+cmake_minimum_required(VERSION 2.6.0)
set(CMAKE_COLOR_MAKEFILE ON)
diff -r 632d5eff158b -r fa6361579ee4 Makefile.am
--- a/Makefile.am Tue Aug 10 10:34:36 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-SUBDIRS = src apps include test
-
-if GDAL_IS_CONFIG
-GDAL_CPPFLAGS = @GDAL_INC@ -DHAVE_GDAL=1
-endif
-
-if GEOTIFF_IS_CONFIG
-GEOTIFF_CPPFLAGS = @GEOTIFF_INC@ -DHAVE_LIBGEOTIFF=1
-endif
-
-if SPATIALINDEX_IS_CONFIG
-SPATIALINDEX_CPPFLAGS = @SPATIALINDEX_INC@/spatialindex @SPATIALINDEX_INC@ -DHAVE_SPATIALINDEX=1
-endif
-
-if OCI_IS_CONFIG
-OCI_CPPFLAGS = @ORACLE_OCI_CFLAGS@ -DHAVE_ORACLE=1
-endif
-
-
-if BOOST_IS_CONFIG
-BOOST_FLAGS = @BOOST_CPPFLAGS@ -DHAVE_BOOST=1
-endif
-
-AM_CPPFLAGS = -I../include/liblas/capi -I../include $(GEOTIFF_CPPFLAGS) $(GDAL_CPPFLAGS) $(SPATIALINDEX_CPPFLAGS) $(OCI_CPPFLAGS) $(BOOST_FLAGS)
-
-EXTRA_DIST = \
- nmake.opt \
- makefile.vc \
- src/makefile.vc \
- src/Version.rc
diff -r 632d5eff158b -r fa6361579ee4 apps/Makefile.am
--- a/apps/Makefile.am Tue Aug 10 10:34:36 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-if GDAL_IS_CONFIG
-GDAL_CPPFLAGS = @GDAL_INC@ -DHAVE_GDAL=1
-endif
-
-if GEOTIFF_IS_CONFIG
-GEOTIFF_CPPFLAGS = @GEOTIFF_INC@ -DHAVE_LIBGEOTIFF=1
-endif
-
-if SPATIALINDEX_IS_CONFIG
-SPATIALINDEX_CPPFLAGS = @SPATIALINDEX_INC@/spatialindex @SPATIALINDEX_INC@ -DHAVE_SPATIALINDEX=1
-endif
-
-if OCI_IS_CONFIG
-if SPATIALINDEX_IS_CONFIG
-OCI_CPPFLAGS = @ORACLE_OCI_CFLAGS@ -DHAVE_ORACLE=1
-endif
-endif
-
-if BOOST_IS_CONFIG
-BOOST_FLAGS = @BOOST_CPPFLAGS@ -DHAVE_BOOST=1
-endif
-
-AM_CPPFLAGS = -I../include/liblas/capi -I../include $(GDAL_CPPFLAGS) $(GEOTIFF_CPPFLAGS) $(SPATIALINDEX_CPPFLAGS) $(OCI_CPPFLAGS) $(ZLIB_CPPFLAGS) $(BOOST_FLAGS)
-
-lasinfo_SOURCES = lasinfo.c lascommon.c
-las2las_SOURCES = las2las.c lascommon.c
-lasmerge_SOURCES = lasmerge.c lascommon.c
-las2txt_SOURCES = las2txt.c lascommon.c
-txt2las_SOURCES = txt2las.c
-ts2las_SOURCES = ts2las.cpp
-ts2las_LDADD = ../src/liblas.la
-lasindex_SOURCES = lasindex.cpp
-lasindex_LDADD = ../src/liblas.la
-
-bin_PROGRAMS = lasinfo las2las lasmerge las2txt txt2las ts2las
-
-if SPATIALINDEX_IS_CONFIG
-bin_PROGRAMS += lasindex
-endif
-
-if OCI_IS_CONFIG
-if GDAL_IS_CONFIG
-if SPATIALINDEX_IS_CONFIG
-AM_CPPFLAGS += -Igeoraster
-las2oci_SOURCES = las2oci.cpp oci_wrapper.cpp
-las2oci_LDADD = ../src/liblas.la
-bin_PROGRAMS += las2oci
-endif
-endif
-endif
-
-bin_SCRIPTS = liblas-config
-
-if GDAL_IS_CONFIG
-las2ogr_SOURCES = las2ogr.cpp
-las2ogr_LDADD = ../src/liblas.la
-bin_PROGRAMS += las2ogr
-endif
-
-LDADD = ../src/liblas_c.la
diff -r 632d5eff158b -r fa6361579ee4 autogen.sh
--- a/autogen.sh Tue Aug 10 10:34:36 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-#!/bin/sh
-# $Id$
-#
-# Autotools boostrapping script for libLAS (http://liblas.org)
-#
-giveup()
-{
- echo
- echo " Something went wrong, giving up!"
- echo
- exit 1
-}
-
-OSTYPE=`uname -s`
-
-for libtoolize in glibtoolize libtoolize; do
- LIBTOOLIZE=`which $libtoolize 2>/dev/null`
- if test "$LIBTOOLIZE"; then
- break;
- fi
-done
-
-#AMFLAGS="--add-missing --copy --force-missing"
-AMFLAGS="--add-missing --copy"
-if test "$OSTYPE" = "IRIX" -o "$OSTYPE" = "IRIX64"; then
- AMFLAGS=$AMFLAGS" --include-deps";
-fi
-
-echo "Running aclocal -I m4"
-aclocal -I m4 || giveup
-#echo "Running autoheader"
-#autoheader || giveup
-echo "Running libtoolize"
-$LIBTOOLIZE --force --copy || giveup
-echo "Running automake"
-automake $AMFLAGS # || giveup
-echo "Running autoconf"
-autoconf || giveup
-
-echo "======================================"
-echo "Now you are ready to run './configure'"
-echo "======================================"
-
diff -r 632d5eff158b -r fa6361579ee4 configure.ac
--- a/configure.ac Tue Aug 10 10:34:36 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,395 +0,0 @@
-dnl $Id$
-dnl
-dnl This is main autoconf bootstrap script of libLAS project.
-dnl
-m4_define([liblas_version_major], [1])
-m4_define([liblas_version_minor], [3])
-m4_define([liblas_version_micro], [0])
-m4_define([liblas_version],
- [liblas_version_major.liblas_version_minor.liblas_version_micro])
-
-AC_PREREQ([2.59])
-AC_INIT([las], [liblas_version], [hobu.inc at gmail.com],[liblas-src])
-AC_CANONICAL_BUILD
-
-RELEASE_VERSION=liblas_version
-AC_SUBST([RELEASE_VERSION])
-
-dnl #########################################################################
-dnl Default compilation flags
-dnl #########################################################################
-
-m4_define([debug_default],[no])
-
-CFLAGS="-Wall -Wno-long-long -pedantic $CFLAGS"
-CXXFLAGS="-Wall -Wno-long-long -pedantic -std=c++98 $CXXFLAGS"
-
-dnl #########################################################################
-dnl Checks for programs.
-dnl #########################################################################
-
-AM_INIT_AUTOMAKE([dist-bzip2 subdir-objects])
-AC_PROG_CXX
-AC_PROG_CXXCPP
-AC_PROG_INSTALL
-AC_PROG_LN_S
-AC_PROG_MAKE_SET
-AC_PROG_LIBTOOL
-AM_PROG_CC_C_O
-
-dnl #########################################################################
-dnl Check platform endianness
-dnl #########################################################################
-
-AC_C_BIGENDIAN
-
-dnl #########################################################################
-dnl Checks for header files.
-dnl #########################################################################
-
-AC_CHECK_HEADERS([string.h],, [AC_MSG_ERROR([cannot find string.h, bailing out])])
-AC_CHECK_HEADERS([stdio.h],, [AC_MSG_ERROR([cannot find stdio.h, bailing out])])
-AC_CHECK_HEADERS([stdlib.h],, [AC_MSG_ERROR([cannot find stdlib.h, bailing out])])
-
-
-LIBS="${LIBS}"
-
-
-dnl #########################################################################
-dnl Build mode configuration (debug/optimized)
-dnl #########################################################################
-
-AC_ARG_ENABLE([debug],
- AC_HELP_STRING([--enable-debug=ARG], [Enable debug compilation mode @<:@yes|no@:>@, default=debug_default]),,)
-
-AC_MSG_CHECKING([for debug enabled])
-
-if test "x$enable_debug" = "xyes"; then
- CFLAGS="$CFLAGS -g -DDEBUG"
- CXXFLAGS="$CXXFLAGS -g -DDEBUG"
- AC_MSG_RESULT(yes)
-else
- CFLAGS="$CFLAGS -O3 -DNDEBUG"
- CXXFLAGS="$CXXFLAGS -O3 -DNDEBUG"
- AC_MSG_RESULT(no)
-fi
-
-dnl #########################################################################
-dnl Definiion of custom Autoconf macros
-dnl #########################################################################
-
-AC_DEFUN([LOC_MSG],[
-echo "$1"
-])
-
-AC_DEFUN([AC_HAVE_LONG_LONG],
-[
- AC_MSG_CHECKING([for 64bit integer type])
-
- echo 'int main() { long long off=0; }' >> conftest.c
- if test -z "`${CC} -o conftest conftest.c 2>&1`" ; then
- AC_DEFINE(HAVE_LONG_LONG, 1, [Define to 1, if your compiler supports long long data type])
- AC_MSG_RESULT([long long])
- else
- AC_MSG_RESULT([no])
- fi
- rm -f conftest*
-])
-
-
-
-HAVE_GDAL="no"
-GDAL_CONFIG="no"
-HAVE_GEOTIFF="no"
-GEOTIFF_CONFIG="no"
-
-USE_GDAL_SOURCE_TREE="no"
-
-dnl #########################################################################
-dnl Determine GDAL Support
-dnl #########################################################################
-
-AC_ARG_WITH([gdal],
- AC_HELP_STRING([--with-gdal=@<:@ARG@:>@], [enable GDAL/OGR library specifying location of gdal-config (ARG=path)]),,)
-AC_MSG_CHECKING([for GDAL])
-
-if test "$with_gdal" = "no" -o "$with_gdal" = "" ; then
- AC_MSG_RESULT([no])
-else
-
- dnl Check if full path to gdal-config provided
- if test "`basename xx/$with_gdal`" = "gdal-config" ; then
- AC_MSG_RESULT([GDAL enabled with provided gdal-config])
- GDAL_CONFIG="$with_gdal"
- elif test -f ${with_gdal}/frmts/gtiff/libgeotiff/geotiff.h; then
- GDAL_INC="-I$with_gdal/port -I$with_gdal/ogr -I$with_gdal/alg -I$with_gdal/gcore -I$with_gdal/frmts "
- GDAL_PREFIX="$with_gdal"
- HAVE_GDAL="yes"
- HAVE_GEOTIFF="yes"
More information about the Liblas-commits
mailing list