Return-Path: Delivered-To: apmail-apr-commits-archive@www.apache.org Received: (qmail 45067 invoked from network); 30 Sep 2010 09:47:36 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 30 Sep 2010 09:47:36 -0000 Received: (qmail 76750 invoked by uid 500); 30 Sep 2010 09:47:35 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 76639 invoked by uid 500); 30 Sep 2010 09:47:33 -0000 Mailing-List: contact commits-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: Reply-To: dev@apr.apache.org List-Id: Delivered-To: mailing list commits@apr.apache.org Received: (qmail 76631 invoked by uid 99); 30 Sep 2010 09:47:33 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 30 Sep 2010 09:47:33 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 30 Sep 2010 09:47:29 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 989302388906; Thu, 30 Sep 2010 09:47:06 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1002976 - in /apr/apr-util/branches/1.3.x: ./ CHANGES buckets/apr_brigade.c build/dbm.m4 dbd/apr_dbd_pgsql.c misc/apr_queue.c test/NWGNUaputest xml/expat/ Date: Thu, 30 Sep 2010 09:47:06 -0000 To: commits@apr.apache.org From: jorton@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100930094706.989302388906@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jorton Date: Thu Sep 30 09:47:05 2010 New Revision: 1002976 URL: http://svn.apache.org/viewvc?rev=1002976&view=rev Log: Merge r1002975 from 1.5.x: * build/dbm.m4: Add Berkeley DB 5.0 support. PR: 49866 Submitted by: Arfrever Frehtes Taifersar Arahesis Modified: apr/apr-util/branches/1.3.x/ (props changed) apr/apr-util/branches/1.3.x/CHANGES apr/apr-util/branches/1.3.x/buckets/apr_brigade.c (props changed) apr/apr-util/branches/1.3.x/build/dbm.m4 apr/apr-util/branches/1.3.x/dbd/apr_dbd_pgsql.c (props changed) apr/apr-util/branches/1.3.x/misc/apr_queue.c (props changed) apr/apr-util/branches/1.3.x/test/NWGNUaputest (props changed) apr/apr-util/branches/1.3.x/xml/expat/ (props changed) Propchange: apr/apr-util/branches/1.3.x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Sep 30 09:47:05 2010 @@ -1,4 +1,4 @@ /apr/apr/trunk:781403,784592,789965,794508 /apr/apr-util/branches/1.3.x:692751 -/apr/apr-util/branches/1.5.x:1002584-1002585,1002620,1002622-1002623,1002628 +/apr/apr-util/branches/1.5.x:1002584-1002585,1002620,1002622-1002623,1002628,1002647,1002975 /apr/apr-util/trunk:692751,731225,743986,744009,745771,747612,747623,747630,781403 Modified: apr/apr-util/branches/1.3.x/CHANGES URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/CHANGES?rev=1002976&r1=1002975&r2=1002976&view=diff ============================================================================== --- apr/apr-util/branches/1.3.x/CHANGES [utf-8] (original) +++ apr/apr-util/branches/1.3.x/CHANGES [utf-8] Thu Sep 30 09:47:05 2010 @@ -15,11 +15,9 @@ Changes with APR-util 1.3.10 several different data types, including APR_DBD_TYPE_TIME. PR 49645. [] - *) Add support for Berkeley DB 5.0. [Bernhard Rosenkraenzer -
] - - *) Add support for Berkeley DB 4.8. [Arfrever Frehtes Taifersar Arahesis - ] + *) Add support for Berkeley DB 4.8 and 5.0. PR 49866, PR 49179. + [Bernhard Rosenkraenzer
, + Arfrever Frehtes Taifersar Arahesis ] *) Make bundled expat compatible with libtool 2.x. PR 49053. [Rainer Jung] Propchange: apr/apr-util/branches/1.3.x/buckets/apr_brigade.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Sep 30 09:47:05 2010 @@ -1,4 +1,4 @@ /apr/apr/trunk/buckets/apr_brigade.c:768417,781403,784592,789965,794508 /apr/apr-util/branches/1.3.x/buckets/apr_brigade.c:692751 -/apr/apr-util/branches/1.5.x/buckets/apr_brigade.c:1002584-1002585,1002620,1002622-1002623,1002628 +/apr/apr-util/branches/1.5.x/buckets/apr_brigade.c:1002584-1002585,1002620,1002622-1002623,1002628,1002647,1002975 /apr/apr-util/trunk/buckets/apr_brigade.c:692751,731225,743986,744009,745771,747612,747623,747630,781403 Modified: apr/apr-util/branches/1.3.x/build/dbm.m4 URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/build/dbm.m4?rev=1002976&r1=1002975&r2=1002976&view=diff ============================================================================== --- apr/apr-util/branches/1.3.x/build/dbm.m4 (original) +++ apr/apr-util/branches/1.3.x/build/dbm.m4 Thu Sep 30 09:47:05 2010 @@ -112,7 +112,7 @@ AC_DEFUN([APU_CHECK_BERKELEY_DB], [ changequote([,]) unset $cache_id AC_CHECK_HEADER([$bdb_header], [ - if test "$1" = "3" -o "$1" = "4"; then + if test "$1" = "3" -o "$1" = "4" -o "$1" = "5"; 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 @@ -541,6 +541,25 @@ AC_DEFUN([APU_CHECK_DB48], [ apu_db_version=4 fi ]) +dnl +dnl APU_CHECK_DB50: is DB5.0 present? +dnl +dnl if present: sets apu_db_header, apu_db_lib, and apu_db_version +dnl +AC_DEFUN([APU_CHECK_DB50], [ + places=$1 + if test -z "$places"; then + places="std /usr/local/BerkeleyDB.5.0 /boot/home/config" + fi + APU_CHECK_BERKELEY_DB("5", "0", "-1", + "$places", + "db50/db.h db5/db.h db.h", + "db-5.0 db5-5.0 db50 db5 db" + ) + if test "$apu_have_db" = "1"; then + apu_db_version=5 + fi +]) AC_DEFUN([APU_CHECK_DB], [ requested=$1 @@ -631,6 +650,12 @@ AC_DEFUN([APU_CHECK_DB], [ AC_MSG_ERROR(Berkeley db4 not found) fi ;; + db50) + APU_CHECK_DB50("$check_places") + if test "$apu_db_version" != "5"; then + AC_MSG_ERROR(Berkeley db5 not found) + fi + ;; default) APU_CHECK_DB_ALL("$check_places") ;; @@ -638,36 +663,39 @@ AC_DEFUN([APU_CHECK_DB], [ ]) dnl -dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 4.8 to 1. +dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 5.0 to 1. dnl AC_DEFUN([APU_CHECK_DB_ALL], [ all_places=$1 - APU_CHECK_DB48("$all_places") - if test "$apu_db_version" != "4"; then - APU_CHECK_DB47("$all_places") + APU_CHECK_DB50("$all_places") + if test "$apu_db_version" != "5"; then + APU_CHECK_DB48("$all_places") if test "$apu_db_version" != "4"; then - 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 @@ -707,11 +735,11 @@ AC_DEFUN([APU_CHECK_DBM], [ 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,db47,db48}])], + DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44,db45,db46,db47,db48,db50}])], [ 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, db47, db48]) + One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47, db48, db50]) fi requested="$withval" ], [ @@ -914,6 +942,10 @@ AC_DEFUN([APU_CHECK_DBM], [ apu_use_db=1 apu_default_dbm=db4 ;; + db50) + apu_use_db=1 + apu_default_dbm=db5 + ;; default) dnl ### use more sophisticated DBMs for the default? apu_default_dbm="sdbm (default)" @@ -921,7 +953,7 @@ AC_DEFUN([APU_CHECK_DBM], [ ;; *) 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, db47, db48]) + Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47, db48, db50]) ;; esac Propchange: apr/apr-util/branches/1.3.x/dbd/apr_dbd_pgsql.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Sep 30 09:47:05 2010 @@ -1,4 +1,4 @@ /apr/apr/trunk/dbd/apr_dbd_pgsql.c:781403,784592,789965,794508 /apr/apr-util/branches/1.3.x/dbd/apr_dbd_pgsql.c:692751 -/apr/apr-util/branches/1.5.x/dbd/apr_dbd_pgsql.c:1002584-1002585,1002620,1002622-1002623,1002628 +/apr/apr-util/branches/1.5.x/dbd/apr_dbd_pgsql.c:1002584-1002585,1002620,1002622-1002623,1002628,1002647,1002975 /apr/apr-util/trunk/dbd/apr_dbd_pgsql.c:692751,704986,731225,743986,744009,745771,747612,747623,747630,781403 Propchange: apr/apr-util/branches/1.3.x/misc/apr_queue.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Sep 30 09:47:05 2010 @@ -1,5 +1,5 @@ /apr/apr/trunk/misc/apr_queue.c:781403,784592,789965,794508 /apr/apr/trunk/util-misc/apr_queue.c:784520 /apr/apr-util/branches/1.3.x/misc/apr_queue.c:692751 -/apr/apr-util/branches/1.5.x/misc/apr_queue.c:1002584-1002585,1002620,1002622-1002623,1002628 +/apr/apr-util/branches/1.5.x/misc/apr_queue.c:1002584-1002585,1002620,1002622-1002623,1002628,1002647,1002975 /apr/apr-util/trunk/misc/apr_queue.c:692751,731225,743986,744009,745771,747612,747623,747630,781403 Propchange: apr/apr-util/branches/1.3.x/test/NWGNUaputest ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Sep 30 09:47:05 2010 @@ -1,4 +1,4 @@ /apr/apr/trunk/test/nwgnuaputest:781403,784592,789965 /apr/apr-util/branches/1.3.x/test/nwgnuaputest:692751 -/apr/apr-util/branches/1.5.x/test/NWGNUaputest:1002584-1002585,1002620,1002622-1002623,1002628 +/apr/apr-util/branches/1.5.x/test/NWGNUaputest:1002584-1002585,1002620,1002622-1002623,1002628,1002647,1002975 /apr/apr-util/trunk/test/nwgnuaputest:692751,731225,743986,744009,745771,747612,747623,747630,781403 Propchange: apr/apr-util/branches/1.3.x/xml/expat/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Sep 30 09:47:05 2010 @@ -1,6 +1,6 @@ /apr/apr/trunk/xml/expat:781403,784592,789965,794508 /apr/apr-util/branches/1.3.x/xml/expat:692751 -/apr/apr-util/branches/1.5.x/xml/expat:1002584-1002585,1002620,1002622-1002623,1002628 +/apr/apr-util/branches/1.5.x/xml/expat:1002584-1002585,1002620,1002622-1002623,1002628,1002647,1002975 /apr/apr-util/trunk/xml/expat:692751,731225,743986,744009,745771,747612,747623,747630,781403 /apr/apr-util/vendor/expat/1.95.7:1002560-1002564 /apr/apr-util/vendor/expat/current:1002513-1002559