Revert previous patch and it breaks builds with built-in cdb lib

diff --git a/ext/dba/config.m4 b/ext/dba/config.m4
index 3adb9784841aba14b5b145889b13b9cbc0ffab35..2beaca25b0eb1642255e0a21e5071a8be2cc297f 100644 (file)
--- a/ext/dba/config.m4
+++ b/ext/dba/config.m4
@@ -463,7 +463,7 @@ AC_DEFUN([PHP_DBA_BUILTIN_CDB],[
 
 AC_ARG_WITH(cdb,
 [  --with-cdb[=DIR]          DBA: Include CDB support],[
-  if test "$withval" = "yes" && test "$HAVE_DBA" = "1"; then
+  if test "$withval" = "yes" || test "$HAVE_DBA" = "1"; then
     PHP_DBA_BUILTIN_CDB
   elif test "$withval" != "no"; then
     PHP_DBA_STD_BEGIN