Fix passing manual, non-standard installation paths

./configure \
  --with-pgsql=/any/path/to/postgresql \
  --with-pdo-postgresql=/any/path/to/postgresql

Author: petk

build/php.m4

@@ -1940,11 +1940,7 @@ dnl install directory or the path to pg_config.
 dnl
 AC_DEFUN([PHP_SETUP_PGSQL],
 [found_pgsql=no
-  PKG_CHECK_MODULES([PGSQL], [libpq >= 9.3], [
-    PHP_EVAL_INCLINE([$PGSQL_CFLAGS])
-    PHP_EVAL_LIBLINE([$PGSQL_LIBS], [$1])
-    found_pgsql=yes
-  ], [
+PKG_CHECK_MODULES([PGSQL], [libpq >= 9.3], [found_pgsql=yes], [
 dnl Undocumented BC feature: The PGSQL_INCLUDE variable can be also passed to
 dnl configure script to override the PostgreSQL library include directory.
   PHP_EXPAND_PATH([$PGSQL_INCLUDE], [PGSQL_INCLUDE])
@@ -1979,14 +1975,17 @@ dnl Set installation PostgreSQL directory if given from configure argument.
 
   AS_IF([test -z "$PGSQL_INCLUDE" || test -z "PGSQL_LIBDIR"], [found_pgsql=no], [
     found_pgsql=yes
-    PHP_ADD_LIBRARY_WITH_PATH([pq], [$PGSQL_LIBDIR], [$1])
-    PHP_ADD_INCLUDE([$PGSQL_INCLUDE])
+    PGSQL_CFLAGS="-I$PGSQL_INCLUDE"
+    PGSQL_LIBS="-lpq -L$PGSQL_LIBDIR"
   ])
 ])
 
-AS_VAR_IF([found_pgsql], [yes],
-  [AC_CHECK_LIB([pq], [PQlibVersion], [:],
-    [AC_MSG_ERROR([PostgreSQL check failed: libpq 9.1 or later is required.])])
+AS_VAR_IF([found_pgsql], [yes], [
+  PHP_EVAL_INCLINE([$PGSQL_CFLAGS])
+  PHP_EVAL_LIBLINE([$PGSQL_LIBS], [$1])
+  PHP_CHECK_LIBRARY([pq], [PQlibVersion],,
+    [AC_MSG_ERROR([PostgreSQL check failed: libpq 9.1 or later is required.])],
+    [$PGSQL_LIBS])
 $2],
 [m4_default([$3], [AC_MSG_ERROR(m4_normalize([
   Cannot find libpq-fe.h or libpq.so anywhere under $PGSQL_SEARCH_PATHS. Please

ext/pdo_pgsql/config.m4

@@ -16,7 +16,9 @@ if test "$PHP_PDO_PGSQL" != "no"; then
 
   AC_DEFINE(HAVE_PDO_PGSQL,1,[Whether to build PostgreSQL for PDO support or not])
 
-  AC_CHECK_LIB(pq, PQresultMemorySize, AC_DEFINE(HAVE_PG_RESULT_MEMORY_SIZE,1,[PostgreSQL 12 or later]))
+  PHP_CHECK_LIBRARY([pq], [PQresultMemorySize],
+    [AC_DEFINE([HAVE_PG_RESULT_MEMORY_SIZE], [1], [PostgreSQL 12 or later])],,
+    [$PGSQL_LIBS])
 
   PHP_CHECK_PDO_INCLUDES
 

ext/pgsql/config.m4

@@ -12,15 +12,28 @@ if test "$PHP_PGSQL" != "no"; then
 
   AC_DEFINE(HAVE_PGSQL,1,[Whether to build PostgreSQL support or not])
 
-  old_CFLAGS=$CFLAGS
-  CFLAGS="$CFLAGS -I$INCLUDES"
+  PHP_CHECK_LIBRARY([pq], [pg_encoding_to_char],
+    [AC_DEFINE([HAVE_PGSQL_WITH_MULTIBYTE_SUPPORT], [1],
+      [Whether libpq is compiled with --enable-multibyte])],,
+    [$PGSQL_LIBS])
+  PHP_CHECK_LIBRARY([pq], [lo_truncate64],
+    [AC_DEFINE([HAVE_PG_LO64], [1], [PostgreSQL 9.3 or later])],,
+    [$PGSQL_LIBS])
+  PHP_CHECK_LIBRARY([pq], [PQsetErrorContextVisibility],
+    [AC_DEFINE([HAVE_PG_CONTEXT_VISIBILITY], [1], [PostgreSQL 9.6 or later])],,
+    [$PGSQL_LIBS])
+  PHP_CHECK_LIBRARY([pq], [PQresultMemorySize],
+    [AC_DEFINE([HAVE_PG_RESULT_MEMORY_SIZE], [1], [PostgreSQL 12 or later])],,
+    [$PGSQL_LIBS])
+  PHP_CHECK_LIBRARY([pq], [PQchangePassword],
+    [AC_DEFINE([HAVE_PG_CHANGE_PASSWORD], [1], [PostgreSQL 17 or later])],,
+    [$PGSQL_LIBS])
+  PHP_CHECK_LIBRARY([pq], [PQsocketPoll],
+    [AC_DEFINE([HAVE_PG_SOCKET_POLL], [1], [PostgreSQL 17 or later])],,
+    [$PGSQL_LIBS])
 
-  AC_CHECK_LIB(pq, pg_encoding_to_char,AC_DEFINE(HAVE_PGSQL_WITH_MULTIBYTE_SUPPORT,1,[Whether libpq is compiled with --enable-multibyte]))
-  AC_CHECK_LIB(pq, lo_truncate64, AC_DEFINE(HAVE_PG_LO64,1,[PostgreSQL 9.3 or later]))
-  AC_CHECK_LIB(pq, PQsetErrorContextVisibility, AC_DEFINE(HAVE_PG_CONTEXT_VISIBILITY,1,[PostgreSQL 9.6 or later]))
-  AC_CHECK_LIB(pq, PQresultMemorySize, AC_DEFINE(HAVE_PG_RESULT_MEMORY_SIZE,1,[PostgreSQL 12 or later]))
-  AC_CHECK_LIB(pq, PQchangePassword, AC_DEFINE(HAVE_PG_CHANGE_PASSWORD,1,[PostgreSQL 17 or later]))
-  AC_CHECK_LIB(pq, PQsocketPoll, AC_DEFINE(HAVE_PG_SOCKET_POLL,1,[PostgreSQL 17 or later]))
+  old_CFLAGS=$CFLAGS
+  CFLAGS="$CFLAGS $PGSQL_CFLAGS"
 
   dnl Available since PostgreSQL 12.
   AC_CACHE_CHECK([if PGVerbosity enum has PQERRORS_SQLSTATE],