[SCM] GNU Autoconf source repository branch, master, updated. v2.61a-364-gc197dc8

[Ralf Wildenhues]

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=c197dc8d27790ecf5f18ee6769545a07cccedf9f

The branch, master has been updated
       via  c197dc8d27790ecf5f18ee6769545a07cccedf9f (commit)
      from  32980cdc2d576f550b4d6fbedca1d6d9e36cc518 (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 c197dc8d27790ecf5f18ee6769545a07cccedf9f
Author: Benoit Sigoure <address@hidden>
Date:   Tue Dec 18 13:54:06 2007 +0100

    Properly expand @configure_input@ in config.status.
    
    * lib/autoconf/status.m4 (_AC_OUTPUT_FILE, _AC_OUTPUT_MAIN_LOOP):
    Escape the backslashes and ampersands in $configure_input before
    using it in the sed replacement string to expand @address@hidden
    Report by Eric Blake and Patrick Welche.
    
    Signed-off-by: Benoit Sigoure <address@hidden>
    Signed-off-by: Ralf Wildenhues <address@hidden>

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

Summary of changes:
 ChangeLog              |    9 +++++++++
 lib/autoconf/status.m4 |   14 ++++++++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0088f5c..38cfe8e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-03-01  Benoit Sigoure  <address@hidden>
+       and Ralf Wildenhues  <address@hidden>
+
+       Properly expand @configure_input@ in config.status.
+       * lib/autoconf/status.m4 (_AC_OUTPUT_FILE, _AC_OUTPUT_MAIN_LOOP):
+       Escape the backslashes and ampersands in $configure_input before
+       using it in the sed replacement string to expand @address@hidden
+       Report by Eric Blake and Patrick Welche.
+
 2008-03-01  Ralf Wildenhues  <address@hidden>
 
        Ignore errors from ./run on w32.
diff --git a/lib/autoconf/status.m4 b/lib/autoconf/status.m4
index 8afa9ba..398d0cb 100644
--- a/lib/autoconf/status.m4
+++ b/lib/autoconf/status.m4
@@ -1,7 +1,7 @@
 # This file is part of Autoconf.                       -*- Autoconf -*-
 # Parameterizing and creating config.status.
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 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
@@ -635,7 +635,10 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 :t
 [/@[a-zA-Z_][a-zA-Z_0-9]*@/!b]
 dnl configure_input is a somewhat special, so we don't call AC_SUBST_TRACE.
-s&@configure_input@&$configure_input&;t t
+dnl Note if you change the s||| delimiter here, don't forget to adjust
+dnl ac_sed_conf_input accordingly.  Using & is a bad idea if & appears in
+dnl the replacement string.
+s|@configure_input@|$ac_sed_conf_input|;t t
 dnl During the transition period, this is a special case:
 s&@top_builddir@&$ac_top_builddir_sub&;t t[]AC_SUBST_TRACE([top_builddir])
 dnl For this substitution see the witness macro _AC_HAVE_TOP_BUILD_PREFIX 
above.
@@ -1655,6 +1658,13 @@ do
       configure_input="$ac_file.  $configure_input"
       AC_MSG_NOTICE([creating $ac_file])
     fi
+    # Neutralize special characters interpreted by sed in replacement strings.
+    case $configure_input in #(
+    *\&* | *\|* | *\\* )
+       ac_sed_conf_input=`AS_ECHO(["$configure_input"]) |
+       sed 's/[[\\\\&|]]/\\\\&/g'`;; #(
+    *) ac_sed_conf_input=$configure_input;;
+    esac
 
     case $ac_tag in
     *:-:* | *:-) cat >"$tmp/stdin" \


hooks/post-receive
--
GNU Autoconf source repository