* acgeneral.m4 (_AC_OUTPUT_CONFIG_STATUS): Put the expansion of

AC_LIST_LINKS in an unquoted `here'-document.

diff --git a/ChangeLog b/ChangeLog
index 741b9f02e70f9b36d9da0e8d99291bdcbf997ae8..c7de2163ff24bc4cacb845b5af29bf38eca2ac83 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-06-07  Jim Meyering  <meyering@lucent.com>
+
+       * acgeneral.m4 (_AC_OUTPUT_CONFIG_STATUS): Put the expansion of
+       AC_LIST_LINKS in an unquoted `here'-document.
+
 2000-06-06  Akim Demaille  <akim@epita.fr>
 
        * tests/aclocal.m4 (AC_ENV_SAVE): Skip `no_x'.

diff --git a/acgeneral.m4 b/acgeneral.m4
index 82032da7ee4173438c9140181ca6eb294ffb1f59..0f93996034faa7bd9a7d964019c0374d717d90ac 100644 (file)
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -3885,9 +3885,15 @@ m4_wrap(AC_LIST_FILES, [  ])"
 ifset([AC_LIST_HEADERS], [config_headers="\
 m4_wrap(AC_LIST_HEADERS, [  ])"
 ])dnl
+EOF
+# Be careful that the expansion of AC_LIST_LINKS (which may contain
+# uses of shell variables) is itself expanded in an unquoted `here'-document.
+cat >>$CONFIG_STATUS <<EOF
 ifset([AC_LIST_LINKS], [config_links="\
 m4_wrap(AC_LIST_LINKS, [  ])"
 ])dnl
+EOF
+cat >>$CONFIG_STATUS <<\EOF
 ifset([AC_LIST_COMMANDS], [config_commands="\
 m4_wrap(AC_LIST_COMMANDS, [  ])"
 ])dnl

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 82032da7ee4173438c9140181ca6eb294ffb1f59..0f93996034faa7bd9a7d964019c0374d717d90ac 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -3885,9 +3885,15 @@ m4_wrap(AC_LIST_FILES, [  ])"
 ifset([AC_LIST_HEADERS], [config_headers="\
 m4_wrap(AC_LIST_HEADERS, [  ])"
 ])dnl
+EOF
+# Be careful that the expansion of AC_LIST_LINKS (which may contain
+# uses of shell variables) is itself expanded in an unquoted `here'-document.
+cat >>$CONFIG_STATUS <<EOF
 ifset([AC_LIST_LINKS], [config_links="\
 m4_wrap(AC_LIST_LINKS, [  ])"
 ])dnl
+EOF
+cat >>$CONFIG_STATUS <<\EOF
 ifset([AC_LIST_COMMANDS], [config_commands="\
 m4_wrap(AC_LIST_COMMANDS, [  ])"
 ])dnl