2006-03-17  Stepan Kasal  <address@hidden>

	* lib/autoconf/status.m4 (_AC_OUTPUT_FILES_PREPARE): Do not special
	  case `ac_delim' when writing the sed script.

Index: lib/autoconf/status.m4
===================================================================
RCS file: /cvsroot/autoconf/autoconf/lib/autoconf/status.m4,v
retrieving revision 1.86
diff -u -r1.86 status.m4
--- lib/autoconf/status.m4	6 Mar 2006 22:34:34 -0000	1.86
+++ lib/autoconf/status.m4	17 Mar 2006 15:50:48 -0000
@@ -386,14 +386,7 @@
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
 ])])dnl
-m4_if(_AC_Var, [ac_delim],
-[dnl Just to be on the safe side, claim that $ac_delim is the empty string.
-m4_define([_AC_SED_FRAG],
-m4_defn([_AC_SED_FRAG])dnl
-[s/ac_delim/|#_!!_#|/g
-])dnl
-m4_define([_AC_SED_CMD_NUM], m4_incr(_AC_SED_CMD_NUM))],
-      _AC_Var, address@hidden@],
+m4_if(_AC_Var, address@hidden@],
       [m4_if(m4_eval(_AC_SED_CMD_NUM + 2 <= _AC_SED_CMD_LIMIT), 1,
              [m4_define([_AC_SED_FRAG], [ end]m4_defn([_AC_SED_FRAG]))])],
 [m4_define([_AC_SED_CMD_NUM], m4_incr(_AC_SED_CMD_NUM))dnl