[SCM] GNU Autoconf source repository branch, master, updated. v2.67-33-g65d740d

[Eric Blake]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Autoconf source repository".

http://git.sv.gnu.org/gitweb/?p=autoconf.git;a=commitdiff;h=65d740da996b3284f0e18fe845d51dbb4373e751

The branch, master has been updated
       via  65d740da996b3284f0e18fe845d51dbb4373e751 (commit)
       via  4b6f3d2ce1096f377d290136b6c84bcf60e786ec (commit)
      from  ae1cc9f03fb60ee3ab686642ac7faa4279bbcfc4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 65d740da996b3284f0e18fe845d51dbb4373e751
Author: Eric Blake <address@hidden>
Date:   Wed Aug 25 21:26:14 2010 -0600

    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 <address@hidden>

commit 4b6f3d2ce1096f377d290136b6c84bcf60e786ec
Author: Eric Blake <address@hidden>
Date:   Wed Aug 25 21:06:16 2010 -0600

    m4sh: revert regression in AS_TMPDIR
    
    Regression introduced in e0ac12089ea4c934029baf77741e659f0bebd653.
    
    * lib/m4sugar/m4sh.m4 (AS_TMPDIR): The previous patch trying to
    rename $tmp to $as_tmp was wrong; config.status relies on it.
    
    Signed-off-by: Eric Blake <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog           |    8 ++++++++
 bin/autoconf.as     |    2 +-
 lib/m4sugar/m4sh.m4 |   11 +++++++----
 tests/tools.at      |    2 +-
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index dbb2fbf..fa252b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2010-08-25  Eric Blake  <address@hidden>
 
+       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.
+
        m4sh: reduce size of AS_VAR_TEST_SET
        * lib/m4sugar/m4sh.m4 (AS_VAR_TEST_SET): Make more compact.
 
diff --git a/bin/autoconf.as b/bin/autoconf.as
index dca4606..aa7fe6b 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/lib/m4sugar/m4sh.m4 b/lib/m4sugar/m4sh.m4
index facd70d..2f8baec 100644
--- a/lib/m4sugar/m4sh.m4
+++ b/lib/m4sugar/m4sh.m4
@@ -1615,17 +1615,20 @@ m4_define([_AS_LITERAL_HEREDOC_IF_NO], [$2])
 # -------------------------------------------------
 # Create as safely as possible a temporary directory in DIRECTORY
 # which name is inspired by PREFIX (should be 2-4 chars max).
+#
+# Even though $tmp does not fit our normal naming scheme of $as_*,
+# it is a documented part of the public API and must not be changed.
 m4_define([AS_TMPDIR],
 [# Create a (secure) tmp directory for tmp files.
 m4_if([$2], [], [: "${TMPDIR=/tmp}"])
 {
-  as_tmp=`(umask 077 && mktemp -d "m4_default([$2],
+  tmp=`(umask 077 && mktemp -d "m4_default([$2],
     [$TMPDIR])/$1XXXXXX") 2>/dev/null` &&
-  test -d "$as_tmp"
+  test -d "$tmp"
 }  ||
 {
-  as_tmp=m4_default([$2], [$TMPDIR])/$1$$-$RANDOM
-  (umask 077 && mkdir "$as_tmp")
+  tmp=m4_default([$2], [$TMPDIR])/$1$$-$RANDOM
+  (umask 077 && mkdir "$tmp")
 } || AS_ERROR([cannot create a temporary directory in m4_default([$2],
              [$TMPDIR])])])# AS_TMPDIR
 
diff --git a/tests/tools.at b/tests/tools.at
index 20e9037..167d68a 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.
 


hooks/post-receive
-- 
GNU Autoconf source repository