X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-pq;a=blobdiff_plain;f=config.m4;h=0ec1dbd1abe63498e287d5922253e75caeebc98a;hp=310382b80971c2b73c3b29a58a6833eb27cc704e;hb=18db85e4b2f6d221cb6f09838dc7ac7f873e9ba6;hpb=9255d2d54bca41644cf3588e4e4259a1855b58d7

diff --git a/config.m4 b/config.m4
index 310382b..0ec1dbd 100644
--- a/config.m4
+++ b/config.m4
@@ -1,7 +1,5 @@
 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)
 
 if test "$PHP_PQ" != "no"; then
 	SEARCH_PATH="/usr/local /usr /opt"
@@ -33,6 +31,7 @@ if test "$PHP_PQ" != "no"; then
 		-L$PQ_DIR/$PHP_LIBDIR
 	])
 	PHP_CHECK_LIBRARY(pq, PQlibVersion, [AC_DEFINE(HAVE_PQLIBVERSION, 1, Have PQlibVersion)])
+	PHP_CHECK_LIBRARY(pq, PQconninfo, [AC_DEFINE(HAVE_PQCONNINFO, 1, Have PQconninfo)])
 	
 	PQ_SRC="\
 		src/php_pq_module.c\
@@ -57,22 +56,5 @@ if test "$PHP_PQ" != "no"; then
 	PHP_ADD_INCLUDE($ext_srcdir/src)
 	PHP_ADD_EXTENSION_DEP(pq, raphf)
 	
-	if test "$PHP_PQ_POSTGRESQL" != "no"; then
-		if test "$PHP_PQ_POSTGRESQL" != "yes"; then
-			SEARCH_PATH="$PHP_PQ_POSTGRESQL $SEARCH_PATH"
-		fi
-		for i in $SEARCH_PATH; do
-			CATALOG="$i/include/postgresql/server/catalog/pg_type.h"
-			AC_MSG_CHECKING(for $CATALOG)
-			if test -f "$CATALOG"; then
-				AC_MSG_RESULT(yep)
-				AC_PROG_AWK()
-				$AWK -f $ext_srcdir/php_pq_type.awk < "$CATALOG" > $ext_srcdir/php_pq_type.h
-				AC_DEFINE(HAVE_PHP_PQ_TYPE_H, 1, Have PostgreSQL type OID defs)
-				break
-			fi
-			AC_MSG_RESULT(nope)
-		done
-	fi
 fi