From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Fri, 22 Oct 2010 14:57:27 +0000 (+0200)
Subject: Fixed autoconf SQUID_STATE_ROLLBACK improper shell variable expansion.
X-Git-Tag: take1~155
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=daed69277a8c854fc3cc6994123b99c901a5e58a;p=thirdparty%2Fsquid.git

Fixed autoconf SQUID_STATE_ROLLBACK improper shell variable expansion.
Fixed out-of-order SQUID_CXXFLAGS autoconf substitution
---

diff --git a/acinclude/squid-util.m4 b/acinclude/squid-util.m4
index 87d3fb0254..5cf57a7fe7 100644
--- a/acinclude/squid-util.m4
+++ b/acinclude/squid-util.m4
@@ -77,7 +77,7 @@ CXX="${$1_CXX}"
 for squid_util_var_tosave in $$1_squid_saved_vars
 do
     squid_util_var_tosave2="$1_${squid_util_var_tosave}"
-    eval "${squid_util_var_tosave}=\$${squid_util_var_tosave2}"
+    eval "${squid_util_var_tosave}=\"${${squid_util_var_tosave2}}\""
 done
 SQUID_STATE_COMMIT($1)
 ])
diff --git a/configure.in b/configure.in
index 9c38b6949f..5d737f0bf4 100644
--- a/configure.in
+++ b/configure.in
@@ -299,9 +299,6 @@ if test "x$enable_strict_error_checking" != "xno"; then
   SQUID_CXXFLAGS="$SQUID_CXXFLAGS $squid_cv_cxx_option_werror"
 fi
 
-AC_SUBST(SQUID_CFLAGS)
-AC_SUBST(SQUID_CXXFLAGS)
-
 SQUID_CXX_CHECK_ARG_FHUGEOBJECTS
 if test "x$squid_cv_cxx_arg_fhugeobjects" = "xyes"; then
   SQUID_CXXFLAGS="$SQUID_CXXFLAGS -fhuge-objects"
@@ -3294,6 +3291,10 @@ if test "x$XTRA_LIBS" = "x"; then
 fi
 AC_SUBST(XTRA_LIBS)
 
+AC_SUBST(SQUID_CFLAGS)
+AC_SUBST(SQUID_CXXFLAGS)
+
+
 dnl Clean up after OSF/1 core dump bug
 rm -f core