_AC_OUTPUT_FILES_PREPARE: fix quoting and optimize

diff --git a/ChangeLog b/ChangeLog
index 179313c0d2c9755322b2499cb8bc645163b53968..ac76599d33bde629800110078400ebfeb5925d2f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-10-21  Stepan Kasal  <kasal@ucw.cz>
+
+       * lib/autoconf/status.m4 (_AC_OUTPUT_FILES_PREPARE): When determining,
+       the delimiter CEOF$ac_eof: fix quoting of CEOF[0-9]* and modify the 
+       code so that the most common case requires less forks.
+
 2005-10-20  Stepan Kasal  <kasal@ucw.cz>
 
        * doc/autoconf.texi (Shell Substitutions}: Document that ${10} is

diff --git a/lib/autoconf/status.m4 b/lib/autoconf/status.m4
index 94e7ce7e4af2d192bbcae8051bf4e8b7c1d24d1e..88e5ad19f9a8d616e8b1b4d3e4d74db72947c2b3 100644 (file)
--- a/lib/autoconf/status.m4
+++ b/lib/autoconf/status.m4
@@ -411,8 +411,11 @@ m4_if(_AC_SED_CMD_LIMIT,
   fi
 done
 
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF//p' conf$$subs.sed | sort -nru | sed 1q`
-ac_eof=`expr 0$ac_eof + 1`
+ac_eof=
+if grep '^CEOF$' conf$$subs.sed >/dev/null; then
+  ac_eof=`sed -n '/^CEOF[[0-9]]*$/s/CEOF//p' conf$$subs.sed | sort -nru | sed 1q`
+  ac_eof=`expr 0$ac_eof + 1`
+fi
 
 dnl Increment fragment number.
 m4_define([_AC_SED_FRAG_NUM], m4_incr(_AC_SED_FRAG_NUM))dnl