You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by fi...@apache.org on 2007/09/01 23:11:34 UTC
svn commit: r571868 - in /apr/apr-util/trunk: CHANGES build/dbm.m4
Author: fielding
Date: Sat Sep 1 14:11:32 2007
New Revision: 571868
URL: http://svn.apache.org/viewvc?rev=571868&view=rev
Log:
Support BerkeleyDB 4.6.
Submitted by: Arfrever Frehtes Taifersar Arahesis <arfrever.fta at gmail.com>
Modified:
apr/apr-util/trunk/CHANGES
apr/apr-util/trunk/build/dbm.m4
Modified: apr/apr-util/trunk/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/CHANGES?rev=571868&r1=571867&r2=571868&view=diff
==============================================================================
--- apr/apr-util/trunk/CHANGES [utf-8] (original)
+++ apr/apr-util/trunk/CHANGES [utf-8] Sat Sep 1 14:11:32 2007
@@ -1,6 +1,8 @@
-*- coding: utf-8 -*-
Changes with APR-util 1.3.0
+ *) Support BerkeleyDB 4.6. [Arfrever Frehtes Taifersar Arahesis]
+
*) Support Tivoli ITDS LDAP client library. [Paul Reder]
*) Portably implement testdate's long-time constants to solve
Modified: apr/apr-util/trunk/build/dbm.m4
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/build/dbm.m4?rev=571868&r1=571867&r2=571868&view=diff
==============================================================================
--- apr/apr-util/trunk/build/dbm.m4 (original)
+++ apr/apr-util/trunk/build/dbm.m4 Sat Sep 1 14:11:32 2007
@@ -483,6 +483,25 @@
apu_db_version=4
fi
])
+dnl
+dnl APU_CHECK_DB46: is DB4.6 present?
+dnl
+dnl if present: sets apu_db_header, apu_db_lib, and apu_db_version
+dnl
+AC_DEFUN([APU_CHECK_DB46], [
+ places=$1
+ if test -z "$places"; then
+ places="std /usr/local/BerkeleyDB.4.6 /boot/home/config"
+ fi
+ APU_CHECK_BERKELEY_DB("4", "6", "-1",
+ "$places",
+ "db46/db.h db4/db.h db.h",
+ "db-4.6 db4-4.6 db46 db4 db"
+ )
+ if test "$apu_have_db" = "1"; then
+ apu_db_version=4
+ fi
+])
AC_DEFUN([APU_CHECK_DB], [
requested=$1
@@ -555,6 +574,12 @@
AC_MSG_ERROR(Berkeley db4 not found)
fi
;;
+ db46)
+ APU_CHECK_DB46("$check_places")
+ if test "$apu_db_version" != "4"; then
+ AC_MSG_ERROR(Berkeley db4 not found)
+ fi
+ ;;
default)
APU_CHECK_DB_ALL("$check_places")
;;
@@ -562,30 +587,33 @@
])
dnl
-dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 4.3 to 1.
+dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 4.6 to 1.
dnl
AC_DEFUN([APU_CHECK_DB_ALL], [
all_places=$1
- 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
@@ -622,11 +650,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}])],
+ DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44,db45,db46}])],
[
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])
+ One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46])
fi
requested="$withval"
], [
@@ -813,6 +841,10 @@
apu_use_db=1
apu_default_dbm=db4
;;
+ db46)
+ apu_use_db=1
+ apu_default_dbm=db4
+ ;;
default)
dnl ### use more sophisticated DBMs for the default?
apu_default_dbm="sdbm (default)"
@@ -820,7 +852,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])
+ Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46])
;;
esac