striker 2003/11/18 14:52:07
Modified: build dbm.m4
Log:
* build/dbm.m4
Add detection code for Berkeley DB 4.2, to be released this month.
Revision Changes Path
1.6 +48 -14 apr-util/build/dbm.m4
Index: dbm.m4
===================================================================
RCS file: /home/cvs/apr-util/build/dbm.m4,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dbm.m4 16 Nov 2003 22:51:17 -0000 1.5
+++ dbm.m4 18 Nov 2003 22:52:07 -0000 1.6
@@ -385,6 +385,27 @@
])
+dnl
+dnl APU_CHECK_DB42: is DB4.2 present?
+dnl
+dnl if present: sets apu_db_header, apu_db_lib, and apu_db_version
+dnl
+AC_DEFUN(APU_CHECK_DB42, [
+ places=$1
+ if test -z "$places"; then
+ places="std /usr/local/BerkeleyDB.4.2 /boot/home/config"
+ fi
+ APU_CHECK_BERKELEY_DB("4", "2", "-1",
+ "$places",
+ "db4/db.h db.h",
+ "db-4.2 db4 db"
+ )
+ if test "$apu_have_db" = "1"; then
+ apu_db_version=4
+ fi
+])
+
+
AC_DEFUN(APU_CHECK_DB, [
requested=$1
check_places=$2
@@ -432,6 +453,12 @@
AC_MSG_ERROR(Berkeley db4 not found)
fi
;;
+ db42)
+ APU_CHECK_DB42("$check_places")
+ if test "$apu_db_version" != "4"; then
+ AC_MSG_ERROR(Berkeley db4 not found)
+ fi
+ ;;
default)
APU_CHECK_DB_ALL("$check_places")
;;
@@ -439,22 +466,25 @@
])
dnl
-dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 4.1 to 1.
+dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 4.2 to 1.
dnl
AC_DEFUN(APU_CHECK_DB_ALL, [
all_places=$1
-
- APU_CHECK_DB41("$all_places")
+
+ APU_CHECK_DB42("$all_places")
if test "$apu_db_version" != "4"; then
- APU_CHECK_DB4("$all_places")
+ APU_CHECK_DB41("$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_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
@@ -488,11 +518,11 @@
AC_ARG_WITH(dbm, [
--with-dbm=DBM choose the DBM type to use.
- DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4}
+ DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db41,db42}
], [
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])
+ One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42])
fi
requested="$withval"
], [
@@ -666,6 +696,10 @@
apu_use_db=1
apu_default_dbm=db4
;;
+ db42)
+ apu_use_db=1
+ apu_default_dbm=db4
+ ;;
default)
dnl ### use more sophisticated DBMs for the default?
apu_default_dbm="sdbm (default)"
@@ -673,7 +707,7 @@
;;
*)
AC_MSG_ERROR([--with-dbm=$look_for is an unknown DBM type.
- Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4])
+ Use one of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41,
db42])
;;
esac
