fix bitbucket issue #2
authorMichael Wallner <mike@php.net>
Thu, 11 Sep 2014 13:29:36 +0000 (15:29 +0200)
committerMichael Wallner <mike@php.net>
Thu, 11 Sep 2014 13:29:36 +0000 (15:29 +0200)
config.m4

index 310382b80971c2b73c3b29a58a6833eb27cc704e..21d3b88cb913b4e9c633c7c0f91aeb9cd4951b60 100644 (file)
--- a/config.m4
+++ b/config.m4
@@ -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
                if test "$PHP_PQ_POSTGRESQL" != "yes"; then
                        SEARCH_PATH="$PHP_PQ_POSTGRESQL $SEARCH_PATH"
                fi
+               CATALOG_PATH=""
                for i in $SEARCH_PATH; do
                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)
                        AC_MSG_CHECKING(for $CATALOG)
                        if test -f "$CATALOG"; then
                                AC_MSG_RESULT(yep)