Changeset 207 for trunk/configure.ac

Timestamp:

Jan 16, 2009, 11:52:26 PM (16 years ago)

Author:

katerina

Message:

Fix for ticket #134 (size may get truncated to INT_MAX)

File:

• trunk/configure.ac (modified) (5 diffs)

trunk/configure.ac

@@ -1229 +1229 @@
             if test -z "$PGSQL_DIR"; then
               for i in $pgsql_directory; do 
+                if test -r $i/include/postgresql/libpq-fe.h; then
+                  PGSQL_INC_DIR=$i/include
+                  PGSQL_DIR=$i
+                fi
+              done
+            fi
+            if test -z "$PGSQL_DIR"; then
+              for i in $pgsql_directory; do 
                 if test -r $i/include/libpq-fe.h; then
                   PGSQL_INC_DIR=$i/include
@@ -1239 +1247 @@
               tmp=""
               for i in $pgsql_directory; do
-                tmp="$tmp $i/include $i/include/pgsql"
+                tmp="$tmp $i/include $i/include/pgsql $i/include/postgresql"
               done
               FAIL_MESSAGE("PostgreSQL header file (libpq-fe.h)", $tmp)
             fi
 
-            for i in lib lib/pgsql; do
+            for i in lib lib/pgsql lib/postgresql; do
                 str="$PGSQL_DIR/$i/libpq.*"
                 for j in `echo $str`; do
@@ -1256 +1264 @@
             if test -z "$PGSQL_LIB_DIR"; then
               for ff in $pgsql_directory; do
-                for i in lib lib/pgsql; do
+                for i in lib lib/pgsql lib/postgresql; do
                   str="$ff/$i/libpq.*"
                   for j in `echo $str`; do
@@ -1271 +1279 @@
                tmp=""
                for i in $pgsql_directory; do
-                   tmp="$i/lib $i/lib/pgsql"
+                   tmp="$i/lib $i/lib/pgsql $i/lib/postgresql"
                done
                FAIL_MESSAGE("postgresql library libpq", $tmp)
@@ -1287 +1295 @@
             CPPFLAGS="$CPPFLAGS -I${PGSQL_INC_DIR}"
             AC_CHECK_HEADERS(pgsql/libpq-fe.h)
+            AC_CHECK_HEADERS(postgresql/libpq-fe.h)
           else
             pg_lib_dir=`${PGCONF} --libdir`