[SCM] GNU Autoconf source repository branch, master, updated. v2.63-191-gd623082

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

The branch, master has been updated
       via  d623082df620e71f807c5db17c8330c8e3b2a8f7 (commit)
       via  973149e01473b0a96d8565cffe5846187f3f49aa (commit)
      from  1b1851ea3a819b82f340854e511eb89da23c20e7 (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 d623082df620e71f807c5db17c8330c8e3b2a8f7
Author: Eric Blake <address@hidden>
Date:   Tue Nov 11 10:34:08 2008 -0700

    Whitespace reduction in configure.
    
    * lib/autoconf/autoheader.m4 (AH_VERBATIM): Avoid empty lines.
    * lib/autoconf/general.m4 (_AC_INIT_PREPARE, AC_CHECK_FILES):
    Likewise.
    (_AC_DEFINE_Q): Restore empty line, since some clients in the wild
    depend on it.
    
    Signed-off-by: Eric Blake <address@hidden>

commit 973149e01473b0a96d8565cffe5846187f3f49aa
Author: Eric Blake <address@hidden>
Date:   Wed Nov 12 20:10:09 2008 -0700

    Make M4sh, not autoconf, guarantee sane $SHELL.
    
    * lib/autoconf/general.m4 (_AC_INIT_DEFAULTS): Move setting of
    SHELL...
    * lib/m4sugar/m4sh.m4 (_AS_DETECT_BETTER_SHELL): ...to here.
    * doc/autoconf.texi (Initialization Macros): Document the effect
    on SHELL.
    * tests/m4sh.at (AS@&address@hidden): New test.
    Reported by Ralf Wildenhues.
    
    Signed-off-by: Eric Blake <address@hidden>

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

Summary of changes:
 ChangeLog                  |   20 ++++++++++++++++++++
 doc/autoconf.texi          |    8 +++++++-
 lib/autoconf/autoheader.m4 |    5 ++---
 lib/autoconf/general.m4    |   19 +++++++++----------
 lib/m4sugar/m4sh.m4        |    5 ++---
 tests/m4sh.at              |   35 +++++++++++++++++++++++++++++++++++
 6 files changed, 75 insertions(+), 17 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2a05748..88ea131 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2008-11-12  Eric Blake  <address@hidden>
+
+       Whitespace reduction in configure.
+       * lib/autoconf/autoheader.m4 (AH_VERBATIM): Avoid empty lines.
+       * lib/autoconf/general.m4 (_AC_INIT_PREPARE, AC_CHECK_FILES):
+       Likewise.
+       (_AC_DEFINE_Q): Restore empty line, since some clients in the wild
+       depend on it.
+
+2008-11-12  Eric Blake  <address@hidden>
+
+       Make M4sh, not autoconf, guarantee sane $SHELL.
+       * lib/autoconf/general.m4 (_AC_INIT_DEFAULTS): Move setting of
+       SHELL...
+       * lib/m4sugar/m4sh.m4 (_AS_DETECT_BETTER_SHELL): ...to here.
+       * doc/autoconf.texi (Initialization Macros): Document the effect
+       on SHELL.
+       * tests/m4sh.at (AS@&address@hidden): New test.
+       Reported by Ralf Wildenhues.
+
 2008-11-12  Ralf Wildenhues  <address@hidden>
 
        Wrap keywords in `testsuite --list' output.
diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index 92c224a..4081604 100644
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -12313,10 +12313,15 @@ implementation-specific actions.  This macro is 
deprecated, since
 
 @defmac AS_INIT
 @asindex{INIT}
address@hidden LC_ALL
address@hidden SHELL
 Initialize the M4sh environment.  This macro calls @code{m4_init}, then
 outputs the @code{#! /bin/sh} line, a notice about where the output was
 generated from, and code to sanitize the environment for the rest of the
-script.  Finally, it changes the current diversion to @code{BODY}.
+script.  Among other initializations, this sets @env{SHELL} to the shell
+chosen to run the script (@pxref{CONFIG_SHELL}), and @env{LC_ALL} to
+ensure the C locale.  Finally, it changes the current diversion to
address@hidden
 @end defmac
 
 @defmac AS_INIT_GENERATED (@var{file}, @ovar{comment})
@@ -19404,6 +19409,7 @@ for an example).
 @file{config.status} checks several optional environment variables that
 can alter its behavior:
 
address@hidden
 @defvar CONFIG_SHELL
 @evindex CONFIG_SHELL
 The shell with which to run @command{configure} for the @option{--recheck}
diff --git a/lib/autoconf/autoheader.m4 b/lib/autoconf/autoheader.m4
index 185c0e4..dfc5f77 100644
--- a/lib/autoconf/autoheader.m4
+++ b/lib/autoconf/autoheader.m4
@@ -2,7 +2,7 @@
 # Interface with autoheader.
 
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002 Free Software Foundation, Inc.
+# 2002, 2008 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -68,8 +68,7 @@ m4_define([AH_OUTPUT], [])
 # Quote for Perl '' strings, which are those used by Autoheader.
 m4_define([AH_VERBATIM],
 [AS_LITERAL_IF([$1],
-              [AH_OUTPUT([$1], AS_ESCAPE([[$2]], [\\'']))])
-])
+              [AH_OUTPUT([$1], AS_ESCAPE([[$2]], [\\'']))])])
 
 
 # AH_TEMPLATE(KEY, DESCRIPTION)
diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 15377cb..4afa794 100644
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -417,7 +417,7 @@ cross_compiling=no
 subdirs=
 MFLAGS=
 MAKEFLAGS=
-AC_SUBST([SHELL], [${CONFIG_SHELL-/bin/sh}])dnl
+AC_SUBST([SHELL])dnl
 AC_SUBST([PATH_SEPARATOR])dnl
 
 # Identity of this package.
@@ -1333,16 +1333,16 @@ AS_ECHO(["/* confdefs.h */"]) > confdefs.h
 
 # Predefined preprocessor variables.
 AC_DEFINE_UNQUOTED([PACKAGE_NAME], ["$PACKAGE_NAME"],
-                  [Define to the full name of this package.])
+                  [Define to the full name of this package.])dnl
 AC_DEFINE_UNQUOTED([PACKAGE_TARNAME], ["$PACKAGE_TARNAME"],
-                  [Define to the one symbol short name of this package.])
+                  [Define to the one symbol short name of this package.])dnl
 AC_DEFINE_UNQUOTED([PACKAGE_VERSION], ["$PACKAGE_VERSION"],
-                  [Define to the version of this package.])
+                  [Define to the version of this package.])dnl
 AC_DEFINE_UNQUOTED([PACKAGE_STRING], ["$PACKAGE_STRING"],
-                  [Define to the full name and version of this package.])
+                  [Define to the full name and version of this package.])dnl
 AC_DEFINE_UNQUOTED([PACKAGE_BUGREPORT], ["$PACKAGE_BUGREPORT"],
                   [Define to the address where bug reports for this package
-                   should be sent.])
+                   should be sent.])dnl
 
 # Let the site file select an alternate cache file if it wants to.
 AC_SITE_LOAD
@@ -2088,8 +2088,8 @@ m4_define([_AC_DEFINE_Q],
 ], [-])])], [], [],
        [m4_warn([syntax], [AC_DEFINE]m4_ifval([$1], [], [[_UNQUOTED]])dnl
 [: `$3' is not a valid preprocessor define value])])]dnl
-[m4_ifval([$4], [AH_TEMPLATE(AC_name, [$4])])]dnl
-[_m4_popdef([AC_name])]dnl
+[m4_ifval([$4], [AH_TEMPLATE(AC_name, [$4])
+])_m4_popdef([AC_name])]dnl
 [cat >>confdefs.h <<$1_ACEOF
 address@hidden:@define] $2 m4_if([$#], 2, 1, [$3], [], [/**/], [$3])
 _ACEOF
@@ -2718,8 +2718,7 @@ m4_define([_AC_CHECK_FILES],
 # ACTION-IF-FOUND or ACTION-IF-NOT-FOUND.  For files that exist, also
 # provide the preprocessor variable HAVE_FILE.
 AC_DEFUN([AC_CHECK_FILES],
-[m4_map_args_w([$1], [AC_CHECK_FILE(_$0(], [)[
-$2], [$3])])])
+[m4_map_args_w([$1], [AC_CHECK_FILE(_$0(], [)[$2], [$3])])])
 
 
 ## ------------------------------- ##
diff --git a/lib/m4sugar/m4sh.m4 b/lib/m4sugar/m4sh.m4
index e0b7c55..2790d8a 100644
--- a/lib/m4sugar/m4sh.m4
+++ b/lib/m4sugar/m4sh.m4
@@ -271,10 +271,9 @@ Then install a modern shell, or manually run the script 
under such a
 shell if you do have one.], [$[]0: ], [], [62])")
   fi
       AS_EXIT(1)])])
-else
-  SHELL=$CONFIG_SHELL
-  export SHELL
 fi
+SHELL=${CONFIG_SHELL-/bin/sh}
+export SHELL
 _m4_popdef([AS_EXIT])])# _AS_DETECT_BETTER_SHELL
 
 
diff --git a/tests/m4sh.at b/tests/m4sh.at
index 55363d8..214b555 100644
--- a/tests/m4sh.at
+++ b/tests/m4sh.at
@@ -1138,3 +1138,38 @@ cleanup 1
 ]])
 
 AT_CLEANUP
+
+
+## ------------------- ##
+## AS_INIT_GENERATED.  ##
+## ------------------- ##
+
+AT_SETUP([AS@&address@hidden)
+
+AT_DATA_M4SH([script.as], [[dnl
+m4_define([AS_MESSAGE_FD], [1])
+AS_INIT
+AS_INIT_GENERATED([child], [echo hello from child])
+cat >>child <<\EOF
+AS_ECHO(["SHELL=$SHELL"])
+EOF
+echo hello from parent
+AS_ECHO(["SHELL=$SHELL"])
+]])
+
+AT_CHECK_M4SH
+AT_CHECK([./script], [0], [stdout])
+AT_CHECK([grep 'SHELL=.' stdout], [0], [ignore])
+sed s/parent/child/ <stdout >expout
+AT_CHECK([./child], [0], [expout])
+SHELL=/bogus
+export SHELL
+cp stdout expout
+mv child child.bak
+AT_CHECK([./script], [0], [expout])
+AT_CHECK([cmp child child.bak])
+AT_CHECK([grep 'SHELL=.' stdout], [0], [ignore])
+sed s/parent/child/ <stdout >expout
+AT_CHECK([./child], [0], [expout])
+
+AT_CLEANUP


hooks/post-receive
--
GNU Autoconf source repository