apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rj...@apache.org
Subject svn commit: r1003788 - in /apr/apr-util/branches/1.3.x: CHANGES build/dbm.m4
Date Sat, 02 Oct 2010 12:36:37 GMT
Author: rjung
Date: Sat Oct  2 12:36:37 2010
New Revision: 1003788

URL: http://svn.apache.org/viewvc?rev=1003788&view=rev
Log:
Add support for Berkeley DB 5.1.

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

Modified: apr/apr-util/branches/1.3.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/CHANGES?rev=1003788&r1=1003787&r2=1003788&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/CHANGES [utf-8] (original)
+++ apr/apr-util/branches/1.3.x/CHANGES [utf-8] Sat Oct  2 12:36:37 2010
@@ -1,6 +1,8 @@
                                                      -*- coding: utf-8 -*-
 Changes with APR-util 1.3.11
 
+  *) Add support for Berkeley DB 5.1.
+     [Rainer Jung]
 
 Changes with APR-util 1.3.10
 

Modified: apr/apr-util/branches/1.3.x/build/dbm.m4
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/build/dbm.m4?rev=1003788&r1=1003787&r2=1003788&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/build/dbm.m4 (original)
+++ apr/apr-util/branches/1.3.x/build/dbm.m4 Sat Oct  2 12:36:37 2010
@@ -560,6 +560,25 @@ AC_DEFUN([APU_CHECK_DB50], [
     apu_db_version=5
   fi
 ])
+dnl
+dnl APU_CHECK_DB51: is DB5.1 present?
+dnl
+dnl if present: sets apu_db_header, apu_db_lib, and apu_db_version
+dnl
+AC_DEFUN([APU_CHECK_DB51], [
+  places=$1
+  if test -z "$places"; then
+    places="std /usr/local/BerkeleyDB.5.1 /boot/home/config"
+  fi
+  APU_CHECK_BERKELEY_DB("5", "1", "-1",
+    "$places",
+    "db51/db.h db5/db.h db.h",
+    "db-5.1 db5-5.1 db51 db5 db"
+  )
+  if test "$apu_have_db" = "1"; then
+    apu_db_version=5
+  fi
+])
 
 AC_DEFUN([APU_CHECK_DB], [
   requested=$1
@@ -656,6 +675,12 @@ AC_DEFUN([APU_CHECK_DB], [
       AC_MSG_ERROR(Berkeley db5 not found)
     fi
     ;;
+  db51)
+    APU_CHECK_DB51("$check_places")
+    if test "$apu_db_version" != "5"; then
+      AC_MSG_ERROR(Berkeley db5 not found)
+    fi
+    ;;
   default)
     APU_CHECK_DB_ALL("$check_places")
     ;;
@@ -663,38 +688,41 @@ AC_DEFUN([APU_CHECK_DB], [
 ])
 
 dnl
-dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 5.0 to 1.
+dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 5.1 to 1.
 dnl
 AC_DEFUN([APU_CHECK_DB_ALL], [
   all_places=$1
  
-  APU_CHECK_DB50("$all_places")
+  APU_CHECK_DB51("$all_places")
   if test "$apu_db_version" != "5"; then
-    APU_CHECK_DB48("$all_places")
-    if test "$apu_db_version" != "4"; then
-      APU_CHECK_DB47("$all_places")
+    APU_CHECK_DB50("$all_places")
+    if test "$apu_db_version" != "5"; then
+      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
@@ -735,11 +763,11 @@ AC_DEFUN([APU_CHECK_DBM], [
   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,db48,db50}])],
+      DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44,db45,db46,db47,db48,db50,db51}])],
   [
     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, db48, db50])
+        One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44,
db45, db46, db47, db48, db50, db51])
     fi
     requested="$withval"
   ], [
@@ -946,6 +974,10 @@ AC_DEFUN([APU_CHECK_DBM], [
       apu_use_db=1
       apu_default_dbm=db5
       ;;
+    db51)
+      apu_use_db=1
+      apu_default_dbm=db5
+      ;;
     default)
       dnl ### use more sophisticated DBMs for the default?
       apu_default_dbm="sdbm (default)"
@@ -953,7 +985,7 @@ AC_DEFUN([APU_CHECK_DBM], [
       ;;
     *)
       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, db48, db50])
+        Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44,
db45, db46, db47, db48, db50, db51])
       ;;
   esac
 



Mime
View raw message