X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=configure.in;h=045c87db166640c1490c776e68eebe5e6129d3c1;hp=ec670d0266fe4bda62674c1f9ea4cdf473718dec;hb=983ba27e15f4691702d498b14f6c1459254bcc78;hpb=d6f6d40eb51a7a7f491c5c027f83bbd7f44c009f

diff --git a/configure.in b/configure.in
index ec670d02..045c87db 100644
--- a/configure.in
+++ b/configure.in
@@ -1,9 +1,9 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl
-dnl $Id: configure.in,v 1.191 2016/02/02 13:08:17 fabiankeil Exp $
+dnl $Id: configure.in,v 1.201 2016/07/26 10:45:58 fabiankeil Exp $
 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
@@ -32,7 +32,7 @@ dnl =================================================================
 dnl AutoConf Initialization
 dnl =================================================================
 
-AC_REVISION($Revision: 1.191 $)
+AC_REVISION($Revision: 1.201 $)
 AC_INIT(jcc.c)
 
 if test ! -f config.h.in; then
@@ -78,7 +78,7 @@ dnl =================================================================
 
 VERSION_MAJOR=3
 VERSION_MINOR=0
-VERSION_POINT=25
+VERSION_POINT=26
 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
-		linux* | gnu*)
+		linux* | gnu* | *bsd*)
 			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 \
+             /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 \
@@ -464,6 +465,26 @@ fi
 
 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
@@ -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(time_t, 8)
 
 dnl Checks for header files.
 AC_CHECK_HEADERS([ \
@@ -915,7 +937,7 @@ fi],
 AC_DEFINE(FEATURE_IMAGE_BLOCKING))
 
 AC_ARG_ENABLE(acl-support,
-[  --disable-acl-support            Prevents the use of ACLs to control access to
+[  --disable-acl-support           Prevents the use of ACLs to control access to
                                   Privoxy by IP address.],
 [if test $enableval = yes; then
   AC_DEFINE(FEATURE_ACL)
@@ -963,7 +985,7 @@ AC_ARG_ENABLE(extended-host-patterns,
 fi])
 
 AC_ARG_ENABLE(external-filters,
-[  --enable-external-filters      Allow to filter content with scripts and programs. Experimental.],
+[  --enable-external-filters       Allow to filter content with scripts and programs. Experimental.],
 [if test $enableval = yes; then
   AC_DEFINE(FEATURE_EXTERNAL_FILTERS,1,[Define to 1 to allow to filter content with scripts and programs.])
 fi])
@@ -983,13 +1005,16 @@ AC_ARG_ENABLE(strptime-sanity-checks,
 fi])
 
 AC_ARG_ENABLE(client-tags,
-[  --enable-client-tags                Enable client-specific tags],
-[if test $enableval = yes; then
-  FEATURE_CLIENT_TAGS_ONLY=""
-  AC_DEFINE(FEATURE_CLIENT_TAGS,1,[Define to enable client-specific tags.])
- else
+[  --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="#"
-fi])
+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=""
+fi
 AC_SUBST(FEATURE_CLIENT_TAGS_ONLY)
 
 dnl pcre/pcrs is needed for CGI anyway, so