The test for libcitadel version in the configure script had too many
places where it could either break or send the build into an infinite
loop of reconfiguration. Moved the test into the citadel.h and
webcit.h header files, where they throw an error if the version is
too old.
#define SERVER_TYPE 0 /* zero for stock Citadel; other developers please
obtain SERVER_TYPE codes for your implementations */
#define SERVER_TYPE 0 /* zero for stock Citadel; other developers please
obtain SERVER_TYPE codes for your implementations */
+#ifdef LIBCITADEL_VERSION_NUMBER
+#if LIBCITADEL_VERSION_NUMBER < LIBCITADEL_MIN
+#error libcitadel is too old. Please upgrade it before continuing.
+#endif
+#endif
+
/* Various length constants */
#define UGLISTLEN 100 /* you get a ungoto list of this size */
/* Various length constants */
#define UGLISTLEN 100 /* you get a ungoto list of this size */
AC_OUTPUT(database_cleanup.sh)
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 <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <libcitadel.h>
-#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
if test -z "$DATABASE"; then
AC_MSG_WARN([No database driver was found. Please install Berkeley DB.])
fi
-dnl Check to see if libcitadel is new enough
-AC_MSG_CHECKING(checking libcitadel version)
-AC_TRY_RUN(
- [
-#include "webcit.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.)
-)
-
-
-
webcit_with_calendar_service=no
dnl Checks for the libical calendaring library.
if test "x$with_libical" != xno ; then
webcit_with_calendar_service=no
dnl Checks for the libical calendaring library.
if test "x$with_libical" != xno ; then
#define DEFAULT_MAXMSGS 20
#define DEFAULT_MAXMSGS 20
+#ifdef LIBCITADEL_VERSION_NUMBER
+#if LIBCITADEL_VERSION_NUMBER < LIBCITADEL_MIN
+#error libcitadel is too old. Please upgrade it before continuing.
+#endif
+#endif
+
+
/*
* Room flags (from Citadel)
*
/*
* Room flags (from Citadel)
*