cvs: php-src /ext/dba config.m4
| From: | Antony Dovgal | Date: | Mon, 21 May 2007 11:37:44 +0000 |
| Subject: | cvs: php-src /ext/dba config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-44401@lists.php.net to get a copy of this message | ||
tony2001 Mon May 21 11:37:44 2007 UTC
Modified files:
/php-src/ext/dba config.m4
Log:
fix #41455 (ext/dba/config.m4 pollutes global $LIBS and $LDFLAGS)
http://cvs.php.net/viewvc.cgi/php-src/ext/dba/config.m4?r1=1.73&r2=1.74&diff_format=u
Index: php-src/ext/dba/config.m4
diff -u php-src/ext/dba/config.m4:1.73 php-src/ext/dba/config.m4:1.74
--- php-src/ext/dba/config.m4:1.73 Tue Nov 28 11:38:57 2006
+++ php-src/ext/dba/config.m4 Mon May 21 11:37:43 2007
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.73 2006/11/28 11:38:57 tony2001 Exp $
+dnl $Id: config.m4,v 1.74 2007/05/21 11:37:43 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 -o -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