Enable ICAP client by default

This component of Squid has been relatively stable now for several
series.

diff --git a/configure.ac b/configure.ac
index b27c9fd0acdcfea370c2dbefebb1371ab4758a7b..42fd0f439740e8c067fce384f199545948b21fa2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -976,13 +976,12 @@ AC_SUBST(XMLLIB)
 
 # icap argument handling
 AC_ARG_ENABLE(icap-client,
-  AS_HELP_STRING([--enable-icap-client],[Enable the ICAP client.]),
-    [squid_opt_use_icap_client=$enableval],
-    [squid_opt_use_icap_client=no])
-SQUID_DEFINE_BOOL(ICAP_CLIENT,$squid_opt_use_icap_client,
-     [Enable ICAP client features in Squid])
-AM_CONDITIONAL(USE_ICAP_CLIENT, [test "x$squid_opt_use_icap_client" = "xyes" ])
-if test "x$squid_opt_use_icap_client" = "xyes" ; then
+  AS_HELP_STRING([--disable-icap-client],[Disable the ICAP client.]),[
+  SQUID_YESNO([$enableval],[Unrecognized argument to --disable-icap-client: $enableval])
+])
+SQUID_DEFINE_BOOL(ICAP_CLIENT,${enable_icap_client:=yes}, [Enable ICAP client features in Squid])
+AM_CONDITIONAL(USE_ICAP_CLIENT, [test "x$enable_icap_client" != "xno" ])
+if test "x$enable_icap_client" != "xno" ; then
   ICAP_LIBS="icap/libicap.la"
   squid_opt_use_adaptation=yes
 else

diff --git a/doc/release-notes/release-3.5.sgml b/doc/release-notes/release-3.5.sgml
index c7b7d6e914314aa20a00c6807c76ccd1392bca58..4f057afc7a79cd5b6d7aa92a176391223f47e7cd 100644 (file)
--- a/doc/release-notes/release-3.5.sgml
+++ b/doc/release-notes/release-3.5.sgml
@@ -352,7 +352,9 @@ This section gives an account of those changes in three categories:
 <sect1>Changes to existing options<label id="modifiedoptions">
 <p>
 <descrip>
-       <p><em>There are no changes to existing ./configure options in Squid-3.5.</em>
+       <tag>--enable-icap-client</tag>
+       <p>Deprecated. ICAP client is now auto-enabled.
+          Use --disable-icap-client to disable if you need to.
 
 </descrip>
 </p>