Browse Source

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

Patch by Clint Byrum
pull/12/head
Raphael Geissert 15 years ago
parent
commit
5b55a18622
  1. 4
      NEWS
  2. 2
      acinclude.m4
  3. 2
      ext/ldap/config.m4
  4. 1
      ext/openssl/config0.m4

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)

2
acinclude.m4

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

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

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

Loading…
Cancel
Save