From f9467b1e78c8a16ebb6bcf3087731b9684d6cff0 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Wilfried=20G=C3=B6esgens?= <willi@citadel.org>
Date: Thu, 25 Oct 2007 21:51:16 +0000
Subject: [PATCH] * handle webcit version through sysdep.h

---
 webcit/autocompletion.c |  2 +-
 webcit/configure.ac     | 10 +---------
 webcit/groupdav_main.c  |  2 +-
 webcit/messages.c       |  6 +++---
 webcit/rss.c            |  4 ++--
 webcit/summary.c        |  2 +-
 webcit/webcit.c         |  6 +++---
 webcit/webcit.h         | 33 ++++++++++++++++-----------------
 webcit/webserver.c      |  2 +-
 9 files changed, 29 insertions(+), 38 deletions(-)
diff --git a/webcit/autocompletion.c b/webcit/autocompletion.c
index 8c516f767..e9c87ab0d 100644
--- a/webcit/autocompletion.c
+++ b/webcit/autocompletion.c
@@ -25,7 +25,7 @@ void recp_autocomplete(char *partial) {
 		"Cache-Control: no-store\r\n"
 		"Expires: -1\r\n"
 		,
-		SERVER);
+		PACKAGE_STRING);
 	begin_burst();
 
 	wprintf("<ul>");
diff --git a/webcit/configure.ac b/webcit/configure.ac
index 18dccdf75..06e7247c7 100644
--- a/webcit/configure.ac
+++ b/webcit/configure.ac
@@ -1,14 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl $Id$
-AC_INIT(webserver.c)
-
-
-PACKAGE=webcit
-VERSION=7.22
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [our package name])
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [our package version])
-AC_SUBST(PACKAGE)
-AC_SUBST(VERSION)
+AC_INIT([WebCit], [7.22], [http://www.citadel.org/])
 
 AC_SUBST(PROG_SUBDIRS)
 AC_DEFINE(PROG_SUBDIRS, [], [Program dirs])
diff --git a/webcit/groupdav_main.c b/webcit/groupdav_main.c
index fe3bbe643..651cdb28d 100644
--- a/webcit/groupdav_main.c
+++ b/webcit/groupdav_main.c
@@ -22,7 +22,7 @@ void groupdav_common_headers(void) {
 	wprintf(
 		"Server: %s / %s\r\n"
 		"Connection: close\r\n",
-		SERVER, serv_info.serv_software
+		PACKAGE_STRING, serv_info.serv_software
 	);
 }
 
diff --git a/webcit/messages.c b/webcit/messages.c
index f06d17fd9..0c417baed 100644
--- a/webcit/messages.c
+++ b/webcit/messages.c
@@ -1257,7 +1257,7 @@ void print_message(char *msgnum_as_string) {
 	wprintf("Content-type: text/html\r\n"
 		"Server: %s\r\n"
 		"Connection: close\r\n",
-		SERVER);
+		PACKAGE_STRING);
 	begin_burst();
 
 	wprintf("\r\n\r\n<html>\n"
@@ -1288,7 +1288,7 @@ void display_headers(char *msgnum_as_string) {
 	wprintf("Content-type: text/plain\r\n"
 		"Server: %s\r\n"
 		"Connection: close\r\n",
-		SERVER);
+		PACKAGE_STRING);
 	begin_burst();
 
 	serv_printf("MSG2 %ld|3", msgnum);
@@ -2760,7 +2760,7 @@ void post_mime_to_server(void) {
 
 	/** RFC2045 requires this, and some clients look for it... */
 	serv_puts("MIME-Version: 1.0");
-	serv_puts("X-Mailer: " SERVER);
+	serv_puts("X-Mailer: " PACKAGE_STRING);
 
 	/** If there are attachments, we have to do multipart/mixed */
 	if (WC->first_attachment != NULL) {
diff --git a/webcit/rss.c b/webcit/rss.c
index f34c49209..fd8fad0ea 100644
--- a/webcit/rss.c
+++ b/webcit/rss.c
@@ -128,7 +128,7 @@ void display_rss(char *roomname, char *request_method)
 	wprintf("Last-Modified: %s\r\n", date);
 /*	if (*msgn) wprintf("ETag: %s\r\n\r\n", msgn); */
 	wprintf("Content-Type: application/rss+xml\r\n");
-	wprintf("$erver: %s\r\n", SERVER);
+	wprintf("$erver: %s\r\n", PACKAGE_STRING);
 	wprintf("Connection: close\r\n");
 	wprintf("\r\n");
 	if (!strcasecmp(request_method, "HEAD"))
@@ -157,7 +157,7 @@ void display_rss(char *roomname, char *request_method)
 	if (now) {
 		wprintf("   <pubDate>%s</pubDate>\n", date);
 	}
-	wprintf("   <generator>%s</generator>\n", SERVER);
+	wprintf("   <generator>%s</generator>\n", PACKAGE_STRING);
 	wprintf("   <docs>http://blogs.law.harvard.edu/tech/rss</docs>\n");
 	wprintf("   <ttl>30</ttl>\n");
 
diff --git a/webcit/summary.c b/webcit/summary.c
index bcab5df63..090e2fe9a 100644
--- a/webcit/summary.c
+++ b/webcit/summary.c
@@ -201,7 +201,7 @@ void server_info_section(void) {
 		_("You are connected to %s, running %s with %s, and located in %s.  Your system administrator is %s."),
 		serv_info.serv_humannode,
 		serv_info.serv_software,
-		SERVER,
+		PACKAGE_STRING,
 		serv_info.serv_bbs_city,
 		serv_info.serv_sysadm);
 	escputs(message);
diff --git a/webcit/webcit.c b/webcit/webcit.c
index e3cef8ff7..11c764c32 100644
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -466,7 +466,7 @@ void output_headers(	int do_httpheaders,	/**< 1 = output HTTP headers
 		wprintf("Content-type: text/html; charset=utf-8\r\n"
 			"Server: %s / %s\n"
 			"Connection: close\r\n",
-			SERVER, serv_info.serv_software
+			PACKAGE_STRING, serv_info.serv_software
 		);
 	}
 
@@ -571,7 +571,7 @@ void http_transmit_thing(char *thing, size_t length, char *content_type,
 		"Server: %s\r\n"
 		"Connection: close\r\n",
 		content_type,
-		SERVER);
+		PACKAGE_STRING);
 
 #ifdef HAVE_ZLIB
 	/** If we can send the data out compressed, please do so. */
@@ -998,7 +998,7 @@ void begin_ajax_response(void) {
                 "Cache-Control: no-cache\r\n"
 		"Expires: -1\r\n"
 		,
-                SERVER);
+                PACKAGE_STRING);
         begin_burst();
 }
 
diff --git a/webcit/webcit.h b/webcit/webcit.h
index 505f49760..eebfbcb07 100644
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -68,32 +68,32 @@ extern locale_t wc_locales[];
 #endif
 
 
-#ifdef WEBCIT_WITH_CALENDAR_SERVICE
 /* Work around PACKAGE/VERSION defs that are (not supposed to be?) in ical.h */
 #ifdef PACKAGE
 # define CTDL_PACKAGE PACKAGE
 # undef PACKAGE
 #endif
+
+#ifdef PACKAGE_STRING
+# define CTDL_PACKAGE_STRING PACKAGE_STRING
+//# undef PACKAGE_STRING
+#endif
+
 #ifdef VERSION
 # define CTDL_VERSION VERSION
 # undef VERSION
 #endif
+
 #include <ical.h>
-#ifdef CTDL_PACKAGE
-# ifdef PACKAGE
-#  undef PACKAGE
-# endif
-# define PACKAGE CTDL_PACKAGE
-# undef CTDL_PACKAGE
-#endif
-#ifdef CTDL_VERSION
-# ifdef VERSION
-#  undef VERSION
-# endif
-# define VERSION CTDL_VERSION
-# undef CTDL_VERSION
-#endif
-#endif
+
+#undef PACKAGE
+#undef VERSION
+#undef PACKAGE_NAME
+#undef PACKAGE_STRING
+#undef PACKAGE_TARNAME
+#undef PACKAGE_VERSION
+#undef PACKAGE_BUGREPORT
+#include "sysdep.h"
 
 
 
@@ -115,7 +115,6 @@ extern locale_t wc_locales[];
 #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 v7.22"	/* who's in da house */
 #define DEVELOPER_ID		0
 #define CLIENT_ID		4
 #define CLIENT_VERSION		722		/* This version of WebCit */
diff --git a/webcit/webserver.c b/webcit/webserver.c
index 38a1f0d1e..55439dc69 100644
--- a/webcit/webserver.c
+++ b/webcit/webserver.c
@@ -739,7 +739,7 @@ int main(int argc, char **argv)
 	}
 
 	/** Tell 'em who's in da house */
-	lprintf(1, SERVER "\n");
+	lprintf(1, PACKAGE_STRING "\n");
 	lprintf(1, "Copyright (C) 1996-2007 by the Citadel development team.\n"
 		"This software is distributed under the terms of the "
 		"GNU General Public License.\n\n"
-- 
2.39.2

