MFH: fix #41455 (ext/dba/config.m4 pollutes global $LIBS and $LDFLAGS)

diff --git a/NEWS b/NEWS
index ef18608d477e998e3cd71d3327a89ce06f038c64..60f8260d5ae760763a0fffe9f4189c6b458b78d2 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -19,6 +19,8 @@ PHP                                                                        NEWS
 - 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 

diff --git a/ext/dba/config.m4 b/ext/dba/config.m4
index 2beaca25b0eb1642255e0a21e5071a8be2cc297f..9de99b0a05e2c944422ab93421cbba64f203dcc8 100644 (file)
--- a/ext/dba/config.m4
+++ b/ext/dba/config.m4
@@ -172,6 +172,7 @@ dnl parameters(version, library list, function)
 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 @@ AC_DEFUN([PHP_DBA_DB_CHECK],[
 #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