* lib/autoconf/general.m4 (AC_CACHE_SAVE): All `ac_cv_env_foo'

variables shall be overriden by the cache.
* tests/torture.at (AC_ARG_VAR): Test also with a first value
that contains braces.

diff --git a/ChangeLog b/ChangeLog
index 88e2a70a5d3c2aeb03ef706184a2b27d9e81f1d9..645ff1d28b144a4de8d92235f74146c05b41df26 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-04-08  Stepan Kasal  <kasal@ucw.cz>,
+           Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * lib/autoconf/general.m4 (AC_CACHE_SAVE): All `ac_cv_env_foo'
+       variables shall be overriden by the cache.
+       * tests/torture.at (AC_ARG_VAR): Test also with a first value
+       that contains braces.
+
 2006-04-07  Stepan Kasal  <kasal@ucw.cz>
 
        Revert the patch from 2006-04-01 and only improve

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index c88c3f57ee8d34f747514ecdcb993081ad4b443a..152733d97783c178c6c1af7f2e6c973b42aa5788 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -1880,11 +1880,12 @@ _ACEOF
 
 _AC_CACHE_DUMP() |
   sed ['
+     /^ac_cv_env_/b end
      t clear
      :clear
      s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
      t end
-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
      :end'] >>confcache
 if diff $cache_file confcache >/dev/null 2>&1; then :; else
   if test -w $cache_file; then

diff --git a/tests/torture.at b/tests/torture.at
index bd12782d6bc28c160403932a86722e6ac6f94fb5..2eca9072ee6b94e520d95c1184f68084533e27a5 100644 (file)
--- a/tests/torture.at
+++ b/tests/torture.at
@@ -116,6 +116,9 @@ AT_CHECK_AC_ARG_VAR([apple of my eye], [])
 # Change a precious variable
 AT_CHECK_AC_ARG_VAR([apple of my eye], [orange of my eye])
 
+# Change a precious variable that contains braces
+AT_CHECK_AC_ARG_VAR([apple of my {eye}], [orange of my eye])
+
 AT_CLEANUP