[patch] apr-util-1.5.2-db6.patch

apr-util-1.5.2-db6.patch (text/plain), 2.65 KB, created by Lars Wendler (Polynomial-C) (RETIRED) on 2013-07-10 10:58:18 UTC

--- apr-util-1.5.2/build/dbm.m4
+++ apr-util-1.5.2/build/dbm.m4
@@ -112,7 +112,7 @@
         changequote([,])
         unset $cache_id
         AC_CHECK_HEADER([$bdb_header], [
-          if test "$1" = "3" -o "$1" = "4" -o "$1" = "5"; then
+          if test "$1" = "3" -o "$1" = "4" -o "$1" = "5" -o "$1" = "6"; then
             # We generate a separate cache variable for each prefix and libname
             # we search under.  That way, we avoid caching information that
             # changes if the user runs `configure' with a different set of
@@ -424,7 +424,7 @@
       AC_MSG_ERROR(Berkeley db3 not found)
     fi
     ;;
-  db[[45]][[0-9]])
+  db[[456]][[0-9]])
     db_major=`echo "$requested" | sed -e 's/db//' -e 's/.$//'`
     db_minor=`echo "$requested" | sed -e 's/db//' -e 's/.//'`
     APU_CHECK_DBXY("$check_places", "$db_major", "$db_minor")
@@ -432,7 +432,7 @@
       AC_MSG_ERROR(Berkeley db$db_major not found)
     fi
     ;;
-  db[[45]])
+  db[[456]])
     db_major=`echo "$requested" | sed -e 's/db//'`
     # Start version search at version x.9
     db_minor=9
@@ -455,13 +455,13 @@
 ])
 
 dnl
-dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 5.X to 1.
+dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 6.X to 1.
 dnl
 AC_DEFUN([APU_CHECK_DB_ALL], [
   all_places=$1
 
-  # Start version search at version 5.9
-  db_version=59
+  # Start version search at version 6.9
+  db_version=69
   while [[ $db_version -ge 40 ]]
   do
     db_major=`echo $db_version | sed -e 's/.$//'`
@@ -511,10 +511,10 @@
   apu_db_version=0
 
   # Maximum supported version announced in help string.
-  # Although we search for all versions up to 5.9,
+  # Although we search for all versions up to 6.9,
   # we should only include existing versions in our
   # help string.
-  db_max_version=53
+  db_max_version=60
   db_min_version=41
   dbm_list="sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4"
   db_version="$db_min_version"
@@ -525,7 +525,7 @@
   done
 
   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,db4X,db5X} for some X=0,...,9])],
+      DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db4X,db5X,db6X} for some X=0,...,9])],
   [
     if test "$withval" = "yes"; then
       AC_MSG_ERROR([--with-dbm needs to specify a DBM type to use.
@@ -668,11 +668,11 @@
       eval "apu_use_$requested=1"
       apu_default_dbm=$requested
       ;;
-    db185 | db[[12345]])
+    db185 | db[[123456]])
       apu_use_db=1
       apu_default_dbm=$requested
       ;;
-    db[[45]][[0-9]])
+    db[[456]][[0-9]])
       apu_use_db=1
       apu_default_dbm=`echo $requested | sed -e 's/.$//'`
       ;;