archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-17 06:28:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Add the libraries we actually test and need for LDAP and OpenSSL, fixes bug #53339

Browse source 
Patch by Clint Byrum
This commit is contained in:
Raphael Geissert 2011-03-18 18:47:09 +00:00
parent f06443593e
commit a286fa3523
3 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
acinclude.m4
View file

@ -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

2
ext/ldap/config.m4
View file

@ -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)

1
ext/openssl/config0.m4
View file

@ -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,
[