summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus Boerger <helly@php.net>2006-08-07 07:57:12 +0000
committerMarcus Boerger <helly@php.net>2006-08-07 07:57:12 +0000
commite038500be3b5c54e790ff0d1d3d6d87dcf7daeb8 (patch)
tree201a6f45e1432f85c4705ee4f03cf016836bc085
parent6c75d829975c0e1ecf72062436e289ab618bf2bb (diff)
downloadphp-git-e038500be3b5c54e790ff0d1d3d6d87dcf7daeb8.tar.gz
- Fix bug #38290
-rw-r--r--NEWS2
-rw-r--r--ext/dba/config.m46
2 files changed, 5 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index ba349ffe3f..932345b7df 100644
--- 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 6af3551811..7f2e125a92 100644
--- 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
])