Documented HAVE_FS_* hack

Removed the now-useless --with-squid configure option

diff --git a/acinclude/squid-util.m4 b/acinclude/squid-util.m4
index 57732b6bb7e7fb32c3d7249fc0e146bdea41d873..da14bb3f1de8920f082db43d2fd1c5194aa6ed73 100644 (file)
--- a/acinclude/squid-util.m4
+++ b/acinclude/squid-util.m4
@@ -84,8 +84,8 @@ SQUID_STATE_COMMIT($1)
 
 
 dnl look for modules in the base-directory supplied as argument.
-dnl fill-in the variable pointed-to by the second argument with the space-separated
-dnl list of modules 
+dnl fill-in the variable pointed-to by the second argument with the
+dnl space-separated list of modules 
 AC_DEFUN([SQUID_LOOK_FOR_MODULES],[
 for dir in $1/*; do
   module="`basename $dir`"

diff --git a/configure.in b/configure.in
index aba5da5fc7b0a66a5cff041ddbc564d4f1db72c2..c9f7a4afd482abcd49a18800a5b4b40d30e5239b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -72,10 +72,6 @@ AC_PATH_PROG(AR, ar, $FALSE)
 AR_R="$AR r"
 AC_SUBST(AR_R)
 
-
-dnl Make the squid top srcdir available to sub-packages as --with-squid=PATH
-ac_configure_args="$ac_configure_args --with-squid=$ac_abs_confdir"
-
 squid_opt_enable_werror="yes" # default
 AC_ARG_ENABLE(strict-error-checking,
   AS_HELP_STRING([--disable-strict-error-checking],[By default squid is compiled
@@ -722,7 +718,8 @@ for fs in $squid_storeio_module_candidates none; do
     esac
 done
 
-dnl TODO: FIXME What are those for? They seem to be never be defined. Kinkie
+dnl hack: need to define those even if not used in the build system to
+dnl make sure that global FS objects are linked to the squid binary.
 AH_TEMPLATE(HAVE_FS_UFS, "Define to 1 if ufs filesystem module is build")
 AH_TEMPLATE(HAVE_FS_AUFS, "Define to 1 if aufs filesystem module is build")
 AH_TEMPLATE(HAVE_FS_DISKD, "Define to 1 if diskd filesystem module is build")