You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@apr.apache.org by Max Bowsher <ma...@ukf.net> on 2005/01/24 15:10:50 UTC

[PATCH] build/dbm.m4 synchronization from 1.x -> 0.9.x

build/dbm.m4 differs between 0.9.x and trunk in a few small ways (diff 
below).

All are safe changes, just introducing additional places and names to look 
for a valid BDB install.

Therefore, I would like to request that 0.9.x's build/dbm.m4 be made the 
same as trunk's, either by applying the patch below, or simply copying the 
trunk file, either of which will produce the same result.

Thanks,

Max.


===========================================================================
--- apr-util-0.9.x/build/dbm.m4 2005-01-17 19:05:47.839556800 +0000
+++ apr-util-trunk/build/dbm.m4 2005-01-02 10:44:20.834233600 +0000
@@ -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 db42 db4 db"
   )
   if test "$apu_have_db" = "1"; then
     apu_db_version=4
===========================================================================