| 1 |
--- apr-util-1.4.1/build/dbm.m4.orig 2012-01-23 10:46:45.564982929 +0100 |
--- apr-util-1.4.1/build/dbm.m4.orig 2012-01-23 10:46:45.564982929 +0100 |
| 2 |
+++ apr-util-1.4.1/build/dbm.m4 2012-01-23 10:48:35.118982932 +0100 |
+++ apr-util-1.4.1/build/dbm.m4 2012-01-23 11:04:30.664982933 +0100 |
| 3 |
@@ -579,6 +579,44 @@ |
@@ -579,6 +579,44 @@ |
| 4 |
apu_db_version=5 |
apu_db_version=5 |
| 5 |
fi |
fi |
| 45 |
|
|
| 46 |
AC_DEFUN([APU_CHECK_DB], [ |
AC_DEFUN([APU_CHECK_DB], [ |
| 47 |
requested=$1 |
requested=$1 |
| 48 |
|
@@ -681,6 +719,18 @@ |
| 49 |
|
AC_MSG_ERROR(Berkeley db5 not found) |
| 50 |
|
fi |
| 51 |
|
;; |
| 52 |
|
+ db52) |
| 53 |
|
+ APU_CHECK_DB52("$check_places") |
| 54 |
|
+ if test "$apu_db_version" != "5"; then |
| 55 |
|
+ AC_MSG_ERROR(Berkeley db5 not found) |
| 56 |
|
+ fi |
| 57 |
|
+ ;; |
| 58 |
|
+ db53) |
| 59 |
|
+ APU_CHECK_DB52("$check_places") |
| 60 |
|
+ if test "$apu_db_version" != "5"; then |
| 61 |
|
+ AC_MSG_ERROR(Berkeley db5 not found) |
| 62 |
|
+ fi |
| 63 |
|
+ ;; |
| 64 |
|
default) |
| 65 |
|
APU_CHECK_DB_ALL("$check_places") |
| 66 |
|
;; |
| 67 |
|
@@ -688,40 +738,46 @@ |
| 68 |
|
]) |
| 69 |
|
|
| 70 |
|
dnl |
| 71 |
|
-dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 5.1 to 1. |
| 72 |
|
+dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 5.3 to 1. |
| 73 |
|
dnl |
| 74 |
|
AC_DEFUN([APU_CHECK_DB_ALL], [ |
| 75 |
|
all_places=$1 |
| 76 |
|
|
| 77 |
|
- APU_CHECK_DB51("$all_places") |
| 78 |
|
+ APU_CHECK_DB53("$all_places") |
| 79 |
|
if test "$apu_db_version" != "5"; then |
| 80 |
|
- APU_CHECK_DB50("$all_places") |
| 81 |
|
+ APU_CHECK_DB52("$all_places") |
| 82 |
|
if test "$apu_db_version" != "5"; then |
| 83 |
|
- APU_CHECK_DB48("$all_places") |
| 84 |
|
- if test "$apu_db_version" != "4"; then |
| 85 |
|
- APU_CHECK_DB47("$all_places") |
| 86 |
|
- if test "$apu_db_version" != "4"; then |
| 87 |
|
- APU_CHECK_DB46("$all_places") |
| 88 |
|
+ APU_CHECK_DB51("$all_places") |
| 89 |
|
+ if test "$apu_db_version" != "5"; then |
| 90 |
|
+ APU_CHECK_DB50("$all_places") |
| 91 |
|
+ if test "$apu_db_version" != "5"; then |
| 92 |
|
+ APU_CHECK_DB48("$all_places") |
| 93 |
|
if test "$apu_db_version" != "4"; then |
| 94 |
|
- APU_CHECK_DB45("$all_places") |
| 95 |
|
+ APU_CHECK_DB47("$all_places") |
| 96 |
|
if test "$apu_db_version" != "4"; then |
| 97 |
|
- APU_CHECK_DB44("$all_places") |
| 98 |
|
+ APU_CHECK_DB46("$all_places") |
| 99 |
|
if test "$apu_db_version" != "4"; then |
| 100 |
|
- APU_CHECK_DB43("$all_places") |
| 101 |
|
+ APU_CHECK_DB45("$all_places") |
| 102 |
|
if test "$apu_db_version" != "4"; then |
| 103 |
|
- APU_CHECK_DB42("$all_places") |
| 104 |
|
+ APU_CHECK_DB44("$all_places") |
| 105 |
|
if test "$apu_db_version" != "4"; then |
| 106 |
|
- APU_CHECK_DB41("$all_places") |
| 107 |
|
+ APU_CHECK_DB43("$all_places") |
| 108 |
|
if test "$apu_db_version" != "4"; then |
| 109 |
|
- APU_CHECK_DB4("$all_places") |
| 110 |
|
+ APU_CHECK_DB42("$all_places") |
| 111 |
|
if test "$apu_db_version" != "4"; then |
| 112 |
|
- APU_CHECK_DB3("$all_places") |
| 113 |
|
- if test "$apu_db_version" != "3"; then |
| 114 |
|
- APU_CHECK_DB2("$all_places") |
| 115 |
|
- if test "$apu_db_version" != "2"; then |
| 116 |
|
- APU_CHECK_DB1("$all_places") |
| 117 |
|
- if test "$apu_db_version" != "1"; then |
| 118 |
|
- APU_CHECK_DB185("$all_places") |
| 119 |
|
+ APU_CHECK_DB41("$all_places") |
| 120 |
|
+ if test "$apu_db_version" != "4"; then |
| 121 |
|
+ APU_CHECK_DB4("$all_places") |
| 122 |
|
+ if test "$apu_db_version" != "4"; then |
| 123 |
|
+ APU_CHECK_DB3("$all_places") |
| 124 |
|
+ if test "$apu_db_version" != "3"; then |
| 125 |
|
+ APU_CHECK_DB2("$all_places") |
| 126 |
|
+ if test "$apu_db_version" != "2"; then |
| 127 |
|
+ APU_CHECK_DB1("$all_places") |
| 128 |
|
+ if test "$apu_db_version" != "1"; then |
| 129 |
|
+ APU_CHECK_DB185("$all_places") |
| 130 |
|
+ fi |
| 131 |
|
+ fi |
| 132 |
|
fi |
| 133 |
|
fi |
| 134 |
|
fi |
| 135 |
|
@@ -763,11 +819,11 @@ |
| 136 |
|
apu_db_version=0 |
| 137 |
|
|
| 138 |
|
AC_ARG_WITH(dbm, [APR_HELP_STRING([--with-dbm=DBM], [choose the DBM type to use. |
| 139 |
|
- DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44,db45,db46,db47,db48,db50,db51}])], |
| 140 |
|
+ DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44,db45,db46,db47,db48,db50,db51,db52,db53}])], |
| 141 |
|
[ |
| 142 |
|
if test "$withval" = "yes"; then |
| 143 |
|
AC_MSG_ERROR([--with-dbm needs to specify a DBM type to use. |
| 144 |
|
- One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47, db48, db50, db51]) |
| 145 |
|
+ One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47, db48, db50, db51, db52, db53]) |
| 146 |
|
fi |
| 147 |
|
requested="$withval" |
| 148 |
|
], [ |
| 149 |
|
@@ -978,6 +1034,14 @@ |
| 150 |
|
apu_use_db=1 |
| 151 |
|
apu_default_dbm=db5 |
| 152 |
|
;; |
| 153 |
|
+ db52) |
| 154 |
|
+ apu_use_db=1 |
| 155 |
|
+ apu_default_dbm=db5 |
| 156 |
|
+ ;; |
| 157 |
|
+ db53) |
| 158 |
|
+ apu_use_db=1 |
| 159 |
|
+ apu_default_dbm=db5 |
| 160 |
|
+ ;; |
| 161 |
|
default) |
| 162 |
|
dnl ### use more sophisticated DBMs for the default? |
| 163 |
|
apu_default_dbm="sdbm (default)" |
| 164 |
|
@@ -985,7 +1049,7 @@ |
| 165 |
|
;; |
| 166 |
|
*) |
| 167 |
|
AC_MSG_ERROR([--with-dbm=$look_for is an unknown DBM type. |
| 168 |
|
- Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47, db48, db50, db51]) |
| 169 |
|
+ Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47, db48, db50, db51, db52, db53]) |
| 170 |
|
;; |
| 171 |
|
esac |
| 172 |
|
|
Parent Directory
| 
Revision Log
| 
Patch