tony2001 Mon May 21 11:38:53 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src NEWS
/php-src/ext/dba config.m4
Log:
MFH: fix #41455 (ext/dba/config.m4 pollutes global $LIBS and $LDFLAGS)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.724&r2=1.2027.2.547.2.725&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.724 php-src/NEWS:1.2027.2.547.2.725
--- php-src/NEWS:1.2027.2.547.2.724 Sat May 19 22:05:08 2007
+++ php-src/NEWS Mon May 21 11:38:53 2007
@@ -19,6 +19,8 @@
- Fixed altering $this via argument named "this". (Dmitry)
- Fixed PHP CLI to use the php.ini from the binary location. (Hannes)
- Fixed segfault in strripos(). (Tony, Joxean Koret)
+- Fixed bug #41455 (ext/dba/config.m4 pollutes global $LIBS and $LDFLAGS).
+ (mmarek at suse dot cz, Tony)
- Fixed bug #41430 (Fatal error with negative values of maxlen parameter of
file_get_contents()). (Tony)
- fixed bug #41423 (PHP assumes wrongly that certain ciphers are enabled in
http://cvs.php.net/viewvc.cgi/php-src/ext/dba/config.m4?r1=1.70.2.2.2.4&r2=1.70.2.2.2.5&diff_format=u
Index: php-src/ext/dba/config.m4
diff -u php-src/ext/dba/config.m4:1.70.2.2.2.4
php-src/ext/dba/config.m4:1.70.2.2.2.5
--- php-src/ext/dba/config.m4:1.70.2.2.2.4 Tue Dec 5 17:54:52 2006
+++ php-src/ext/dba/config.m4 Mon May 21 11:38:53 2007
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.70.2.2.2.4 2006/12/05 17:54:52 iliaa Exp $
+dnl $Id: config.m4,v 1.70.2.2.2.5 2007/05/21 11:38:53 tony2001 Exp $
dnl
dnl Suppose we need FlatFile if no support or only CDB is used.
@@ -172,6 +172,7 @@
AC_DEFUN([PHP_DBA_DB_CHECK],[
for LIB in $2; do
if test -f $THIS_PREFIX/$PHP_LIBDIR/lib$LIB.a || test -f
$THIS_PREFIX/$PHP_LIBDIR/lib$LIB.$SHLIB_SUFFIX_NAME; then
+ lib_found="";
PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/$PHP_LIBDIR, -l$LIB,[
AC_TRY_LINK([
#include "$THIS_INCLUDE"
@@ -185,10 +186,14 @@
#endif
],[
THIS_LIBS=$LIB
- break
+ lib_found=1
])
])
])
+ if test -n "$lib_found"; then
+ lib_found="";
+ break;
+ fi
fi
done
if test -z "$THIS_LIBS"; then
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
