X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=configure.in;h=29908b96612f49d19a14e74c0f3cff06eafc63a5;hb=cd77cddcf0cb26b3023532c51e700b9000fdc7b4;hp=23a104237d27cd1ec0d3ffb0ed1f3d37e42e8e9b;hpb=4c5d9731001ca7082db2c70a2e45106ee7869b2d;p=privoxy.git

diff --git a/configure.in b/configure.in
index 23a10423..29908b96 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.134 2009/07/18 12:21:03 fabiankeil Exp $
+dnl $Id: configure.in,v 1.142 2010/02/13 16:35:45 fabiankeil Exp $
 dnl 
-dnl Written by and Copyright (C) 2001-2009 the
+dnl Written by and Copyright (C) 2001-2010 the
 dnl Privoxy team. http://www.privoxy.org/
 dnl
 dnl Based on the Internet Junkbuster originally written
@@ -32,7 +32,7 @@ dnl =================================================================
 dnl AutoConf Initialization
 dnl =================================================================
 
-AC_REVISION($Revision: 1.134 $)
+AC_REVISION($Revision: 1.142 $)
 AC_INIT(jcc.c)
 
 if test ! -f config.h.in; then
@@ -78,8 +78,8 @@ dnl =================================================================
 
 VERSION_MAJOR=3
 VERSION_MINOR=0
-VERSION_POINT=14
-CODE_STATUS="beta"
+VERSION_POINT=17
+CODE_STATUS="UNRELEASED"
 
 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"
@@ -837,11 +837,23 @@ AC_ARG_ENABLE(graceful-termination,
 fi])
 
 AC_ARG_ENABLE(extended-host-patterns,
-[  --enable-extended-host-patterns Allow extended regular expressions in host patterns.],
+[  --enable-extended-host-patterns Enable and require PCRE syntax in host patterns. This feature hasn't
+                                  been announced yet and it's not clear if it's a good idea. It's expected
+                                  to work, but undocumented. You should only enable it if you know what
+                                  PCRE is and are sure that you need it for your host patterns. You can
+                                  use tools/url-pattern-translator.pl to convert existing action files to
+                                  use PCRE host patterns. Please don't enable this option when creating
+                                  packages for others that may not be expecting it.],
 [if test $enableval = yes; then
   AC_DEFINE(FEATURE_EXTENDED_HOST_PATTERNS)
 fi])
 
+AC_ARG_ENABLE(accept-filter,
+[  --enable-accept-filter          Try to use accf_http(9) if supported.],
+[if test $enableval = yes; then
+  AC_DEFINE(FEATURE_ACCEPT_FILTER)
+fi])
+
 dnl pcre/pcrs is needed for CGI anyway, so
 dnl the choice is only between static and
 dnl dynamic:
@@ -897,9 +909,11 @@ else
   STATIC_PCRE_ONLY=
 fi
 
+AC_DEFINE(FEATURE_CONNECTION_KEEP_ALIVE)
+
 if test $have_pthread = "yes" -o $target_type = "mingw"; then
-  echo Enabling keep-alive support for outgoing connections.
-  AC_DEFINE(FEATURE_CONNECTION_KEEP_ALIVE)
+  echo Enabling connection-sharing support.
+  AC_DEFINE(FEATURE_CONNECTION_SHARING)
 fi
 
 dnl =================================================