Resurrected acconfig.h and removed double quotes from AC_DEFINE params to enable...

diff --git a/configure.in b/configure.in
index 2e6a7e4..2c50e61 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl 
 dnl Process this file with autoconf to produce a configure script.
 dnl 

-dnl $Id: configure.in,v 1.73 2002/06/05 00:26:21 hal9 Exp $
+dnl $Id: configure.in,v 1.74 2002/09/03 17:31:33 oes Exp $

 dnl 
 dnl Written by and Copyright (C) 2001, 2002 the SourceForge
 dnl Privoxy team. http://www.privoxy.org/
 dnl 
 dnl Written by and Copyright (C) 2001, 2002 the SourceForge
 dnl Privoxy team. http://www.privoxy.org/


@@ -28,6 +28,9 @@ dnl or write to the Free Software Foundation, Inc., 59
 dnl Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 dnl 
 dnl $Log: configure.in,v $
 dnl Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 dnl 
 dnl $Log: configure.in,v $

+dnl Revision 1.74  2002/09/03 17:31:33  oes
+dnl Added workaround for very strange behaviour of AC_PROG_CC, which sets CFLAGS to -g -O2 if empty
+dnl

 dnl Revision 1.73  2002/06/05 00:26:21  hal9
 dnl Move all doc build stuff to doc/source/GNUmakefile, leaving a 'make dok'
 dnl target only in toplevel. Add DOC_STATUS variable so docs can be built without
 dnl Revision 1.73  2002/06/05 00:26:21  hal9
 dnl Move all doc build stuff to doc/source/GNUmakefile, leaving a 'make dok'
 dnl target only in toplevel. Add DOC_STATUS variable so docs can be built without


@@ -394,7 +397,7 @@ dnl =================================================================
 dnl AutoConf Initialization
 dnl =================================================================
 
 dnl AutoConf Initialization
 dnl =================================================================
 

-AC_REVISION($Revision: 1.73 $)
+AC_REVISION($Revision: 1.74 $)

 AC_INIT(src/jcc.c)
 
 if test ! -f src/config.h.in; then
 AC_INIT(src/jcc.c)
 
 if test ! -f src/config.h.in; then


@@ -969,31 +972,31 @@ AC_ARG_ENABLE(ie-images,
 if test $enableval2 = yes; then
   AC_DEFINE(FEATURE_IMAGE_DETECT_MSIE,1,
     [ Detect image requests automatically for MSIE.  Will fall back to
 if test $enableval2 = yes; then
   AC_DEFINE(FEATURE_IMAGE_DETECT_MSIE,1,
     [ Detect image requests automatically for MSIE.  Will fall back to

-      other image-detection methods (i.e. "+image" action) for other
+      other image-detection methods (i.e. ´´+image´´ action) for other

       browsers.
 
       You must also define FEATURE_IMAGE_BLOCKING to use this feature.
 
       It detects the following header pair as an image request:
       browsers.
 
       You must also define FEATURE_IMAGE_BLOCKING to use this feature.
 
       It detects the following header pair as an image request:

-      "User-Agent: Mozilla/4.0 (compatible; MSIE 5.5; Windows NT 5.0)",
-      "Accept: * / *".
+      ´´User-Agent: Mozilla/4.0 (compatible; MSIE 5.5; Windows NT 5.0)´´,
+      ´´Accept: * / *´´.

 
       And the following as a HTML request:
 
       And the following as a HTML request:

-      "User-Agent: Mozilla/4.0 (compatible; MSIE 5.5; Windows NT 5.0)",
-      "Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, * / *".
+      User-Agent: Mozilla/4.0 (compatible; MSIE 5.5; Windows NT 5.0),
+      Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, * / *.

 
       And no, I haven't got that backwards - IE is being wierd.
 
       Known limitations: 
       1) If you press shift-reload on a blocked HTML page, you get
 
       And no, I haven't got that backwards - IE is being wierd.
 
       Known limitations: 
       1) If you press shift-reload on a blocked HTML page, you get

-         the image "blocked" page, not the HTML "blocked" page.
-      2) Once an image "blocked" page has been sent, viewing it 
+         the image blocked page, not the HTML ´´blocked´´ page.
+      2) Once an image ´´blocked´´ page has been sent, viewing it 

          in it's own browser window *should* bring up the HTML
          in it's own browser window *should* bring up the HTML

-         "blocked" page, but it doesn't.  You need to clear the 
+         ´´blocked´´ page, but it doesn't.  You need to clear the 

          browser cache to get the HTML version again.
 
       These limitations are due to IE making inconsistent choices
          browser cache to get the HTML version again.
 
       These limitations are due to IE making inconsistent choices

-      about which "Accept:" header to send. ])
+      about which ´´Accept:´´ header to send. ])

 fi
 
 AC_ARG_ENABLE(image-blocking,
 fi
 
 AC_ARG_ENABLE(image-blocking,


@@ -1116,92 +1119,6 @@ fi
 AC_SUBST(STATIC_PCRE_ONLY)
 AC_SUBST(STATIC_PCRS_ONLY)
 
 AC_SUBST(STATIC_PCRE_ONLY)
 AC_SUBST(STATIC_PCRS_ONLY)
 

-dnl =================================================================
-dnl config.h Header/footer
-dnl =================================================================
-
-AH_TOP(
-[#ifndef CONFIG_H_INCLUDED
-#define CONFIG_H_INCLUDED
-
-/*********************************************************************
- *
- * File        :  config.h
- *
- * Purpose     :  This file should be the first thing included in every
- *                .c file.  (Before even system headers).  It contains 
- *                #define statements for various features.  It was
- *                introduced because the compile command line started
- *                getting ludicrously long with feature defines.
- *
- * Copyright   :  Written by and Copyright (C) 2001 the SourceForge
- *                Privoxy team. http://www.privoxy.org/
- *
- *                This program is free software; you can redistribute it 
- *                and/or modify it under the terms of the GNU General
- *                Public License as published by the Free Software
- *                Foundation; either version 2 of the License, or (at
- *                your option) any later version.
- *
- *                This program is distributed in the hope that it will
- *                be useful, but WITHOUT ANY WARRANTY; without even the
- *                implied warranty of MERCHANTABILITY or FITNESS FOR A
- *                PARTICULAR PURPOSE.  See the GNU General Public
- *                License for more details.
- *
- *                The GNU General Public License should be included with
- *                this file.  If not, you can view it at
- *                http://www.gnu.org/copyleft/gpl.html
- *                or write to the Free Software Foundation, Inc., 59
- *                Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- *********************************************************************/
-\f
-
-/*
- * It's too easy to accidentally use a Cygwin or MinGW32 version of config.h
- * under VC++, and it usually gives many wierd error messages.  Let's make
- * the error messages understandable, by bailing out now.
- */
-#ifdef _MSC_VER
-#error For MS VC++, please use vc_config_winthreads.h or vc_config_pthreads.h.  You can usually do this by selecting the "Build", "Clean" menu option.
-#endif /* def _MSC_VER */
-
-])
-
-AH_BOTTOM(
-[
-
-/*
- * Defined always.
- * FIXME: Don't know what it does or why we need it.
- * (presumably something to do with ANSI Standard C?)
- */
-#ifndef __STDC__
-#define __STDC__ 1
-#endif /* ndef __STDC__ */
-
-/*
- * Need to set up this define only for the Pthreads library for
- * Win32, available from http://sources.redhat.com/pthreads-win32/
- */
-#if defined(FEATURE_PTHREAD) && defined(_WIN32)
-#define __CLEANUP_C
-#endif /* defined(FEATURE_PTHREAD) && defined(_WIN32) */
-
-/*
- * BEOS does not currently support POSIX threads.
- * This *should* be detected by ./configure, but let's be sure.
- */
-#if defined(FEATURE_PTHREAD) && defined(__BEOS__)
-#error BEOS does not support pthread - please run ./configure again with "--disable-pthread"
-
-#endif /* defined(FEATURE_PTHREAD) && defined(__BEOS__) */
-
-
-#endif /* CONFIG_H_INCLUDED */
-])
-

 dnl =================================================================
 dnl DocBook stuff
 dnl =================================================================
 dnl =================================================================
 dnl DocBook stuff
 dnl =================================================================