Fix a bug in the previous patch: it assumed that echo '...\...' had

the BSD interpretation rather than the SysV interpretation.  Use
a short here-document instead.

diff --git a/lib/autoconf/status.m4 b/lib/autoconf/status.m4
index 8d785fb11bba4b15893b28916e3d3e1749e89d5e..57810fc9e596a3c4c7c31a6fdb525f866c7480a9 100644 (file)
--- a/lib/autoconf/status.m4
+++ b/lib/autoconf/status.m4
@@ -680,12 +680,14 @@ while :
 do
   # Write a here document:
   dnl Quote, for the `[ ]' and `define'.
-  echo ['    # First, check the format of the line:
-    cat >"$tmp/defines.sed" <<\CEOF
-/^[     ]*#[    ]*undef[        ][      ]*'"$ac_word_re"'[      ]*$/b def
-/^[     ]*#[    ]*define[       ][      ]*'"$ac_word_re"'[(     ]/b def
+[  cat >>$CONFIG_STATUS <<_ACEOF
+    # First, check the format of the line:
+    cat >"\$tmp/defines.sed" <<\\CEOF
+/^[     ]*#[    ]*undef[        ][      ]*$ac_word_re[  ]*\$/b def
+/^[     ]*#[    ]*define[       ][      ]*$ac_word_re[(         ]/b def
 b
-:def'] >>$CONFIG_STATUS
+:def
+_ACEOF]
   sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
   echo 'CEOF
     sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS