Annotation of /trunk/apr-util/patches/apr-util-1.3.12-db52.patch
Parent Directory | Revision Log
Revision 1520 -
(hide annotations)
(download)
Tue Sep 6 17:15:34 2011 UTC (13 years ago) by niro
File size: 5199 byte(s)
Tue Sep 6 17:15:34 2011 UTC (13 years ago) by niro
File size: 5199 byte(s)
-added patch to support berkely db 5.2
1 | niro | 1520 | --- build/dbm.m4 |
2 | +++ build/dbm.m4 | ||
3 | @@ -579,6 +579,25 @@ | ||
4 | apu_db_version=5 | ||
5 | fi | ||
6 | ]) | ||
7 | +dnl | ||
8 | +dnl APU_CHECK_DB52: is DB5.2 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_DB52], [ | ||
13 | + places=$1 | ||
14 | + if test -z "$places"; then | ||
15 | + places="std /usr/local/BerkeleyDB.5.2 /boot/home/config" | ||
16 | + fi | ||
17 | + APU_CHECK_BERKELEY_DB("5", "2", "-1", | ||
18 | + "$places", | ||
19 | + "db52/db.h db5/db.h db.h", | ||
20 | + "db-5.2 db5-5.2 db52 db5 db" | ||
21 | + ) | ||
22 | + if test "$apu_have_db" = "1"; then | ||
23 | + apu_db_version=5 | ||
24 | + fi | ||
25 | +]) | ||
26 | |||
27 | AC_DEFUN([APU_CHECK_DB], [ | ||
28 | requested=$1 | ||
29 | @@ -681,6 +700,12 @@ | ||
30 | AC_MSG_ERROR(Berkeley db5 not found) | ||
31 | fi | ||
32 | ;; | ||
33 | + db52) | ||
34 | + APU_CHECK_DB52("$check_places") | ||
35 | + if test "$apu_db_version" != "5"; then | ||
36 | + AC_MSG_ERROR(Berkeley db5 not found) | ||
37 | + fi | ||
38 | + ;; | ||
39 | default) | ||
40 | APU_CHECK_DB_ALL("$check_places") | ||
41 | ;; | ||
42 | @@ -688,40 +713,43 @@ | ||
43 | ]) | ||
44 | |||
45 | dnl | ||
46 | -dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 5.1 to 1. | ||
47 | +dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 5.2 to 1. | ||
48 | dnl | ||
49 | AC_DEFUN([APU_CHECK_DB_ALL], [ | ||
50 | all_places=$1 | ||
51 | |||
52 | - APU_CHECK_DB51("$all_places") | ||
53 | + APU_CHECK_DB52("$all_places") | ||
54 | if test "$apu_db_version" != "5"; then | ||
55 | - APU_CHECK_DB50("$all_places") | ||
56 | + APU_CHECK_DB51("$all_places") | ||
57 | if test "$apu_db_version" != "5"; then | ||
58 | - APU_CHECK_DB48("$all_places") | ||
59 | - if test "$apu_db_version" != "4"; then | ||
60 | - APU_CHECK_DB47("$all_places") | ||
61 | + APU_CHECK_DB50("$all_places") | ||
62 | + if test "$apu_db_version" != "5"; then | ||
63 | + APU_CHECK_DB48("$all_places") | ||
64 | if test "$apu_db_version" != "4"; then | ||
65 | - APU_CHECK_DB46("$all_places") | ||
66 | + APU_CHECK_DB47("$all_places") | ||
67 | if test "$apu_db_version" != "4"; then | ||
68 | - APU_CHECK_DB45("$all_places") | ||
69 | + APU_CHECK_DB46("$all_places") | ||
70 | if test "$apu_db_version" != "4"; then | ||
71 | - APU_CHECK_DB44("$all_places") | ||
72 | + APU_CHECK_DB45("$all_places") | ||
73 | if test "$apu_db_version" != "4"; then | ||
74 | - APU_CHECK_DB43("$all_places") | ||
75 | + APU_CHECK_DB44("$all_places") | ||
76 | if test "$apu_db_version" != "4"; then | ||
77 | - APU_CHECK_DB42("$all_places") | ||
78 | + APU_CHECK_DB43("$all_places") | ||
79 | if test "$apu_db_version" != "4"; then | ||
80 | - APU_CHECK_DB41("$all_places") | ||
81 | + APU_CHECK_DB42("$all_places") | ||
82 | if test "$apu_db_version" != "4"; then | ||
83 | - APU_CHECK_DB4("$all_places") | ||
84 | + APU_CHECK_DB41("$all_places") | ||
85 | if test "$apu_db_version" != "4"; then | ||
86 | - APU_CHECK_DB3("$all_places") | ||
87 | - if test "$apu_db_version" != "3"; then | ||
88 | - APU_CHECK_DB2("$all_places") | ||
89 | - if test "$apu_db_version" != "2"; then | ||
90 | - APU_CHECK_DB1("$all_places") | ||
91 | - if test "$apu_db_version" != "1"; then | ||
92 | - APU_CHECK_DB185("$all_places") | ||
93 | + APU_CHECK_DB4("$all_places") | ||
94 | + if test "$apu_db_version" != "4"; then | ||
95 | + APU_CHECK_DB3("$all_places") | ||
96 | + if test "$apu_db_version" != "3"; then | ||
97 | + APU_CHECK_DB2("$all_places") | ||
98 | + if test "$apu_db_version" != "2"; then | ||
99 | + APU_CHECK_DB1("$all_places") | ||
100 | + if test "$apu_db_version" != "1"; then | ||
101 | + APU_CHECK_DB185("$all_places") | ||
102 | + fi | ||
103 | fi | ||
104 | fi | ||
105 | fi | ||
106 | @@ -763,11 +791,11 @@ | ||
107 | apu_db_version=0 | ||
108 | |||
109 | AC_ARG_WITH(dbm, [APR_HELP_STRING([--with-dbm=DBM], [choose the DBM type to use. | ||
110 | - DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44,db45,db46,db47,db48,db50,db51}])], | ||
111 | + DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44,db45,db46,db47,db48,db50,db51,db52}])], | ||
112 | [ | ||
113 | if test "$withval" = "yes"; then | ||
114 | AC_MSG_ERROR([--with-dbm needs to specify a DBM type to use. | ||
115 | - One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47, db48, db50, db51]) | ||
116 | + One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47, db48, db50, db51, db52]) | ||
117 | fi | ||
118 | requested="$withval" | ||
119 | ], [ | ||
120 | @@ -978,6 +1006,10 @@ | ||
121 | apu_use_db=1 | ||
122 | apu_default_dbm=db5 | ||
123 | ;; | ||
124 | + db52) | ||
125 | + apu_use_db=1 | ||
126 | + apu_default_dbm=db5 | ||
127 | + ;; | ||
128 | default) | ||
129 | dnl ### use more sophisticated DBMs for the default? | ||
130 | apu_default_dbm="sdbm (default)" | ||
131 | @@ -985,7 +1017,7 @@ | ||
132 | ;; | ||
133 | *) | ||
134 | AC_MSG_ERROR([--with-dbm=$look_for is an unknown DBM type. | ||
135 | - Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47, db48, db50, db51]) | ||
136 | + Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47, db48, db50, db51, db52]) | ||
137 | ;; | ||
138 | esac | ||
139 |