Bump required Privoxy version to 3.0.25

[privoxy.git] / configure.in

diff --git a/configure.in b/configure.in
index 520559b..595ac7e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,9 +1,9 @@
 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.193 2016/03/30 11:15:42 fabiankeil Exp $
+dnl $Id: configure.in,v 1.203 2016/08/26 12:26:43 fabiankeil Exp $

 dnl
 dnl

-dnl Written by and Copyright (C) 2001-2014 the
-dnl Privoxy team. http://www.privoxy.org/
+dnl Written by and Copyright (C) 2001-2016 the
+dnl Privoxy team. https://www.privoxy.org/

 dnl
 dnl Based on the Internet Junkbuster originally written
 dnl by and Copyright (C) 1997 Anonymous Coders and
 dnl
 dnl Based on the Internet Junkbuster originally written
 dnl by and Copyright (C) 1997 Anonymous Coders and


@@ -32,7 +32,7 @@ dnl =================================================================
 dnl AutoConf Initialization
 dnl =================================================================
 
 dnl AutoConf Initialization
 dnl =================================================================
 

-AC_REVISION($Revision: 1.193 $)
+AC_REVISION($Revision: 1.203 $)

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


@@ -78,7 +78,7 @@ dnl =================================================================
 
 VERSION_MAJOR=3
 VERSION_MINOR=0
 
 VERSION_MAJOR=3
 VERSION_MINOR=0

-VERSION_POINT=25
+VERSION_POINT=27

 CODE_STATUS="UNRELEASED"
 
 dnl CODE_STATUS can be "alpha", "beta", "stable" or "UNRELEASED",
 CODE_STATUS="UNRELEASED"
 
 dnl CODE_STATUS can be "alpha", "beta", "stable" or "UNRELEASED",


@@ -282,7 +282,7 @@ if test $dodk = auto; then
        dodk=no
        if test $target_type = unix; then
                case "$host_os" in
        dodk=no
        if test $target_type = unix; then
                case "$host_os" in

-               linux* | gnu*)
+               linux* | gnu* | *bsd*)

                        dodk=yes
                ;;
                esac
                        dodk=yes
                ;;
                esac


@@ -383,6 +383,7 @@ dnl      echo -n "checking for $i/html/docbook.dsl..."
     for i in /usr/share/sgml/CATALOG.docbk30 \
              /usr/share/sgml/CATALOG.docbk31 \
              /usr/share/sgml/CATALOG.docbk31 \
     for i in /usr/share/sgml/CATALOG.docbk30 \
              /usr/share/sgml/CATALOG.docbk31 \
              /usr/share/sgml/CATALOG.docbk31 \

+             /usr/local/share/sgml/docbook/2.4.1/docbook.cat \

              /usr/local/share/sgml/docbook/3.0/docbook.cat \
              /usr/local/share/sgml/docbook/3.1/docbook.cat \
              /usr/share/sgml/docbook/dtd/3.1/docbook.cat \
              /usr/local/share/sgml/docbook/3.0/docbook.cat \
              /usr/local/share/sgml/docbook/3.1/docbook.cat \
              /usr/share/sgml/docbook/dtd/3.1/docbook.cat \


@@ -464,6 +465,26 @@ fi
 
 AC_SUBST(PTHREAD_ONLY)
 
 
 AC_SUBST(PTHREAD_ONLY)
 

+dnl =================================================================
+dnl On most platforms select() does not support fd numbers above
+dnl FD_SETSIZE, as a result Privoxy can't handle more than
+dnl approximately FD_SETSIZE/2 client connections.
+dnl On some platforms the value can be changed at compile time,
+dnl on others it's hardcoded and requires recompilation of the OS.
+dnl =================================================================
+AC_ARG_WITH(fdsetsize,
+ [  --with-fdsetsize=n  Optimistically redefine FD_SETSIZE with the intend to change the number of connections Privoxy can handle. Dangerous if the platform doesn't support this.],
+ [
+   if test "x$withval" != "xyes"; then
+     AC_DEFINE_UNQUOTED(FD_SETSIZE,$with_fdsetsize,[Relevant for select(). Not honoured by all OS.])
+     echo "Redefining FD_SETSIZE to $with_fdsetsize."
+     AC_MSG_WARN(On platforms that don't support FD_SETSIZE redefinition it may cause memory corruption.)
+   else
+     AC_MSG_ERROR(--with-fdsetsize used without value)
+   fi
+   ]
+)
+

 dnl =================================================================
 dnl Support for thread-safe versions of gethostbyaddr, gethostbyname,
 dnl gmtime and localtime
 dnl =================================================================
 dnl Support for thread-safe versions of gethostbyaddr, gethostbyname,
 dnl gmtime and localtime


@@ -715,6 +736,7 @@ AC_CHECK_SIZEOF(char *, 4)
 AC_CHECK_SIZEOF(long, 4)
 AC_CHECK_SIZEOF(long long, 8)
 AC_CHECK_SIZEOF(size_t, 4)
 AC_CHECK_SIZEOF(long, 4)
 AC_CHECK_SIZEOF(long long, 8)
 AC_CHECK_SIZEOF(size_t, 4)

+AC_CHECK_SIZEOF(time_t, 8)

 
 dnl Checks for header files.
 AC_CHECK_HEADERS([ \
 
 dnl Checks for header files.
 AC_CHECK_HEADERS([ \


@@ -982,13 +1004,17 @@ AC_ARG_ENABLE(strptime-sanity-checks,
   AC_DEFINE(FEATURE_STRPTIME_SANITY_CHECKS)
 fi])
 
   AC_DEFINE(FEATURE_STRPTIME_SANITY_CHECKS)
 fi])
 

-FEATURE_CLIENT_TAGS_ONLY="#"

 AC_ARG_ENABLE(client-tags,
 AC_ARG_ENABLE(client-tags,

-[  --enable-client-tags                Enable client-specific tags],
-[if test $enableval = yes; then
+[  --disable-client-tags           Disable support for client-specific tags],
+[ if test $enableval = "no"; then have_client_tags=no; fi ])
+if test "${have_client_tags}" = "no"; then
+  echo "Disabling support for client-specific tags."
+  FEATURE_CLIENT_TAGS_ONLY="#"
+else
+  echo "Enabling support for client-specific tags."
+  AC_DEFINE(FEATURE_CLIENT_TAGS,1,[Define to enable support for client-specific tags.])

   FEATURE_CLIENT_TAGS_ONLY=""
   FEATURE_CLIENT_TAGS_ONLY=""

-  AC_DEFINE(FEATURE_CLIENT_TAGS,1,[Define to enable client-specific tags.])
-fi])
+fi

 AC_SUBST(FEATURE_CLIENT_TAGS_ONLY)
 
 dnl pcre/pcrs is needed for CGI anyway, so
 AC_SUBST(FEATURE_CLIENT_TAGS_ONLY)
 
 dnl pcre/pcrs is needed for CGI anyway, so