* Duh. I don't need to twiddle CFLAGS when autoconf provides -DHAVE_ZLIB_H

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index e87d830068199c1d8030e36ce9e0ae79de470262..91f204800725e0ee436ae7a7f36b678aed725ddd 100644 (file)
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,4 +1,7 @@
 $Log$
+Revision 400.10  2002/09/15 02:50:55  ajc
+* Duh.  I don't need to twiddle CFLAGS when autoconf provides -DHAVE_ZLIB_H
+
 Revision 400.9  2002/09/14 21:33:31  ajc
 * Backed out compression of inlines -- not all browsers appear to handle it
 
@@ -967,4 +970,3 @@ Sun Dec  6 19:50:55 EST 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
 
 1998-12-03 Nathan Bryant <bryant@cs.usm.maine.edu>
        * webserver.c: warning fix
-

diff --git a/webcit/configure.in b/webcit/configure.in
index 00f4119555ab22e2c9e9abbcb322c8fa18294695..b456af0ef8fa5514b00114afe935aedd53ea8606 100644 (file)
--- a/webcit/configure.in
+++ b/webcit/configure.in
@@ -82,7 +82,6 @@ fi
 
 if test "x$ok_zlib" != xno ; then
        LIBS="-lz $LIBS"
-       CFLAGS="-DWITH_ZLIB $CFLAGS"
        AC_DEFINE(HAVE_ZLIB)
 fi
 
@@ -96,7 +95,6 @@ fi
 
 if test "x$ok_libical" != xno ; then
         LIBS="-lical $LIBS"
-       CFLAGS="-DWITH_LIBICAL $CFLAGS"
         AC_DEFINE(HAVE_LIBICAL)
 fi
 

diff --git a/webcit/context_loop.c b/webcit/context_loop.c
index 99af01990ce2ac12b0aba6725fd610ea65cb98c2..b13ef6fff7b46a7d9cca17835a784d299ebff9a1 100644 (file)
--- a/webcit/context_loop.c
+++ b/webcit/context_loop.c
@@ -234,7 +234,7 @@ void context_loop(int sock)
        struct wcsession *TheSession, *sptr;
        int gzip = 0;
 
-#ifdef WITH_ZLIB
+#ifdef HAVE_ZLIB_H
        int i;
        char enc[SIZ];
        char encodings[SIZ];
@@ -253,7 +253,7 @@ void context_loop(int sock)
                        got_cookie = 1;
                }
 
-#ifdef WITH_ZLIB
+#ifdef HAVE_ZLIB_H
                if (!strncasecmp(buf, "Accept-encoding: ", 17)) {
                        extract_token(encodings, &buf[17], 0, ';');
                        for (i=0; i<num_tokens(encodings, ','); ++i) {

diff --git a/webcit/webcit.c b/webcit/webcit.c
index 277ca76a04d4590329765b9c78fe2776309dff78..e23801bc7abeb1976a8412025d82b6a64ff3d037 100644 (file)
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -152,7 +152,7 @@ char *bstr(char *key)
 }
 
 
-#ifdef WITH_ZLIB
+#ifdef HAVE_ZLIB_H
 
 ssize_t http_write(int fd, void *buf, size_t count) {
 
@@ -320,7 +320,7 @@ void output_headers(int controlcode)
        int suppress_check = 0;
        char httpnow[SIZ];
        static int pageseq = 0;
-#ifdef WITH_ZLIB
+#ifdef HAVE_ZLIB_H
        gzFile temp_gzfd = NULL;
 #endif
 
@@ -332,7 +332,7 @@ void output_headers(int controlcode)
 
        httpdate(httpnow, time(NULL));
 
-#ifdef WITH_ZLIB
+#ifdef HAVE_ZLIB_H
        if (WC->gzcompressed) {
                temp_gzfd = gzdopen(WC->http_sock, "wb9");
        }
@@ -346,7 +346,7 @@ void output_headers(int controlcode)
                        "Pragma: no-cache\n"
                        "Cache-Control: no-store\n"
                );
-#ifdef WITH_ZLIB
+#ifdef HAVE_ZLIB_H
                if (temp_gzfd != NULL) {
                        wprintf("Content-Encoding: gzip\n");
                }
@@ -366,7 +366,7 @@ void output_headers(int controlcode)
        if (print_standard_html_head > 0) {
                wprintf("\n");
 
-#ifdef WITH_ZLIB
+#ifdef HAVE_ZLIB_H
                if (temp_gzfd != NULL) {
                        WC->gzfd = temp_gzfd;
                }
@@ -879,7 +879,7 @@ void session_loop(struct httprequest *req, int gzip)
 
        WC->is_wap = 0;
 
-#ifdef WITH_ZLIB
+#ifdef HAVE_ZLIB_H
        if (gzip) {
                WC->gzcompressed = 1;
        }
@@ -1268,7 +1268,7 @@ SKIP_ALL_THIS_CRAP:
                WC->upload_length = 0;
        }
 
-#ifdef WITH_ZLIB
+#ifdef HAVE_ZLIB_H
        if (WC->gzfd) {
                gzclose(WC->gzfd);
                WC->gzfd = NULL;

diff --git a/webcit/webcit.h b/webcit/webcit.h
index 4aac82df13adc3984ea2b00c16c34bbf7ebd91f0..eb950d0f53468b3902123146a95157f9ce171eeb 100644 (file)
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -1,6 +1,6 @@
 /* $Id$ */
 
-#ifdef WITH_ZLIB
+#ifdef HAVE_ZLIB_H
 #include <zlib.h>
 #endif
 
@@ -168,7 +168,7 @@ struct wcsession {
        char this_page[SIZ];            /* address of current page */
        char http_host[SIZ];            /* HTTP Host: header */
        char *preferences;
-#ifdef WITH_ZLIB
+#ifdef HAVE_ZLIB_H
        int gzcompressed;               /* nonzero if compressed output */
        gzFile gzfd;                    /* stream to send compressed */
 #endif