Merge pull request #76 from flightaware/revert-linux

Revert linux changes in aclocal.m4
flightaware · Oct 3, 2017 · 6e22e56 · 6e22e56
2 parents 3826839 + f88004a
commit 6e22e56
Show file tree

Hide file tree

Showing 26 changed files with 36 additions and 51 deletions.
diff --git a/README.FreeBSD b/README.FreeBSD
@@ -1,3 +1,8 @@
+#
+# Get rid of old configurations
+#
+[ -f Makefile ] && make clean
+
 #
 # This makes sure that TEA knows about all the necessary bits and stuffs them into configure from configure.in
 #

diff --git a/configure.in b/configure.in
@@ -18,7 +18,7 @@ dnl	to configure the system for the local environment.
 # so you can encode the package version directly into the source files.
 #-----------------------------------------------------------------------
 
-AC_INIT([speedtables], [1.13.7])
+AC_INIT([speedtables], [1.13.8])
 
 #--------------------------------------------------------------------
 # Call TEA_INIT as the first TEA_ macro to set up initial vars.

diff --git a/ctable_server/configure.in b/ctable_server/configure.in
@@ -18,7 +18,7 @@ dnl	to configure the system for the local environment.
 # so you can encode the package version directly into the source files.
 #-----------------------------------------------------------------------
 
-AC_INIT([ctable_server], [1.13.7])
+AC_INIT([ctable_server], [1.13.8])
 
 #--------------------------------------------------------------------
 # Call TEA_INIT as the first TEA_ macro to set up initial vars.

diff --git a/ctable_server/ctable_client.tcl b/ctable_server/ctable_client.tcl
@@ -621,6 +621,6 @@ proc maketable {cttpUrl sock} {
   return [::sttp_buffer::table $cttpUrl]
 }
 
-package provide ctable_client 1.13.7
+package provide ctable_client 1.13.8
 
 # vim: set ts=8 sw=4 sts=4 noet :
diff --git a/ctable_server/ctable_client_server.tcl b/ctable_server/ctable_client_server.tcl
@@ -98,6 +98,6 @@ namespace export split_ctable_url join_ctable_url
 
 }
 
-package provide ctable_net 1.13.7
+package provide ctable_net 1.13.8
 
 # vim: set ts=8 sw=4 sts=4 noet :
diff --git a/ctable_server/ctable_server.tcl b/ctable_server/ctable_server.tcl
@@ -678,7 +678,7 @@ proc serverdie {{message ""}} {
 
 }
 
-package provide ctable_server 1.13.7
+package provide ctable_server 1.13.8
 
 #get, set, array_get, array_get_with_nulls, exists, delete, count, foreach, sort, type, import, import_postgres_result, export, fields, fieldtype, needs_quoting, names, reset, destroy, statistics, write_tabsep, or read_tabsep
 

diff --git a/ctable_server/sttp_buffer.tcl b/ctable_server/sttp_buffer.tcl
@@ -177,6 +177,6 @@ proc table {cttpUrl} {
 
 }
 
-package provide sttp_buffer 1.13.7
+package provide sttp_buffer 1.13.8
 
 # vim: set ts=8 sw=4 sts=4 noet :
diff --git a/ctables/aclocal.m4 b/ctables/aclocal.m4
@@ -62,12 +62,12 @@ fi
 
 
 # Handle the --with-pgsql configure option.
-AC_ARG_WITH([pgsql-include],
-	[  --with-pgsql-include[=PATH]       Build with pgsql/pgtcl library support],
+AC_ARG_WITH([pgsql],
+	[  --with-pgsql[=PATH]       Build with pgsql/pgtcl library support],
 [
-AC_MSG_CHECKING([location of libpq include file])
+AC_MSG_CHECKING([location of pgsql and pgtcl])
 if test "x$withval" = "x" -o "$withval" = "yes"; then
-  pg_prefixes="/usr/local/include /usr/local/pgsql/include /usr/include /usr/include/postgresql"
+  pg_prefixes="/usr/local /usr/local/pgsql /usr"
 else
   pg_prefixes=$withval
 fi
@@ -76,41 +76,21 @@ fi
 for prefix in $pg_prefixes
 do
   # look for pgsql frontend header
-  if test -f $prefix/libpq-fe.h; then
+  if test -f $prefix/include/libpq-fe.h; then
 sysconfig_tcl_content="$sysconfig_tcl_content
 set sysconfig(pqprefix) $prefix"
-pqprefix=$prefix
   else
     continue
   fi
-done
-if test -z "$pqprefix"; then
-  AC_MSG_ERROR([pgsql libpq-fe.h include file not found under $pg_prefixes])
-fi
-
-AC_MSG_RESULT([found under $pqprefix])
-])
 
-AC_ARG_WITH([pgtcl-lib],
-	[  --with-pgtcl-lib[=PATH]       Build with pgsql/pgtcl library support],
-[
-AC_MSG_CHECKING([location of pgtcl])
-if test "x$withval" = "x" -o "$withval" = "yes"; then
-  pg_prefixes="/usr/lib /usr/local/lib"
-else
-  pg_prefixes=$withval
-fi
-
-# Look for pgsql and pgtcl
-for prefix in $pg_prefixes
-do
   # there may be multiple installed versions of pgtcl so sort with the highest version first.
-  pg_libdirs=`find $prefix -maxdepth 2 -name "pgtcl*" -type d | sort -rn`
+  pg_libdirs=`find $prefix/lib -maxdepth 1 -name "pgtcl*" -type d | sort -rn`
 
   if test -z "$pg_libdirs"; then
      continue
   fi
 
+  # look for pgtcl-ng before pgtcl
   pgtclver=""
   for dir in $pg_libdirs
   do

diff --git a/ctables/configure.in b/ctables/configure.in
@@ -18,7 +18,7 @@ dnl	to configure the system for the local environment.
 # so you can encode the package version directly into the source files.
 #-----------------------------------------------------------------------
 
-AC_INIT([ctable], [1.13.7])
+AC_INIT([ctable], [1.13.8])
 
 #--------------------------------------------------------------------
 # Call TEA_INIT as the first TEA_ macro to set up initial vars.

diff --git a/ctables/gentable.tcl b/ctables/gentable.tcl
@@ -5687,7 +5687,7 @@ proc compile {fileFragName version} {
 	set pgString -I$sysconfig(pgtclprefix)/include
 	if [info exists sysconfig(pqprefix)] {
 	    if {"$sysconfig(pqprefix)" != "$sysconfig(pgtclprefix)"} {
-	        append pgString " -I$sysconfig(pqprefix)"
+	        append pgString " -I$sysconfig(pqprefix)/include"
 	    }
 	}
     } else {

diff --git a/stapi/client/cass.tcl b/stapi/client/cass.tcl
@@ -1236,6 +1236,6 @@ namespace eval ::stapi {
   }
 }
 
-package provide st_client_cassandra 1.13.7
+package provide st_client_cassandra 1.13.8
 
 # vim: set ts=8 sw=4 sts=4 noet :
diff --git a/stapi/client/client.tcl b/stapi/client/client.tcl
@@ -100,6 +100,6 @@ namespace eval ::stapi {
   register package connect_package
 }
 
-package provide st_client 1.13.7
+package provide st_client 1.13.8
 
 # vim: set ts=8 sw=4 sts=4 noet :
diff --git a/stapi/client/extend.tcl b/stapi/client/extend.tcl
@@ -395,7 +395,7 @@ namespace eval ::stapi {
   namespace import ::stapi::extend::*
 }
 
-package provide stapi_extend 1.13.7
+package provide stapi_extend 1.13.8
 
 
 # vim: set ts=8 sw=4 sts=4 noet :
diff --git a/stapi/client/pgsql.tcl b/stapi/client/pgsql.tcl
@@ -952,6 +952,6 @@ namespace eval ::stapi {
   }
 }
 
-package provide st_client_postgres 1.13.7
+package provide st_client_postgres 1.13.8
 
 # vim: set ts=8 sw=4 sts=4 noet :
diff --git a/stapi/client/shared.tcl b/stapi/client/shared.tcl
@@ -115,6 +115,6 @@ namespace eval ::stapi {
   }
 }
 
-package provide st_shared 1.13.7
+package provide st_shared 1.13.8
 
 # vim: set ts=8 sw=4 sts=4 noet :
diff --git a/stapi/client/uri.tcl b/stapi/client/uri.tcl
@@ -40,6 +40,6 @@ namespace eval stapi {
 
 }
 
-package provide st_client_uri 1.13.7
+package provide st_client_uri 1.13.8
 
 # vim: set ts=8 sw=4 sts=4 noet :
diff --git a/stapi/configure.in b/stapi/configure.in
@@ -18,7 +18,7 @@ dnl	to configure the system for the local environment.
 # so you can encode the package version directly into the source files.
 #-----------------------------------------------------------------------
 
-AC_INIT([stapi], [1.13.7])
+AC_INIT([stapi], [1.13.8])
 
 #--------------------------------------------------------------------
 # Call TEA_INIT as the first TEA_ macro to set up initial vars.

diff --git a/stapi/copy.tcl b/stapi/copy.tcl
@@ -167,5 +167,5 @@ namespace eval ::stapi {
   }
 }
 
-package provide st_postgres 1.13.7
+package provide st_postgres 1.13.8
 
diff --git a/stapi/debug.tcl b/stapi/debug.tcl
@@ -54,4 +54,4 @@ namespace eval ::stapi {
   }
 }
 
-package provide st_debug 1.13.7
+package provide st_debug 1.13.8
diff --git a/stapi/display/display.tcl b/stapi/display/display.tcl
@@ -2576,5 +2576,5 @@ catch { ::itcl::delete class ::STDisplayField_boolean }
 
 } ; ## ::itcl::class ::STDisplayField_boolean
 
-package provide st_display 1.13.7
+package provide st_display 1.13.8
 
diff --git a/stapi/display/test.tcl b/stapi/display/test.tcl
@@ -29,4 +29,4 @@ proc stapi_display_test {} {
   }
 }
 
-package provide st_display_test 1.13.7
+package provide st_display_test 1.13.8
diff --git a/stapi/pgsql.tcl b/stapi/pgsql.tcl
@@ -379,4 +379,4 @@ namespace eval ::stapi {
   }
 }
 
-package provide st_postgres 1.13.7
+package provide st_postgres 1.13.8
diff --git a/stapi/server/lock.tcl b/stapi/server/lock.tcl
@@ -185,4 +185,4 @@ namespace eval ::stapi {
   }
 }
 
-package provide st_locks 1.13.7
+package provide st_locks 1.13.8
diff --git a/stapi/server/server.tcl b/stapi/server/server.tcl
@@ -1279,4 +1279,4 @@ namespace eval ::stapi {
   }
 }
 
-package provide st_server 1.13.7
+package provide st_server 1.13.8
diff --git a/stapi/stapi.tcl b/stapi/stapi.tcl
@@ -2,5 +2,5 @@
 
 package require st_client
 
-package provide stapi 1.13.7
+package provide stapi 1.13.8
 
diff --git a/update_ver.sh b/update_ver.sh
@@ -2,7 +2,7 @@
 
 # This script simplifies the process of incrementing all version numbers for a new release.
 
-NEWVER="1.13.7"
+NEWVER="1.13.8"
 
 perl -p -i -e "s/^(AC_INIT\\(\\[[a-z_]+\\],) \\[[0-9.]+\\]/\\1 \\[$NEWVER\\]/" configure.in ctables/configure.in stapi/configure.in ctable_server/configure.in