From 22efb81e0aaad363d4b0f9fb6cfef80aa6e46f85 Mon Sep 17 00:00:00 2001
From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Mon, 4 Aug 2008 08:02:53 +0200
Subject: [PATCH] Fix AC_CONFIG_FILES([$var]) 2.62 regression.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

* lib/autoconf/status.m4 (_AC_OUTPUT_CONFIG_STATUS): Flatten
whitespace in $ac_config_files and $ac_config_headers.
* tests/torture.at (Parameterized AC_CONFIG_FILES): New test.
Report by Andreas Schwab and Per Øyvind Karlsen.
* THANKS: Update.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
---
 ChangeLog              |  9 +++++++++
 THANKS                 |  1 +
 lib/autoconf/status.m4 | 12 ++++++++++++
 tests/torture.at       | 17 +++++++++++++++++
 4 files changed, 39 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 5ff6e000..71abf0f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-08-04  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	Fix AC_CONFIG_FILES([$var]) 2.62 regression.
+	* lib/autoconf/status.m4 (_AC_OUTPUT_CONFIG_STATUS): Flatten
+	whitespace in $ac_config_files and $ac_config_headers.
+	* tests/torture.at (Parameterized AC_CONFIG_FILES): New test.
+	Report by Andreas Schwab and Per Øyvind Karlsen.
+	* THANKS: Update.
+
 2008-07-30  Eric Blake  <ebb9@byu.net>
 
 	Fix bugs in previous version of m4_bpatsubsts.
diff --git a/THANKS b/THANKS
index dfc26eb2..912ec2c8 100644
--- a/THANKS
+++ b/THANKS
@@ -267,6 +267,7 @@ Paul Martinolich            martinol@datasync.com
 Paul Pogonyshev             ?
 Paul Townsend               ?
 Pavel Roskin                pavel_roskin@geocities.com
+Per Øyvind Karlsen          peroyvind@mandriva.org
 Peter Eisentraut            peter_e@gmx.net
 Peter Hendrickson           pdh@wiredyne.com
 Peter O'Gorman              peter@pogma.com
diff --git a/lib/autoconf/status.m4 b/lib/autoconf/status.m4
index 4d220855..48974612 100644
--- a/lib/autoconf/status.m4
+++ b/lib/autoconf/status.m4
@@ -1357,6 +1357,18 @@ on `(hostname || uname -n) 2>/dev/null | sed 1q`
 
 _ACEOF
 
+dnl remove any newlines from these variables.
+m4_ifdef([_AC_SEEN_CONFIG(FILES)],
+[case $ac_config_files in *"
+"*) set x $ac_config_files; shift; ac_config_files=$[*];;
+esac
+])
+m4_ifdef([_AC_SEEN_CONFIG(HEADERS)],
+[case $ac_config_headers in *"
+"*) set x $ac_config_headers; shift; ac_config_headers=$[*];;
+esac
+])
+
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 # Files that config.status was made for.
 m4_ifdef([_AC_SEEN_CONFIG(FILES)],
diff --git a/tests/torture.at b/tests/torture.at
index 92f8d5b7..44fdcd5e 100644
--- a/tests/torture.at
+++ b/tests/torture.at
@@ -43,6 +43,23 @@ AT_CHECK_AUTOCONF([], 1, [], [ignore])
 AT_CLEANUP
 
 
+## ------------------------------- ##
+## parameterized AC_CONFIG_FILES.  ##
+## ------------------------------- ##
+
+AT_SETUP([Parameterized AC_CONFIG_FILES])
+
+AT_CONFIGURE_AC([[
+files="foo
+bar"
+AC_CONFIG_FILES([$files])]])
+AT_CHECK_AUTOCONF([], [], [], [ignore])
+touch foo.in bar.in config.hin
+AT_CHECK_CONFIGURE
+
+AT_CLEANUP
+
+
 
 ## ------------ ##
 ## AC_ARG_VAR.  ##
-- 
2.47.2