From f8699bea283d4f5bb52e932639a4e3d5578fb4f7 Mon Sep 17 00:00:00 2001 From: didg Date: Sat, 9 Sep 2006 03:52:41 +0000 Subject: [PATCH] configure macros for Berkeley DB4.4 --- macros/db3-check.m4 | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/macros/db3-check.m4 b/macros/db3-check.m4 index b4c5a3b4..453ed790 100644 --- a/macros/db3-check.m4 +++ b/macros/db3-check.m4 @@ -1,4 +1,4 @@ -dnl $Id: db3-check.m4,v 1.13 2005-04-28 20:50:05 bfernhomberg Exp $ +dnl $Id: db3-check.m4,v 1.14 2006-09-09 03:52:41 didg Exp $ dnl Autoconf macros to check for the Berkeley DB library @@ -111,7 +111,12 @@ int main(void) { CFLAGS="$savedcflags" ]) - +dnl I don't understand this stuff below +dnl AFAIK it works for 4.1 and 4.2 and (4.3 xor 4.4) +dnl you can have 4.2 and 4.3 installed +dnl but If you have 4.3 and 4.4 it won't work with 4.3 +dnl only 4.4 +dnl didier AC_DEFUN([NETATALK_BERKELEY_LINK], [ atalk_cv_lib_db=no @@ -119,10 +124,17 @@ NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_dot_2,[-ldb-4.2]) NETATALK_BDB_LINK_TRY(atalk_cv_db_db42,[-ldb42]) NETATALK_BDB_LINK_TRY(atalk_cv_db_db_42,[-ldb-42]) NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_2,[-ldb-4-2]) + +NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_dot_2,[-ldb-4.4]) +NETATALK_BDB_LINK_TRY(atalk_cv_db_db42,[-ldb44]) +NETATALK_BDB_LINK_TRY(atalk_cv_db_db_42,[-ldb-44]) +NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_2,[-ldb-4-4]) + NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_dot_2,[-ldb-4.3]) NETATALK_BDB_LINK_TRY(atalk_cv_db_db42,[-ldb43]) NETATALK_BDB_LINK_TRY(atalk_cv_db_db_42,[-ldb-43]) NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_2,[-ldb-4-3]) + NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_dot_1,[-ldb-4.1]) NETATALK_BDB_LINK_TRY(atalk_cv_db_db41,[-ldb41]) NETATALK_BDB_LINK_TRY(atalk_cv_db_db_41,[-ldb-41]) @@ -138,7 +150,7 @@ AC_DEFUN([AC_PATH_BDB], trybdbdir="" dobdbsearch=yes bdb_search_dirs="/usr/local/include /usr/include" - search_subdirs="/db4.2 /db42 /db4.3 /db43 /db4.1 /db41 /db4 /" + search_subdirs="/db4.2 /db42 /db4.3 /db43 /db4.4 /db44 /db4.1 /db41 /db4 /" dnl required BDB version DB_MAJOR_REQ=4 -- 2.39.2