From 8cfa8c2267d8e9cb175224abda9fd8ef8e33eff4 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 25 Apr 2006 22:46:38 +0000 Subject: compatibility with libd4.4 git-svn-id: file:///home/lennart/svn/public/syrep/trunk@106 07ea20a6-d2c5-0310-9e02-9ef735347d72 --- configure.ac | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 936b22d..2f517b4 100644 --- a/configure.ac +++ b/configure.ac @@ -71,7 +71,14 @@ AC_CHECK_HEADER([zlib.h],, [AC_MSG_ERROR([*** Sorry, you have to install the zli # Check for Berkeley DB (needs to be improved) AC_CHECK_HEADER([db.h],, [AC_MSG_ERROR([*** Sorry, you have to install the Berkeley Database Library (libdb) 4.3 or newer ***])]) -AC_CHECK_LIB([db], [__db_db_create_4003],, [AC_MSG_ERROR([*** Sorry, you have to install the Berkeley Database Library (libdb) 4.3 or newer ***])]) + +flag=0 +AC_CHECK_LIB([db], [__db_db_create_4003],[flag=1]) +AC_CHECK_LIB([db], [__db_db_create_4004],[flag=1]) + +if test "x$flag" = "x0" ; then + AC_MSG_ERROR([*** Sorry, you have to install the Berkeley Database Library (libdb) 4.3/4.4 ***]) +fi LIBS="$LIBS -ldb" # Checking libdb version number @@ -79,7 +86,7 @@ AC_MSG_CHECKING([for Berkeley libdb 4.3]) AC_LANG_PUSH(C) AC_PREPROC_IFELSE([AC_LANG_SOURCE([[ #include -#if (DB_VERSION_MAJOR != 4) || (DB_VERSION_MINOR != 3) +#if (DB_VERSION_MAJOR != 4) || (DB_VERSION_MINOR != 3 && DB_VERSION_MINOR != 4) #error "foo" #endif ]])], -- cgit