svn commit: r1528827 - in /apr/apr-util/branches/1.5.x: ./ CHANGES build/dbm.m4

[rj...@apache.org]

Author: rjung
Date: Thu Oct  3 12:36:13 2013
New Revision: 1528827

URL: http://svn.apache.org/r1528827
Log:
Add support for Berkeley DB 6.0.

Backport of r1495887 from trunk.

Modified:
    apr/apr-util/branches/1.5.x/   (props changed)
    apr/apr-util/branches/1.5.x/CHANGES
    apr/apr-util/branches/1.5.x/build/dbm.m4

Propchange: apr/apr-util/branches/1.5.x/
------------------------------------------------------------------------------
  Merged /apr/apr/trunk:r1495887

Modified: apr/apr-util/branches/1.5.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/CHANGES?rev=1528827&r1=1528826&r2=1528827&view=diff
==============================================================================
--- apr/apr-util/branches/1.5.x/CHANGES [utf-8] (original)
+++ apr/apr-util/branches/1.5.x/CHANGES [utf-8] Thu Oct  3 12:36:13 2013
@@ -4,12 +4,17 @@ Changes with APR-util 1.5.3
   *) Add experimental cmake-based build system for Windows.  Refer to
      README.cmake for more information.  [Jeff Trawick, Tom Donovan]
 
+  *) Add apr_pbase64_encode() and apr_pbase64_decode() to encode to/from
+     the pool. [Graham Leggett]
+
   *) Fix warnings in odbc driver on 64bit systems.
      PR 55197  [Tom Donovan]
 
   *) Add support to apr_memcache for unix domain sockets. PR 54573 [Remi
      Gacogne <rgacogne+asf aquaray.com>]
 
+  *) Add support for Berkeley DB 6.0. [Rainer Jung]
+
 Changes with APR-util 1.5.2
 
   *) Windows: Add command line makefiles. [Gregg Smith]

Modified: apr/apr-util/branches/1.5.x/build/dbm.m4
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/build/dbm.m4?rev=1528827&r1=1528826&r2=1528827&view=diff
==============================================================================
--- apr/apr-util/branches/1.5.x/build/dbm.m4 (original)
+++ apr/apr-util/branches/1.5.x/build/dbm.m4 Thu Oct  3 12:36:13 2013
@@ -424,7 +424,7 @@ AC_DEFUN([APU_CHECK_DB], [
       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_DEFUN([APU_CHECK_DB], [
       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
@@ -523,6 +523,7 @@ AC_DEFUN([APU_CHECK_DBM], [
     dbm_list="$dbm_list, db$db_version"
     db_version=`expr $db_version + 1`
   done
+  dbm_list="$dbm_list, db60"
 
   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])],
@@ -668,11 +669,11 @@ AC_DEFUN([APU_CHECK_DBM], [
       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/.$//'`
       ;;