summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorRaphael Geissert <geissert@php.net>2011-03-18 18:47:09 +0000
committerRaphael Geissert <geissert@php.net>2011-03-18 18:47:09 +0000
commita286fa3523b230fded3204d8b09381675f70d85c (patch)
tree6681159062398f959be4172d28fe0789b4fa4a7a /ext
parentf06443593eb832dd1c796c787f079f9aeb3fe691 (diff)
downloadphp-git-a286fa3523b230fded3204d8b09381675f70d85c.tar.gz
Add the libraries we actually test and need for LDAP and OpenSSL, fixes bug #53339
Patch by Clint Byrum
Diffstat (limited to 'ext')
-rw-r--r--ext/ldap/config.m42
-rw-r--r--ext/openssl/config0.m41
2 files changed, 2 insertions, 1 deletions
diff --git a/ext/ldap/config.m4 b/ext/ldap/config.m4
index 4112d46811..58d994c10e 100644
--- a/ext/ldap/config.m4
+++ b/ext/ldap/config.m4
@@ -50,7 +50,7 @@ AC_DEFUN([PHP_LDAP_SASL_CHECKS], [
SASL_LIB="-L$LDAP_SASL_LIBDIR -lsasl2"
fi
- PHP_CHECK_LIBRARY(ldap, sasl_version,
+ PHP_CHECK_LIBRARY(sasl2, sasl_version,
[
PHP_ADD_INCLUDE($LDAP_SASL_INCDIR)
PHP_ADD_LIBRARY_WITH_PATH(sasl2, $LDAP_SASL_LIBDIR, LDAP_SHARED_LIBADD)
diff --git a/ext/openssl/config0.m4 b/ext/openssl/config0.m4
index e9699605fe..2c7f4fb691 100644
--- a/ext/openssl/config0.m4
+++ b/ext/openssl/config0.m4
@@ -17,6 +17,7 @@ if test "$PHP_OPENSSL" != "no"; then
fi
AC_CHECK_LIB(ssl, DSA_get_default_method, AC_DEFINE(HAVE_DSA_DEFAULT_METHOD, 1, [OpenSSL 0.9.7 or later]))
+ AC_CHECK_LIB(crypto, X509_free, AC_DEFINE(HAVE_DSA_DEFAULT_METHOD, 1, [OpenSSL 0.9.7 or later]))
PHP_SETUP_OPENSSL(OPENSSL_SHARED_LIBADD,
[