* Fix configure mis-detecting libical and zlib and a missing semicolon in

  tools.h

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 80c2a2337649e808b7b9ec26bbd14e0b3a6a81ed..32cdd19e92155d458bd9d66e3f0ac0e9f4108947 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,8 @@
  $Log$
+ Revision 601.12  2002/09/30 07:20:35  error
+ * Fix configure mis-detecting libical and zlib and a missing semicolon in
+   tools.h
+
  Revision 601.11  2002/09/29 04:55:13  error
  * File and attachment downloads now use the new IPC code.
  * Implemented high-speed pipelined file download in IPC code.
@@ -4026,4 +4030,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 2d54e4dedcb88700f219026c02c2e7c9aed52e72..57238fe597144523767c6eaabb3e8db1063cc304 100644 (file)
--- a/citadel/configure.ac
+++ b/citadel/configure.ac
@@ -377,7 +377,7 @@ if test "x$with_zlib" != xno ; then
        )])
 fi
 
-if test "x$ok_zlib" != xno ; then
+if test "x$ok_zlib" = xyes ; then
        LIBS="-lz $LIBS"
        AC_DEFINE(HAVE_ZLIB)
 fi
@@ -392,7 +392,7 @@ if test "x$with_libical" != xno ; then
        )])
 fi
 
-if test "x$ok_libical" != xno ; then
+if test "x$ok_libical" = xyes ; then
        LIBS="-lical $LIBS"
        AC_DEFINE(HAVE_LIBICAL)
 fi

diff --git a/citadel/tools.h b/citadel/tools.h
index 0407ba9b9e033cc9c2defeb87d52e2f14bc71413..3e353f298046a9048a0a06039e975acb371d1c3a 100644 (file)
--- a/citadel/tools.h
+++ b/citadel/tools.h
@@ -15,7 +15,7 @@ int is_msg_in_mset(char *mset, long msgnum);
 char *memreadline(char *start, char *buf, int maxlen);
 
 #ifndef HAVE_STRNCASECMP
-int strncasecmp(char *, char *, int)
+int strncasecmp(char *, char *, int);
 #endif
 #ifndef HAVE_STRCASECMP
 #define strcasecmp(x,y) strncasecmp(x,y,INT_MAX);