mirror/autoconf
2
0
Fork 0
mirror of git://git.sv.gnu.org/autoconf synced 2025-02-17 14:01:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Stepan Kasal 2005-06-21 16:03:58 +00:00
parent 0ed02e1aa5
commit 79539e6fbf
4 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ChangeLog
View File

@ -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> 2005-06-20 Derek Price <derek@ximbiot.com>
* lib/m4/programs.m4 (AC_PROG_YACC): Declare YACC & YFLAGS precious. * lib/m4/programs.m4 (AC_PROG_YACC): Declare YACC & YFLAGS precious.
@ -29,13 +43,13 @@
2005-06-10 Paul Eggert <eggert@cs.ucla.edu> 2005-06-10 Paul Eggert <eggert@cs.ucla.edu>
* doc/autoconf.texi: "filesystem" -> "file system". * doc/autoconf.texi: "filesystem" -> "file system".
"behavior" -> "behavior". "behaviour" -> "behavior".
Warn about \(...\)* in Solaris sed (written by Ralf Menzel). Warn about \(...\)* in Solaris sed (written by Ralf Menzel).
* lib/autoconf/general.m4: Omit blank after ":" sed command, * lib/autoconf/general.m4: Omit blank after ":" sed command,
as per POSIX. as per POSIX.
* lib/m4sugar/m4sh.m4: Likewise. * lib/m4sugar/m4sh.m4: Likewise.
* lib/autoconf/status.m4 (_AC_OUTPUT_HEADERS): Work around problem * 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. * man/Makefile.am (MOSTLYCLEANFILES): Add $(srcdir)/*.t.
(.x.1): Ignore the time stamp in the .TH line when deciding whether (.x.1): Ignore the time stamp in the .TH line when deciding whether

8
doc/autoconf.texi
View File

@ -10788,7 +10788,8 @@ $ @kbd{sed '=' <lineno |}
> @kbd{ sed '} > @kbd{ sed '}
> @kbd{ N} > @kbd{ N}
> @kbd{ s,$,-,} > @kbd{ s,$,-,}
> @kbd{ : loop} > @kbd{ t loop}
> @kbd{ :loop}
> @kbd{ s,^\([0-9]*\)\(.*\)[$]LINENO\([^a-zA-Z0-9_]\),\1\2\1\3,} > @kbd{ s,^\([0-9]*\)\(.*\)[$]LINENO\([^a-zA-Z0-9_]\),\1\2\1\3,}
> @kbd{ t loop} > @kbd{ t loop}
> @kbd{ s,-$,,} > @kbd{ s,-$,,}
@ -12237,6 +12238,11 @@ $ @kbd{echo "foo" | sed -n '/bar/ !p'}
foo foo
@end example @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}) @item @command{sed} (@samp{t})
@c --------------------------- @c ---------------------------
@prindex @command{sed} (@samp{t}) @prindex @command{sed} (@samp{t})

6
lib/autoconf/status.m4
View File

@ -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 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 different AC_DEFINEs, the last one should be honored.
dnl 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. dnl the space, because some symbol may have been AC_DEFINEd several times.
[ac_word_regexp=[_$as_cr_Letters][_$as_cr_alnum]*] [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. # look for a macro that doesn't take arguments.
cat >confdef2opt.sed <<\_ACEOF cat >confdef2opt.sed <<\_ACEOF
t clear t clear
: clear :clear
s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g
t quote t quote
s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g
t quote t quote
d d
: quote :quote
s,[ `~#$^&*(){}\\|;'"<>?],\\&,g s,[ `~#$^&*(){}\\|;'"<>?],\\&,g
s,\[,\\&,g s,\[,\\&,g
s,\],\\&,g s,\],\\&,g

2
lib/autotest/general.m4
View File

@ -1037,7 +1037,7 @@ AS_IF([$at_arg_given_[]m4_bpatsubst([AT_first_option], -, _)],,[$5])dnl
# if --noOPTION is received, and `false' by default. # if --noOPTION is received, and `false' by default.
# #
# Run ACTION-IF-GIVEN each time an option in OPTIONS is encountered with # 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. # just a copy of $at_arg_OPTION.
# #
# ACTION-IF-NOT-GIVEN will be run once after option parsing is complete # ACTION-IF-NOT-GIVEN will be run once after option parsing is complete