Return-Path: Delivered-To: apmail-apr-dev-archive@www.apache.org Received: (qmail 43269 invoked from network); 26 Aug 2007 14:52:23 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 26 Aug 2007 14:52:23 -0000 Received: (qmail 46670 invoked by uid 500); 26 Aug 2007 14:52:18 -0000 Delivered-To: apmail-apr-dev-archive@apr.apache.org Received: (qmail 46597 invoked by uid 500); 26 Aug 2007 14:52:18 -0000 Mailing-List: contact dev-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Id: Delivered-To: mailing list dev@apr.apache.org Received: (qmail 46586 invoked by uid 99); 26 Aug 2007 14:52:17 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 26 Aug 2007 07:52:17 -0700 X-ASF-Spam-Status: No, hits=-0.0 required=10.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of arfrever.fta@gmail.com designates 64.233.182.188 as permitted sender) Received: from [64.233.182.188] (HELO nf-out-0910.google.com) (64.233.182.188) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 26 Aug 2007 14:52:11 +0000 Received: by nf-out-0910.google.com with SMTP id 30so1038035nfu for ; Sun, 26 Aug 2007 07:51:50 -0700 (PDT) DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta; h=domainkey-signature:received:received:to:subject:date:user-agent:references:in-reply-to:mime-version:content-type:content-transfer-encoding:message-id:from; b=nj1PxNj/Nkfqu8rphKbBFcRYjmYRxSSceGeNLU/HVt4zB/nBz5mDOkWsKi3cSL9Mu+wkJqcJ/zFMLj08886BgFTtWoJoQJ4AS+qxRVGAHbx6MlpX8QtVYvxToXqn6a7WxD20EQeZfwlNG536czVlTJXcVVHaw+PmHjiZQy3R968= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=received:to:subject:date:user-agent:references:in-reply-to:mime-version:content-type:content-transfer-encoding:message-id:from; b=LtcLI3ulA/U/U/+6PMtmoDPRCPM8qYif5m4vQO320FsZTDT1F1FVgIb+/2RiHRmg6lb/CzLB6guwv0WZdrT6ahs/Huh1dP3u6i6qC6VlgtvA3X5OBd3GaHUnpeJJbku5DoHpXTyF0al+1WTak4ZFwlR5bn3taJ2jbU+5EyTVPCY= Received: by 10.86.54.3 with SMTP id c3mr4078583fga.1188139910143; Sun, 26 Aug 2007 07:51:50 -0700 (PDT) Received: from ip-85-198-225-222.broker.com.pl ( [85.198.225.222]) by mx.google.com with ESMTPS id e32sm3004176fke.2007.08.26.07.51.48 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 26 Aug 2007 07:51:48 -0700 (PDT) To: APR Development Subject: Re: [PATCH] APR-Util and Berkeley DB 4.6 Date: Sun, 26 Aug 2007 16:50:08 +0200 User-Agent: KMail/1.9.7 References: <200708241713.00006.Arfrever.FTA@gmail.com> In-Reply-To: <200708241713.00006.Arfrever.FTA@gmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart1262596.UIXVaOuvWb"; protocol="application/pgp-signature"; micalg=pgp-sha1 Content-Transfer-Encoding: 7bit Message-Id: <200708261650.33292.Arfrever.FTA@gmail.com> From: Arfrever Frehtes Taifersar Arahesis X-Virus-Checked: Checked by ClamAV on apache.org --nextPart1262596.UIXVaOuvWb Content-Type: multipart/mixed; boundary="Boundary-01=_QNZ0GjXJrdsa/ec" Content-Transfer-Encoding: 7bit Content-Disposition: inline --Boundary-01=_QNZ0GjXJrdsa/ec Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline 2007-08-24 17:11:30 Arfrever Frehtes Taifersar Arahesis napisa=C5=82(a): > APR-Util currently can't be built with Berkeley DB 4.6. > I'm attaching a patch which fixes this bug. Why nobody has committed this patch yet? Without this patch configure script fails with Berkeley DB 4.6. =2D-=20 Arfrever Frehtes Taifersar Arahesis --Boundary-01=_QNZ0GjXJrdsa/ec Content-Type: text/x-diff; charset="utf-8"; name="apr-util-db46.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="apr-util-db46.patch" Index: build/dbm.m4 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =2D-- build/dbm.m4 (wersja 569411) +++ build/dbm.m4 (kopia robocza) @@ -483,6 +483,25 @@ apu_db_version=3D4 fi ]) +dnl +dnl APU_CHECK_DB46: is DB4.6 present? +dnl +dnl if present: sets apu_db_header, apu_db_lib, and apu_db_version +dnl +AC_DEFUN([APU_CHECK_DB46], [ + places=3D$1 + if test -z "$places"; then + places=3D"std /usr/local/BerkeleyDB.4.6 /boot/home/config" + fi + APU_CHECK_BERKELEY_DB("4", "6", "-1", + "$places", + "db46/db.h db4/db.h db.h", + "db-4.6 db4-4.6 db46 db4 db" + ) + if test "$apu_have_db" =3D "1"; then + apu_db_version=3D4 + fi +]) =20 AC_DEFUN([APU_CHECK_DB], [ requested=3D$1 @@ -555,6 +574,12 @@ AC_MSG_ERROR(Berkeley db4 not found) fi ;; + db46) + APU_CHECK_DB46("$check_places") + if test "$apu_db_version" !=3D "4"; then + AC_MSG_ERROR(Berkeley db4 not found) + fi + ;; default) APU_CHECK_DB_ALL("$check_places") ;; @@ -562,30 +587,33 @@ ]) =20 dnl =2Ddnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 4.3 to 1. +dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 4.6 to 1. dnl AC_DEFUN([APU_CHECK_DB_ALL], [ all_places=3D$1 =20 =2D APU_CHECK_DB45("$all_places") + APU_CHECK_DB46("$all_places") if test "$apu_db_version" !=3D "4"; then =2D APU_CHECK_DB44("$all_places") + APU_CHECK_DB45("$all_places") if test "$apu_db_version" !=3D "4"; then =2D APU_CHECK_DB43("$all_places") + APU_CHECK_DB44("$all_places") if test "$apu_db_version" !=3D "4"; then =2D APU_CHECK_DB42("$all_places") + APU_CHECK_DB43("$all_places") if test "$apu_db_version" !=3D "4"; then =2D APU_CHECK_DB41("$all_places") + APU_CHECK_DB42("$all_places") if test "$apu_db_version" !=3D "4"; then =2D APU_CHECK_DB4("$all_places") + APU_CHECK_DB41("$all_places") if test "$apu_db_version" !=3D "4"; then =2D APU_CHECK_DB3("$all_places") =2D if test "$apu_db_version" !=3D "3"; then =2D APU_CHECK_DB2("$all_places") =2D if test "$apu_db_version" !=3D "2"; then =2D APU_CHECK_DB1("$all_places") =2D if test "$apu_db_version" !=3D "1"; then =2D APU_CHECK_DB185("$all_places") + APU_CHECK_DB4("$all_places") + if test "$apu_db_version" !=3D "4"; then + APU_CHECK_DB3("$all_places") + if test "$apu_db_version" !=3D "3"; then + APU_CHECK_DB2("$all_places") + if test "$apu_db_version" !=3D "2"; then + APU_CHECK_DB1("$all_places") + if test "$apu_db_version" !=3D "1"; then + APU_CHECK_DB185("$all_places") + fi fi fi fi @@ -622,11 +650,11 @@ apu_db_version=3D0 =20 AC_ARG_WITH(dbm, [APR_HELP_STRING([--with-dbm=3DDBM], [choose the DBM ty= pe to use. =2D DBM=3D{sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44= ,db45}])], + DBM=3D{sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42,db43,db44,d= b45,db46}])], [ if test "$withval" =3D "yes"; then AC_MSG_ERROR([--with-dbm needs to specify a DBM type to use. =2D One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, d= b42, db43, db44, db45]) + One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db4= 2, db43, db44, db45, db46]) fi requested=3D"$withval" ], [ @@ -813,6 +841,10 @@ apu_use_db=3D1 apu_default_dbm=3Ddb4 ;; + db46) + apu_use_db=3D1 + apu_default_dbm=3Ddb4 + ;; default) dnl ### use more sophisticated DBMs for the default? apu_default_dbm=3D"sdbm (default)" @@ -820,7 +852,7 @@ ;; *) AC_MSG_ERROR([--with-dbm=3D$look_for is an unknown DBM type. =2D Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db4= 1, db42, db43, db44 db45]) + Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41,= db42, db43, db44, db45, db46]) ;; esac =20 --Boundary-01=_QNZ0GjXJrdsa/ec-- --nextPart1262596.UIXVaOuvWb Content-Type: application/pgp-signature; name=signature.asc Content-Description: This is a digitally signed message part. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.6 (GNU/Linux) iD8DBQBG0ZNQ/axNJ4Xo/ZERAsJzAKCGVgvQKd0N+obWlnre/nPstdbnhgCfZDkB fJ/vr5PT8h9169ksz206Fo4= =a+q7 -----END PGP SIGNATURE----- --nextPart1262596.UIXVaOuvWb--