svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/acinclude.m4 branches/PHP_5_3/ext/ldap/config.m4 branches/PHP_5_3/ext/openssl/config0.m4
trunk/acinclude.m4 trunk/ext/ldap/config.m4 trunk/ext/openssl/config0.m4
| From: | Raphael Geissert | Date: | Fri, 18 Mar 2011 18:47:09 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/acinclude.m4 branches/PHP_5_3/ext/ldap/config.m4 branches/PHP_5_3/ext/openssl/config0.m4 trunk/acinclude.m4 trunk/ext/ldap/config.m4 trunk/ext/openssl/config0.m4 |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-64716@lists.php.net to get a copy of this message | ||
geissert Fri, 18 Mar 2011 18:47:09 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=309398
Log:
Add the libraries we actually test and need for LDAP and OpenSSL, fixes bug #53339
Patch by Clint Byrum
Bug: http://bugs.php.net/53339 (Open) Fails to build LDAP
module when compilng with gcc 4.5 and DSO libraries
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/acinclude.m4
U php/php-src/branches/PHP_5_3/ext/ldap/config.m4
U php/php-src/branches/PHP_5_3/ext/openssl/config0.m4
U php/php-src/trunk/acinclude.m4
U php/php-src/trunk/ext/ldap/config.m4
U php/php-src/trunk/ext/openssl/config0.m4
Modified: php/php-src/branches/PHP_5_3/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3/NEWS 2011-03-18 17:05:46 UTC (rev 309397)
+++ php/php-src/branches/PHP_5_3/NEWS 2011-03-18 18:47:09 UTC (rev 309398)
@@ -13,6 +13,10 @@
- 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)
Modified: php/php-src/branches/PHP_5_3/acinclude.m4
===================================================================
--- php/php-src/branches/PHP_5_3/acinclude.m4 2011-03-18 17:05:46 UTC (rev 309397)
+++ php/php-src/branches/PHP_5_3/acinclude.m4 2011-03-18 18:47:09 UTC (rev 309398)
@@ -2397,7 +2397,7 @@
-L$OPENSSL_LIBDIR
])
LIBS=$old_LIBS
- PHP_ADD_LIBRARY(ssl,,$1)
+ PHP_ADD_LIBRARY(crypto,,$1)
PHP_ADD_LIBPATH($OPENSSL_LIBDIR, $1)
fi
Modified: php/php-src/branches/PHP_5_3/ext/ldap/config.m4
===================================================================
--- php/php-src/branches/PHP_5_3/ext/ldap/config.m4 2011-03-18 17:05:46 UTC (rev 309397)
+++ php/php-src/branches/PHP_5_3/ext/ldap/config.m4 2011-03-18 18:47:09 UTC (rev 309398)
@@ -50,7 +50,7 @@
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)
Modified: php/php-src/branches/PHP_5_3/ext/openssl/config0.m4
===================================================================
--- php/php-src/branches/PHP_5_3/ext/openssl/config0.m4 2011-03-18 17:05:46 UTC (rev 309397)
+++ php/php-src/branches/PHP_5_3/ext/openssl/config0.m4 2011-03-18 18:47:09 UTC (rev 309398)
@@ -17,6 +17,7 @@
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,
[
Modified: php/php-src/trunk/acinclude.m4
===================================================================
--- php/php-src/trunk/acinclude.m4 2011-03-18 17:05:46 UTC (rev 309397)
+++ php/php-src/trunk/acinclude.m4 2011-03-18 18:47:09 UTC (rev 309398)
@@ -2412,7 +2412,7 @@
-L$OPENSSL_LIBDIR
])
LIBS=$old_LIBS
- PHP_ADD_LIBRARY(ssl,,$1)
+ PHP_ADD_LIBRARY(crypto,,$1)
PHP_ADD_LIBPATH($OPENSSL_LIBDIR, $1)
fi
Modified: php/php-src/trunk/ext/ldap/config.m4
===================================================================
--- php/php-src/trunk/ext/ldap/config.m4 2011-03-18 17:05:46 UTC (rev 309397)
+++ php/php-src/trunk/ext/ldap/config.m4 2011-03-18 18:47:09 UTC (rev 309398)
@@ -50,7 +50,7 @@
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)
Modified: php/php-src/trunk/ext/openssl/config0.m4
===================================================================
--- php/php-src/trunk/ext/openssl/config0.m4 2011-03-18 17:05:46 UTC (rev 309397)
+++ php/php-src/trunk/ext/openssl/config0.m4 2011-03-18 18:47:09 UTC (rev 309398)
@@ -17,6 +17,7 @@
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,
[