X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-pq;a=blobdiff_plain;f=config.m4;h=21d3b88cb913b4e9c633c7c0f91aeb9cd4951b60;hp=cfb995bfc3e1528267d9e1a24e551798657fbad8;hb=a1dd22ffd46416cf229ae78963885f22e8e01a51;hpb=fad4fe6a60c56ad5d5752e10abd1085884cc09c2

diff --git a/config.m4 b/config.m4
index cfb995b..21d3b88 100644
--- a/config.m4
+++ b/config.m4
@@ -1,7 +1,7 @@
 PHP_ARG_WITH(pq, [whether to enable libpq (PostgreSQL) support],
-[  --with-pq			   Include libpq support])
+[  --with-pq[=DIR]           Include libpq support])
 PHP_ARG_WITH(pq-postgresql, [where to find PostgreSQL server headers],
-[  --with-pq-postgresql	Define some standard type IODs from catalog/pg_type.h], [$PHP_PQ])
+[  --with-pq-postgresql[=DIR]  PQ: Define some standard type OIDs from catalog/pg_type.h], $PHP_PQ)
 
 if test "$PHP_PQ" != "no"; then
 	SEARCH_PATH="/usr/local /usr /opt"
@@ -39,6 +39,7 @@ if test "$PHP_PQ" != "no"; then
 		src/php_pq_misc.c\
 		src/php_pq_callback.c\
 		src/php_pq_object.c\
+		src/php_pq_params.c\
 		src/php_pqcancel.c\
 		src/php_pqconn.c\
 		src/php_pqconn_event.c\
@@ -49,6 +50,7 @@ if test "$PHP_PQ" != "no"; then
 		src/php_pqstm.c\
 		src/php_pqtxn.c\
 		src/php_pqtypes.c\
+		src/php_pqcur.c\
 	"
 	PHP_NEW_EXTENSION(pq, $PQ_SRC, $ext_shared)
 	PHP_ADD_BUILD_DIR($ext_builddir/src)
@@ -59,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)