From: Amos Jeffries <squid3@treenet.co.nz>
Date: Thu, 21 Aug 2014 18:11:23 +0000 (-0700)
Subject: Docs: update release notes and configure --help after Kerberos update
X-Git-Tag: SQUID_3_5_0_1~106
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a5c79bf36c2fbbf066db25a8311ac7b52eaacdae;p=thirdparty%2Fsquid.git

Docs: update release notes and configure --help after Kerberos update

Add release notes for the ./configure option changes in rev.13538.

Also, adjust ./configure --help display text to match the option
behaviour:
 * --with is default action, so --without gets documented.
 * --without does not accept path, and --with-foo=PATH is available on
   all library options. So remove repeated text.
---

diff --git a/configure.ac b/configure.ac
index 99308d13b4..f70fcc96e7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1347,11 +1347,8 @@ AC_SUBST(SSLLIB)
 
 dnl User may specify MIT Kerberos is needed from a non-standard location
 AC_ARG_WITH(mit-krb5,
-  AS_HELP_STRING([--with-mit-krb5=PATH],
-		 [Compile with the MIT Kerberos libraries. The path to
-		  the MIT Kerberos development libraries and headers
-		  installation can be specified if outside of the
-                  system standard directories]), [
+  AS_HELP_STRING([--without-mit-krb5],
+		 [Compile without MIT Kerberos support.]), [
 case "$with_mit_krb5" in
   yes|no)
     : # Nothing special to do here
@@ -1375,11 +1372,8 @@ AH_TEMPLATE(USE_SOLARIS_KRB5,[Solaris Kerberos support is available])
 
 dnl User may specify Heimdal Kerberos is needed from a non-standard location
 AC_ARG_WITH(heimdal-krb5,
-  AS_HELP_STRING([--with-heimdal-krb5=PATH],
-		 [Compile with the Heimdal Kerberos libraries. The path to
-		  the Heimdal Kerberos development libraries and headers
-		  installation can be specified if outside of the
-                  system standard directories]), [
+  AS_HELP_STRING([--without-heimdal-krb5],
+		 [Compile without Heimdal Kerberos support.]), [
 case "$with_heimdal_krb5" in
   yes|no)
     : # Nothing special to do here
@@ -1404,11 +1398,8 @@ AH_TEMPLATE(USE_HEIMDAL_KRB5,[Heimdal Kerberos support is available])
 
 dnl User may specify GNU gss is needed from a non-standard location
 AC_ARG_WITH(gnugss,
-  AS_HELP_STRING([--with-gnugss=PATH],
-		 [Compile with the GNU gss libraries. The path to
-		  the GNU gss development libraries and headers
-		  installation can be specified if outside of the
-                  system standard directories]), [
+  AS_HELP_STRING([--without-gnugss],
+		 [Compile without the GNU gss libraries.]), [
 case "$with_gnugss" in
   yes|no)
     : # Nothing special to do here
diff --git a/doc/release-notes/release-3.5.sgml b/doc/release-notes/release-3.5.sgml
index ed3af7edd5..07f7734f54 100644
--- a/doc/release-notes/release-3.5.sgml
+++ b/doc/release-notes/release-3.5.sgml
@@ -410,6 +410,21 @@ This section gives an account of those changes in three categories:
 	   Use of this library is auto-enabled if v3.1.5 or later is available.
 	<p>It is currently only used by the squidclient tool.
 
+	<tag>--without-mit-krb5</tag>
+	<p>New option to explicitly disable use of MIT Kerberos library.
+	   Default is to auto-detect and use if possible.
+	<p>Only one Kerberos library may be built against.
+
+	<tag>--without-heimdal-krb5</tag>
+	<p>New option to explicitly disable use of Hiemdal Kerberos library.
+	   Default is to auto-detect and use if possible.
+	<p>Only one Kerberos library may be built against.
+
+	<tag>--without-gnugss</tag>
+	<p>New option to explicitly disable use of GNU GSSAPI library for Kerberos.
+	   Default is to auto-detect and use if possible.
+	<p>Only one Kerberos library may be built against.
+
 </descrip>
 
 <sect1>Changes to existing options<label id="modifiedoptions">
@@ -437,6 +452,11 @@ This section gives an account of those changes in three categories:
 	<p>The COSS cache type has been removed.
 	   It has been replaced by <em>rock</em> cache type.
 
+	<tag>--with-krb5-config</tag>
+	<p>Removed. The Kerberos library is auto-detected now.
+	<p>Use <em>--with/--without-mit-krb5</em>, <em>--with/--without-heimdal-krb5</em>, or
+	   <em>--with/--without-gnugss</em> options for specific library selection if necesary.
+
 </descrip>