From commits-return-11625-apmail-apr-commits-archive=apr.apache.org@apr.apache.org Fri Oct 08 21:15:28 2010 Return-Path: Delivered-To: apmail-apr-commits-archive@www.apache.org Received: (qmail 28746 invoked from network); 8 Oct 2010 21:15:28 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 8 Oct 2010 21:15:28 -0000 Received: (qmail 44194 invoked by uid 500); 8 Oct 2010 21:15:28 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 44092 invoked by uid 500); 8 Oct 2010 21:15:28 -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 44083 invoked by uid 99); 8 Oct 2010 21:15:28 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 08 Oct 2010 21:15:28 +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; Fri, 08 Oct 2010 21:15:27 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 070C12388A40; Fri, 8 Oct 2010 21:15:07 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1006022 - in /apr/apr-util/branches/0.9.x: CHANGES build/dbm.m4 Date: Fri, 08 Oct 2010 21:15:06 -0000 To: commits@apr.apache.org From: rjung@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101008211507.070C12388A40@eris.apache.org> Author: rjung Date: Fri Oct 8 21:15:06 2010 New Revision: 1006022 URL: http://svn.apache.org/viewvc?rev=1006022&view=rev Log: Undo Berkeley DB support for 5.0 and 5.1 in m4 files. This would also need code adjustments, so only support it in the more modern apr-util branches. Modified: apr/apr-util/branches/0.9.x/CHANGES apr/apr-util/branches/0.9.x/build/dbm.m4 Modified: apr/apr-util/branches/0.9.x/CHANGES URL: http://svn.apache.org/viewvc/apr/apr-util/branches/0.9.x/CHANGES?rev=1006022&r1=1006021&r2=1006022&view=diff ============================================================================== --- apr/apr-util/branches/0.9.x/CHANGES [utf-8] (original) +++ apr/apr-util/branches/0.9.x/CHANGES [utf-8] Fri Oct 8 21:15:06 2010 @@ -26,9 +26,8 @@ Changes with APR-util 0.9.18 *) Improve platform detection for bundled expat by updating config.guess and config.sub. [Rainer Jung] - *) Add support for Berkeley DB 4.6 to 5.1. PR 49866, PR 49179. - [Bernhard Rosenkraenzer
, - Arfrever Frehtes Taifersar Arahesis , + *) Add support for Berkeley DB 4.6 to 4.8. + [Arfrever Frehtes Taifersar Arahesis , Rainer Jung] Changes with APR-util 0.9.17 Modified: apr/apr-util/branches/0.9.x/build/dbm.m4 URL: http://svn.apache.org/viewvc/apr/apr-util/branches/0.9.x/build/dbm.m4?rev=1006022&r1=1006021&r2=1006022&view=diff ============================================================================== --- apr/apr-util/branches/0.9.x/build/dbm.m4 (original) +++ apr/apr-util/branches/0.9.x/build/dbm.m4 Fri Oct 8 21:15:06 2010 @@ -96,7 +96,7 @@ AC_DEFUN(APU_CHECK_BERKELEY_DB, [ 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"; 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 @@ -525,44 +525,6 @@ 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 @@ -653,18 +615,6 @@ 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") ;; @@ -672,42 +622,36 @@ AC_DEFUN(APU_CHECK_DB, [ ]) dnl -dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 5.1 to 1. +dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 4.8 to 1. dnl AC_DEFUN(APU_CHECK_DB_ALL, [ all_places=$1 - 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") + 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") if test "$apu_db_version" != "4"; then - APU_CHECK_DB47("$all_places") + APU_CHECK_DB45("$all_places") if test "$apu_db_version" != "4"; then - APU_CHECK_DB46("$all_places") + APU_CHECK_DB44("$all_places") if test "$apu_db_version" != "4"; then - APU_CHECK_DB45("$all_places") + APU_CHECK_DB43("$all_places") if test "$apu_db_version" != "4"; then - APU_CHECK_DB44("$all_places") + APU_CHECK_DB42("$all_places") if test "$apu_db_version" != "4"; then - APU_CHECK_DB43("$all_places") + APU_CHECK_DB41("$all_places") if test "$apu_db_version" != "4"; then - APU_CHECK_DB42("$all_places") + APU_CHECK_DB4("$all_places") if test "$apu_db_version" != "4"; then - 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 + 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 @@ -748,11 +692,11 @@ AC_DEFUN(APU_CHECK_DBM, [ AC_ARG_WITH(dbm, [ --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,db50,db51} + DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44,db45,db46,db47,db48} ], [ 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, db50, db51]) + One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47, db48]) fi requested="$withval" ], [ @@ -954,14 +898,6 @@ 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)" @@ -969,7 +905,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, db50, db51]) + Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42, db43, db44, db45, db46, db47, db48]) ;; esac