Permalink
Browse files

Add the libraries we actually test and need for LDAP and OpenSSL, fix…

…es bug #53339

Patch by Clint Byrum
  • Loading branch information...
1 parent f064435 commit a286fa3523b230fded3204d8b09381675f70d85c @rgeissert rgeissert committed Mar 18, 2011
Showing with 3 additions and 2 deletions.
  1. +1 −1 acinclude.m4
  2. +1 −1 ext/ldap/config.m4
  3. +1 −0 ext/openssl/config0.m4
View
@@ -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
View
@@ -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)
View
@@ -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,
[

0 comments on commit a286fa3

Please sign in to comment.