Merge pull request #214 from pblottiere/rip_ght

Remove GHT support

Author: pblottiere

.install-libght.sh

@@ -11,7 +11,6 @@ install:
   - sudo apt-get install -qq g++-4.8
   - export CXX="g++-4.8"
   - sh .install-lazperf.sh
-  - sh .install-libght.sh
   - npm install -g eclint@1.1.5
 
 addons:
@@ -26,7 +25,6 @@ addons:
 
 script:
   - eclint check * */* */cunit/*
-  - ./tools/build-install.sh --with-lazperf=/usr/local --with-libght=/usr/local && make check
-  - ./tools/build-install.sh --with-lazperf=/usr/local --without-libght && ./tools/valgrind.sh
+  - ./tools/build-install.sh --with-lazperf=/usr/local && make check && ./tools/valgrind.sh
   - make installcheck || { cat pgsql/regression.diffs && false; }
   - (cd tools/benchmark_compression && sh compression_benchmark.sh)

.travis.yml

@@ -11,9 +11,6 @@ ZLIB_LDFLAGS = @ZLIB_LDFLAGS@
 CUNIT_CPPFLAGS = @CUNIT_CPPFLAGS@
 CUNIT_LDFLAGS = @CUNIT_LDFLAGS@
 
-GHT_CPPFLAGS = @GHT_CPPFLAGS@
-GHT_LDFLAGS = @GHT_LDFLAGS@
-
 PG_CONFIG = @PG_CONFIG@
 PGXS = @PGXS@
 

README.md

@@ -3,7 +3,7 @@ dnl * configure.ac
 dnl *
 dnl *  Pointclound build configuration.
 dnl *
-dnl *  PgSQL Pointcloud is free and open source software provided 
+dnl *  PgSQL Pointcloud is free and open source software provided
 dnl *  by the Government of Canada
 dnl *  Copyright (c) 2013 Natural Resources Canada
 dnl *
@@ -49,32 +49,32 @@ AC_SUBST([POINTCLOUD_VERSION])
 AC_DEFINE_UNQUOTED([POINTCLOUD_VERSION], ["$POINTCLOUD_VERSION"], [Pointcloud version])
 
 dnl ===========================================================================
-dnl Detect ZLib if it is installed 
+dnl Detect ZLib if it is installed
 dnl ===========================================================================
 
 ZLIB_LDFLAGS=""
 AC_CHECK_HEADER([zlib.h], [
 	ZLIB_CPPFLAGS="$CPPFLAGS"
-	AC_CHECK_LIB([z], 
-	  [inflate], 
-	  [ZLIB_LDFLAGS="$LDFLAGS -lz"], 
+	AC_CHECK_LIB([z],
+	  [inflate],
+	  [ZLIB_LDFLAGS="$LDFLAGS -lz"],
 	  [AC_MSG_ERROR([could not locate zlib])]
 	  )
 	],
 	[
 	AC_MSG_ERROR([could not locate zlib])
 	])
-	
+
 AC_SUBST([ZLIB_CPPFLAGS])
 AC_SUBST([ZLIB_LDFLAGS])
 
 
 dnl ===========================================================================
-dnl Detect CUnit if it is installed 
+dnl Detect CUnit if it is installed
 dnl ===========================================================================
 
-AC_ARG_WITH([cunit], 
-	[AS_HELP_STRING([--with-cunit=DIR], [specify the base cunit install directory])], 
+AC_ARG_WITH([cunit],
+	[AS_HELP_STRING([--with-cunit=DIR], [specify the base cunit install directory])],
 	[CUNITDIR="$withval"], [CUNITDIR=""])
 
 if test "x$CUNITDIR" = "xyes"; then
@@ -85,7 +85,7 @@ if test "x$CUNITDIR" != "x"; then
 
   dnl CUNITDIR was specified, so let's look there!
 
-  dnl Build the linker and include flags 
+  dnl Build the linker and include flags
   CUNIT_LDFLAGS="-L${CUNITDIR}/lib"
   CUNIT_CPPFLAGS="-I${CUNITDIR}/include"
 
@@ -102,9 +102,9 @@ fi
 dnl Run the header/link tests
 AC_CHECK_HEADER([CUnit/CUnit.h], [
 	CUNIT_CPPFLAGS="$CPPFLAGS"
-	AC_CHECK_LIB([cunit], 
-	  [CU_initialize_registry], 
-	  [CUNIT_LDFLAGS="$LDFLAGS -lcunit" FOUND_CUNIT="YES"], 
+	AC_CHECK_LIB([cunit],
+	  [CU_initialize_registry],
+	  [CUNIT_LDFLAGS="$LDFLAGS -lcunit" FOUND_CUNIT="YES"],
 	  [FOUND_CUNIT="NO"]
 	  )
 	],
@@ -138,8 +138,8 @@ dnl ===========================================================================
 dnl Detect the version of PostgreSQL installed on the system
 dnl ===========================================================================
 
-AC_ARG_WITH([pgconfig], 
-	[AS_HELP_STRING([--with-pgconfig=FILE], [specify an alternative pg_config file])], 
+AC_ARG_WITH([pgconfig],
+	[AS_HELP_STRING([--with-pgconfig=FILE], [specify an alternative pg_config file])],
 	[PG_CONFIG="$withval"], [PG_CONFIG=""])
 
 if test "x$PG_CONFIG" = "x"; then
@@ -165,8 +165,8 @@ fi
 
 
 dnl ===========================================================================
-dnl Ensure that $PG_CONFIG --pgxs points to a valid file. This is because some 
-dnl distributions such as Debian also include pg_config as part of libpq-dev 
+dnl Ensure that $PG_CONFIG --pgxs points to a valid file. This is because some
+dnl distributions such as Debian also include pg_config as part of libpq-dev
 dnl packages, but don't install the Makefile it points to unless
 dnl the postgresql-server-dev packages are installed :)
 dnl ===========================================================================
@@ -181,9 +181,9 @@ AC_SUBST([PGXS])
 
 dnl Extract the version information from pg_config
 dnl Note: we extract the major & minor separately, ensure they are numeric, and then combine to give
-dnl the final version. This is to guard against user error... 
-PGSQL_MAJOR_VERSION=`$PG_CONFIG --version | sed 's/[[A-Za-z ]]*//' | cut -d. -f1 | sed 's/[[^0-9]]//g'`	
-PGSQL_MINOR_VERSION=`$PG_CONFIG --version | sed 's/[[A-Za-z ]]*//' | cut -d. -f2 | sed 's/[[^0-9]]//g'`	
+dnl the final version. This is to guard against user error...
+PGSQL_MAJOR_VERSION=`$PG_CONFIG --version | sed 's/[[A-Za-z ]]*//' | cut -d. -f1 | sed 's/[[^0-9]]//g'`
+PGSQL_MINOR_VERSION=`$PG_CONFIG --version | sed 's/[[A-Za-z ]]*//' | cut -d. -f2 | sed 's/[[^0-9]]//g'`
 PGSQL_FULL_VERSION=`$PG_CONFIG --version`
 PGSQL_VERSION="$PGSQL_MAJOR_VERSION$PGSQL_MINOR_VERSION"
 
@@ -195,7 +195,7 @@ AC_MSG_RESULT([checking PostgreSQL version... $PGSQL_FULL_VERSION])
 dnl Ensure that we are using PostgreSQL >= 9.0
 if test ! "$PGSQL_MAJOR_VERSION" -ge 9; then
 	AC_MSG_ERROR([PointCloud requires PostgreSQL >= 9.0])
-fi	
+fi
 
 dnl Extract the linker and include flags for the frontend (for programs that use libpq)
 PGSQL_FE_LDFLAGS=-L`$PG_CONFIG --libdir`" -lpq"
@@ -219,16 +219,16 @@ AC_CHECK_LIB([pq], [PQserverVersion],
 	[])
 LIBS="$LIBS_SAVE"
 
-AC_DEFINE_UNQUOTED([PGSQL_VERSION], [$PGSQL_VERSION], [PostgreSQL server version])	
+AC_DEFINE_UNQUOTED([PGSQL_VERSION], [$PGSQL_VERSION], [PostgreSQL server version])
 AC_SUBST([PGSQL_VERSION])
 
 
 dnl ===========================================================================
-dnl Detect LibXML2 
+dnl Detect LibXML2
 dnl ===========================================================================
 
-AC_ARG_WITH([xml2config], 
-	[AS_HELP_STRING([--with-xml2config=FILE], [specify an alternative xml2-config file])], 
+AC_ARG_WITH([xml2config],
+	[AS_HELP_STRING([--with-xml2config=FILE], [specify an alternative xml2-config file])],
 	[XML2CONFIG="$withval"], [XML2CONFIG=""])
 
 if test "x$XML2CONFIG" = "x"; then
@@ -248,12 +248,12 @@ else
 			AC_MSG_RESULT([Using user-specified xml2-config file: $XML2CONFIG])
 		else
 			AC_MSG_ERROR([the user-specified xml2-config file $XML2CONFIG does not exist])
-		fi	
+		fi
 	fi
 fi
 
 
-dnl Extract the linker and include flags 
+dnl Extract the linker and include flags
 XML2_LDFLAGS=`$XML2CONFIG --libs`
 XML2_CPPFLAGS=`$XML2CONFIG --cflags`
 
@@ -278,61 +278,6 @@ AC_SUBST([LIBXML2_VERSION])
 AC_SUBST([XML2_LDFLAGS])
 AC_SUBST([XML2_CPPFLAGS])
 
-dnl ===========================================================================
-dnl Detect LibGHT
-dnl ===========================================================================
-
-AC_ARG_WITH([libght], 
-	[AS_HELP_STRING([--with-libght=DIR], [specify the base libght installation directory])], 
-	[GHTDIR="$withval"], [GHTDIR=""])
-
-if test "x$GHTDIR" = "xyes"; then
-	AC_MSG_ERROR([you must specify a parameter to --with-libght, e.g. --with-libght=/opt/local])
-fi
-
-if test "x$GHTDIR" = "x"; then
-  dnl GHTDIR was not specified, so search in usual system places
-  AC_CHECK_HEADER([ght.h], [GHT_CPPFLAGS="$CPPFLAGS" FOUND_GHT_H="YES"], [FOUND_GHT_H="NO"])
-  AC_CHECK_LIB([ght], [ght_init], [GHT_LDFLAGS="-lght" FOUND_GHT_LIB="YES"], [FOUND_GHT_LIB="NO"])
-elif test "x$GHTDIR" != "xno"; then
-  dnl GHTDIR was specified, so let's look there!
-
-
-  dnl Extract the linker and include flags 
-  GHT_LDFLAGS="-L${GHTDIR}/lib -lght"
-  GHT_CPPFLAGS="-I${GHTDIR}/include"
-
-  dnl Check headers file
-  CPPFLAGS_SAVE="$CPPFLAGS"
-  CPPFLAGS="$GHT_CPPFLAGS $XML2_CPPFLAGS"
-
-  dnl Check libraries file
-  LIBS_SAVE="$LIBS"
-  LIBS="$GHT_LDFLAGS $XML2_LDFLAGS"
-
-  AC_CHECK_HEADER([ght.h], [FOUND_GHT_H="YES"], [FOUND_GHT_H="NO"])
-  AC_CHECK_LIB([ght], [ght_init], [FOUND_GHT_LIB="YES"], [FOUND_GHT_LIB="NO"])
-  
-  dnl back to the originals
-  LIBS="${LIBS_SAVE}"
-  CPPFLAGS="${CPPFLAGS_SAVE}"
-fi
-
-if test "x$FOUND_GHT_H" = "xYES" -a "x$FOUND_GHT_LIB" = "xYES"; then
-  AC_DEFINE([HAVE_LIBGHT], [1], [Have libght])
-  GHT_STATUS="enabled"
-  if test $GHTDIR; then
-    GHT_STATUS="$GHTDIR"
-  fi
-else
-  GHT_LDFLAGS=""
-  GHT_CPPFLAGS=""
-  GHT_STATUS="disabled"
-fi
-
-AC_SUBST([GHT_LDFLAGS])
-AC_SUBST([GHT_CPPFLAGS])
-
 dnl ===========================================================================
 dnl Detect LazPerf
 dnl ===========================================================================
@@ -391,10 +336,10 @@ dnl ===========================================================================
 dnl Output the relevant files
 dnl ===========================================================================
 
-AC_OUTPUT([ 
+AC_OUTPUT([
    config.mk
 ])
-    
+
 dnl ===========================================================================
 dnl Display the configuration status information
 dnl ===========================================================================
@@ -410,7 +355,6 @@ AC_MSG_RESULT([  PostgreSQL config:    ${PG_CONFIG}])
 AC_MSG_RESULT([  PostgreSQL version:   ${PGSQL_FULL_VERSION}])
 AC_MSG_RESULT([  Libxml2 config:       ${XML2CONFIG}])
 AC_MSG_RESULT([  Libxml2 version:      ${LIBXML2_VERSION}])
-AC_MSG_RESULT([  LibGHT status:        ${GHT_STATUS}])
 AC_MSG_RESULT([  LazPerf status:       ${LAZPERF_STATUS}])
 AC_MSG_RESULT([  CUnit status:         ${CUNIT_STATUS}])
 AC_MSG_RESULT()

config.mk.in

@@ -1,8 +1,8 @@
 
 include ../config.mk
 
-CPPFLAGS = $(XML2_CPPFLAGS) $(ZLIB_CPPFLAGS) $(GHT_CPPFLAGS) $(LAZPERF_CPPFLAGS)
-LDFLAGS = $(XML2_LDFLAGS) $(ZLIB_LDFLAGS) $(GHT_LDFLASGS)
+CPPFLAGS = $(XML2_CPPFLAGS) $(ZLIB_CPPFLAGS) $(LAZPERF_CPPFLAGS)
+LDFLAGS = $(XML2_LDFLAGS) $(ZLIB_LDFLAGS)
 CFLAGS += -fPIC
 
 OBJS = \
@@ -13,7 +13,6 @@ OBJS = \
 	pc_patch.o \
 	pc_patch_dimensional.o \
 	pc_patch_uncompressed.o \
-	pc_patch_ght.o \
 	pc_point.o \
 	pc_pointlist.o \
 	pc_schema.o \

configure.ac

@@ -1,8 +1,8 @@
 
 include ../../config.mk
 
-CPPFLAGS = $(XML2_CPPFLAGS) $(CUNIT_CPPFLAGS) $(ZLIB_CPPFLAGS) $(GHT_CPPFLAGS) -I..
-LDFLAGS = $(XML2_LDFLAGS) $(CUNIT_LDFLAGS) $(ZLIB_LDFLAGS) $(GHT_LDFLAGS)
+CPPFLAGS = $(XML2_CPPFLAGS) $(CUNIT_CPPFLAGS) $(ZLIB_CPPFLAGS) -I..
+LDFLAGS = $(XML2_LDFLAGS) $(CUNIT_LDFLAGS) $(ZLIB_LDFLAGS)
 
 EXE = cu_tester
 
@@ -13,7 +13,6 @@ OBJS =	\
 	cu_pc_schema.o \
 	cu_pc_point.o \
 	cu_pc_patch.o \
-	cu_pc_patch_ght.o \
 	cu_pc_patch_lazperf.o \
 	cu_pc_sort.o \
 	cu_pc_util.o