* tiny 'file'-extract, now we can detect the type of an image. and set the mimetype...

[citadel.git] / webcit / configure.ac

diff --git a/webcit/configure.ac b/webcit/configure.ac
index d8c30e82d586008e26d8b4aab3a8a9ece4e5bc70..a10a0d9aa98688e1b2f6f1e109769cf85e5bf8cd 100644 (file)
--- a/webcit/configure.ac
+++ b/webcit/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl $Id$
-AC_INIT([WebCit], [7.24], [http://www.citadel.org/])
+AC_INIT([WebCit], [7.30], [http://www.citadel.org/])
 
 AC_SUBST(PROG_SUBDIRS)
 AC_DEFINE(PROG_SUBDIRS, [], [Program dirs])
@@ -105,7 +105,6 @@ dnl Check for libcitadel
 AC_CHECK_HEADER(libcitadel.h,
        [AC_CHECK_LIB(citadel, libcitadel_version_string,
                [
-                       AC_MSG_RESULT(OK)
                        LIBS="-lcitadel $LIBS"
                ],
                [
@@ -138,11 +137,11 @@ main() {
         sscanf(ICAL_VERSION, "%d.%d", &major, &minor);
         v = 100*major + minor;
         printf("libical version: %i\n", v);
-        if (v >= 24) {
+        if (v >= 30) {
                 printf("This version is ok.\n");
                return(0);
        }
-       printf("libical 0.24 or newer required.\n");
+       printf("libical 0.30 or newer required.\n");
        printf("Citadel will be built without calendar support.\n");
        return(1);
 }
@@ -154,6 +153,8 @@ main() {
                ]
        )
 fi
+ok_libical=$webcit_with_calendar_service
+
 
 if test "$webcit_with_calendar_service" == "yes"; then
                        AC_DEFINE(WEBCIT_WITH_CALENDAR_SERVICE,[],[whether we can do with calendar.])
@@ -318,6 +319,27 @@ if test "$ok_nls" != "no"; then
        )
 fi
 
+if test "$ok_iconv" = "no"; then
+       LD_FLAGS_BEFORE=$LDFLAGS
+       LDFLAGS="$LDFLAGS -liconv"
+               AC_TRY_RUN([
+                       #include <iconv.h>
+                       main() {
+                              iconv_t ic = (iconv_t)(-1) ;
+                              ic = iconv_open("UTF-8", "us-ascii");
+                              iconv_close(ic);
+                              exit(0);
+                       }
+                       ],
+                       ok_iconv=yes,
+                       ok_iconv=no
+               )
+               if test "$ok_iconv" != "no"; then
+                  LDFLAGS=$LD_FLAGS_BEFORE 
+                  LIBS="$LIBS -liconv"
+               fi
+fi
+
 if test "$ok_iconv" != "no"; then
        AC_MSG_RESULT(WebCit will be built with character set conversion.)
        AC_DEFINE(HAVE_ICONV,[],[whether we have iconv for charset conversion])
@@ -328,6 +350,7 @@ fi
 
 
 dnl Here is the check for libintl etc.
+AC_CHECK_FUNCS(strftime_l uselocale gettext)
 
 AC_ARG_ENABLE(nls,
        [  --disable-nls           do not use Native Language Support],