[SCM] GNU Autoconf source repository branch, master, updated. v2.63-51-g7eba1c0

[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=7eba1c0ae03df9227cbd6ec47893395d72e2ef0f

The branch, master has been updated
       via  7eba1c0ae03df9227cbd6ec47893395d72e2ef0f (commit)
      from  6edff90b47fbfe7a3b503b9b453ffd374e3d0369 (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 7eba1c0ae03df9227cbd6ec47893395d72e2ef0f
Author: Eric Blake <address@hidden>
Date:   Wed Oct 15 16:15:52 2008 -0600

    Break circular require chain in _AS_LINENO_PREPARE.
    
    * lib/m4sugar/m4sh.m4 (_AS_LINENO_PREPARE): Ensure that logging is
    disabled when reporting LINENO failure, since logging requires
    LINENO.
    * doc/autoconf.texi (Initialization Macros): Recommend m4_pushdef,
    not m4_rename, since the latter is undocumented.
    * lib/autoconf/status.m4 (_AC_OUTPUT_CONFIG_STATUS): Avoid
    m4_rename, as it does not yet handle pushdef stacks.
    Reported by Ralf Wildenhues.
    
    Signed-off-by: Eric Blake <address@hidden>

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

Summary of changes:
 ChangeLog              |   12 ++++++++++++
 doc/autoconf.texi      |    9 ++++++---
 lib/autoconf/status.m4 |    4 ++--
 lib/m4sugar/m4sh.m4    |    4 ++++
 4 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d4619b9..e627d14 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2008-10-15  Eric Blake  <address@hidden>
 
+       Break circular require chain in _AS_LINENO_PREPARE.
+       * lib/m4sugar/m4sh.m4 (_AS_LINENO_PREPARE): Ensure that logging is
+       disabled when reporting LINENO failure, since logging requires
+       LINENO.
+       * doc/autoconf.texi (Initialization Macros): Recommend m4_pushdef,
+       not m4_rename, since the latter is undocumented.
+       * lib/autoconf/status.m4 (_AC_OUTPUT_CONFIG_STATUS): Avoid
+       m4_rename, as it does not yet handle pushdef stacks.
+       Reported by Ralf Wildenhues.
+
+2008-10-15  Eric Blake  <address@hidden>
+
        Cleanups to previous patches.
        * doc/autoconf.texi (Portable Shell): Minor edits.
        (Limitations of Builtins): Touch up wording.
diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index b3ffc76..43227a6 100644
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -11978,11 +11978,14 @@ Note that @code{AS_INIT_GENERATED} does not emit the 
entire prolog.
 In particular, a line containing @code{#!$SHELL} must have already been
 emitted to the child script; you should not use @code{#!/bin/sh}, or the
 child script will not use the more modern shell that the parent script
-might have detected.  Currently, the suggested idiom for writing a M4sh
+might have detected.  Likewise, the child script starts life without a
+log file open, so you must temporarily disable any attempts to use the
+log file until after emitting code to open a log within the child.
+Currently, the suggested idiom for writing a M4sh
 shell script from within another script is:
 
 @example
-m4_rename([AS_MESSAGE_LOG_FD], [save_AS_MESSAGE_LOG_FD])dnl
+m4_pushdef([AS_MESSAGE_LOG_FD])dnl
 cat > "@var{file}" <<__EOF__
 #! $SHELL
 # Generated by $as_me.
@@ -11995,7 +11998,7 @@ cat >>"@var{file}" <<\__EOF__
 AS_INIT_GENERATED
 # ...
 __EOF__
-m4_rename([save_AS_MESSAGE_LOG_FD], [AS_MESSAGE_LOG_FD])dnl
+m4_popdef([AS_MESSAGE_LOG_FD])dnl
 @end example
 
 This, however, may change in the future as the M4sh interface is
diff --git a/lib/autoconf/status.m4 b/lib/autoconf/status.m4
index 6d622b9..26fa2cf 100644
--- a/lib/autoconf/status.m4
+++ b/lib/autoconf/status.m4
@@ -1317,7 +1317,7 @@ fi
 m4_define([_AC_OUTPUT_CONFIG_STATUS],
 [AC_MSG_NOTICE([creating $CONFIG_STATUS])
 dnl AS_MESSAGE_LOG_FD is not available yet:
-m4_rename([AS_MESSAGE_LOG_FD], [_AC_save_AS_MESSAGE_LOG_FD])dnl
+m4_pushdef([AS_MESSAGE_LOG_FD])dnl
 cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 #! $SHELL
 # Generated by $as_me.
@@ -1541,7 +1541,7 @@ fi
 _ACEOF
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 dnl Open the log:
-m4_rename([_AC_save_AS_MESSAGE_LOG_FD], [AS_MESSAGE_LOG_FD])dnl
+m4_popdef([AS_MESSAGE_LOG_FD])dnl
 exec AS_MESSAGE_LOG_FD>>config.log
 {
   echo
diff --git a/lib/m4sugar/m4sh.m4 b/lib/m4sugar/m4sh.m4
index b42e87f..44c8049 100644
--- a/lib/m4sugar/m4sh.m4
+++ b/lib/m4sugar/m4sh.m4
@@ -953,6 +953,9 @@ m4_defun([_AS_LINENO_PREPARE],
 [AS_REQUIRE([_AS_CR_PREPARE])dnl
 AS_REQUIRE([_AS_ME_PREPARE])dnl
 _AS_DETECT_SUGGESTED([_AS_LINENO_WORKS])dnl
+dnl Even if the logging fd is open, we don't want to use $LINENO in the
+dnl AS_ERROR complaining that LINENO is broken.
+m4_pushdef([AS_MESSAGE_LOG_FD])dnl
 _AS_LINENO_WORKS || {
 
   dnl Create $as_me.lineno as a copy of $as_myself, but with $LINENO
@@ -989,6 +992,7 @@ _AS_LINENO_WORKS || {
   # Exit status is that of the last command.
   exit
 }
+m4_popdef([AS_MESSAGE_LOG_FD])dnl
 ])# _AS_LINENO_PREPARE
 
 


hooks/post-receive
--
GNU Autoconf source repository