From commits-return-11583-apmail-apr-commits-archive=apr.apache.org@apr.apache.org Sat Oct 02 12:26:06 2010 Return-Path: Delivered-To: apmail-apr-commits-archive@www.apache.org Received: (qmail 90969 invoked from network); 2 Oct 2010 12:26:06 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 2 Oct 2010 12:26:06 -0000 Received: (qmail 94114 invoked by uid 500); 2 Oct 2010 12:26:06 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 94019 invoked by uid 500); 2 Oct 2010 12:26:05 -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 94012 invoked by uid 99); 2 Oct 2010 12:26:05 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 02 Oct 2010 12:26:05 +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; Sat, 02 Oct 2010 12:26:02 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4718C23889BF; Sat, 2 Oct 2010 12:25:41 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1003784 - /apr/apr/trunk/build/dbm.m4 Date: Sat, 02 Oct 2010 12:25:41 -0000 To: commits@apr.apache.org From: rjung@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101002122541.4718C23889BF@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rjung Date: Sat Oct 2 12:25:40 2010 New Revision: 1003784 URL: http://svn.apache.org/viewvc?rev=1003784&view=rev Log: Support Berkeley DB 5.0 and 5.1. Modified: apr/apr/trunk/build/dbm.m4 Modified: apr/apr/trunk/build/dbm.m4 URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/dbm.m4?rev=1003784&r1=1003783&r2=1003784&view=diff ============================================================================== --- apr/apr/trunk/build/dbm.m4 (original) +++ apr/apr/trunk/build/dbm.m4 Sat Oct 2 12:25:40 2010 @@ -541,6 +541,44 @@ 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 +]) +dnl +dnl APU_CHECK_DB51: is DB5.1 present? +dnl +dnl if present: sets apu_db_header, apu_db_lib, and apu_db_version +dnl +AC_DEFUN([APU_CHECK_DB51], [ + places=$1 + if test -z "$places"; then + places="std /usr/local/BerkeleyDB.5.1 /boot/home/config" + fi + APU_CHECK_BERKELEY_DB("5", "1", "-1", + "$places", + "db51/db.h db5/db.h db.h", + "db-5.1 db5-5.1 db51 db5 db" + ) + if test "$apu_have_db" = "1"; then + apu_db_version=5 + fi +]) AC_DEFUN([APU_CHECK_DB], [ requested=$1 @@ -631,6 +669,18 @@ 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 + ;; + db51) + APU_CHECK_DB51("$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 +688,42 @@ 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.1 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") - if test "$apu_db_version" != "4"; then - APU_CHECK_DB46("$all_places") + APU_CHECK_DB51("$all_places") + if test "$apu_db_version" != "5"; then + 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_DB45("$all_places") + APU_CHECK_DB47("$all_places") if test "$apu_db_version" != "4"; then - APU_CHECK_DB44("$all_places") + APU_CHECK_DB46("$all_places") if test "$apu_db_version" != "4"; then - APU_CHECK_DB43("$all_places") + APU_CHECK_DB45("$all_places") if test "$apu_db_version" != "4"; then - APU_CHECK_DB42("$all_places") + APU_CHECK_DB44("$all_places") if test "$apu_db_version" != "4"; then - APU_CHECK_DB41("$all_places") + APU_CHECK_DB43("$all_places") if test "$apu_db_version" != "4"; then - APU_CHECK_DB4("$all_places") + APU_CHECK_DB42("$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_DB41("$all_places") + if test "$apu_db_version" != "4"; then + 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 fi @@ -707,11 +763,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,db51}])], [ 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, db51]) fi requested="$withval" ], [ @@ -914,6 +970,14 @@ AC_DEFUN([APU_CHECK_DBM], [ apu_use_db=1 apu_default_dbm=db4 ;; + db50) + apu_use_db=1 + apu_default_dbm=db5 + ;; + db51) + apu_use_db=1 + apu_default_dbm=db5 + ;; default) dnl ### use more sophisticated DBMs for the default? apu_default_dbm="sdbm (default)" @@ -921,7 +985,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, db51]) ;; esac