]>
Commit | Line | Data |
---|---|---|
8e79d606 JB |
1 | --- apr-util-1.3.0/build/dbm.m4.orig 2008-05-28 18:27:01.000000000 +0200 |
2 | +++ apr-util-1.3.0/build/dbm.m4 2008-06-17 00:07:17.967540272 +0200 | |
3 | @@ -503,6 +503,25 @@ | |
4 | apu_db_version=4 | |
5 | fi | |
6 | ]) | |
7 | +dnl | |
8 | +dnl APU_CHECK_DB47: is DB4.7 present? | |
9 | +dnl | |
10 | +dnl if present: sets apu_db_header, apu_db_lib, and apu_db_version | |
11 | +dnl | |
12 | +AC_DEFUN([APU_CHECK_DB47], [ | |
13 | + places=$1 | |
14 | + if test -z "$places"; then | |
15 | + places="std /usr/local/BerkeleyDB.4.7 /boot/home/config" | |
16 | + fi | |
17 | + APU_CHECK_BERKELEY_DB("4", "7", "-1", | |
18 | + "$places", | |
19 | + "db47/db.h db4/db.h db.h", | |
20 | + "db-4.7 db4-4.7 db47 db4 db" | |
21 | + ) | |
22 | + if test "$apu_have_db" = "1"; then | |
23 | + apu_db_version=4 | |
24 | + fi | |
25 | +]) | |
26 | ||
27 | AC_DEFUN([APU_CHECK_DB], [ | |
28 | requested=$1 | |
29 | @@ -581,6 +600,12 @@ | |
30 | AC_MSG_ERROR(Berkeley db4 not found) | |
31 | fi | |
32 | ;; | |
33 | + db47) | |
34 | + APU_CHECK_DB47("$check_places") | |
35 | + if test "$apu_db_version" != "4"; then | |
36 | + AC_MSG_ERROR(Berkeley db4 not found) | |
37 | + fi | |
38 | + ;; | |
39 | default) | |
40 | APU_CHECK_DB_ALL("$check_places") | |
41 | ;; | |
42 | @@ -593,6 +618,8 @@ | |
43 | AC_DEFUN([APU_CHECK_DB_ALL], [ | |
44 | all_places=$1 | |
45 | ||
46 | + APU_CHECK_DB47("$all_places") | |
47 | + if test "$apu_db_version" != "4"; then | |
48 | APU_CHECK_DB46("$all_places") | |
49 | if test "$apu_db_version" != "4"; then | |
50 | APU_CHECK_DB45("$all_places") | |
51 | @@ -624,6 +651,7 @@ | |
52 | fi | |
53 | fi | |
54 | fi | |
55 | + fi | |
56 | AC_MSG_CHECKING(for Berkeley DB) | |
57 | if test "$apu_have_db" = "1"; then | |
58 | AC_MSG_RESULT(found db$apu_db_version) | |
59 | @@ -651,11 +679,11 @@ | |
60 | apu_db_version=0 | |
61 | ||
62 | AC_ARG_WITH(dbm, [APR_HELP_STRING([--with-dbm=DBM], [choose the DBM type to use. | |
63 | - DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44,db45,db46}])], | |
64 | + DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44,db45,db46,db47}])], | |
65 | [ | |
66 | if test "$withval" = "yes"; then | |
67 | AC_MSG_ERROR([--with-dbm needs to specify a DBM type to use. | |
68 | - One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46]) | |
69 | + One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47]) | |
70 | fi | |
71 | requested="$withval" | |
72 | ], [ | |
73 | @@ -850,6 +878,10 @@ | |
74 | apu_use_db=1 | |
75 | apu_default_dbm=db4 | |
76 | ;; | |
77 | + db47) | |
78 | + apu_use_db=1 | |
79 | + apu_default_dbm=db4 | |
80 | + ;; | |
81 | default) | |
82 | dnl ### use more sophisticated DBMs for the default? | |
83 | apu_default_dbm="sdbm (default)" | |
84 | @@ -857,7 +889,7 @@ | |
85 | ;; | |
86 | *) | |
87 | AC_MSG_ERROR([--with-dbm=$look_for is an unknown DBM type. | |
88 | - Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46]) | |
89 | + Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46,db47]) | |
90 | ;; | |
91 | esac | |
92 |