From bdd4eb2d9e118a3ffdaef53c0b800c5bdc5f15cc Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Wed, 7 Nov 2018 13:25:14 -0500 Subject: [PATCH] ext/pdo_pgsql: drop unneeded code 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 | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/ext/pdo_pgsql/config.m4 b/ext/pdo_pgsql/config.m4 index ca6320ef35..523127de3d 100644 --- a/ext/pdo_pgsql/config.m4 +++ b/ext/pdo_pgsql/config.m4 @@ -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) -- 2.49.0