Skip to content

Commit d79ef88

Browse files
committed
ext/pdo_pgsql: drop unneeded code
This check was added in 0db3738 and greps for a private implementation detail of the postgres headers, removed in postgres/postgres@3c4768d It hasn't worked as intended for 12 years, and can safely be assumed to not be needed.
1 parent 5e81cf6 commit d79ef88

File tree

1 file changed

+1
-14
lines changed

1 file changed

+1
-14
lines changed

ext/pdo_pgsql/config.m4

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -67,19 +67,6 @@ if test "$PHP_PDO_PGSQL" != "no"; then
6767

6868
AC_DEFINE(HAVE_PDO_PGSQL,1,[Whether to build PostgreSQL for PDO support or not])
6969

70-
AC_MSG_CHECKING([for openssl dependencies])
71-
grep openssl $PGSQL_INCLUDE/libpq-fe.h >/dev/null 2>&1
72-
if test $? -eq 0 ; then
73-
AC_MSG_RESULT([yes])
74-
dnl First try to find pkg-config
75-
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
76-
if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists openssl; then
77-
PDO_PGSQL_CFLAGS=`$PKG_CONFIG openssl --cflags`
78-
fi
79-
else
80-
AC_MSG_RESULT([no])
81-
fi
82-
8370
old_LIBS=$LIBS
8471
old_LDFLAGS=$LDFLAGS
8572
LDFLAGS="-L$PGSQL_LIBDIR $LDFLAGS"
@@ -114,7 +101,7 @@ if test "$PHP_PDO_PGSQL" != "no"; then
114101
AC_MSG_RESULT($pdo_cv_inc_path)
115102
])
116103

117-
PHP_NEW_EXTENSION(pdo_pgsql, pdo_pgsql.c pgsql_driver.c pgsql_statement.c, $ext_shared,,-I$pdo_cv_inc_path $PDO_PGSQL_CFLAGS)
104+
PHP_NEW_EXTENSION(pdo_pgsql, pdo_pgsql.c pgsql_driver.c pgsql_statement.c, $ext_shared,,-I$pdo_cv_inc_path)
118105
ifdef([PHP_ADD_EXTENSION_DEP],
119106
[
120107
PHP_ADD_EXTENSION_DEP(pdo_pgsql, pdo)

0 commit comments

Comments
 (0)