mirror of
https://github.com/php/php-src.git
synced 2025-08-16 05:58:45 +02:00
Add the libraries we actually test and need for LDAP and OpenSSL, fixes bug #53339
Patch by Clint Byrum
This commit is contained in:
parent
5a53a74304
commit
5b55a18622
4 changed files with 7 additions and 2 deletions
4
NEWS
4
NEWS
|
@ -13,6 +13,10 @@ PHP NEWS
|
|||
- DBA extension:
|
||||
. Fixed bug #54242 (dba_insert returns true if key already exists). (Felipe)
|
||||
|
||||
- LDAP extension:
|
||||
. Fixed bug #53339 (Fails to build when compilng with gcc 4.5 and DSO
|
||||
libraries). (Clint Byrum, Raphael)
|
||||
|
||||
- MySQL Improved extension:
|
||||
. Fixed Bug #54221 (mysqli::get_warnings segfault when used in multi queries).
|
||||
(Andrey)
|
||||
|
|
|
@ -2397,7 +2397,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
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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,
|
||||
[
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue