X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=configure.in;h=c86c8a57639e963c23080977d9b868cc60aaa94f;hp=87f9d548a50c6241d0eceff242209058e5262783;hb=b2ec9aa06da57dace80f6f00915b0bb79aa55e21;hpb=73c8c91a16290884d02c9dee559a0671c5019caa

diff --git a/configure.in b/configure.in
index 87f9d548..c86c8a57 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.131 2009/06/14 14:35:42 fabiankeil Exp $
+dnl $Id: configure.in,v 1.147 2010/10/30 15:57:50 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.131 $)
+AC_REVISION($Revision: 1.147 $)
 AC_INIT(jcc.c)
 
 if test ! -f config.h.in; then
@@ -78,7 +78,7 @@ dnl =================================================================
 
 VERSION_MAJOR=3
 VERSION_MINOR=0
-VERSION_POINT=14
+VERSION_POINT=18
 CODE_STATUS="UNRELEASED"
 
 dnl CODE_STATUS can be "alpha", "beta", or "stable", and will be
@@ -118,8 +118,8 @@ AC_PROG_MAKE_SET
 AC_PROG_AWK
 
 AC_CHECK_PROG(GDB,gdb,yes,no)
-AC_PATH_PROG(BGROUPS,groups,no,/bin:/usr/bin:/usr/local/bin)
-AC_PATH_PROG(ID,id,no,/bin:/usr/bin:/usr/local/bin)
+AC_PATH_PROG(BGROUPS,groups,no,$PATH:/bin:/usr/bin:/usr/local/bin)
+AC_PATH_PROG(ID,id,no,$PATH:/bin:/usr/bin:/usr/local/bin)
 AC_SUBST(ID)
 AC_SUBST(BGROUPS)
 
@@ -298,6 +298,7 @@ fi])
 
 if test $target_type = mingw; then
   WIN_ONLY=
+  CFLAGS="$CFLAGS -DWINVER=0x501"
   SPECIAL_CFLAGS="-mwindows -mno-cygwin"
   PTHREAD_LIB=-lpthreadGC
   echo "Using mingw32 (Win32 GUI)"
@@ -398,6 +399,13 @@ fi
 AC_SUBST(JADECAT)
 AC_SUBST(DKPREFIX)
 
+AC_ARG_ENABLE(large-file-support,
+[  --enable-large-file-support     Define _LARGE_FILES and friends.
+                                  Required by some systems to support files larger then 2GB.],
+[if test $enableval = yes; then
+    CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE_SOURCE=1"
+fi])
+
 dnl Save old CFLAGS so we can restore them later, then add SPECIAL_CFLAGS
 old_CFLAGS_nospecial=$CFLAGS
 CFLAGS="$CFLAGS $SPECIAL_CFLAGS"
@@ -706,13 +714,47 @@ dnl AC_FUNC_STAT
 AC_CHECK_FUNCS([access atexit getcwd gethostbyaddr gethostbyaddr_r gethostbyname gethostbyname_r gettimeofday inet_ntoa localtime_r memchr memmove memset poll putenv random regcomp select setlocale snprintf socket strchr strdup strerror strftime strlcat strlcpy strptime strstr strtoul timegm tzset])
 
 dnl Checks for RFC 2553 resolver and socket functions
-AC_CHECK_FUNC([getaddrinfo],
-   [AC_CHECK_FUNC([getnameinfo],
-      [AC_DEFINE([HAVE_RFC2553], [1],
-         [Define if RFC 2553 resolver functions like getaddrinfo(3) and
-          getnameinfo(3) present])
-      ])
-])
+if test $target_type = mingw; then
+  AC_CHECK_LIB(ws2_32, main)
+
+  AC_MSG_CHECKING(getaddrinfo in ws2_32)
+  AC_TRY_LINK(
+    [
+      #include<windows.h>
+      #include<ws2tcpip.h>
+    ],
+    [getaddrinfo(0,0,0,0)],
+    have_ws2_32_getaddrinfo=yes
+  )
+  AC_MSG_RESULT($have_ws2_32_getaddrinfo)
+
+  AC_MSG_CHECKING(getnameinfo in ws2_32)
+  AC_TRY_LINK(
+    [
+      #include<windows.h>
+      #include<ws2tcpip.h>
+    ],
+    [getnameinfo(0,0,0,0,0,0,0)],
+    have_ws2_32_getnameinfo=yes
+  )
+  AC_MSG_RESULT($have_ws2_32_getnameinfo)
+
+  if test $have_ws2_32_getaddrinfo ; then
+    if test $have_ws2_32_getnameinfo ; then
+      AC_DEFINE([HAVE_RFC2553], [1],
+        [Define if RFC 2553 resolver functions like getaddrinfo(3) and
+         getnameinfo(3) present])
+    fi
+  fi
+else
+  AC_CHECK_FUNC([getaddrinfo],
+     [AC_CHECK_FUNC([getnameinfo],
+        [AC_DEFINE([HAVE_RFC2553], [1],
+           [Define if RFC 2553 resolver functions like getaddrinfo(3) and
+            getnameinfo(3) present])
+        ])
+  ])
+fi
 
 dnl =================================================================
 dnl Checks for libraries.
@@ -837,11 +879,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 +951,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 =================================================