X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-pq;a=blobdiff_plain;f=config9.m4;h=8064df9d3346562c99ff573a737de484978d5065;hp=6877c85aa59c63fd4a571ee0b8fda1eacba818e6;hb=HEAD;hpb=27c018b2cdc0bc7e16dd4b4170ff4c3d53009363

diff --git a/config9.m4 b/config9.m4
index 6877c85..d845e28 100644
--- a/config9.m4
+++ b/config9.m4
@@ -76,19 +76,22 @@ if test "$PHP_PQ" != "no"; then
 	dnl PQ_CHECK_FUNC(sym, fail-hard)
 	dnl
 	AC_DEFUN([PQ_CHECK_FUNC], [
+		PQ_SYM=$1
 		FAIL_HARD=$2
-
+		save_LIBS="$LIBS"
+		LIBS=
 		PHP_CHECK_LIBRARY(pq, $1, [
 			AC_DEFINE([HAVE_]translit($1,a-z,A-Z), 1, Have $1)
 		], [
 			if test -n "$FAIL_HARD"; then
-				if "$FAIL_HARD"; then
-					AC_MSG_ERROR(could not find $PQ_SYM in -lpq)
+				if $FAIL_HARD; then
+					AC_MSG_ERROR(could not find $PQ_SYM in -lpq -L$PQ_LIBDIR)
 				fi
 			fi
 		], [
 			-L$PQ_LIBDIR
 		])
+		LIBS="$save_LIBS"
 	])
 
 	PQ_CHECK_FUNC(PQregisterEventProc, true)
@@ -96,6 +99,8 @@ if test "$PHP_PQ" != "no"; then
 	PHP_SUBST(PQ_SHARED_LIBADD)
 
 	PQ_CHECK_FUNC(PQlibVersion)
+	PQ_CHECK_FUNC(PQprotocolVersion)
+	PQ_CHECK_FUNC(PQserverVersion)
 	PQ_CHECK_FUNC(PQconninfo)
 	PQ_CHECK_FUNC(PQsetSingleRowMode)