* configure.ac: Attempt to check for libical 0.24 or newer

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 45cea01ba0bc220b0a85624a3430f6d58075117e..25fab9f6ee55b41d58d7c05ee8650ef4b2fd8977 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,7 @@
  $Log$
+ Revision 601.105  2003/01/12 23:07:40  ajc
+ * configure.ac: Attempt to check for libical 0.24 or newer
+
  Revision 601.104  2003/01/12 05:01:58  ajc
  * Start marking things for 6.05 release
 
@@ -4358,3 +4361,4 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import
+

diff --git a/citadel/configure.ac b/citadel/configure.ac
index 1250be7eeb6c2b01935cc84807dc8719b0a31eb0..1a061cb96dc540dd600a70d7d8b800c94edf799c 100644 (file)
--- a/citadel/configure.ac
+++ b/citadel/configure.ac
@@ -398,8 +398,31 @@ if test "x$with_libical" != xno ; then
 fi
 
 if test "x$ok_libical" = xyes ; then
-       LIBS="-lical $LIBS"
-       AC_DEFINE(HAVE_LIBICAL)
+
+       AC_TRY_RUN(
+               [
+#include <ical.h>
+main() {
+       float v;
+       int i;
+       sscanf(ICAL_VERSION, "%f", &v);
+       printf("libical version: %0.2f\n", v);
+       v = v * 100.0;
+       i = (int) v;
+       if (i >= 24) {
+               printf("This version is ok.\n");
+               return(0);
+       }
+       printf("libical 0.24 or newer required.\n");
+       printf("Citadel will be built without calendar support.\n");
+       return(1);
+}
+               ], 
+               [
+                       LIBS="-lical $LIBS"
+                       AC_DEFINE(HAVE_LIBICAL)
+               ]
+       )
 fi
 
 

diff --git a/citadel/messages.c b/citadel/messages.c
index 21af67c642123cd2c21b17805b3fa84778daa964..b6341e50efcfc1706bdc7711e09049afec7e542a 100644 (file)
--- a/citadel/messages.c
+++ b/citadel/messages.c
@@ -552,8 +552,10 @@ int read_message(CtdlIPC *ipc,
                                fprintf(dest, "Subject: %s\n",
                                                        message->subject);
                        } else {
-                               color(BRIGHT_MAGENTA);
-                               scr_printf("Subject: %s\n", message->subject);
+                               color(DIM_WHITE);
+                               scr_printf("Subject: ");
+                               color(BRIGHT_CYAN);
+                               scr_printf("%s\n", message->subject);
                                ++lines_printed;
                                lines_printed = checkpagin(lines_printed,
                                                pagin, screenheight);