]> granicus.if.org Git - php/commitdiff
ext/pdo_pgsql: drop unneeded code
authorEli Schwartz <eschwartz@archlinux.org>
Wed, 7 Nov 2018 18:25:14 +0000 (13:25 -0500)
committerNikita Popov <nikita.ppv@gmail.com>
Sun, 9 Dec 2018 16:15:58 +0000 (17:15 +0100)
This check was added in 0db373883fb073e1773823b236daaf0d3f5a0491 and
greps for a private implementation detail of the postgres headers,
removed in https://github.com/postgres/postgres/commit/3c4768d0d17d4569f2417aa5741e0317404b6c45

It hasn't worked as intended for 12 years, and can safely be assumed to
not be needed.

ext/pdo_pgsql/config.m4

index ca6320ef35447b1ceff0b3f34a06d5d313110a33..523127de3d725ca6a3993eae7d79d606a97d1d67 100644 (file)
@@ -67,19 +67,6 @@ if test "$PHP_PDO_PGSQL" != "no"; then
 
   AC_DEFINE(HAVE_PDO_PGSQL,1,[Whether to build PostgreSQL for PDO support or not])
 
-  AC_MSG_CHECKING([for openssl dependencies])
-  grep openssl $PGSQL_INCLUDE/libpq-fe.h >/dev/null 2>&1
-  if test $? -eq 0 ; then
-    AC_MSG_RESULT([yes])
-    dnl First try to find pkg-config
-    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-    if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists openssl; then
-      PDO_PGSQL_CFLAGS=`$PKG_CONFIG openssl --cflags`
-    fi
-  else
-    AC_MSG_RESULT([no])
-  fi
-
   old_LIBS=$LIBS
   old_LDFLAGS=$LDFLAGS
   LDFLAGS="-L$PGSQL_LIBDIR $LDFLAGS"
@@ -114,7 +101,7 @@ if test "$PHP_PDO_PGSQL" != "no"; then
     AC_MSG_RESULT($pdo_cv_inc_path)
   ])
 
-  PHP_NEW_EXTENSION(pdo_pgsql, pdo_pgsql.c pgsql_driver.c pgsql_statement.c, $ext_shared,,-I$pdo_cv_inc_path $PDO_PGSQL_CFLAGS)
+  PHP_NEW_EXTENSION(pdo_pgsql, pdo_pgsql.c pgsql_driver.c pgsql_statement.c, $ext_shared,,-I$pdo_cv_inc_path)
   ifdef([PHP_ADD_EXTENSION_DEP],
   [
     PHP_ADD_EXTENSION_DEP(pdo_pgsql, pdo)