From 3aeac561dad87ecbe07f0beb04435afa26412fb5 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Mon, 4 Apr 2005 17:49:31 +0000 Subject: [PATCH] * configure.in: fix libical version detection * bumped internal version number to 6.10 --- webcit/ChangeLog | 5 ++++- webcit/README.txt | 2 +- webcit/auth.c | 2 ++ webcit/configure.in | 19 ++++++++----------- webcit/webcit.h | 4 ++-- 5 files changed, 17 insertions(+), 15 deletions(-) diff --git a/webcit/ChangeLog b/webcit/ChangeLog index b44b782eb..cc132bc86 100644 --- a/webcit/ChangeLog +++ b/webcit/ChangeLog @@ -1,4 +1,8 @@ $Log$ +Revision 603.15 2005/04/04 17:49:31 ajc +* configure.in: fix libical version detection +* bumped internal version number to 6.10 + Revision 603.14 2005/03/30 21:44:44 ajc * Changed the color of the side button bar * Removed session ID's from wholist display, because they are only @@ -2495,4 +2499,3 @@ Sun Dec 6 19:50:55 EST 1998 Art Cancro 1998-12-03 Nathan Bryant * webserver.c: warning fix - diff --git a/webcit/README.txt b/webcit/README.txt index 1031fea47..88bfa6a09 100644 --- a/webcit/README.txt +++ b/webcit/README.txt @@ -1,5 +1,5 @@ WEBCIT for the Citadel System - version 5.26 + version 6.10 Copyright (C) 1996-2004 by the authors. Portions written by: Art Cancro diff --git a/webcit/auth.c b/webcit/auth.c index 78f15f239..a48e22771 100644 --- a/webcit/auth.c +++ b/webcit/auth.c @@ -157,6 +157,7 @@ void do_welcome(void) FILE *fp; int i; +#ifdef XXX_NOT_FINISHED_YET_XXX /* * See if we have to run the first-time setup wizard */ @@ -187,6 +188,7 @@ void do_welcome(void) http_redirect("/setup_wizard"); } } +#endif /* * Go to the user's preferred start page diff --git a/webcit/configure.in b/webcit/configure.in index b8c6dd3fa..329146102 100644 --- a/webcit/configure.in +++ b/webcit/configure.in @@ -96,19 +96,16 @@ if test "x$ok_libical" = xyes ; then [ #include 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"); - printf("WebCit will be built with calendar support.\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 is required.\n"); - printf("WebCit will be built without calendar support.\n"); + printf("libical 0.24 or newer required.\n"); + printf("Citadel will be built without calendar support.\n"); return(1); } ], diff --git a/webcit/webcit.h b/webcit/webcit.h index 103908e13..ec39ab477 100644 --- a/webcit/webcit.h +++ b/webcit/webcit.h @@ -32,10 +32,10 @@ #define SLEEPING 180 /* TCP connection timeout */ #define WEBCIT_TIMEOUT 900 /* WebCit session timeout */ #define PORT_NUM 2000 /* port number to listen on */ -#define SERVER "WebCit v6.03" /* who's in da house */ +#define SERVER "WebCit v6.10" /* who's in da house */ #define DEVELOPER_ID 0 #define CLIENT_ID 4 -#define CLIENT_VERSION 603 /* This version of WebCit */ +#define CLIENT_VERSION 610 /* This version of WebCit */ #define MINIMUM_CIT_VERSION 640 /* min required Citadel vers */ #define DEFAULT_HOST "localhost" /* Default Citadel server */ #define DEFAULT_PORT "504" -- 2.39.2