fix --without-pq-postgresql

[m6w6/ext-pq] / config.m4

diff --git a/config.m4 b/config.m4
index 310382b80971c2b73c3b29a58a6833eb27cc704e..cb35a05f675b9613d1bde4017b0e7defde510f64 100644 (file)
--- a/config.m4
+++ b/config.m4
@@ -1,7 +1,7 @@
 PHP_ARG_WITH(pq, [whether to enable libpq (PostgreSQL) support],
 [  --with-pq[=DIR]           Include libpq support])
 PHP_ARG_WITH(pq-postgresql, [where to find PostgreSQL server headers],
-[  --with-pq-postgresql[=DIR]  PQ: Define some standard type OIDs from catalog/pg_type.h], $PHP_PQ)
+[  --with-pq-postgresql[=DIR]  PQ: Define some standard type OIDs from catalog/pg_type.h], $PHP_PQ, no)
 
 if test "$PHP_PQ" != "no"; then
        SEARCH_PATH="/usr/local /usr /opt"
@@ -61,8 +61,12 @@ if test "$PHP_PQ" != "no"; then
                if test "$PHP_PQ_POSTGRESQL" != "yes"; then
                        SEARCH_PATH="$PHP_PQ_POSTGRESQL $SEARCH_PATH"
                fi
+               CATALOG_PATH=""
                for i in $SEARCH_PATH; do
-                       CATALOG="$i/include/postgresql/server/catalog/pg_type.h"
+                       CATALOG_PATH="$i/include/server/catalog/pg_type.h $CATALOG_PATH"
+                       CATALOG_PATH="$i/include/postgresql/server/catalog/pg_type.h $CATALOG_PATH"
+               done
+               for CATALOG in $CATALOG_PATH; do
                        AC_MSG_CHECKING(for $CATALOG)
                        if test -f "$CATALOG"; then
                                AC_MSG_RESULT(yep)