* doc/autoconf.texi (Limitations of Usual Tools) <sed>: For

the HP-UX sed limitation of 99 commands, labels do not count.
* lib/autoconf/status.m4 (_AC_SED_CMD_LIMIT): Mention that
in the comment.
(_AC_OUTPUT_HEADER): Revert the change from 2006-05-19.

diff --git a/ChangeLog b/ChangeLog
index 2bfb5a2d0fb664fa9ca566199359be2d07c4cee6..6d97e8138dbe9049d1eecf64906e09d749863d82 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-05-21  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * doc/autoconf.texi (Limitations of Usual Tools) <sed>: For
+       the HP-UX sed limitation of 99 commands, labels do not count.
+       * lib/autoconf/status.m4 (_AC_SED_CMD_LIMIT): Mention that
+       in the comment.
+       (_AC_OUTPUT_HEADER): Revert the change from 2006-05-19.
+
 2006-05-21  Paul Eggert  <eggert@cs.ucla.edu>
 
        * lib/autoconf/functions.m4 (AC_FUNC_GETMNTENT):

diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index a7b450a729e88404cd26140b05bbc22e5ad4f29e..c6e71102de3da09a25406fc34164c1ad561d6ed1 100644 (file)
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -13207,7 +13207,8 @@ them.
 Unicos 9 @command{sed} loops endlessly on patterns like @samp{.*\n.*}.
 
 Sed scripts should not use branch labels longer than 8 characters and
-should not contain comments.  HP-UX sed has a limit of 99 commands and
+should not contain comments.  HP-UX sed has a limit of 99 commands
+(not counting @samp{:} commands) and
 48 labels, which can not be circumvented by using more than one script
 file.  It can execute up to 19 reads with the @samp{r} command per cycle.
 

diff --git a/lib/autoconf/status.m4 b/lib/autoconf/status.m4
index e1ebd95936ce0a622b50ddc5d3e83b45fb663c63..b32341bc47f67874529dd2c7fbe362acb0345215 100644 (file)
--- a/lib/autoconf/status.m4
+++ b/lib/autoconf/status.m4
@@ -303,7 +303,7 @@ AC_DEFUN([AC_CONFIG_FILES], [_AC_CONFIG_FOOS([FILES], $@)])
 # _AC_SED_CMD_LIMIT
 # -----------------
 # Evaluate to an m4 number equal to the maximum number of commands to put
-# in any single sed program.
+# in any single sed program, not counting ":" commands.
 #
 # Some seds have small command number limits, like on Digital OSF/1 and HP-UX.
 m4_define([_AC_SED_CMD_LIMIT],
@@ -660,7 +660,7 @@ echo 's/ $//
 [s,^[   #]*u.*,/* & */,]' >>conftest.defines
 
 # Break up conftest.defines:
-ac_max_sed_lines=m4_eval(_AC_SED_CMD_LIMIT - 4)
+ac_max_sed_lines=m4_eval(_AC_SED_CMD_LIMIT - 3)
 
 # First sed command is:         sed -f defines.sed $ac_file_inputs >"$tmp/out1"
 # Second one is:        sed -f defines.sed "$tmp/out1" >"$tmp/out2"