* lib/autoconf/status.m4 (_AC_OUTPUT_FILES_PREPARE):

Fix quoting of output line (triggered for many AC_SUBST_FILEs).
Fix macro quoting.  Fix output for n*100 substituted variables.

diff --git a/ChangeLog b/ChangeLog
index 21940a2a54f460006c2b74bae583ac00b90ededa..126717ee32d1dd026227fa2ffb903496271b7803 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-11-09  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * lib/autoconf/status.m4 (_AC_OUTPUT_FILES_PREPARE):
+       Fix quoting of output line (triggered for many AC_SUBST_FILEs).
+       Fix macro quoting.  Fix output for n*100 substituted variables.
+
 2005-11-08  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * lib/autoconf/status.m4 (_AC_OUTPUT_MAIN_LOOP): Initialize

diff --git a/lib/autoconf/status.m4 b/lib/autoconf/status.m4
index 68fecd1b3c7f13869067f4a32880451cdac71199..233d0443b929fc98c4779c25dff9a2938791aba5 100644 (file)
--- a/lib/autoconf/status.m4
+++ b/lib/autoconf/status.m4
@@ -351,9 +351,9 @@ dnl Record that this fragment will need to be used.
 m4_define([_AC_SED_CMDS],
   m4_defn([_AC_SED_CMDS])[| sed -f "$tmp/subs-]_AC_SED_FRAG_NUM[.sed" ])dnl
 [cat >>$CONFIG_STATUS <<_ACEOF
-cat >"$tmp/subs-]_AC_SED_FRAG_NUM[.sed" <\CEOF
+cat >"\$tmp/subs-]_AC_SED_FRAG_NUM[.sed" <<\CEOF
 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-]m4_defn(_AC_SED_FRAG)dnl
+]m4_defn([_AC_SED_FRAG])dnl
 [CEOF
 
 _ACEOF
@@ -399,7 +399,7 @@ m4_define([_AC_SED_DELIM_NUM], m4_incr(_AC_SED_DELIM_NUM))dnl
 _AC_Var!$_AC_Var$ac_delim
 ])dnl
 m4_if(_AC_SED_CMD_LIMIT,
-      m4_if(_AC_Var, [@END@], _AC_SED_CMD_LIMIT, _AC_SED_CMD_NUM),
+      m4_if(_AC_Var, [@END@], m4_if(_AC_SED_CMD_NUM, 2, 2, _AC_SED_CMD_LIMIT), _AC_SED_CMD_NUM),
 [_ACEOF
 
   if test `grep -c "$ac_delim\$" conf$$subs.sed` = _AC_SED_DELIM_NUM; then