From: Stepan Kasal <kasal@ucw.cz>
Date: Tue, 21 Jun 2005 16:03:58 +0000 (+0000)
Subject: No blanks after sed command ":" and other minor fixes.
X-Git-Tag: AUTOCONF-2.59c~326
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=79539e6fbf92d19ebedcce0cd3ecdf0c99e27f49;p=thirdparty%2Fautoconf.git

No blanks after sed command ":" and other minor fixes.
---

diff --git a/ChangeLog b/ChangeLog
index ba61008b1..4c504bbda 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2005-06-21  Stepan Kasal  <kasal@ucw.cz>
+
+	* 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.
+
+2005-06-21  Stepan Kasal  <kasal@ucw.cz>
+
+	* lib/m4sugar/m4sugar.m4 (m4_split): If the parameter is empty,
+	expand to the empty list.  Don't use two pairs of m4_changequote,
+	it's not necessary.
+
 2005-06-20  Derek Price  <derek@ximbiot.com>
 
 	* lib/m4/programs.m4 (AC_PROG_YACC): Declare YACC & YFLAGS precious.
@@ -29,13 +43,13 @@
 2005-06-10  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* doc/autoconf.texi: "filesystem" -> "file system".
-	"behavior" -> "behavior".
+	"behaviour" -> "behavior".
 	Warn about \(...\)* in Solaris sed (written by Ralf Menzel).
 	* lib/autoconf/general.m4: Omit blank after ":" sed command,
 	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
diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index 102ce3602..9aa4b38c1 100644
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -10788,7 +10788,8 @@ $ @kbd{sed '=' <lineno |}
 > @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 @@ $ @kbd{echo "foo" | sed -n '/bar/ !p'}
 foo
 @end example
 
+Also note that Posix requires that the arguments of commands @samp{b},
+@samp{t}, @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})
diff --git a/lib/autoconf/status.m4 b/lib/autoconf/status.m4
index 951fa895b..a4d41bcac 100644
--- a/lib/autoconf/status.m4
+++ b/lib/autoconf/status.m4
@@ -508,7 +508,7 @@ dnl the extra command meant extra calls to sed.
 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 @@ m4_define([AC_OUTPUT_MAKE_DEFS],
 # 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
diff --git a/lib/autotest/general.m4 b/lib/autotest/general.m4
index 04306b9a8..4a2e49a6f 100644
--- a/lib/autotest/general.m4
+++ b/lib/autotest/general.m4
@@ -1037,7 +1037,7 @@ AS_IF([$at_arg_given_[]m4_bpatsubst([AT_first_option], -, _)],,[$5])dnl
 # 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