svn commit: r368497 - /apr/apr-util/branches/1.2.x/build/dbm.m4

[ro...@apache.org]

Author: rooneg
Date: Thu Jan 12 14:23:55 2006
New Revision: 368497

URL: http://svn.apache.org/viewcvs?rev=368497&view=rev
Log:
Backport r368482 from trunk, add support for Berkeley DB 4.4 to the build
system.

* build/dbm.m4: Add 4.4 in the appropriate places, and add 4.3 in one spot
  that was previously missed.

Modified:
    apr/apr-util/branches/1.2.x/build/dbm.m4

Modified: apr/apr-util/branches/1.2.x/build/dbm.m4
URL: http://svn.apache.org/viewcvs/apr/apr-util/branches/1.2.x/build/dbm.m4?rev=368497&r1=368496&r2=368497&view=diff
==============================================================================
--- apr/apr-util/branches/1.2.x/build/dbm.m4 (original)
+++ apr/apr-util/branches/1.2.x/build/dbm.m4 Thu Jan 12 14:23:55 2006
@@ -445,6 +445,25 @@
     apu_db_version=4
   fi
 ])
+dnl
+dnl APU_CHECK_DB44: is DB4.4 present?
+dnl
+dnl if present: sets apu_db_header, apu_db_lib, and apu_db_version
+dnl
+AC_DEFUN([APU_CHECK_DB44], [
+  places=$1
+  if test -z "$places"; then
+    places="std /usr/local/BerkeleyDB.4.4 /boot/home/config"
+  fi
+  APU_CHECK_BERKELEY_DB("4", "4", "-1",
+    "$places",
+    "db44/db.h db4/db.h db.h",
+    "db-4.4 db4-4.4 db44 db4 db"
+  )
+  if test "$apu_have_db" = "1"; then
+    apu_db_version=4
+  fi
+])
 
 
 AC_DEFUN([APU_CHECK_DB], [
@@ -506,6 +525,12 @@
       AC_MSG_ERROR(Berkeley db4 not found)
     fi
     ;;
+  db44)
+    APU_CHECK_DB44("$check_places")
+    if test "$apu_db_version" != "4"; then
+      AC_MSG_ERROR(Berkeley db4 not found)
+    fi
+    ;;
   default)
     APU_CHECK_DB_ALL("$check_places")
     ;;
@@ -518,21 +543,24 @@
 AC_DEFUN([APU_CHECK_DB_ALL], [
   all_places=$1
  
-  APU_CHECK_DB43("$all_places")
+  APU_CHECK_DB44("$all_places")
   if test "$apu_db_version" != "4"; then
-    APU_CHECK_DB42("$all_places")
+    APU_CHECK_DB43("$all_places")
     if test "$apu_db_version" != "4"; then
-      APU_CHECK_DB41("$all_places")
+      APU_CHECK_DB42("$all_places")
       if test "$apu_db_version" != "4"; then
-        APU_CHECK_DB4("$all_places")
+        APU_CHECK_DB41("$all_places")
         if test "$apu_db_version" != "4"; then
-          APU_CHECK_DB3("$all_places")
-          if test "$apu_db_version" != "3"; then
-            APU_CHECK_DB2("$all_places")
-            if test "$apu_db_version" != "2"; then
-              APU_CHECK_DB1("$all_places")
-              if test "$apu_db_version" != "1"; then
-                APU_CHECK_DB185("$all_places")
+          APU_CHECK_DB4("$all_places")
+          if test "$apu_db_version" != "4"; then
+            APU_CHECK_DB3("$all_places")
+            if test "$apu_db_version" != "3"; then
+              APU_CHECK_DB2("$all_places")
+              if test "$apu_db_version" != "2"; then
+                APU_CHECK_DB1("$all_places")
+                if test "$apu_db_version" != "1"; then
+                  APU_CHECK_DB185("$all_places")
+                fi
               fi
             fi
           fi
@@ -568,11 +596,11 @@
 
   AC_ARG_WITH(dbm, [
     --with-dbm=DBM          choose the DBM type to use.
-      DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43}
+      DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44}
   ], [
     if test "$withval" = "yes"; then
       AC_MSG_ERROR([--with-dbm needs to specify a DBM type to use.
-        One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43])
+        One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44])
     fi
     requested="$withval"
   ], [
@@ -754,6 +782,10 @@
       apu_use_db=1
       apu_default_dbm=db4
       ;;
+    db44)
+      apu_use_db=1
+      apu_default_dbm=db4
+      ;;
     default)
       dnl ### use more sophisticated DBMs for the default?
       apu_default_dbm="sdbm (default)"
@@ -761,7 +793,7 @@
       ;;
     *)
       AC_MSG_ERROR([--with-dbm=$look_for is an unknown DBM type.
-        Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42])
+        Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44])
       ;;
   esac