Merged from trunk

diff --cc configure.in
index 057f74cf8be77793a2f59d5a13dc8226e1ed0eed,e32395fc9630e89af7431043dd6184a1c3c79b10..8afb7dc38a699420c88fb2403c37116c2ac73520
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -1888,35 -1883,46 +1882,35 @@@ AC_SUBST(EXTERNAL_ACL_HELPERS
  
  
  dnl Select url_rewrite helpers to build
 -URL_REWRITE_HELPERS=all
  AC_ARG_ENABLE(url-rewrite-helpers,
-   AC_HELP_STRING([--enable-url-rewrite-helpers="list of helpers"],
+   AS_HELP_STRING([--enable-url-rewrite-helpers="list of helpers"],
                   [This option selects which url_rewrite helpers to
                    build and install as part of the normal build
 -                  process. For a list of available helpers see the
 -                  helpers/url_rewrite directory.]),
 -[ case "$enableval" in
 -  yes)
 -      URL_REWRITE_HELPERS=all
 -      ;;
 -  no)
 -      URL_REWRITE_HELPERS=""
 -      ;;
 -  *)
 -      URL_REWRITE_HELPERS="`echo $enableval| sed -e 's/,/ /g;s/  */ /g'`"
 -      ;;
 -  esac
 -])
 -if test "$URL_REWRITE_HELPERS" = "all" ; then
 -      URL_REWRITE_HELPERS=""
 -      for dir in $srcdir/helpers/url_rewrite/*; do
 -          helper="`basename $dir`"
 -          if test -f $dir/config.test && sh $dir/config.test "$@"; then
 -              URL_REWRITE_HELPERS="$URL_REWRITE_HELPERS $helper"
 -            elif test -d $srcdir/helpers/url_rewrite/$helper ; then
 -                AC_MSG_NOTICE([URL re-write helper $helper ... found but cannot be built])
 -          fi
 -      done
 -fi
 -if test -n "$URL_REWRITE_HELPERS"; then
 -    for helper in $URL_REWRITE_HELPERS; do
 -      if test -f $srcdir/helpers/url_rewrite/$helper/Makefile.in; then
 -              :
 -      else
 -              AC_MSG_ERROR(url_rewrite helper $helper does not exist)
 -      fi
 -    done
 -    AC_MSG_NOTICE([url_rewrite helpers built: $URL_REWRITE_HELPERS])
 +                  process. The default is to attempt the build of all possible
 +                  helpers. Use --disable-url-rewrite-helpers to build none.
 +                  For a list of available helpers see the
 +                  helpers/url_rewrite directory.]),[
 +])
 +if test "x${enable_url_rewrite_helpers:=yes}" = "xyes" ; then
 +    SQUID_LOOK_FOR_MODULES([$srcdir/helpers/url_rewrite],
 +                           [enable_url_rewrite_helpers])
 +fi
 +enable_url_rewrite_helpers="`echo $enable_url_rewrite_helpers| sed -e 's/,/ /g;s/  */ /g'`"
 +AC_MSG_NOTICE([URL rewrite helper candidates: $enable_url_rewrite_helpers])
 +URL_REWRITE_HELPERS=""
 +if test "x$enable_url_rewrite_helpers" != "xno" ; then
 +  for helper in $enable_url_rewrite_helpers; do
 +    dir="$srcdir/helpers/url_rewrite/$helper"
 +    if test -f $dir/config.test && sh $dir/config.test "$@"; then
 +      URL_REWRITE_HELPERS="$URL_REWRITE_HELPERS $helper"
 +    elif test -d $srcdir/helpers/ntlm_auth/$helper ; then
 +      AC_MSG_NOTICE([URL rewrite helper $helper ... found but cannot be built])
 +    else
 +      AC_MSG_NOTICE([URL rewrite helper $helper ... not found])
 +    fi
 +  done
  fi
 +AC_MSG_NOTICE([URL rewrite helpers built: $URL_REWRITE_HELPERS])
  AC_SUBST(URL_REWRITE_HELPERS)
  
  

diff --cc src/client_side_request.cc
Simple merge