* Applied a configure script fix sent in by David Given for more reliable

  detection of the installed libical version.

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index f7ae4282124a59c2ee6ea81e916a262df5c5ba9b..5da4aa15f37a828617dd8ab90761babb4a99a30f 100644 (file)
--- 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 1ede14026a90df207fd498fa172c7178d56131c2..269a7c8c08eecdccc1bed3417310770e1c0741d7 100644 (file)
--- 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 ee3cae2eb878e7bad714fed374c69ec336ea1383..a07fe7b7462b01e3bd026c9c7a79cce1bfe56f5f 100644 (file)
--- 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>