View | Details | Raw Unified | Return to bug 261523 | Differences between
and this patch

Collapse All | Expand All

(-)b/devel/apr1/files/patch-apr-util-1.6.1_build_dbm.m4 (-1 / +40 lines)
Added Link Here
0
- 
1
--- apr-util-1.6.1/build/dbm.m4.orig	2013-11-23 18:00:53 UTC
2
+++ apr-util-1.6.1/build/dbm.m4
3
@@ -112,7 +112,7 @@ AC_DEFUN([APU_CHECK_BERKELEY_DB], [
4
         changequote([,])
5
         unset $cache_id
6
         AC_CHECK_HEADER([$bdb_header], [
7
-          if test "$1" = "3" -o "$1" = "4" -o "$1" = "5" -o "$1" = "6"; then
8
+          if test "$1" = "3" -o "$1" = "4" -o "$1" = "5" -o "$1" = "6" -o "$1" = "18" ; then
9
             # We generate a separate cache variable for each prefix and libname
10
             # we search under.  That way, we avoid caching information that
11
             # changes if the user runs `configure' with a different set of
12
@@ -424,7 +424,7 @@ AC_DEFUN([APU_CHECK_DB], [
13
       AC_MSG_ERROR(Berkeley db3 not found)
14
     fi
15
     ;;
16
-  db[[456]][[0-9]])
17
+  db[[456]][[0-9]]|db18)
18
     db_major=`echo "$requested" | sed -e 's/db//' -e 's/.$//'`
19
     db_minor=`echo "$requested" | sed -e 's/db//' -e 's/.//'`
20
     APU_CHECK_DBXY("$check_places", "$db_major", "$db_minor")
21
@@ -432,7 +432,7 @@ AC_DEFUN([APU_CHECK_DB], [
22
       AC_MSG_ERROR(Berkeley db$db_major not found)
23
     fi
24
     ;;
25
-  db[[456]])
26
+  db[[456]]|db18)
27
     db_major=`echo "$requested" | sed -e 's/db//'`
28
     # Start version search at version x.9
29
     db_minor=9
30
@@ -460,8 +460,8 @@ dnl
31
 AC_DEFUN([APU_CHECK_DB_ALL], [
32
   all_places=$1
33
 
34
-  # Start version search at version 6.9
35
-  db_version=69
36
+  # Start version search at version 18.9
37
+  db_version=189
38
   while [[ $db_version -ge 40 ]]
39
   do
40
     db_major=`echo $db_version | sed -e 's/.$//'`

Return to bug 261523