Mailing-List: contact cvs-help@apr.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@apr.apache.org
Date: 15 Jun 2004 10:36:20 -0000
Message-ID: <20040615103620.37673.qmail@minotaur.apache.org>
From: dreid@apache.org
To: apr-util-cvs@apache.org
Subject: cvs commit: apr-util/build dbm.m4

dreid       2004/06/15 03:36:19

  Modified:    build    dbm.m4
  Log:
  Get configure detection of db41 and db42 working on FreeBSD if installed from
  ports.
  
  Thanks to Justin for pushing me into this :-)
  
  Revision  Changes    Path
  1.10      +4 -4      apr-util/build/dbm.m4
  
  Index: dbm.m4
  ===================================================================
  RCS file: /home/cvs/apr-util/build/dbm.m4,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- dbm.m4	13 Mar 2004 04:33:54 -0000	1.9
  +++ dbm.m4	15 Jun 2004 10:36:19 -0000	1.10
  @@ -378,12 +378,12 @@
   AC_DEFUN(APU_CHECK_DB41, [
     places=$1
     if test -z "$places"; then
  -    places="std /usr/local/BerkeleyDB.4.1 /boot/home/config"
  +    places="std /usr/local /usr/local/BerkeleyDB.4.1 /boot/home/config"
     fi
     APU_CHECK_BERKELEY_DB("4", "1", "-1",
       "$places",
       "db41/db.h db4/db.h db.h",
  -    "db-4.1 db4 db"
  +    "db-4.1 db41 db4 db"
     )
     if test "$apu_have_db" = "1"; then
       apu_db_version=4
  @@ -399,12 +399,12 @@
   AC_DEFUN(APU_CHECK_DB42, [
     places=$1
     if test -z "$places"; then
  -    places="std /usr/local/BerkeleyDB.4.2 /boot/home/config"
  +    places="std /usr/local /usr/local/BerkeleyDB.4.2 /boot/home/config"
     fi
     APU_CHECK_BERKELEY_DB("4", "2", "-1",
       "$places",
       "db42/db.h db4/db.h db.h",
  -    "db-4.2 db4 db"
  +    "db-4.2 db41 db4 db"
     )
     if test "$apu_have_db" = "1"; then
       apu_db_version=4