diff options
| author | Raphael Geissert <geissert@php.net> | 2011-03-18 18:47:09 +0000 |
|---|---|---|
| committer | Raphael Geissert <geissert@php.net> | 2011-03-18 18:47:09 +0000 |
| commit | a286fa3523b230fded3204d8b09381675f70d85c (patch) | |
| tree | 6681159062398f959be4172d28fe0789b4fa4a7a | |
| parent | f06443593eb832dd1c796c787f079f9aeb3fe691 (diff) | |
| download | php-git-a286fa3523b230fded3204d8b09381675f70d85c.tar.gz | |
Add the libraries we actually test and need for LDAP and OpenSSL, fixes bug #53339
Patch by Clint Byrum
| -rw-r--r-- | acinclude.m4 | 2 | ||||
| -rw-r--r-- | ext/ldap/config.m4 | 2 | ||||
| -rw-r--r-- | ext/openssl/config0.m4 | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 9d38902ca0..1c5cecd9a6 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2412,7 +2412,7 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[ -L$OPENSSL_LIBDIR ]) LIBS=$old_LIBS - PHP_ADD_LIBRARY(ssl,,$1) + PHP_ADD_LIBRARY(crypto,,$1) PHP_ADD_LIBPATH($OPENSSL_LIBDIR, $1) fi 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, [ |