From: Eric Blake Date: Thu, 26 Aug 2010 03:26:14 +0000 (-0600) Subject: m4sh: revert incorrect mix of "${a='b'}" X-Git-Tag: v2.68~48 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=65d740da996b3284f0e18fe845d51dbb4373e751;p=thirdparty%2Fautoconf.git m4sh: revert incorrect mix of "${a='b'}" Regression introduced in cb27df430d86d5a16bc1f210d36e29400369dbc2. * bin/autoconf.as: Revert leak of literal '' into assignment. * tests/tools.at (autom4te preselections): Likewise. Signed-off-by: Eric Blake --- diff --git a/ChangeLog b/ChangeLog index 71c764f6e..fa252b32f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2010-08-25 Eric Blake + m4sh: revert incorrect mix of "${a='b'}" + * bin/autoconf.as: Revert leak of literal '' into assignment. + * tests/tools.at (autom4te preselections): Likewise. + m4sh: revert regression in AS_TMPDIR * lib/m4sugar/m4sh.m4 (AS_TMPDIR): The previous patch trying to rename $tmp to $as_tmp was wrong; config.status relies on it. diff --git a/bin/autoconf.as b/bin/autoconf.as index dca460688..aa7fe6b5c 100644 --- a/bin/autoconf.as +++ b/bin/autoconf.as @@ -85,7 +85,7 @@ exit_missing_arg=' # restore font-lock: ' # Variables. -: "${AUTOM4TE='@bindir@/@autom4te-name@'}" +: ${AUTOM4TE='@bindir@/@autom4te-name@'} autom4te_options= outfile= verbose=false diff --git a/tests/tools.at b/tests/tools.at index 20e903796..167d68a81 100644 --- a/tests/tools.at +++ b/tests/tools.at @@ -1160,7 +1160,7 @@ AT_CLEANUP # ----------------------------- AT_SETUP([autom4te preselections]) -: "${sleep='sleep 1'}" # Command to force different time stamps. +: ${sleep='sleep 1'} # Command to force different time stamps. # If this test should run on FAT file systems and older w32, # then setting $sleep correctly needs to be revisited.