Return-Path: Delivered-To: apmail-apr-commits-archive@www.apache.org Received: (qmail 55939 invoked from network); 24 Jun 2008 23:54:47 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 24 Jun 2008 23:54:47 -0000 Received: (qmail 58388 invoked by uid 500); 24 Jun 2008 23:54:49 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 58344 invoked by uid 500); 24 Jun 2008 23:54:49 -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 58335 invoked by uid 99); 24 Jun 2008 23:54:49 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 24 Jun 2008 16:54:49 -0700 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; Tue, 24 Jun 2008 23:54:07 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id CB2DF2388A06; Tue, 24 Jun 2008 16:54:26 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r671383 - in /apr/apr-util/branches/1.3.x: CHANGES build/dbm.m4 Date: Tue, 24 Jun 2008 23:54:26 -0000 To: commits@apr.apache.org From: bojan@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080624235426.CB2DF2388A06@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bojan Date: Tue Jun 24 16:54:26 2008 New Revision: 671383 URL: http://svn.apache.org/viewvc?rev=671383&view=rev Log: Backport r671382 from the trunk. Add support for Berkeley DB 4.7. Patch by Arfrever Frehtes Taifersar Arahesis Modified: apr/apr-util/branches/1.3.x/CHANGES apr/apr-util/branches/1.3.x/build/dbm.m4 Modified: apr/apr-util/branches/1.3.x/CHANGES URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/CHANGES?rev=671383&r1=671382&r2=671383&view=diff ============================================================================== --- apr/apr-util/branches/1.3.x/CHANGES [utf-8] (original) +++ apr/apr-util/branches/1.3.x/CHANGES [utf-8] Tue Jun 24 16:54:26 2008 @@ -1,7 +1,8 @@ -*- coding: utf-8 -*- Changes with APR-util 1.3.3 - + *) Add Berkeley DB 4.7 support. + [Arfrever Frehtes Taifersar Arahesis ] Changes with APR-util 1.3.2 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=671383&r1=671382&r2=671383&view=diff ============================================================================== --- apr/apr-util/branches/1.3.x/build/dbm.m4 (original) +++ apr/apr-util/branches/1.3.x/build/dbm.m4 Tue Jun 24 16:54:26 2008 @@ -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