X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=configure.in;h=691c5a63d2e5859d11f3bc38318d182194e92385;hb=5c6e6e02171bc7ab75e626d97e4deba5c4c322ad;hp=c00b2bbeffa6ea368cfd3a7ca0e8a20b4f639bc5;hpb=71cc9c2b0fcc58292c43fed7969f692f5e2491f6;p=privoxy.git

diff --git a/configure.in b/configure.in
index c00b2bbe..691c5a63 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl
-dnl $Id: configure.in,v 1.171 2012/10/12 11:11:42 fabiankeil Exp $
+dnl $Id: configure.in,v 1.176 2013/01/06 11:06:23 fabiankeil Exp $
 dnl
 dnl Written by and Copyright (C) 2001-2010 the
 dnl Privoxy team. http://www.privoxy.org/
@@ -32,7 +32,7 @@ dnl =================================================================
 dnl AutoConf Initialization
 dnl =================================================================
 
-AC_REVISION($Revision: 1.171 $)
+AC_REVISION($Revision: 1.176 $)
 AC_INIT(jcc.c)
 
 if test ! -f config.h.in; then
@@ -79,7 +79,7 @@ dnl =================================================================
 VERSION_MAJOR=3
 VERSION_MINOR=0
 VERSION_POINT=20
-CODE_STATUS="UNRELEASED"
+CODE_STATUS="beta"
 
 dnl CODE_STATUS can be "alpha", "beta", "stable" or "UNRELEASED",
 dnl and will be used for CGI output. Increment version number and
@@ -316,11 +316,10 @@ else
 fi
 AC_SUBST(WIN_ONLY)
 
-dnl Checking which text html browser we have available
 if test $dodk != no; then
-	AC_CHECK_PROGS(WDUMP,w3m lynx links,false)
-	if test "$WDUMP" = false; then
-		AC_MSG_WARN(You need some kind of text browser to build documentation \(w3m, lynx and links are supported\))
+	AC_CHECK_PROGS(W3M, w3m, false)
+	if test "$W3M" = false; then
+		AC_MSG_WARN(You need w3m to build text documentation.)
 	fi
 	if test $DB2HTML = false; then
 		dnl We need to clean the variable, otherwise AC_CHECK_PROGS
@@ -329,7 +328,7 @@ if test $dodk != no; then
 		AC_CHECK_PROGS(DB2HTML,db2html docbook2html,false)
 	fi
 fi
-AC_SUBST(WDUMP)
+AC_SUBST(W3M)
 AC_SUBST(DB2HTML)
 
 dnl If we use rpm, we need to check where %_topdir is
@@ -761,6 +760,7 @@ AC_CHECK_FUNCS([ \
  regcomp \
  select \
  setlocale \
+ shutdown \
  snprintf \
  socket \
  strchr \
@@ -770,7 +770,6 @@ AC_CHECK_FUNCS([ \
  strlcat \
  strlcpy \
  strptime \
- strstr \
  strtoul \
  timegm \
  tzset \
@@ -968,6 +967,14 @@ AC_ARG_ENABLE(accept-filter,
   AC_DEFINE(FEATURE_ACCEPT_FILTER)
 fi])
 
+AC_ARG_ENABLE(strptime-sanity-checks,
+[  --enable-strptime-sanity-checks Only trust strptime() results if an additional strftime()/strptime()
+                                  conversion doesn't change the result. Can be useful if strptime() is
+                                  known or suspected to be broken.],
+[if test $enableval = yes; then
+  AC_DEFINE(FEATURE_STRPTIME_SANITY_CHECKS)
+fi])
+
 dnl pcre/pcrs is needed for CGI anyway, so
 dnl the choice is only between static and
 dnl dynamic: