Author: minfrin
Date: Sat Sep 19 15:10:03 2009
New Revision: 816935

URL: http://svn.apache.org/viewvc?rev=816935&view=rev
Log:
Add support for Berkeley DB 4.8.
Submitted by: Arfrever Frehtes Taifersar Arahesis <arfrever.fta gmail.com>

Modified:
    apr/apr/trunk/CHANGES
    apr/apr/trunk/build/dbm.m4

Modified: apr/apr/trunk/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr/trunk/CHANGES?rev=816935&r1=816934&r2=816935&view=diff
==============================================================================
--- apr/apr/trunk/CHANGES [utf-8] (original)
+++ apr/apr/trunk/CHANGES [utf-8] Sat Sep 19 15:10:03 2009
@@ -5,6 +5,9 @@
      Fix overflow in pools and rmm, where size alignment was taking place.
      [Matt Lewis <mattlewis@google.com>, Sander Striker]
 
+  *) Add support for Berkeley DB 4.8. [Arfrever Frehtes Taifersar Arahesis
+     <arfrever.fta gmail.com>]
+
   *) Add comments describing the thread-safety properties of apr_pool_t.
      [Neil Conway nrc cs.berkeley.edu]
 

Modified: apr/apr/trunk/build/dbm.m4
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/dbm.m4?rev=816935&r1=816934&r2=816935&view=diff
==============================================================================
--- apr/apr/trunk/build/dbm.m4 (original)
+++ apr/apr/trunk/build/dbm.m4 Sat Sep 19 15:10:03 2009
@@ -522,6 +522,25 @@
     apu_db_version=4
   fi
 ])
+dnl
+dnl APU_CHECK_DB48: is DB4.8 present?
+dnl
+dnl if present: sets apu_db_header, apu_db_lib, and apu_db_version
+dnl
+AC_DEFUN([APU_CHECK_DB48], [
+  places=$1
+  if test -z "$places"; then
+    places="std /usr/local/BerkeleyDB.4.8 /boot/home/config"
+  fi
+  APU_CHECK_BERKELEY_DB("4", "8", "-1",
+    "$places",
+    "db48/db.h db4/db.h db.h",
+    "db-4.8 db4-4.8 db48 db4 db"
+  )
+  if test "$apu_have_db" = "1"; then
+    apu_db_version=4
+  fi
+])
 
 AC_DEFUN([APU_CHECK_DB], [
   requested=$1
@@ -606,6 +625,12 @@
       AC_MSG_ERROR(Berkeley db4 not found)
     fi
     ;;
+  db48)
+    APU_CHECK_DB48("$check_places")
+    if test "$apu_db_version" != "4"; then
+      AC_MSG_ERROR(Berkeley db4 not found)
+    fi
+    ;;
   default)
     APU_CHECK_DB_ALL("$check_places")
     ;;
@@ -613,34 +638,37 @@
 ])
 
 dnl
-dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 4.7 to 1.
+dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 4.8 to 1.
 dnl
 AC_DEFUN([APU_CHECK_DB_ALL], [
   all_places=$1
  
-  APU_CHECK_DB47("$all_places")
+  APU_CHECK_DB48("$all_places")
   if test "$apu_db_version" != "4"; then
-    APU_CHECK_DB46("$all_places")
+    APU_CHECK_DB47("$all_places")
     if test "$apu_db_version" != "4"; then
-      APU_CHECK_DB45("$all_places")
+      APU_CHECK_DB46("$all_places")
       if test "$apu_db_version" != "4"; then
-        APU_CHECK_DB44("$all_places")
+        APU_CHECK_DB45("$all_places")
         if test "$apu_db_version" != "4"; then
-          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
@@ -679,11 +707,11 @@
   apu_db_version=0
 
   AC_ARG_WITH(dbm, [APR_HELP_STRING([--with-dbm=DBM], [choose the DBM type to use.
-      DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44,db45,db46,db47}])],
+      DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44,db45,db46,db47,db48}])],
   [
     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, db44, db45, db46, db47])
+        One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47, db48])
     fi
     requested="$withval"
   ], [
@@ -882,6 +910,10 @@
       apu_use_db=1
       apu_default_dbm=db4
       ;;
+    db48)
+      apu_use_db=1
+      apu_default_dbm=db4
+      ;;
     default)
       dnl ### use more sophisticated DBMs for the default?
       apu_default_dbm="sdbm (default)"
@@ -889,7 +921,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, db43, db44, db45, db46, db47])
+        Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47, db48])
       ;;
   esac