helly           Thu May 29 08:33:19 2003 EDT

  Modified files:              
    /php4/ext/dba       config.m4 
  Log:
  MFB (these parts were missing)
  
Index: php4/ext/dba/config.m4
diff -u php4/ext/dba/config.m4:1.50 php4/ext/dba/config.m4:1.51
--- php4/ext/dba/config.m4:1.50 Tue May 20 20:14:16 2003
+++ php4/ext/dba/config.m4      Thu May 29 08:33:19 2003
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.50 2003/05/21 00:14:16 helly Exp $
+dnl $Id: config.m4,v 1.51 2003/05/29 12:33:19 helly Exp $
 dnl
 
 dnl Suppose we need FlatFile if no support or only CDB is used.
@@ -140,7 +140,7 @@
         AC_TRY_LINK([
 #include "$THIS_INCLUDE"
         ],[
-          (void)db_create((DB**)0, (DB_ENV*)0, 0);
+          $3;
         ],[
           AC_EGREP_CPP(yes,[
 #include "$THIS_INCLUDE"
@@ -329,8 +329,10 @@
             fi
             AC_DEFINE(DBA_DBM,1,[ ]) 
             THIS_LIBS=$LIB
-            break
           ])
+          if test -n "$THIS_LIBS"; then
+            break
+          fi
         ])
       done
     fi
@@ -352,7 +354,7 @@
 
 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



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

Reply via email to