From 315522ab5ab89ffee69abc95465455de4a0cb19f Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Tue, 29 Jan 2008 04:42:08 +0000 Subject: [PATCH] Moved the libcitadel version check below the point where it generates sysdep.h because that header is needed for the test. --- citadel/configure.ac | 45 +++++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/citadel/configure.ac b/citadel/configure.ac index e3d51730c..a0b0d08b9 100644 --- a/citadel/configure.ac +++ b/citadel/configure.ac @@ -419,27 +419,6 @@ AC_CHECK_HEADER(libcitadel.h, -dnl Check to see if libcitadel is new enough -AC_MSG_CHECKING(checking libcitadel version) -AC_TRY_RUN( - [ -#include -#include -#include -#include -#include "citadel.h" -main() { - if (LIBCITADEL_VERSION_NUMBER >= LIBCITADEL_MIN) { - return(0); - } - return(1); -} - ], - AC_MSG_RESULT(ok), - AC_MSG_ERROR(libcitadel is too old. Please upgrade it first.) -) - - # The big search for OpenSSL if test "$with_ssl" != "no"; then @@ -909,6 +888,30 @@ AC_CONFIG_HEADER(sysdep.h) AC_CONFIG_FILES([Makefile]) AC_OUTPUT(database_cleanup.sh) + +dnl Check to see if libcitadel is new enough +dnl The test is way down here because it needs sysdep.h to be generated first +AC_MSG_CHECKING(libcitadel version) +AC_TRY_RUN( + [ +#include +#include +#include +#include +#include "citadel.h" +main() { + if (LIBCITADEL_VERSION_NUMBER >= LIBCITADEL_MIN) { + return(0); + } + return(1); +} + ], + AC_MSG_RESULT(ok), + AC_MSG_ERROR(libcitadel is too old. Please upgrade it first.) +) + + + if test -z "$DATABASE"; then AC_MSG_WARN([No database driver was found. Please install Berkeley DB.]) fi -- 2.39.2