diff options
author | Wez Furlong <wez@php.net> | 2005-01-13 01:12:34 +0000 |
---|---|---|
committer | Wez Furlong <wez@php.net> | 2005-01-13 01:12:34 +0000 |
commit | 0db373883fb073e1773823b236daaf0d3f5a0491 (patch) | |
tree | 73e0559f61e1ae2747756353e44b7bdc88c6f655 | |
parent | 6fa37163f24c1283c29b15da310e1d0a638cbcad (diff) | |
download | php-git-0db373883fb073e1773823b236daaf0d3f5a0491.tar.gz |
detect funky kerberos deps that chain on from openssl deps on RH distros
-rw-r--r-- | ext/pdo_pgsql/config.m4 | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/ext/pdo_pgsql/config.m4 b/ext/pdo_pgsql/config.m4 index 2ead970e9d..42978f4996 100644 --- a/ext/pdo_pgsql/config.m4 +++ b/ext/pdo_pgsql/config.m4 @@ -66,6 +66,17 @@ if test "$PHP_PDO_PGSQL" != "no"; then fi AC_DEFINE(HAVE_PDO_PGSQL,1,[Whether to build PostgreSQL for PDO support or not]) + + AC_MSG_CHECKING([for openssl dependencies]) + if grep -q openssl $PGSQL_INCLUDE/libpq-fe.h ; then + AC_MSG_RESULT([yes]) + if pkg-config openssl ; then + PDO_PGSQL_CFLAGS="`pkg-config openssl --cflags`" + fi + else + AC_MSG_RESULT([no]) + fi + old_LIBS=$LIBS old_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -L$PGSQL_LIBDIR" @@ -77,7 +88,7 @@ if test "$PHP_PDO_PGSQL" != "no"; then AC_CHECK_LIB(pq, PQparameterStatus,AC_DEFINE(HAVE_PQPARAMETERSTATUS,1,[PostgreSQL 7.4 or later])) AC_CHECK_LIB(pq, PQprotocolVersion,AC_DEFINE(HAVE_PQPROTOCOLVERSION,1,[PostgreSQL 7.4 or later])) AC_CHECK_LIB(pq, PQtransactionStatus,AC_DEFINE(HAVE_PGTRANSACTIONSTATUS,1,[PostgreSQL 7.4 or later])) - AC_CHECK_LIB(pq, pg_encoding_to_char,AC_DEFINE(HAVE_PGSQL_WITH_MULTIBYTE_SUPPORT,1,[Whether libpq is compiled with --enable-multibye])) + AC_CHECK_LIB(pq, pg_encoding_to_char,AC_DEFINE(HAVE_PGSQL_WITH_MULTIBYTE_SUPPORT,1,[Whether libpq is compiled with --enable-multibyte])) LIBS=$old_LIBS LDFLAGS=$old_LDFLAGS @@ -97,6 +108,6 @@ dnl find PDO sources AC_MSG_ERROR([Cannot find php_pdo_driver.h.]) fi - PHP_NEW_EXTENSION(pdo_pgsql, pdo_pgsql.c pgsql_driver.c pgsql_statement.c, $ext_shared,,-I$pdo_inc_path) + PHP_NEW_EXTENSION(pdo_pgsql, pdo_pgsql.c pgsql_driver.c pgsql_statement.c, $ext_shared,,-I$pdo_inc_path $PDO_PGSQL_CFLAGS) PHP_ADD_EXTENSION_DEP(pdo_pgsql, pdo) fi |