From: Amos Jeffries <squid3@treenet.co.nz>
Date: Mon, 6 Sep 2010 08:13:20 +0000 (+1200)
Subject: Author: Christian Wittmer <chris@computersalat.de>
X-Git-Tag: take1~289
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bf52b026b28fa32c84e6b59ff0e63e44b9791ba8;p=thirdparty%2Fsquid.git

Author: Christian Wittmer <chris@computersalat.de>
Add --with-swapdir=PATH to override default /var/cache/squid

For use on systems where /var/cache is not the required placement.

Adds the 'squid' part to the default path in accordance to the UNIX
standard filesystem layout definition. In squid-3 it is no longer used
for creating an implicit active cache. Only documentation and potential
core dumps use the variable set by this now.
---

diff --git a/configure.in b/configure.in
index dd68ef3ef8..fdacf0bc24 100644
--- a/configure.in
+++ b/configure.in
@@ -209,6 +209,21 @@ case $withval in
 ])
 AC_SUBST(DEFAULT_PID_FILE)
 
+DEFAULT_SWAP_DIR="$localstatedir/cache/squid"
+AC_ARG_WITH(swapdir,
+  AS_HELP_STRING([--with-swapdir=PATH],
+    [Default location for squid cache directories. Default: PREFIX/var/cache/squid]), [
+case $withval in
+ yes|no)
+   AC_MSG_ERROR( --with-swapdir requires a directory PATH. --with-swapdir=PATH )
+   ;;
+ *)
+   DEFAULT_SWAP_DIR="$withval"
+   ;;
+ esac
+])
+AC_SUBST(DEFAULT_SWAP_DIR)
+
 if test "x$GCC" = "xyes"; then
   GCCVER=`$CC -v 2>&1 | awk '$2 ==  "version" {print $3}'`
   GCCVER2=`echo $GCCVER | awk '{print $1 * 100}'`
diff --git a/doc/release-notes/release-3.2.sgml b/doc/release-notes/release-3.2.sgml
index 07df58fbfb..9a68dfd409 100644
--- a/doc/release-notes/release-3.2.sgml
+++ b/doc/release-notes/release-3.2.sgml
@@ -479,6 +479,13 @@ This section gives an account of those changes in three categories:
 	   Currently one demo helper <em>fake</em> is provided in shell and C++ forms to demonstrate
 	   the helper protocol usage and provide exemplar code.
 
+	<tag>--with-swapdir=PATH</tag>
+	<p>Location to display in documentation for the default cache.
+	   Updated to indicate /var/cache/squid in accordance with the filesystem layout standards.
+	   Squid-3 no longer builds an implicit disk cache at this location, so the change is not expected
+	   to have any effect on existing builds other than fixing some mysterious lack of core dumps.
+	   The old /var/cache location was often non-writable which blocked core dumps creation.
+
 </descrip>
 
 <sect1>Changes to existing options<label id="modifiedoptions">