Merged from trunk

diff --cc acinclude.m4
index 73c36220bf38f674bead0bedc08568bd3fd953c0,72bb8956ee9eacf2fde29336830c362ab15c1697..83d6b2cc778350ec2b883d6c1642b1cfd80c8d58
--- 1/acinclude.m4
--- 2/acinclude.m4
+++ b/acinclude.m4
@@@ -62,7 -62,41 +62,6 @@@ SQUID_DEFAULT_INCLUDE
  #endif
  ])
  
 -dnl
 -dnl thanks to autogen, for the template..
 -dnl
 -dnl @synopsis  AC_TEST_CHECKFORHUGEOBJECTS
 -dnl
 -dnl Test whether -fhuge-objects is available with this c++ compiler. gcc-29.5 series compilers need this on some platform with large objects.
 -dnl
 -AC_DEFUN([AC_TEST_CHECKFORHUGEOBJECTS],[
 - if test "$GCC" = "yes"; then
 -  AC_MSG_CHECKING([whether compiler accepts -fhuge-objects])
 -  AC_CACHE_VAL([ac_cv_test_checkforhugeobjects],[
 -    ac_cv_test_checkforhugeobjects=`echo "int main(int argc, char **argv) { int foo; }" > conftest.cc
 -${CXX} -Werror -fhuge-objects -o conftest.bin conftest.cc 2>/dev/null
 -res=$?
 -rm -f conftest.*
 -echo yes
 -exit $res`
 -    if [[ $? -ne 0 ]]
 -    then ac_cv_test_checkforhugeobjects=no
 -    else if [[ -z "$ac_cv_test_checkforhugeobjects" ]]
 -         then ac_cv_test_checkforhugeobjects=yes
 -    fi ; fi
 -  ]) # end of CACHE_VAL
 -  AC_MSG_RESULT([${ac_cv_test_checkforhugeobjects}])
 -
 -  if test "X${ac_cv_test_checkforhugeobjects}" != Xno
 -  then
 -    HUGE_OBJECT_FLAG="-fhuge-objects"
 -  else
 -    HUGE_OBJECT_FLAG=""
 -  fi
 - fi
 -]) # end of AC_DEFUN of AC_TEST_CHECKFORHUGEOBJECTS
 -
--
  dnl ===========================================================================
  dnl              http://autoconf-archive.cryp.to/ax_with_prog.html
  dnl ===========================================================================

diff --cc configure.in
Simple merge