apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From roo...@apache.org
Subject svn commit: r125358 - /apr/apr-util/branches/0.9.x/CHANGES /apr/apr-util/branches/0.9.x/build/dbm.m4
Date Sun, 16 Jan 2005 17:27:11 GMT
Author: rooneg
Date: Sun Jan 16 09:27:07 2005
New Revision: 125358

URL: http://svn.apache.org/viewcvs?view=rev&rev=125358
Log:
* build/dbm.m4: merge BDB 4.3 support, committed to trunk in r59141.

* CHANGES: note addition of BDB 4.3 support.

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

Modified: apr/apr-util/branches/0.9.x/CHANGES
Url: http://svn.apache.org/viewcvs/apr/apr-util/branches/0.9.x/CHANGES?view=diff&rev=125358&p1=apr/apr-util/branches/0.9.x/CHANGES&r1=125357&p2=apr/apr-util/branches/0.9.x/CHANGES&r2=125358
==============================================================================
--- apr/apr-util/branches/0.9.x/CHANGES	(original)
+++ apr/apr-util/branches/0.9.x/CHANGES	Sun Jan 16 09:27:07 2005
@@ -7,6 +7,8 @@
 
   *) Add a build script to create a solaris package. [Graham Leggett]
 
+  *) Add support for Berkeley DB 4.3.  [Jani Averbach <jaa jaa.iki.fi>]
+
 Changes with APR-util 0.9.5
 
   *) Guarantee and require default address alignment for block offsets

Modified: apr/apr-util/branches/0.9.x/build/dbm.m4
Url: http://svn.apache.org/viewcvs/apr/apr-util/branches/0.9.x/build/dbm.m4?view=diff&rev=125358&p1=apr/apr-util/branches/0.9.x/build/dbm.m4&r1=125357&p2=apr/apr-util/branches/0.9.x/build/dbm.m4&r2=125358
==============================================================================
--- apr/apr-util/branches/0.9.x/build/dbm.m4	(original)
+++ apr/apr-util/branches/0.9.x/build/dbm.m4	Sun Jan 16 09:27:07 2005
@@ -410,6 +410,25 @@
     apu_db_version=4
   fi
 ])
+dnl
+dnl APU_CHECK_DB43: is DB4.3 present?
+dnl
+dnl if present: sets apu_db_header, apu_db_lib, and apu_db_version
+dnl
+AC_DEFUN(APU_CHECK_DB43, [
+  places=$1
+  if test -z "$places"; then
+    places="std /usr/local/BerkeleyDB.4.3 /boot/home/config"
+  fi
+  APU_CHECK_BERKELEY_DB("4", "3", "-1",
+    "$places",
+    "db43/db.h db4/db.h db.h",
+    "db-4.3 db43 db4 db"
+  )
+  if test "$apu_have_db" = "1"; then
+    apu_db_version=4
+  fi
+])
 
 
 AC_DEFUN(APU_CHECK_DB, [
@@ -465,6 +484,12 @@
       AC_MSG_ERROR(Berkeley db4 not found)
     fi
     ;;
+  db43)
+    APU_CHECK_DB43("$check_places")
+    if test "$apu_db_version" != "4"; then
+      AC_MSG_ERROR(Berkeley db4 not found)
+    fi
+    ;;
   default)
     APU_CHECK_DB_ALL("$check_places")
     ;;
@@ -472,24 +497,27 @@
 ])
 
 dnl
-dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 4.2 to 1.
+dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 4.3 to 1.
 dnl
 AC_DEFUN(APU_CHECK_DB_ALL, [
   all_places=$1
  
-  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
@@ -524,11 +552,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}
+      DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43}
   ], [
     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])
+        One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43])
     fi
     requested="$withval"
   ], [
@@ -703,6 +731,10 @@
       apu_default_dbm=db4
       ;;
     db42)
+      apu_use_db=1
+      apu_default_dbm=db4
+      ;;
+    db43)
       apu_use_db=1
       apu_default_dbm=db4
       ;;

Mime
View raw message