- Fix bug #38290

diff --git a/NEWS b/NEWS
index ba349ffe3faa1cdd10f00aaad54c82c302edb3d5..932345b7dfe443a2c72d2dae756391f136897561 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -37,6 +37,8 @@ PHP                                                                        NEWS
   execution). (Tony)
 - Fixed bug #38303 (spl_autoload_register() supress all errors silently).
   (Ilia)
+- Fixed bug #38290 (configure script ignores --without-cdb,inifile,flatfile).
+  (Marcus)
 - Fixed bug #38289 (segfault in session_decode() when _SESSION is NULL). 
   (Tony)
 - Fixed bug #38278 (session_cache_expire()'s value does not match phpinfo's 

diff --git a/ext/dba/config.m4 b/ext/dba/config.m4
index 6af355181192586f89970b11db1d6bc56966fa32..7f2e125a92522e0afc862584dd8ac0ebfc25ca64 100644 (file)
--- a/ext/dba/config.m4
+++ b/ext/dba/config.m4
@@ -493,7 +493,7 @@ AC_ARG_WITH(cdb,
     PHP_DBA_STD_ATTACH
   fi
 ],[
-  if test "$PHP_DBA" != "no" || test "$HAVE_DBA" = "1"; then
+  if test "$PHP_DBA" != "no" && test "$HAVE_DBA" = "1"; then
     PHP_DBA_BUILTIN_CDB
   fi
 ])
@@ -511,7 +511,7 @@ AC_ARG_WITH(inifile,
     PHP_DBA_BUILTIN_INI
   fi
 ],[
-  if test "$PHP_DBA" != "no" || test "$HAVE_DBA" = "1"; then
+  if test "$PHP_DBA" != "no" && test "$HAVE_DBA" = "1"; then
     PHP_DBA_BUILTIN_INI
   fi
 ])
@@ -532,7 +532,7 @@ AC_ARG_WITH(flatfile,
     PHP_DBA_BUILTIN_FLATFILE
   fi
 ],[
-  if test "$PHP_DBA" != "no" || test "$HAVE_DBA" = "1"; then
+  if test "$PHP_DBA" != "no" && test "$HAVE_DBA" = "1"; then
     PHP_DBA_BUILTIN_FLATFILE
   fi
 ])