X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=configure.in;h=50066f742b1ee50c54ef55f6b40eeb6ff59d8d19;hp=dbd2ec200519ba847f0f738ba4bfb565e0ad0d9e;hb=5b366a65be8550ee01cc3e7cf2495a2f4f2bd870;hpb=f4107f65b676b63a199fe4230e58695757f9f199

diff --git a/configure.in b/configure.in
index dbd2ec20..50066f74 100644
--- a/configure.in
+++ b/configure.in
@@ -1,8 +1,8 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl 
-dnl $Id: configure.in,v 1.111 2008/02/03 14:40:47 fabiankeil Exp $
+dnl $Id: configure.in,v 1.117 2008/06/14 12:47:30 fabiankeil Exp $
 dnl 
-dnl Written by and Copyright (C) 2001 - 2007 the SourceForge
+dnl Written by and Copyright (C) 2001-2008 the SourceForge
 dnl Privoxy team. http://www.privoxy.org/
 dnl
 dnl Based on the Internet Junkbuster originally written
@@ -28,6 +28,29 @@ 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 Revision 1.117  2008/06/14 12:47:30  fabiankeil
+dnl Set CODE_STATUS to beta.
+dnl
+dnl Revision 1.116  2008/06/08 11:55:09  fabiankeil
+dnl - Show a warning if the soon-to-be-removed static PCRE code is used.
+dnl - Hide the "using built-in static pcrs" message. With dynamic linking
+dnl   against PCRS disabled, the message isn't particularly useful.
+dnl
+dnl Revision 1.115  2008/05/25 15:50:14  fabiankeil
+dnl Try to use zlib by default, but just show a warning if it's
+dnl unavailable. Remove --enable-zlib, add  --disable-zlib.
+dnl
+dnl Revision 1.114  2008/04/06 15:18:33  fabiankeil
+dnl Oh well, rename the --enable-pcre-host-patterns option to
+dnl --enable-extended-host-patterns as it's not really PCRE syntax.
+dnl
+dnl Revision 1.113  2008/04/06 14:54:26  fabiankeil
+dnl Use PCRE syntax in host patterns when configured
+dnl with --enable-pcre-host-patterns.
+dnl
+dnl Revision 1.112  2008/03/27 18:27:22  fabiankeil
+dnl Remove kill-popups action.
+dnl
 dnl Revision 1.111  2008/02/03 14:40:47  fabiankeil
 dnl Remove unused OSX_DARWIN macro. Reported by Mark Miller in #1852529.
 dnl
@@ -514,7 +537,7 @@ dnl =================================================================
 dnl AutoConf Initialization
 dnl =================================================================
 
-AC_REVISION($Revision: 1.111 $)
+AC_REVISION($Revision: 1.117 $)
 AC_INIT(jcc.c)
 
 if test ! -f config.h.in; then
@@ -561,7 +584,7 @@ dnl =================================================================
 VERSION_MAJOR=3
 VERSION_MINOR=0
 VERSION_POINT=9
-CODE_STATUS="UNRELEASED"
+CODE_STATUS="beta"
 
 dnl CODE_STATUS can be "alpha", "beta", or "stable", and will be
 dnl used for CGI output. Set version to 0.0.0 and status to "UNRELEASED"
@@ -902,6 +925,10 @@ AC_ARG_ENABLE(pthread,
 [  --disable-pthread               Don't use POSIX threads (pthreads)],
 [if test $enableval = no; then
   # Disable pthreads
+  if test $have_pthread = yes; then
+     AC_MSG_WARN([pthreads seem to be available but you are using --disable-pthread.]) 
+     AC_MSG_WARN([This is almost always a mistake and can render Privoxy unacceptable slow.])
+  fi
   have_pthread=no
 fi])
 
@@ -1313,6 +1340,12 @@ AC_ARG_ENABLE(graceful-termination,
   AC_DEFINE(FEATURE_GRACEFUL_TERMINATION)
 fi])
 
+AC_ARG_ENABLE(extended-host-patterns,
+[  --enable-extended-host-patterns Allow extended regular expressions in host patterns.],
+[if test $enableval = yes; then
+  AC_DEFINE(FEATURE_EXTENDED_HOST_PATTERNS)
+fi])
+
 dnl pcre/pcrs is needed for CGI anyway, so
 dnl the choice is only between static and
 dnl dynamic:
@@ -1335,17 +1368,19 @@ dnl This check is incomplete. For mingw32 zlib is found
 dnl by configure, but not necessarily by the compiler.
 dnl ====================================================
 AC_ARG_ENABLE(zlib,
-[  --enable-zlib                   Use an external zlib library to allow decompressing
-                                  data on the fly.],
+[  --disable-zlib                  Don't use zlib to decompress data before filtering.],
 [enableval2=$enableval],
-[enableval2=no])
+[enableval2=yes])
 if test $enableval2 = yes; then
-  AC_CHECK_LIB(z, zlibVersion, , [
-    AC_MSG_ERROR([Unable to find a copy of zlib. The zlib library
-is necessary to enable compresion support. ])
-  ]) 
-  AC_DEFINE(FEATURE_ZLIB,1,
-    [ Define to 1 to use compression through the zlib library. ])
+  AC_CHECK_LIB(z, zlibVersion, [have_zlib="yes"], [have_zlib="no"])
+  if test $have_zlib = "yes"; then
+    LIBS="$LIBS -lz"
+    AC_DEFINE(FEATURE_ZLIB,1,[Define to 1 to use compression through the zlib library.])
+  else
+   AC_MSG_WARN([No zlib found.
+   Privoxy will not be able to filter compressed content.
+   This may become a fatal error in the future.])
+  fi  
 fi
 
 
@@ -1359,7 +1394,8 @@ if test $have_pcre = "yes"; then
   STATIC_PCRE_ONLY=#
   LIBS="$LIBS -lpcre -lpcreposix"
 else
-  echo "using built-in static pcre"
+  AC_MSG_WARN([You are using the static PCRE code which is scheduled for removal, for details see: 
+    https://sourceforge.net/mailarchive/message.php?msg_id=20080511195555.2dc6cfdc%40fabiankeil.de])
   pcre_dyn=no
   AC_DEFINE(STATIC_PCRE)
   STATIC_PCRE_ONLY=
@@ -1378,7 +1414,7 @@ dnl  echo "using libpcrs"
 dnl  STATIC_PCRS_ONLY=#
 dnl  LIBS="$LIBS -lpcrs"
 dnl else
-  echo "using built-in static pcrs"
+dnl  echo "using built-in static pcrs"
   AC_DEFINE(STATIC_PCRS)
   STATIC_PCRS_ONLY=
 dnl fi