From: Michael Wallner <mike@php.net>
Date: Thu, 11 Sep 2014 13:29:36 +0000 (+0200)
Subject: fix bitbucket issue #2
X-Git-Tag: v0.5.0~38
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=a1dd22ffd46416cf229ae78963885f22e8e01a51;p=m6w6%2Fext-pq

fix bitbucket issue #2
---

diff --git a/config.m4 b/config.m4
index 310382b..21d3b88 100644
--- 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
+		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)