1 --- apr-util-1.3.9/dbm/apr_dbm_berkeleydb.c.orig 2008-11-21 09:22:35.000000000 +0100
2 +++ apr-util-1.3.9/dbm/apr_dbm_berkeleydb.c 2010-05-21 09:34:59.958939260 +0200
4 * DB_185, DB2, DB3, and DB4.
7 -#if defined(DB_VERSION_MAJOR) && (DB_VERSION_MAJOR == 4)
8 +#if defined(DB_VERSION_MAJOR) && (DB_VERSION_MAJOR > 4)
10 +#elif defined(DB_VERSION_MAJOR) && (DB_VERSION_MAJOR == 4)
11 /* We will treat anything greater than 4.1 as DB4.
12 * We can treat 4.0 as DB3.
14 --- apr-util-1.3.9/build/dbm.m4.orig 2008-11-21 07:32:58.000000000 +0100
15 +++ apr-util-1.3.9/build/dbm.m4 2010-05-21 09:40:46.866935908 +0200
19 AC_CHECK_HEADER([$bdb_header], [
20 - if test "$1" = "3" -o "$1" = "4"; then
21 + if test "$1" = "3" -o "$1" = "4" -o "$1" = "5"; then
22 # We generate a separate cache variable for each prefix and libname
23 # we search under. That way, we avoid caching information that
24 # changes if the user runs `configure' with a different set of
30 +dnl APU_CHECK_DB48: is DB4.8 present?
32 +dnl if present: sets apu_db_header, apu_db_lib, and apu_db_version
34 +AC_DEFUN([APU_CHECK_DB48], [
36 + if test -z "$places"; then
37 + places="std /usr/local/BerkeleyDB.4.8 /boot/home/config"
39 + APU_CHECK_BERKELEY_DB("4", "8", "-1",
41 + "db48/db.h db4/db.h db.h",
42 + "db-4.8 db4-4.8 db48 db4 db"
44 + if test "$apu_have_db" = "1"; then
49 +dnl APU_CHECK_DB50: is DB5.0 present?
51 +dnl if present: sets apu_db_header, apu_db_lib, and apu_db_version
53 +AC_DEFUN([APU_CHECK_DB50], [
55 + if test -z "$places"; then
56 + places="std /usr/local/BerkeleyDB.5.0 /boot/home/config"
58 + APU_CHECK_BERKELEY_DB("5", "0", "-1",
60 + "db50/db.h db5/db.h db.h",
61 + "db-5.0 db5-5.0 db50 db5 db"
63 + if test "$apu_have_db" = "1"; then
68 AC_DEFUN([APU_CHECK_DB], [
71 AC_MSG_ERROR(Berkeley db4 not found)
75 + APU_CHECK_DB48("$check_places")
76 + if test "$apu_db_version" != "4"; then
77 + AC_MSG_ERROR(Berkeley db4 not found)
81 + APU_CHECK_DB50("$check_places")
82 + if test "$apu_db_version" != "5"; then
83 + AC_MSG_ERROR(Berkeley db5 not found)
87 APU_CHECK_DB_ALL("$check_places")
90 AC_DEFUN([APU_CHECK_DB_ALL], [
93 + APU_CHECK_DB50("$all_places")
94 + if test "$apu_db_version" != "5"; then
95 + APU_CHECK_DB48("$all_places")
96 + if test "$apu_db_version" != "4"; then
97 APU_CHECK_DB47("$all_places")
98 if test "$apu_db_version" != "4"; then
99 APU_CHECK_DB46("$all_places")
106 AC_MSG_CHECKING(for Berkeley DB)
107 if test "$apu_have_db" = "1"; then
108 AC_MSG_RESULT(found db$apu_db_version)
109 @@ -679,11 +735,11 @@
112 AC_ARG_WITH(dbm, [APR_HELP_STRING([--with-dbm=DBM], [choose the DBM type to use.
113 - DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44,db45,db46,db47}])],
114 + DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44,db45,db46,db47,db48,db50}])],
116 if test "$withval" = "yes"; then
117 AC_MSG_ERROR([--with-dbm needs to specify a DBM type to use.
118 - One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47])
119 + One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47,db48,db50])
129 + apu_default_dbm=db4
133 + apu_default_dbm=db5
136 dnl ### use more sophisticated DBMs for the default?
137 apu_default_dbm="sdbm (default)"
141 AC_MSG_ERROR([--with-dbm=$look_for is an unknown DBM type.
142 - Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47])
143 + Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47, db48, db50])