From 33aba4a58bb6e6154e1950dd82508c2523ecd888 Mon Sep 17 00:00:00 2001
From: Art Cancro <ajc@citadel.org>
Date: Fri, 14 Jan 2005 17:08:31 +0000
Subject: [PATCH] * Applied a configure script fix sent in by David Given for
 more reliable   detection of the installed libical version.

---
 citadel/ChangeLog         |  5 ++++-
 citadel/configure.ac      | 14 ++++++--------
 citadel/docs/citadel.html |  2 +-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index f7ae42821..5da4aa15f 100644
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,8 @@
  $Log$
+ Revision 629.5  2005/01/14 17:08:30  ajc
+ * Applied a configure script fix sent in by David Given for more reliable
+   detection of the installed libical version.
+
  Revision 629.4  2005/01/13 05:43:16  ajc
  * Initial support for having a room participate in a remote mailing list
 
@@ -6268,4 +6272,3 @@ 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 1ede14026..269a7c8c0 100644
--- a/citadel/configure.ac
+++ b/citadel/configure.ac
@@ -443,14 +443,12 @@ if test "x$ok_libical" = xyes ; then
 		[
 #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");
+        int major, minor, v;
+        sscanf(ICAL_VERSION, "%d.%d", &major, &minor);
+        v = 100*major + minor;
+        printf("libical version: %i\n", v);
+        if (v >= 24) {
+                printf("This version is ok.\n");
 		return(0);
 	}
 	printf("libical 0.24 or newer required.\n");
diff --git a/citadel/docs/citadel.html b/citadel/docs/citadel.html
index ee3cae2eb..a07fe7b74 100644
--- a/citadel/docs/citadel.html
+++ b/citadel/docs/citadel.html
@@ -55,7 +55,7 @@ developer<br>
     <tr>
       <td valign="top">David Given<br>
       </td>
-      <td valign="top"><i>non-ASCII IMAP mailbox naming<br>
+      <td valign="top"><i>IMAP and build patches<br>
       </i></td>
     </tr>
     <tr>
-- 
2.39.2