------------------------------------------------------------
revno: 13474
revision-id: squid3@treenet.co.nz-20140622070508-pds45iw2c1n5br84
parent: squid3@treenet.co.nz-20140622033330-7ht5vac7q7hjxzhp
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: trunk
timestamp: Sun 2014-06-22 00:05:08 -0700
message:
  Enable ICAP client by default
  
  This component of Squid has been relatively stable now for several
  series.
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20140622070508-pds45iw2c1n5br84
# target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# testament_sha1: 43524949245b0e5bfaf2dda2c952a0c6a8076396
# timestamp: 2014-06-22 07:53:53 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# base_revision_id: squid3@treenet.co.nz-20140622033330-\
#   7ht5vac7q7hjxzhp
# 
# Begin patch
=== modified file 'configure.ac'
--- configure.ac	2014-06-05 14:49:32 +0000
+++ configure.ac	2014-06-22 07:05:08 +0000
@@ -976,13 +976,12 @@
 
 # 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

=== modified file 'doc/release-notes/release-3.5.sgml'
--- doc/release-notes/release-3.5.sgml	2014-06-04 15:30:16 +0000
+++ doc/release-notes/release-3.5.sgml	2014-06-22 07:05:08 +0000
@@ -352,7 +352,9 @@
 <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>