Hello,
in my previous post, I forgot to attach the patch.
This time the patch is attached; the text of my previous post is repeated
below.
Sorry,
Stepan
On Fri, Jun 10, 2005 at 11:08:41PM -0700, Paul Eggert wrote:
> Stepan Kasal <[EMAIL PROTECTED]> writes:
> > I committed a variation of the patch.
>
> Hmm, it wasn't committed. I committed a variant of it (along with
> some other minor fixes I had prepared) as follows.
thanks for fixing my mistake.
> * lib/autoconf/general.m4: Omit blank after ":" sed command,
> as per POSIX.
I found more occurrences, and I documented the weird Posix requirements in the
manual.
Committed, together with some other typos. See the patch attached to this
mail.
Have a nice day,
Stepan Kasal
2005-06-21 Stepan Kasal <[EMAIL PROTECTED]>
* doc/autoconf.texi (Limitations of Usual Tools) <sed>: Document that
b, t, r, w commands require single space, while : cannot have any.
(Special Shell Variables): Fix sed code this in the example.
* lib/autoconf/status.m4 (_AC_OUTPUT_HEADERS): Likewise; and fix a typo.
* lib/autotest/general.m4 (AT_ARG_OPTION): Fix typo in the description.
Index: ChangeLog
===================================================================
RCS file: /cvsroot/autoconf/autoconf/ChangeLog,v
retrieving revision 1.2564
diff -u -r1.2564 ChangeLog
--- ChangeLog 20 Jun 2005 14:48:09 -0000 1.2564
+++ ChangeLog 21 Jun 2005 15:38:57 -0000
@@ -35,7 +35,7 @@
as per POSIX.
* lib/m4sugar/m4sh.m4: Likewise.
* lib/autoconf/status.m4 (_AC_OUTPUT_HEADERS): Work around problem
- with Solaris sed. Fix by Stepan Kasal.
+ with Solaris sed. Fix by Ralf Menzel and Stepan Kasal.
* man/Makefile.am (MOSTLYCLEANFILES): Add $(srcdir)/*.t.
(.x.1): Ignore the time stamp in the .TH line when deciding whether
Index: doc/autoconf.texi
===================================================================
RCS file: /cvsroot/autoconf/autoconf/doc/autoconf.texi,v
retrieving revision 1.915
diff -u -r1.915 autoconf.texi
--- doc/autoconf.texi 17 Jun 2005 20:37:37 -0000 1.915
+++ doc/autoconf.texi 21 Jun 2005 15:39:00 -0000
@@ -10788,7 +10788,8 @@
> @kbd{ sed '}
> @kbd{ N}
> @kbd{ s,$,-,}
-> @kbd{ : loop}
+> @kbd{ t loop}
+> @kbd{ :loop}
> @kbd{ s,^\([0-9]*\)\(.*\)[$]LINENO\([^a-zA-Z0-9_]\),\1\2\1\3,}
> @kbd{ t loop}
> @kbd{ s,-$,,}
@@ -12237,6 +12238,11 @@
foo
@end example
+Also note that Posix requires that the arguments of commands @samp{b},
[EMAIL PROTECTED], @samp{r}, @samp{w} have to be separated by exactly one space.
+On the other hand, no white space is allowed between @samp{:} and the
+following label name.
+
@item @command{sed} (@samp{t})
@c ---------------------------
@prindex @command{sed} (@samp{t})
Index: lib/autoconf/status.m4
===================================================================
RCS file: /cvsroot/autoconf/autoconf/lib/autoconf/status.m4,v
retrieving revision 1.62
diff -u -r1.62 status.m4
--- lib/autoconf/status.m4 11 Jun 2005 06:05:12 -0000 1.62
+++ lib/autoconf/status.m4 21 Jun 2005 15:39:00 -0000
@@ -508,7 +508,7 @@
dnl 2) The code was incorrect: in the unusual case where a symbol has multiple
dnl different AC_DEFINEs, the last one should be honored.
dnl
-dnl ac_dB works because every line has a space appended. ac_dB reinserts
+dnl ac_dB works because every line has a space appended. ac_dD reinserts
dnl the space, because some symbol may have been AC_DEFINEd several times.
[ac_word_regexp=[_$as_cr_Letters][_$as_cr_alnum]*]
@@ -1623,13 +1623,13 @@
# look for a macro that doesn't take arguments.
cat >confdef2opt.sed <<\_ACEOF
t clear
-: clear
+:clear
s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[
]*\(.*\),-D\1=\2,g
t quote
s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[
]*\(.*\),-D\1=\2,g
t quote
d
-: quote
+:quote
s,[ `~#$^&*(){}\\|;'"<>?],\\&,g
s,\[,\\&,g
s,\],\\&,g
Index: lib/autotest/general.m4
===================================================================
RCS file: /cvsroot/autoconf/autoconf/lib/autotest/general.m4,v
retrieving revision 1.184
diff -u -r1.184 general.m4
--- lib/autotest/general.m4 8 Jun 2005 20:22:39 -0000 1.184
+++ lib/autotest/general.m4 21 Jun 2005 15:39:00 -0000
@@ -1037,7 +1037,7 @@
# if --noOPTION is received, and `false' by default.
#
# Run ACTION-IF-GIVEN each time an option in OPTIONS is encountered with
-# $at_optarg set to `:' or `false' as appropriate. $opt_arg is actually
+# $at_optarg set to `:' or `false' as appropriate. $at_optarg is actually
# just a copy of $at_arg_OPTION.
#
# ACTION-IF-NOT-GIVEN will be run once after option parsing is complete
