1 |
arfrever 10/10/04 01:03:27 |
2 |
|
3 |
Added: apr-util-1.3.10-support_berkeley_db-5.1.patch |
4 |
Log: |
5 |
Version bump. Support Berkeley DB 5.1. |
6 |
|
7 |
(Portage version: 2.2_rc88_p83/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 dev-libs/apr-util/files/apr-util-1.3.10-support_berkeley_db-5.1.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/apr-util/files/apr-util-1.3.10-support_berkeley_db-5.1.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/apr-util/files/apr-util-1.3.10-support_berkeley_db-5.1.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: apr-util-1.3.10-support_berkeley_db-5.1.patch |
16 |
=================================================================== |
17 |
https://svn.apache.org/viewvc?view=revision&revision=1003788 |
18 |
|
19 |
--- build/dbm.m4 |
20 |
+++ build/dbm.m4 |
21 |
@@ -560,6 +560,25 @@ |
22 |
apu_db_version=5 |
23 |
fi |
24 |
]) |
25 |
+dnl |
26 |
+dnl APU_CHECK_DB51: is DB5.1 present? |
27 |
+dnl |
28 |
+dnl if present: sets apu_db_header, apu_db_lib, and apu_db_version |
29 |
+dnl |
30 |
+AC_DEFUN([APU_CHECK_DB51], [ |
31 |
+ places=$1 |
32 |
+ if test -z "$places"; then |
33 |
+ places="std /usr/local/BerkeleyDB.5.1 /boot/home/config" |
34 |
+ fi |
35 |
+ APU_CHECK_BERKELEY_DB("5", "1", "-1", |
36 |
+ "$places", |
37 |
+ "db51/db.h db5/db.h db.h", |
38 |
+ "db-5.1 db5-5.1 db51 db5 db" |
39 |
+ ) |
40 |
+ if test "$apu_have_db" = "1"; then |
41 |
+ apu_db_version=5 |
42 |
+ fi |
43 |
+]) |
44 |
|
45 |
AC_DEFUN([APU_CHECK_DB], [ |
46 |
requested=$1 |
47 |
@@ -656,6 +675,12 @@ |
48 |
AC_MSG_ERROR(Berkeley db5 not found) |
49 |
fi |
50 |
;; |
51 |
+ db51) |
52 |
+ APU_CHECK_DB51("$check_places") |
53 |
+ if test "$apu_db_version" != "5"; then |
54 |
+ AC_MSG_ERROR(Berkeley db5 not found) |
55 |
+ fi |
56 |
+ ;; |
57 |
default) |
58 |
APU_CHECK_DB_ALL("$check_places") |
59 |
;; |
60 |
@@ -663,38 +688,41 @@ |
61 |
]) |
62 |
|
63 |
dnl |
64 |
-dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 5.0 to 1. |
65 |
+dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 5.1 to 1. |
66 |
dnl |
67 |
AC_DEFUN([APU_CHECK_DB_ALL], [ |
68 |
all_places=$1 |
69 |
|
70 |
- APU_CHECK_DB50("$all_places") |
71 |
+ APU_CHECK_DB51("$all_places") |
72 |
if test "$apu_db_version" != "5"; then |
73 |
- APU_CHECK_DB48("$all_places") |
74 |
- if test "$apu_db_version" != "4"; then |
75 |
- APU_CHECK_DB47("$all_places") |
76 |
+ APU_CHECK_DB50("$all_places") |
77 |
+ if test "$apu_db_version" != "5"; then |
78 |
+ APU_CHECK_DB48("$all_places") |
79 |
if test "$apu_db_version" != "4"; then |
80 |
- APU_CHECK_DB46("$all_places") |
81 |
+ APU_CHECK_DB47("$all_places") |
82 |
if test "$apu_db_version" != "4"; then |
83 |
- APU_CHECK_DB45("$all_places") |
84 |
+ APU_CHECK_DB46("$all_places") |
85 |
if test "$apu_db_version" != "4"; then |
86 |
- APU_CHECK_DB44("$all_places") |
87 |
+ APU_CHECK_DB45("$all_places") |
88 |
if test "$apu_db_version" != "4"; then |
89 |
- APU_CHECK_DB43("$all_places") |
90 |
+ APU_CHECK_DB44("$all_places") |
91 |
if test "$apu_db_version" != "4"; then |
92 |
- APU_CHECK_DB42("$all_places") |
93 |
+ APU_CHECK_DB43("$all_places") |
94 |
if test "$apu_db_version" != "4"; then |
95 |
- APU_CHECK_DB41("$all_places") |
96 |
+ APU_CHECK_DB42("$all_places") |
97 |
if test "$apu_db_version" != "4"; then |
98 |
- APU_CHECK_DB4("$all_places") |
99 |
+ APU_CHECK_DB41("$all_places") |
100 |
if test "$apu_db_version" != "4"; then |
101 |
- APU_CHECK_DB3("$all_places") |
102 |
- if test "$apu_db_version" != "3"; then |
103 |
- APU_CHECK_DB2("$all_places") |
104 |
- if test "$apu_db_version" != "2"; then |
105 |
- APU_CHECK_DB1("$all_places") |
106 |
- if test "$apu_db_version" != "1"; then |
107 |
- APU_CHECK_DB185("$all_places") |
108 |
+ APU_CHECK_DB4("$all_places") |
109 |
+ if test "$apu_db_version" != "4"; then |
110 |
+ APU_CHECK_DB3("$all_places") |
111 |
+ if test "$apu_db_version" != "3"; then |
112 |
+ APU_CHECK_DB2("$all_places") |
113 |
+ if test "$apu_db_version" != "2"; then |
114 |
+ APU_CHECK_DB1("$all_places") |
115 |
+ if test "$apu_db_version" != "1"; then |
116 |
+ APU_CHECK_DB185("$all_places") |
117 |
+ fi |
118 |
fi |
119 |
fi |
120 |
fi |
121 |
@@ -735,11 +763,11 @@ |
122 |
apu_db_version=0 |
123 |
|
124 |
AC_ARG_WITH(dbm, [APR_HELP_STRING([--with-dbm=DBM], [choose the DBM type to use. |
125 |
- DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44,db45,db46,db47,db48,db50}])], |
126 |
+ DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44,db45,db46,db47,db48,db50,db51}])], |
127 |
[ |
128 |
if test "$withval" = "yes"; then |
129 |
AC_MSG_ERROR([--with-dbm needs to specify a DBM type to use. |
130 |
- One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47, db48, db50]) |
131 |
+ One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47, db48, db50, db51]) |
132 |
fi |
133 |
requested="$withval" |
134 |
], [ |
135 |
@@ -946,6 +974,10 @@ |
136 |
apu_use_db=1 |
137 |
apu_default_dbm=db5 |
138 |
;; |
139 |
+ db51) |
140 |
+ apu_use_db=1 |
141 |
+ apu_default_dbm=db5 |
142 |
+ ;; |
143 |
default) |
144 |
dnl ### use more sophisticated DBMs for the default? |
145 |
apu_default_dbm="sdbm (default)" |
146 |
@@ -953,7 +985,7 @@ |
147 |
;; |
148 |
*) |
149 |
AC_MSG_ERROR([--with-dbm=$look_for is an unknown DBM type. |
150 |
- Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47, db48, db50]) |
151 |
+ Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47, db48, db50, db51]) |
152 |
;; |
153 |
esac |