From: Art Cancro <ajc@citadel.org>
Date: Sun, 12 Jan 2003 23:07:40 +0000 (+0000)
Subject: * configure.ac: Attempt to check for libical 0.24 or newer
X-Git-Tag: v7.86~6048
X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=fcb314d106308a2ce6ebb85e13381a168aeacef0;p=citadel.git

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

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 45cea01ba..25fab9f6e 100644
--- 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 1250be7ee..1a061cb96 100644
--- 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 21af67c64..b6341e50e 100644
--- 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);