helly           Mon Aug  7 07:57:12 2006 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src/ext/dba    config.m4 
    /php-src    NEWS 
  Log:
  - Fix bug #38290
  
http://cvs.php.net/viewvc.cgi/php-src/ext/dba/config.m4?r1=1.70.2.2&r2=1.70.2.2.2.1&diff_format=u
Index: php-src/ext/dba/config.m4
diff -u php-src/ext/dba/config.m4:1.70.2.2 
php-src/ext/dba/config.m4:1.70.2.2.2.1
--- php-src/ext/dba/config.m4:1.70.2.2  Tue Nov 29 18:25:58 2005
+++ php-src/ext/dba/config.m4   Mon Aug  7 07:57:12 2006
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.70.2.2 2005/11/29 18:25:58 tony2001 Exp $
+dnl $Id: config.m4,v 1.70.2.2.2.1 2006/08/07 07:57:12 helly Exp $
 dnl
 
 dnl Suppose we need FlatFile if no support or only CDB is used.
@@ -493,7 +493,7 @@
     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 @@
     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 @@
     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
 ])
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.185&r2=1.2027.2.547.2.186&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.185 php-src/NEWS:1.2027.2.547.2.186
--- php-src/NEWS:1.2027.2.547.2.185     Sun Aug  6 19:38:45 2006
+++ php-src/NEWS        Mon Aug  7 07:57:12 2006
@@ -37,6 +37,8 @@
   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 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to