MFH: Enable bundled submodules when enabling module

diff --git a/ext/dba/config.m4 b/ext/dba/config.m4
index 360be9af2487201167eef0f7fc7d17d0723ac4b5..30467e3b48ae4bdbefa3cbaaa6d4ab9299ecd0e7 100644 (file)
--- a/ext/dba/config.m4
+++ b/ext/dba/config.m4
@@ -355,7 +355,7 @@ AC_DEFUN(PHP_DBA_BUILTIN_CDB,[
 
 AC_ARG_WITH(cdb,
 [  --with-cdb[=DIR]          DBA: Include CDB support],[
-  if test "$withval" = "yes"; then
+  if test "$withval" = "yes" -o "$HAVE_DBA" = "1"; then
     PHP_DBA_BUILTIN_CDB
   elif test "$withval" != "no"; then
     PHP_DBA_STD_BEGIN
@@ -385,7 +385,7 @@ AC_ARG_WITH(cdb,
     PHP_DBA_STD_ATTACH
   fi
 ],[
-  if test "$PHP_DBA" != "no"; then
+  if test "$PHP_DBA" != "no" -o "$HAVE_DBA" = "1"; then
     PHP_DBA_BUILTIN_CDB
   fi
 ])
@@ -407,7 +407,7 @@ AC_ARG_WITH(flatfile,
     PHP_DBA_BUILTIN_FLATFILE
   fi
 ],[
-  if test "$PHP_DBA" != "no"; then
+  if test "$PHP_DBA" != "no" -o "$HAVE_DBA" = "1"; then
     PHP_DBA_BUILTIN_FLATFILE
   fi
 ])