Attachment #88689 for bug #125520

View | Details | Raw Unified | Return to bug 125520
Collapse All | Expand All




--- srclib/apr-util/build/dbm.m4.orig	2008-05-28 16:27:01.000000000 +0000
+++ srclib/apr-util/build/dbm.m4	2008-07-11 20:32:59.000000000 +0000
@@ -315,8 +315,8 @@
   fi
   APU_CHECK_BERKELEY_DB(1, -1, -1,
     "$places",

   )
   if test "$apu_have_db" = "1"; then
     apu_db_version=185
@@ -358,7 +358,7 @@
   APU_CHECK_BERKELEY_DB(3, -1, -1,
     "$places",
     "db3/db.h db.h",

   )
   if test "$apu_have_db" = "1"; then
     apu_db_version=3
@@ -378,8 +378,8 @@
   fi
   APU_CHECK_BERKELEY_DB("4", "0", "-1",
     "$places",

   )
   if test "$apu_have_db" = "1"; then
     apu_db_version=4
@@ -399,8 +399,8 @@
   fi
   APU_CHECK_BERKELEY_DB("4", "1", "-1",
     "$places",

   )
   if test "$apu_have_db" = "1"; then
     apu_db_version=4
@@ -420,8 +420,8 @@
   fi
   APU_CHECK_BERKELEY_DB("4", "2", "-1",
     "$places",

   )
   if test "$apu_have_db" = "1"; then
     apu_db_version=4
@@ -439,8 +439,8 @@
   fi
   APU_CHECK_BERKELEY_DB("4", "3", "-1",
     "$places",

   )
   if test "$apu_have_db" = "1"; then
     apu_db_version=4
@@ -503,6 +503,25 @@
     apu_db_version=4
   fi
 ])
+dnl
+dnl APU_CHECK_DB47: is DB4.7 present?
+dnl
+dnl if present: sets apu_db_header, apu_db_lib, and apu_db_version
+dnl
+AC_DEFUN([APU_CHECK_DB47], [
+  places=$1
+  if test -z "$places"; then
+    places="std /usr/local/BerkeleyDB.4.7 /boot/home/config"
+  fi
+  APU_CHECK_BERKELEY_DB("4", "7", "-1",
+    "$places",
+    "db47/db.h db4/db.h db.h",
+    "db-4.7 db4-4.7 db47 db4 db"
+  )
+  if test "$apu_have_db" = "1"; then
+    apu_db_version=4
+  fi
+])
 
 AC_DEFUN([APU_CHECK_DB], [
   requested=$1
@@ -581,6 +600,12 @@
       AC_MSG_ERROR(Berkeley db4 not found)
     fi
     ;;
+  db47)
+    APU_CHECK_DB47("$check_places")
+    if test "$apu_db_version" != "4"; then
+      AC_MSG_ERROR(Berkeley db4 not found)
+    fi
+    ;;
   default)
     APU_CHECK_DB_ALL("$check_places")
     ;;
@@ -588,32 +613,35 @@
 ])
 
 dnl
-dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 4.6 to 1.
+dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 4.7 to 1.
 dnl
 AC_DEFUN([APU_CHECK_DB_ALL], [
   all_places=$1
  
-  APU_CHECK_DB46("$all_places")
+  APU_CHECK_DB47("$all_places")
   if test "$apu_db_version" != "4"; then
-    APU_CHECK_DB45("$all_places")
+    APU_CHECK_DB46("$all_places")
     if test "$apu_db_version" != "4"; then
-      APU_CHECK_DB44("$all_places")
+      APU_CHECK_DB45("$all_places")
       if test "$apu_db_version" != "4"; then
-        APU_CHECK_DB43("$all_places")
+        APU_CHECK_DB44("$all_places")
         if test "$apu_db_version" != "4"; then
-          APU_CHECK_DB42("$all_places")
+          APU_CHECK_DB43("$all_places")
           if test "$apu_db_version" != "4"; then
-            APU_CHECK_DB41("$all_places")
+            APU_CHECK_DB42("$all_places")
             if test "$apu_db_version" != "4"; then
-              APU_CHECK_DB4("$all_places")
+              APU_CHECK_DB41("$all_places")
               if test "$apu_db_version" != "4"; then
-                APU_CHECK_DB3("$all_places")
-                if test "$apu_db_version" != "3"; then
-                  APU_CHECK_DB2("$all_places")
-                  if test "$apu_db_version" != "2"; then
-                    APU_CHECK_DB1("$all_places")
-                    if test "$apu_db_version" != "1"; then
-                      APU_CHECK_DB185("$all_places")
+                APU_CHECK_DB4("$all_places")
+                if test "$apu_db_version" != "4"; then
+                  APU_CHECK_DB3("$all_places")
+                  if test "$apu_db_version" != "3"; then
+                    APU_CHECK_DB2("$all_places")
+                    if test "$apu_db_version" != "2"; then
+                      APU_CHECK_DB1("$all_places")
+                      if test "$apu_db_version" != "1"; then
+                        APU_CHECK_DB185("$all_places")
+                      fi
                     fi
                   fi
                 fi
@@ -651,11 +679,11 @@
   apu_db_version=0
 
   AC_ARG_WITH(dbm, [APR_HELP_STRING([--with-dbm=DBM], [choose the DBM type to use.
-      DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44,db45,db46}])],
+      DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44,db45,db46,db47}])],
   [
     if test "$withval" = "yes"; then
       AC_MSG_ERROR([--with-dbm needs to specify a DBM type to use.
-        One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46])
+        One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47])
     fi
     requested="$withval"
   ], [
@@ -850,6 +878,10 @@
       apu_use_db=1
       apu_default_dbm=db4
       ;;
+    db47)
+      apu_use_db=1
+      apu_default_dbm=db4
+      ;;
     default)
       dnl ### use more sophisticated DBMs for the default?
       apu_default_dbm="sdbm (default)"
@@ -857,7 +889,7 @@
       ;;
     *)
       AC_MSG_ERROR([--with-dbm=$look_for is an unknown DBM type.
-        Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46])
+        Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47])
       ;;
   esac
 

Return to bug 125520

Lines 1-6 Link Here

(-)apache22/files/patch-srclib:apr-util:build:dbm.m4 (-8 / +132 lines)
1	--- srclib/apr-util/build/dbm.m4.orig Thu Feb 24 10:23:34 2005	1	--- srclib/apr-util/build/dbm.m4.orig 2008-05-28 16:27:01.000000000 +0000
2	+++ srclib/apr-util/build/dbm.m4 Sun Oct 30 19:44:43 2005	2	+++ srclib/apr-util/build/dbm.m4 2008-07-11 20:32:59.000000000 +0000
3	@@ -314,8 +314,8 @@	3	@@ -315,8 +315,8 @@
4	fi	4	fi
5	APU_CHECK_BERKELEY_DB(1, -1, -1,	5	APU_CHECK_BERKELEY_DB(1, -1, -1,
6	"$places",	6	"$places",
Lines 11-17 Link Here
11	)	11	)
12	if test "$apu_have_db" = "1"; then	12	if test "$apu_have_db" = "1"; then
13	apu_db_version=185	13	apu_db_version=185
14	@@ -357,7 +357,7 @@	14	@@ -358,7 +358,7 @@
15	APU_CHECK_BERKELEY_DB(3, -1, -1,	15	APU_CHECK_BERKELEY_DB(3, -1, -1,
16	"$places",	16	"$places",
17	"db3/db.h db.h",	17	"db3/db.h db.h",
Lines 20-26 Link Here
20	)	20	)
21	if test "$apu_have_db" = "1"; then	21	if test "$apu_have_db" = "1"; then
22	apu_db_version=3	22	apu_db_version=3
23	@@ -377,8 +377,8 @@	23	@@ -378,8 +378,8 @@
24	fi	24	fi
25	APU_CHECK_BERKELEY_DB("4", "0", "-1",	25	APU_CHECK_BERKELEY_DB("4", "0", "-1",
26	"$places",	26	"$places",
Lines 31-37 Link Here
31	)	31	)
32	if test "$apu_have_db" = "1"; then	32	if test "$apu_have_db" = "1"; then
33	apu_db_version=4	33	apu_db_version=4
34	@@ -398,8 +398,8 @@	34	@@ -399,8 +399,8 @@
35	fi	35	fi
36	APU_CHECK_BERKELEY_DB("4", "1", "-1",	36	APU_CHECK_BERKELEY_DB("4", "1", "-1",
37	"$places",	37	"$places",
Lines 42-48 Link Here
42	)	42	)
43	if test "$apu_have_db" = "1"; then	43	if test "$apu_have_db" = "1"; then
44	apu_db_version=4	44	apu_db_version=4
45	@@ -419,8 +419,8 @@	45	@@ -420,8 +420,8 @@
46	fi	46	fi
47	APU_CHECK_BERKELEY_DB("4", "2", "-1",	47	APU_CHECK_BERKELEY_DB("4", "2", "-1",
48	"$places",	48	"$places",
Lines 53-59 Link Here
53	)	53	)
54	if test "$apu_have_db" = "1"; then	54	if test "$apu_have_db" = "1"; then
55	apu_db_version=4	55	apu_db_version=4
56	@@ -438,8 +438,8 @@	56	@@ -439,8 +439,8 @@
57	fi	57	fi
58	APU_CHECK_BERKELEY_DB("4", "3", "-1",	58	APU_CHECK_BERKELEY_DB("4", "3", "-1",
59	"$places",	59	"$places",
Lines 64-66 Link Here
64	)	64	)
65	if test "$apu_have_db" = "1"; then	65	if test "$apu_have_db" = "1"; then
66	apu_db_version=4	66	apu_db_version=4
		67	@@ -503,6 +503,25 @@
		68	apu_db_version=4
		69	fi
		70	])
		71	+dnl
		72	+dnl APU_CHECK_DB47: is DB4.7 present?
		73	+dnl
		74	+dnl if present: sets apu_db_header, apu_db_lib, and apu_db_version
		75	+dnl
		76	+AC_DEFUN([APU_CHECK_DB47], [
		77	+ places=$1
		78	+ if test -z "$places"; then
		79	+ places="std /usr/local/BerkeleyDB.4.7 /boot/home/config"
		80	+ fi
		81	+ APU_CHECK_BERKELEY_DB("4", "7", "-1",
		82	+ "$places",
		83	+ "db47/db.h db4/db.h db.h",
		84	+ "db-4.7 db4-4.7 db47 db4 db"
		85	+ )
		86	+ if test "$apu_have_db" = "1"; then
		87	+ apu_db_version=4
		88	+ fi
		89	+])
		90
		91	AC_DEFUN([APU_CHECK_DB], [
		92	requested=$1
		93	@@ -581,6 +600,12 @@
		94	AC_MSG_ERROR(Berkeley db4 not found)
		95	fi
		96	;;
		97	+ db47)
		98	+ APU_CHECK_DB47("$check_places")
		99	+ if test "$apu_db_version" != "4"; then
		100	+ AC_MSG_ERROR(Berkeley db4 not found)
		101	+ fi
		102	+ ;;
		103	default)
		104	APU_CHECK_DB_ALL("$check_places")
		105	;;
		106	@@ -588,32 +613,35 @@
		107	])
		108
		109	dnl
		110	-dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 4.6 to 1.
		111	+dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 4.7 to 1.
		112	dnl
		113	AC_DEFUN([APU_CHECK_DB_ALL], [
		114	all_places=$1
		115
		116	- APU_CHECK_DB46("$all_places")
		117	+ APU_CHECK_DB47("$all_places")
		118	if test "$apu_db_version" != "4"; then
		119	- APU_CHECK_DB45("$all_places")
		120	+ APU_CHECK_DB46("$all_places")
		121	if test "$apu_db_version" != "4"; then
		122	- APU_CHECK_DB44("$all_places")
		123	+ APU_CHECK_DB45("$all_places")
		124	if test "$apu_db_version" != "4"; then
		125	- APU_CHECK_DB43("$all_places")
		126	+ APU_CHECK_DB44("$all_places")
		127	if test "$apu_db_version" != "4"; then
		128	- APU_CHECK_DB42("$all_places")
		129	+ APU_CHECK_DB43("$all_places")
		130	if test "$apu_db_version" != "4"; then
131	- APU_CHECK_DB41("$all_places")
132	+ APU_CHECK_DB42("$all_places")
133	if test "$apu_db_version" != "4"; then
134	- APU_CHECK_DB4("$all_places")
135	+ APU_CHECK_DB41("$all_places")
136	if test "$apu_db_version" != "4"; then
137	- APU_CHECK_DB3("$all_places")
138	- if test "$apu_db_version" != "3"; then
139	- APU_CHECK_DB2("$all_places")
140	- if test "$apu_db_version" != "2"; then
141	- APU_CHECK_DB1("$all_places")
142	- if test "$apu_db_version" != "1"; then
143	- APU_CHECK_DB185("$all_places")
144	+ APU_CHECK_DB4("$all_places")
145	+ if test "$apu_db_version" != "4"; then
146	+ APU_CHECK_DB3("$all_places")
147	+ if test "$apu_db_version" != "3"; then
148	+ APU_CHECK_DB2("$all_places")
149	+ if test "$apu_db_version" != "2"; then
150	+ APU_CHECK_DB1("$all_places")
151	+ if test "$apu_db_version" != "1"; then
152	+ APU_CHECK_DB185("$all_places")
153	+ fi
154	fi
155	fi
156	fi
157	@@ -651,11 +679,11 @@
158	apu_db_version=0
159
160	AC_ARG_WITH(dbm, [APR_HELP_STRING([--with-dbm=DBM], [choose the DBM type to use.
161	- DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44,db45,db46}])],
162	+ DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44,db45,db46,db47}])],
163	[
164	if test "$withval" = "yes"; then
165	AC_MSG_ERROR([--with-dbm needs to specify a DBM type to use.
166	- One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46])
167	+ One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47])
168	fi
169	requested="$withval"
170	], [
171	@@ -850,6 +878,10 @@
172	apu_use_db=1
173	apu_default_dbm=db4
174	;;
175	+ db47)
176	+ apu_use_db=1
177	+ apu_default_dbm=db4
178	+ ;;
179	default)
180	dnl ### use more sophisticated DBMs for the default?
181	apu_default_dbm="sdbm (default)"
182	@@ -857,7 +889,7 @@
183	;;
184	*)
185	AC_MSG_ERROR([--with-dbm=$look_for is an unknown DBM type.
186	- Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46])
187	+ Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47])
188	;;
189	esac
190