Summary: Merge in ksh m4 fix from Gerard Eviston

Keywords:

Patches applied:

 * ports@eviston.net--aix/squid--aix-fixes--3.0--base-0
   tag of robertc@squid-cache.org--squid/squid--HEAD--3.0--patch-396

 * ports@eviston.net--aix/squid--aix-fixes--3.0--patch-1
   acinclude.m4 shell incompatibility

diff --git a/acinclude.m4 b/acinclude.m4
index 7ccb0592e4454fd81cb02d3ce9d427c53a373a93..21327b997e9fd54d01ee71f770f4a14cf09e6332 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -71,7 +71,7 @@ ${CXX} -Werror -fhuge-objects -c conftest.cc 2>/dev/null
 res=$?
 rm -f conftest.*
 echo yes
-exit $res` 2> /dev/null
+exit $res`
     if [[ $? -ne 0 ]]
     then ac_cv_test_checkforhugeobjects=no
     else if [[ -z "$ac_cv_test_checkforhugeobjects" ]]

diff --git a/lib/libTrie/acinclude.m4 b/lib/libTrie/acinclude.m4
index 848b6be99217c43fb80e6ac175d2f53fa2d53161..a9e4caf9d4f34f47e8f3e0bda96bf8d96f7ec04e 100644 (file)
--- a/lib/libTrie/acinclude.m4
+++ b/lib/libTrie/acinclude.m4
@@ -13,7 +13,7 @@ ${CXX} -Werror -fhuge-objects -c conftest.cc 2>/dev/null
 res=$?
 rm -f conftest.*
 echo yes
-exit $res` 2> /dev/null
+exit $res`
     if [[ $? -ne 0 ]]
     then ac_cv_test_checkforhugeobjects=no
     else if [[ -z "$ac_cv_test_checkforhugeobjects" ]]