jani Mon Jul 9 12:53:52 2007 UTC
Modified files:
/php-src/ext/pdo_pgsql config.m4
Log:
- Fixed bug #35981 (pdo-pgsql should not use pkg-config when not present)
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_pgsql/config.m4?r1=1.16&r2=1.17&diff_format=u
Index: php-src/ext/pdo_pgsql/config.m4
diff -u php-src/ext/pdo_pgsql/config.m4:1.16
php-src/ext/pdo_pgsql/config.m4:1.17
--- php-src/ext/pdo_pgsql/config.m4:1.16 Mon Jul 9 12:37:57 2007
+++ php-src/ext/pdo_pgsql/config.m4 Mon Jul 9 12:53:52 2007
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.16 2007/07/09 12:37:57 jani Exp $
+dnl $Id: config.m4,v 1.17 2007/07/09 12:53:52 jani Exp $
dnl
if test "$PHP_PDO" != "no"; then
@@ -71,8 +71,10 @@
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`"
+ 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])
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
