[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Automake patch to not assume egrep or fgrep
|
From: |
Paul Eggert |
|
Subject: |
Automake patch to not assume egrep or fgrep |
|
Date: |
Wed, 29 May 2002 23:21:02 -0700 (PDT) |
I've been porting GNU tools to a stricter POSIX 1003.1-2001
environment, and noticed that Automake uses the obsolecent commands
'egrep' and 'fgrep'. These commands need not exist on a modern POSIX
host; you're supposed to use grep -E and grep -F instead. I installed
the following patch on the main Automake branch; I don't know whether
this sort of thing is suitable for branch-1-6 so I left branch-1-6
alone.
2002-05-29 Paul Eggert <address@hidden>
Don't assume that egrep and fgrep exist, as POSIX 1003.1-2001 no
longer requires them.
* Makefile.am (maintainer-check): Use grep -E and grep -F instead
of egrep and fgrep. Omit unnecessary -E and -F.
Fix quoting typo -- "fgrep '\$${'" should have been "fgrep '$${'".
* lib/am/distdir.am (distdir): fgrep -> grep -F.
Use $(), not ${}, for Make variables.
* lib/am/texinfos.am (install-info-am, uninstall-info-am):
fgrep -> grep
* m4/make.m4 (AM_MAKE_INCLUDE): Likewise.
* tests/defs: Set FGREP and EGREP.
* tests/aclocali.test, tests/acoutput2.test, tests/all.test,
tests/ansi.test, tests/ansi4.test, tests/colon3.test,
tests/cond21.test, tests/condlib.test, tests/confh4.test,
tests/confsub.test, tests/cxxansi.test, tests/cxxo.test,
tests/depend4.test, tests/discover.test, tests/distname.test,
tests/dup3.test, tests/empty4.test, tests/fo.test,
tests/implicit.test, tests/insh2.test, tests/interp.test,
tests/lex.test, tests/lex3.test, tests/lex4.test,
tests/libobj5.test, tests/libobj7.test, tests/make.test,
tests/makevars.test, tests/nostdinc.test, tests/parse.test,
tests/pluseq.test, tests/pluseq4.test, tests/pluseq6.test,
tests/pr2.test, tests/pr9.test, tests/seenc.test,
tests/specflags.test, tests/specflags3.test,
tests/specflags6.test, tests/subobj.test, tests/subobj2.test,
tests/suffix3.test, tests/texinfo.test, tests/texinfo6.test,
tests/texinfo8.test, tests/vtexi.test, tests/yacc3.test,
tests/yacc6.test: fgrep -> $FGREP, egrep -> $EGREP
Index: Makefile.am
===================================================================
RCS file: /cvs/automake/automake/Makefile.am,v
retrieving revision 1.191
diff -p -u -r1.191 Makefile.am
--- Makefile.am 6 May 2002 19:29:37 -0000 1.191
+++ Makefile.am 30 May 2002 05:50:37 -0000
@@ -2,7 +2,8 @@
## Makefile for Automake.
-## Copyright 1995, 1996, 1997, 1998, 1999, 2001 Free Software Foundation, Inc.
+## Copyright (C) 1995, 1996, 1997, 1998, 1999, 2001, 2002 Free
+## Software Foundation, Inc.
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -78,33 +79,32 @@ maintainer-check: automake aclocal
perllibdir=$(srcdir)/lib $(PERL) -c -w aclocal
## expect no instances of '${...}'. However, $${...} is ok, since that
## is a shell construct, not a Makefile construct.
-## The backslash in `$${' is needed for some versions of bash.
- @if fgrep '\$${' $(srcdir)/lib/am/[a-z]*.am | \
- fgrep -v '$$$$'; then \
+ @if grep -F '$${' $(srcdir)/lib/am/[a-z]*.am | \
+ grep -F -v '$$$$'; then \
echo "Found too many uses of '\$${' in the lines above." 1>&2; \
exit 1; \
else :; fi
## Make sure `rm' is called with `-f'.
- @if egrep '\<rm ([^-]|\-[^f ]*\>)' \
+ @if grep -E '\<rm ([^-]|\-[^f ]*\>)' \
$(srcdir)/lib/am/[a-z]*.am $(srcdir)/tests/*.test | \
- fgrep -v '##'; then \
+ grep -v '##'; then \
echo "Suspicious 'rm' invocation." 1>&2; \
exit 1; \
else :; fi
## Make sure all invocations of mkinstalldirs are correct.
- @if fgrep -n 'mkinstalldirs' $(srcdir)/lib/am/[a-z]*.am | \
- fgrep -v '$$(mkinstalldirs)'; then \
+ @if grep -n 'mkinstalldirs' $(srcdir)/lib/am/[a-z]*.am | \
+ grep -F -v '$$(mkinstalldirs)'; then \
echo "Found incorrect use of mkinstalldirs in the lines above" 1>&2; \
exit 1; \
else :; fi
## We never want to use "undef", only "delete", but for $/.
@if grep -n -w 'undef ' $(srcdir)/automake.in | \
- fgrep -v 'undef $$/'; then \
+ grep -F -v 'undef $$/'; then \
echo "Found undef in automake.in; use delete instead" 1>&2; \
exit 1; \
fi
## We never want split (/ /,...), only split (' ', ...).
- @if fgrep -n 'split (/ /' $(srcdir)/automake.in; then \
+ @if grep -n 'split (/ /' $(srcdir)/automake.in; then \
echo "Found bad split in the lines above." 1>&2; \
exit 1; \
fi
@@ -146,34 +146,34 @@ maintainer-check: automake aclocal
exit 1; \
fi
## Tests should never call make directly.
- @if grep -v '^#' $(srcdir)/tests/*.test | egrep ':[ ]*make'; then \
+ @if grep -v '^#' $(srcdir)/tests/*.test | grep ':[ ]*make'; then \
echo 'Do not run "make" in the above tests. Use "$$MAKE" instead.'
1>&2; \
exit 1; \
fi
## Tests should never call autoconf directly.
- @if grep -v '^#' $(srcdir)/tests/*.test | egrep ':[ ]*autoconf';
then \
+ @if grep -v '^#' $(srcdir)/tests/*.test | grep ':[ ]*autoconf';
then \
echo 'Do not run "autoconf" in the above tests. Use "$$AUTOCONF"
instead.' 1>&2; \
exit 1; \
fi
## Tests should never call automake directly.
- @if grep -v '^#' $(srcdir)/tests/*.test | egrep ':[ ]*automake';
then \
+ @if grep -v '^#' $(srcdir)/tests/*.test | grep ':[ ]*automake';
then \
echo 'Do not run "automake" in the above tests. Use "$$AUTOMAKE"
instead.' 1>&2; \
exit 1; \
fi
## Tests should never call aclocal directly.
- @if grep -v '^#' $(srcdir)/tests/*.test | egrep ':[ ]*aclocal';
then \
+ @if grep -v '^#' $(srcdir)/tests/*.test | grep ':[ ]*aclocal';
then \
echo 'Do not run "aclocal" in the above tests. Use "$$ACLOCAL"
instead.' 1>&2; \
exit 1; \
fi
## Tests should never call perl directly.
- @if grep -v '^#' $(srcdir)/tests/*.test | egrep ':[ ]*perl'; then \
+ @if grep -v '^#' $(srcdir)/tests/*.test | grep ':[ ]*perl'; then \
echo 'Do not run "perl" in the above tests. Use "$$PERL" instead.'
1>&2; \
exit 1; \
fi
## Overriding a Makefile macro on the command line is not portable when
## recursive targets are used. Better use an envvar. SHELL is an exception,
## POSIX says it can't come from the environment.
- @if egrep '\$$MAKE .*(SHELL=.*=|=.*SHELL=)' $(srcdir)/tests/*.test;
then \
+ @if grep -E '\$$MAKE .*(SHELL=.*=|=.*SHELL=)' $(srcdir)/tests/*.test;
then \
echo 'Rewrite "$$MAKE foo=bar SHELL=/bin/sh" as "foo=bar $$MAKE -e
SHELL=/bin/sh"' 1>&2; \
echo ' in the above lines, it is more portable.' 1>&2; \
exit 1; \
@@ -190,7 +190,7 @@ maintainer-check: automake aclocal
echo 'Use "$$MAKE -e SHELL=/bin/sh" in the above lines.' 1>&2; \
exit 1; \
fi
- @if egrep 'SHELL=.*\$$MAKE' $(srcdir)/tests/*.test; then \
+ @if grep 'SHELL=.*\$$MAKE' $(srcdir)/tests/*.test; then \
echo '$$MAKE ignores the SHELL envvar, use "$$MAKE SHELL=/bin/sh" in'
1>&2; \
echo 'the above lines.' 1>&2; \
exit 1; \
@@ -198,7 +198,7 @@ maintainer-check: automake aclocal
## Never use `sleep 1' to create files with different timestamps.
## Use `sleep 2' instead. Some filesystems (e.g., Windows') have only
## a 2sec resolution.
- @if egrep '\bsleep +1\b' $(srcdir)/tests/*.test; then \
+ @if grep -E '\bsleep +1\b' $(srcdir)/tests/*.test; then \
echo 'Do not use "sleep 1" in the above tests. Use "sleep 2"
instead.' 1>&2; \
exit 1; \
fi
Index: lib/am/distdir.am
===================================================================
RCS file: /cvs/automake/automake/lib/am/distdir.am,v
retrieving revision 1.33
diff -p -u -r1.33 distdir.am
--- lib/am/distdir.am 17 May 2002 10:49:53 -0000 1.33
+++ lib/am/distdir.am 30 May 2002 05:50:37 -0000
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright 2001 Free Software Foundation, Inc.
+## Copyright (C) 2001, 2002 Free Software Foundation, Inc.
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@ -42,7 +42,7 @@ distdir: $(DISTFILES)
##
if %?TOPDIR_P%
if %?CK-NEWS%
- @if sed 15q $(srcdir)/NEWS | fgrep -e "$(VERSION)" >/dev/null; \
+ @if sed 15q $(srcdir)/NEWS | grep -F -e "$(VERSION)" >/dev/null; \
then :; else \
echo "NEWS not updated; not releasing" 1>&2; \
exit 1; \
@@ -142,7 +142,7 @@ endif %?SUBDIRS%
##
if %?DIST-TARGETS%
$(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="${top_distdir}" distdir="$(distdir)" \
+ top_distdir="$(top_distdir)" distdir="$(distdir)" \
%DIST-TARGETS%
endif %?DIST-TARGETS%
##
Index: lib/am/texinfos.am
===================================================================
RCS file: /cvs/automake/automake/lib/am/texinfos.am,v
retrieving revision 1.91
diff -p -u -r1.91 texinfos.am
--- lib/am/texinfos.am 2 Oct 2001 16:00:04 -0000 1.91
+++ lib/am/texinfos.am 30 May 2002 05:50:37 -0000
@@ -1,5 +1,6 @@
## automake - create Makefile.in from Makefile.am
-## Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+
+## Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
## Free Software Foundation, Inc.
## This program is free software; you can redistribute it and/or modify
@@ -127,11 +128,11 @@ install-info-am: $(INFO_DEPS)
## prints version info to stderr.
##
## Do not use
-## install-info --version 2>&1 | sed 1q | fgrep -s -v -i debian
-## as if install-info does not exist, fgrep -v will be happy, and
+## install-info --version 2>&1 | sed 1q | grep -s -v -i debian
+## as if install-info does not exist, grep -v will be happy, and
## therefore the code will be triggered although install-info is missing.
@if (install-info --version && \
- install-info --version | fgrep -i -v debian) >/dev/null 2>&1; then
\
+ install-info --version | grep -i -v debian) >/dev/null 2>&1; then \
list='$(INFO_DEPS)'; \
for file in $$list; do \
## Run `:' after install-info in case install-info fails. We really
@@ -167,7 +168,7 @@ uninstall-info-am:
## NORMAL_UNINSTALL correctly. Debian install-info v1.8.3 prints
## version info to stderr.
@if (install-info --version && \
- install-info --version | fgrep -i -v debian) >/dev/null 2>&1; then
\
+ install-info --version | grep -i -v debian) >/dev/null 2>&1; then \
list='$(INFO_DEPS)'; \
for file in $$list; do \
## install-info needs the actual info file. We use the installed one,
Index: m4/make.m4
===================================================================
RCS file: /cvs/automake/automake/m4/make.m4,v
retrieving revision 1.9
diff -p -u -r1.9 make.m4
--- m4/make.m4 12 Nov 2001 08:55:52 -0000 1.9
+++ m4/make.m4 30 May 2002 05:50:37 -0000
@@ -1,4 +1,6 @@
-# Copyright 2001 Free Software Foundation, Inc. -*- Autoconf -*-
+# Check to see how 'make' treats includes. -*- Autoconf -*-
+
+# Copyright (C) 2001, 2002 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -38,7 +40,7 @@ echo "include confinc" > confmf
# In particular we don't look at `^make:' because GNU make might
# be invoked under some other name (usually "gmake"), in which
# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" =
"done"; then
+if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" =
"done"; then
am__include=include
am__quote=
_am_result=GNU
Index: tests/aclocali.test
===================================================================
RCS file: /cvs/automake/automake/tests/aclocali.test,v
retrieving revision 1.1
diff -p -u -r1.1 aclocali.test
--- tests/aclocali.test 16 Feb 1998 07:15:11 -0000 1.1
+++ tests/aclocali.test 30 May 2002 05:50:37 -0000
@@ -22,4 +22,4 @@ $ACLOCAL -I macros || exit 1
$AUTOMAKE || exit 1
-fgrep quux.m4 Makefile.in
+$FGREP quux.m4 Makefile.in
Index: tests/acoutput2.test
===================================================================
RCS file: /cvs/automake/automake/tests/acoutput2.test,v
retrieving revision 1.4
diff -p -u -r1.4 acoutput2.test
--- tests/acoutput2.test 20 Oct 2001 11:17:16 -0000 1.4
+++ tests/acoutput2.test 30 May 2002 05:50:37 -0000
@@ -20,7 +20,7 @@ mkdir subdir
$ACLOCAL || exit 1
$AUTOMAKE || exit 1
-count=`fgrep foo.in Makefile.in | wc -l`
+count=`$FGREP foo.in Makefile.in | wc -l`
test $count -eq 2 || exit 1
# This ought to work as well.
Index: tests/all.test
===================================================================
RCS file: /cvs/automake/automake/tests/all.test,v
retrieving revision 1.3
diff -p -u -r1.3 all.test
--- tests/all.test 20 Oct 2001 11:17:16 -0000 1.3
+++ tests/all.test 30 May 2002 05:50:37 -0000
@@ -11,6 +11,6 @@ for target in all install-exec install-d
$ACLOCAL || exit 1
$AUTOMAKE || exit 1
- fgrep "${target}-local ${target}-local" Makefile.in && exit 1
+ $FGREP "${target}-local ${target}-local" Makefile.in && exit 1
done
exit 0
Index: tests/ansi.test
===================================================================
RCS file: /cvs/automake/automake/tests/ansi.test,v
retrieving revision 1.6
diff -p -u -r1.6 ansi.test
--- tests/ansi.test 20 Oct 2001 11:17:16 -0000 1.6
+++ tests/ansi.test 30 May 2002 05:50:37 -0000
@@ -21,5 +21,5 @@ END
$ACLOCAL || exit 1
$AUTOMAKE || exit 1
-fgrep -v @SET_MAKE@ Makefile.in > Makefile.sed
+$FGREP -v @SET_MAKE@ Makefile.in > Makefile.sed
$MAKE -s -f Makefile.sed SHELL=/bin/sh magic | grep 'ansi2knr\.c'
Index: tests/ansi4.test
===================================================================
RCS file: /cvs/automake/automake/tests/ansi4.test,v
retrieving revision 1.2
diff -p -u -r1.2 ansi4.test
--- tests/ansi4.test 9 Apr 2001 14:50:51 -0000 1.2
+++ tests/ansi4.test 30 May 2002 05:50:37 -0000
@@ -24,4 +24,4 @@ END
$ACLOCAL || exit 1
$AUTOMAKE || exit 1
-fgrep 'ansi2knr.$(' Makefile.in || exit 1
+$FGREP 'ansi2knr.$(' Makefile.in || exit 1
Index: tests/colon3.test
===================================================================
RCS file: /cvs/automake/automake/tests/colon3.test,v
retrieving revision 1.9
diff -p -u -r1.9 colon3.test
--- tests/colon3.test 28 Oct 2001 14:00:28 -0000 1.9
+++ tests/colon3.test 30 May 2002 05:50:37 -0000
@@ -26,8 +26,8 @@ test -f zardoz.in || exit 1
# never just "zardoz" -- except the actual automake invocation can
# refer to it (don't ask).
echo Grep1
-grep zardoz zardoz.in | fgrep -v 'zardoz.in' | fgrep -v 'zardoz.am' \
- | fgrep -v AUTOMAKE > O
+grep zardoz zardoz.in | $FGREP -v 'zardoz.in' | $FGREP -v 'zardoz.am' \
+ | $FGREP -v AUTOMAKE > O
# We cat the output file so we see in when verbose.
cat O
test -z "`cat O`" || exit 1
Index: tests/cond21.test
===================================================================
RCS file: /cvs/automake/automake/tests/cond21.test,v
retrieving revision 1.1
diff -p -u -r1.1 cond21.test
--- tests/cond21.test 6 May 2002 06:51:05 -0000 1.1
+++ tests/cond21.test 30 May 2002 05:50:37 -0000
@@ -61,5 +61,5 @@ $ACLOCAL
$AUTOCONF
$AUTOMAKE -a
./configure
-$MAKE test | fgrep 'BAR: bar12 bar bar3 :BAR'
-$MAKE test | fgrep 'FOO: foo foo1 foo1b foo2 :FOO'
+$MAKE test | $FGREP 'BAR: bar12 bar bar3 :BAR'
+$MAKE test | $FGREP 'FOO: foo foo1 foo1b foo2 :FOO'
Index: tests/condlib.test
===================================================================
RCS file: /cvs/automake/automake/tests/condlib.test,v
retrieving revision 1.2
diff -p -u -r1.2 condlib.test
--- tests/condlib.test 9 Apr 2001 14:50:51 -0000 1.2
+++ tests/condlib.test 30 May 2002 05:50:37 -0000
@@ -24,5 +24,5 @@ END
$ACLOCAL || exit 1
$AUTOMAKE || exit 1
-fgrep librsaref.a.c Makefile.in && exit 1
+$FGREP librsaref.a.c Makefile.in && exit 1
exit 0
Index: tests/confh4.test
===================================================================
RCS file: /cvs/automake/automake/tests/confh4.test,v
retrieving revision 1.9
diff -p -u -r1.9 confh4.test
--- tests/confh4.test 20 Oct 2001 11:15:55 -0000 1.9
+++ tests/confh4.test 30 May 2002 05:50:37 -0000
@@ -27,4 +27,4 @@ mkdir include
$ACLOCAL || exit 1
$AUTOMAKE || exit 1
-egrep '^DEFAULT_INCLUDES =.* -I(\.|\$\(top_builddir\))/include' Makefile.in
+$EGREP '^DEFAULT_INCLUDES =.* -I(\.|\$\(top_builddir\))/include' Makefile.in
Index: tests/confsub.test
===================================================================
RCS file: /cvs/automake/automake/tests/confsub.test,v
retrieving revision 1.18
diff -p -u -r1.18 confsub.test
--- tests/confsub.test 7 Apr 2002 21:35:02 -0000 1.18
+++ tests/confsub.test 30 May 2002 05:50:37 -0000
@@ -29,16 +29,16 @@ $AUTOMAKE || exit 1
# One line is allowed though:
#
# cd $(top_builddir) && $(SHELL) ./config.status subdir/config.h
-(fgrep 'subdir/config.h' subdir/Makefile.in |
- fgrep -v 'cd $(top_builddir)') && exit 1
+($FGREP 'subdir/config.h' subdir/Makefile.in |
+ $FGREP -v 'cd $(top_builddir)') && exit 1
$AUTOCONF || exit 1
./configure || exit 1
-fgrep 'Before.' subdir/config.h
+$FGREP 'Before.' subdir/config.h
sleep 2
echo 'After.' > subdir/config.hin
$MAKE || exit 1
-fgrep 'After.' subdir/config.h || exit 1
+$FGREP 'After.' subdir/config.h || exit 1
exit 0
Index: tests/cxxansi.test
===================================================================
RCS file: /cvs/automake/automake/tests/cxxansi.test,v
retrieving revision 1.3
diff -p -u -r1.3 cxxansi.test
--- tests/cxxansi.test 24 Oct 2001 09:04:18 -0000 1.3
+++ tests/cxxansi.test 30 May 2002 05:50:37 -0000
@@ -25,7 +25,7 @@ END
$ACLOCAL || exit 1
$AUTOMAKE || exit 1
-fgrep 'jane$U' Makefile.in && exit 1
-fgrep 'doe$U' Makefile.in || exit 1
+$FGREP 'jane$U' Makefile.in && exit 1
+$FGREP 'doe$U' Makefile.in || exit 1
exit 0
Index: tests/cxxo.test
===================================================================
RCS file: /cvs/automake/automake/tests/cxxo.test,v
retrieving revision 1.3
diff -p -u -r1.3 cxxo.test
--- tests/cxxo.test 9 Apr 2001 14:50:51 -0000 1.3
+++ tests/cxxo.test 30 May 2002 05:50:37 -0000
@@ -17,4 +17,4 @@ END
$ACLOCAL || exit 1
$AUTOMAKE || exit 1
-fgrep 'doe.$(OBJEXT)' Makefile.in
+$FGREP 'doe.$(OBJEXT)' Makefile.in
Index: tests/defs
===================================================================
RCS file: /cvs/automake/automake/tests/defs,v
retrieving revision 1.48
diff -p -u -r1.48 defs
--- tests/defs 22 May 2002 09:50:54 -0000 1.48
+++ tests/defs 30 May 2002 05:50:37 -0000
@@ -127,6 +127,23 @@ esac
# generated for the tests do not use the installed tools.
export AUTOMAKE ACLOCAL
+# POSIX no longer requires 'egrep' and 'fgrep',
+# but some hosts lack 'grep -E' and 'grep -F'.
+if test -z "$EGREP"; then
+ if echo a | (grep -E '(a|b)') >/dev/null 2>&1; then
+ EGREP='grep -E'
+ else
+ EGREP='egrep'
+ fi
+fi
+if test -z "$FGREP"; then
+ if echo 'ab*c' | (grep -F 'ab*c') >/dev/null 2>&1; then
+ FGREP='grep -F'
+ else
+ FGREP='fgrep'
+ fi
+fi
+
# The tests call `make -e' but we do not want $srcdir from the evironment
# to override the definition from the Makefile.
testsrcdir=$srcdir
Index: tests/depend4.test
===================================================================
RCS file: /cvs/automake/automake/tests/depend4.test,v
retrieving revision 1.1
diff -p -u -r1.1 depend4.test
--- tests/depend4.test 29 Jun 2001 06:55:25 -0000 1.1
+++ tests/depend4.test 30 May 2002 05:50:37 -0000
@@ -19,7 +19,7 @@ END
$AUTOMAKE || exit 1
- egrep '^(@address@hidden@)*DEP_FILES = ' Makefile.in || exit 1
+ $EGREP '^(@address@hidden@)*DEP_FILES = ' Makefile.in || exit 1
done
exit 0
Index: tests/discover.test
===================================================================
RCS file: /cvs/automake/automake/tests/discover.test,v
retrieving revision 1.7
diff -p -u -r1.7 discover.test
--- tests/discover.test 12 Apr 2002 16:37:28 -0000 1.7
+++ tests/discover.test 30 May 2002 05:50:37 -0000
@@ -20,5 +20,5 @@ END
: > fsusage.c
$ACLOCAL || exit 1
-$AUTOMAKE 2>&1 | fgrep fsusage.c || exit 1
+$AUTOMAKE 2>&1 | $FGREP fsusage.c || exit 1
exit 0
Index: tests/distname.test
===================================================================
RCS file: /cvs/automake/automake/tests/distname.test,v
retrieving revision 1.2
diff -p -u -r1.2 distname.test
--- tests/distname.test 26 Dec 2001 08:22:05 -0000 1.2
+++ tests/distname.test 30 May 2002 05:50:37 -0000
@@ -29,5 +29,5 @@ $AUTOMAKE --include-deps --copy --add-mi
$MAKE dist
gunzip nonesuch-0.23.tar.gz
-(tar tf nonesuch-0.23.tar | fgrep './nonesuch-0.23/a.c') && exit 1
+(tar tf nonesuch-0.23.tar | $FGREP './nonesuch-0.23/a.c') && exit 1
exit 0
Index: tests/dup3.test
===================================================================
RCS file: /cvs/automake/automake/tests/dup3.test,v
retrieving revision 1.4
diff -p -u -r1.4 dup3.test
--- tests/dup3.test 26 Mar 2002 11:11:49 -0000 1.4
+++ tests/dup3.test 30 May 2002 05:50:37 -0000
@@ -17,4 +17,4 @@ END
# Strip all options from ACLOCAL, especially -I's.
ACLOCAL="`echo $ACLOCAL | sed -e 's/ -.*$//'` --acdir=$testsrcdir/../m4"
$ACLOCAL -I zoo || exit 1
-fgrep zardoz aclocal.m4
+$FGREP zardoz aclocal.m4
Index: tests/empty4.test
===================================================================
RCS file: /cvs/automake/automake/tests/empty4.test,v
retrieving revision 1.2
diff -p -u -r1.2 empty4.test
--- tests/empty4.test 9 Apr 2001 14:50:51 -0000 1.2
+++ tests/empty4.test 30 May 2002 05:50:37 -0000
@@ -20,5 +20,5 @@ END
$ACLOCAL || exit 1
$AUTOMAKE || exit 1
-fgrep zoo. Makefile.in && exit 1
+$FGREP zoo. Makefile.in && exit 1
exit 0
Index: tests/fo.test
===================================================================
RCS file: /cvs/automake/automake/tests/fo.test,v
retrieving revision 1.4
diff -p -u -r1.4 fo.test
--- tests/fo.test 20 Oct 2001 11:17:17 -0000 1.4
+++ tests/fo.test 30 May 2002 05:50:37 -0000
@@ -19,4 +19,4 @@ END
$ACLOCAL || exit 1
$AUTOMAKE || exit 1
-fgrep 'doe.$(OBJEXT)' Makefile.in
+$FGREP 'doe.$(OBJEXT)' Makefile.in
Index: tests/implicit.test
===================================================================
RCS file: /cvs/automake/automake/tests/implicit.test,v
retrieving revision 1.4
diff -p -u -r1.4 implicit.test
--- tests/implicit.test 9 Apr 2001 14:50:52 -0000 1.4
+++ tests/implicit.test 30 May 2002 05:50:37 -0000
@@ -16,4 +16,4 @@ END
$ACLOCAL || exit 1
$AUTOMAKE || exit 1
-grep '^libapp_1_OBJECTS' Makefile.in | fgrep '.$(OBJEXT)'
+grep '^libapp_1_OBJECTS' Makefile.in | $FGREP '.$(OBJEXT)'
Index: tests/insh2.test
===================================================================
RCS file: /cvs/automake/automake/tests/insh2.test,v
retrieving revision 1.5
diff -p -u -r1.5 insh2.test
--- tests/insh2.test 20 Oct 2001 11:17:17 -0000 1.5
+++ tests/insh2.test 30 May 2002 05:50:37 -0000
@@ -13,5 +13,5 @@ END
$ACLOCAL || exit 1
$AUTOMAKE || exit 1
-fgrep -v @SET_MAKE@ Makefile.in > Makefile.sed
+$FGREP -v @SET_MAKE@ Makefile.in > Makefile.sed
$MAKE -s -f Makefile.sed SHELL=/bin/sh magic | grep install-sh
Index: tests/interp.test
===================================================================
RCS file: /cvs/automake/automake/tests/interp.test,v
retrieving revision 1.4
diff -p -u -r1.4 interp.test
--- tests/interp.test 9 Apr 2001 14:50:52 -0000 1.4
+++ tests/interp.test 30 May 2002 05:50:37 -0000
@@ -17,4 +17,4 @@ END
$ACLOCAL || exit 1
$AUTOMAKE || exit 1
-fgrep 'z.$(OBJEXT)' Makefile.in
+$FGREP 'z.$(OBJEXT)' Makefile.in
Index: tests/lex.test
===================================================================
RCS file: /cvs/automake/automake/tests/lex.test,v
retrieving revision 1.8
diff -p -u -r1.8 lex.test
--- tests/lex.test 21 Oct 2001 18:03:20 -0000 1.8
+++ tests/lex.test 30 May 2002 05:50:37 -0000
@@ -21,11 +21,11 @@ $AUTOMAKE || exit 1
# Test to make sure that lex source generates correct target.
-fgrep '$(LEX)' Makefile.in || exit 1
+$FGREP '$(LEX)' Makefile.in || exit 1
# Test to make sure that lex source generates correct clean rule.
# From Ralf Corsepius.
-fgrep joel Makefile.in && exit 1
+$FGREP joel Makefile.in && exit 1
exit 0
Index: tests/lex3.test
===================================================================
RCS file: /cvs/automake/automake/tests/lex3.test,v
retrieving revision 1.6
diff -p -u -r1.6 lex3.test
--- tests/lex3.test 26 Dec 2001 08:22:06 -0000 1.6
+++ tests/lex3.test 30 May 2002 05:50:37 -0000
@@ -66,4 +66,4 @@ $MAKE distcheck
# foo.c must be shipped.
gunzip am_lex_bug-0.1.1.tar.gz
-tar tf am_lex_bug-0.1.1.tar | fgrep foo.c
+tar tf am_lex_bug-0.1.1.tar | $FGREP foo.c
Index: tests/lex4.test
===================================================================
RCS file: /cvs/automake/automake/tests/lex4.test,v
retrieving revision 1.2
diff -p -u -r1.2 lex4.test
--- tests/lex4.test 9 Apr 2001 14:50:52 -0000 1.2
+++ tests/lex4.test 30 May 2002 05:50:37 -0000
@@ -21,4 +21,4 @@ END
$ACLOCAL || exit 1
$AUTOMAKE || exit 1
-fgrep joe.Po Makefile.in
+$FGREP joe.Po Makefile.in
Index: tests/libobj5.test
===================================================================
RCS file: /cvs/automake/automake/tests/libobj5.test,v
retrieving revision 1.3
diff -p -u -r1.3 libobj5.test
--- tests/libobj5.test 9 Apr 2001 14:50:52 -0000 1.3
+++ tests/libobj5.test 30 May 2002 05:50:37 -0000
@@ -20,4 +20,4 @@ END
$ACLOCAL || exit 1
$AUTOMAKE || exit 1
-fgrep foo.c Makefile.in
+$FGREP foo.c Makefile.in
Index: tests/libobj7.test
===================================================================
RCS file: /cvs/automake/automake/tests/libobj7.test,v
retrieving revision 1.8
diff -p -u -r1.8 libobj7.test
--- tests/libobj7.test 28 Oct 2001 14:00:28 -0000 1.8
+++ tests/libobj7.test 30 May 2002 05:50:37 -0000
@@ -33,4 +33,4 @@ sed -n -e ': again
n
s/^/DIST_COMMON/
b again
- }' < Makefile.in | fgrep dirname.c
+ }' < Makefile.in | $FGREP dirname.c
Index: tests/make.test
===================================================================
RCS file: /cvs/automake/automake/tests/make.test,v
retrieving revision 1.6
diff -p -u -r1.6 make.test
--- tests/make.test 22 Feb 2002 17:31:06 -0000 1.6
+++ tests/make.test 30 May 2002 05:50:37 -0000
@@ -33,12 +33,12 @@ save="$MAKE"
for flag in '' -w; do
MAKE="$save $flag" ./configure
- fgrep 'am__include = include' Makefile
+ $FGREP 'am__include = include' Makefile
touch configure.in
$MAKE $flag
- fgrep 'am__include = include' Makefile
+ $FGREP 'am__include = include' Makefile
rm -f config.cache
done
Index: tests/makevars.test
===================================================================
RCS file: /cvs/automake/automake/tests/makevars.test,v
retrieving revision 1.3
diff -p -u -r1.3 makevars.test
--- tests/makevars.test 26 Jan 2001 22:29:42 -0000 1.3
+++ tests/makevars.test 30 May 2002 05:50:37 -0000
@@ -14,6 +14,6 @@ $ACLOCAL || exit 1
$AUTOMAKE || exit 1
# We are definitely not needing a compiler or preprocessor.
-egrep '^(CC|CPP|CXX|CXXCPP) =' Makefile.in && exit 1
+$EGREP '^(CC|CPP|CXX|CXXCPP) =' Makefile.in && exit 1
exit 0
Index: tests/nostdinc.test
===================================================================
RCS file: /cvs/automake/automake/tests/nostdinc.test,v
retrieving revision 1.2
diff -p -u -r1.2 nostdinc.test
--- tests/nostdinc.test 9 Apr 2001 14:50:52 -0000 1.2
+++ tests/nostdinc.test 30 May 2002 05:50:37 -0000
@@ -17,5 +17,5 @@ END
$ACLOCAL || exit 1
$AUTOMAKE || exit 1
-fgrep -e '-I.' Makefile.in && exit 1
+$FGREP -e '-I.' Makefile.in && exit 1
exit 0
Index: tests/parse.test
===================================================================
RCS file: /cvs/automake/automake/tests/parse.test,v
retrieving revision 1.7
diff -p -u -r1.7 parse.test
--- tests/parse.test 21 Oct 2001 18:05:03 -0000 1.7
+++ tests/parse.test 30 May 2002 05:50:37 -0000
@@ -22,5 +22,5 @@ END
$ACLOCAL || exit 1
$AUTOMAKE || exit 1
-fgrep zar.cdoz Makefile.in && exit 1
+$FGREP zar.cdoz Makefile.in && exit 1
exit 0
Index: tests/pluseq.test
===================================================================
RCS file: /cvs/automake/automake/tests/pluseq.test,v
retrieving revision 1.2
diff -p -u -r1.2 pluseq.test
--- tests/pluseq.test 20 Oct 2001 11:17:17 -0000 1.2
+++ tests/pluseq.test 30 May 2002 05:50:37 -0000
@@ -14,4 +14,4 @@ END
$ACLOCAL || exit 1
$AUTOMAKE || exit 1
-fgrep 'zar doz' Makefile.in
+$FGREP 'zar doz' Makefile.in
Index: tests/pluseq4.test
===================================================================
RCS file: /cvs/automake/automake/tests/pluseq4.test,v
retrieving revision 1.2
diff -p -u -r1.2 pluseq4.test
--- tests/pluseq4.test 9 Apr 2001 14:50:52 -0000 1.2
+++ tests/pluseq4.test 30 May 2002 05:50:37 -0000
@@ -15,4 +15,4 @@ END
$ACLOCAL || exit 1
$AUTOMAKE || exit 1
-fgrep '@CC@ -Dwhatever' Makefile.in
+$FGREP '@CC@ -Dwhatever' Makefile.in
Index: tests/pluseq6.test
===================================================================
RCS file: /cvs/automake/automake/tests/pluseq6.test,v
retrieving revision 1.2
diff -p -u -r1.2 pluseq6.test
--- tests/pluseq6.test 20 Oct 2001 11:17:17 -0000 1.2
+++ tests/pluseq6.test 30 May 2002 05:50:37 -0000
@@ -14,7 +14,7 @@ END
$ACLOCAL || exit 1
$AUTOMAKE || exit 1
-fgrep '@mandir@ foo' Makefile.in || exit 1
+$FGREP '@mandir@ foo' Makefile.in || exit 1
num=`grep '^mandir =' Makefile.in | wc -l`
test $num -eq 1
Index: tests/pr2.test
===================================================================
RCS file: /cvs/automake/automake/tests/pr2.test,v
retrieving revision 1.8
diff -p -u -r1.8 pr2.test
--- tests/pr2.test 28 Oct 2001 14:00:28 -0000 1.8
+++ tests/pr2.test 30 May 2002 05:50:37 -0000
@@ -20,4 +20,4 @@ $AUTOMAKE || exit 1
# Look for mkinstalldirs invocation for the templ directory.
# We use the `[^/]' to avoid matching `templ/README.foo.in'.
-egrep 'mkinstalldirs.*templ([^/]|$)' Makefile.in
+$EGREP 'mkinstalldirs.*templ([^/]|$)' Makefile.in
Index: tests/pr9.test
===================================================================
RCS file: /cvs/automake/automake/tests/pr9.test,v
retrieving revision 1.7
diff -p -u -r1.7 pr9.test
--- tests/pr9.test 26 Dec 2001 08:22:06 -0000 1.7
+++ tests/pr9.test 30 May 2002 05:50:37 -0000
@@ -31,4 +31,4 @@ $MAKE distcheck || exit 1
gunzip pr9-0.tar.gz || exit 1
-tar tf pr9-0.tar | fgrep support
+tar tf pr9-0.tar | $FGREP support
Index: tests/seenc.test
===================================================================
RCS file: /cvs/automake/automake/tests/seenc.test,v
retrieving revision 1.4
diff -p -u -r1.4 seenc.test
--- tests/seenc.test 12 Apr 2002 16:37:28 -0000 1.4
+++ tests/seenc.test 30 May 2002 05:50:37 -0000
@@ -24,5 +24,5 @@ $ACLOCAL || exit 1
# output for this test, and we just want to make sure some of
# them are about CC and CXX being undefined.
$AUTOMAKE --Wno-error 2> err && exit 1
-fgrep CC err || exit 1
-fgrep CXX err || exit 1
+$FGREP CC err || exit 1
+$FGREP CXX err || exit 1
Index: tests/specflags.test
===================================================================
RCS file: /cvs/automake/automake/tests/specflags.test,v
retrieving revision 1.3
diff -p -u -r1.3 specflags.test
--- tests/specflags.test 9 Apr 2001 14:50:53 -0000 1.3
+++ tests/specflags.test 30 May 2002 05:50:37 -0000
@@ -30,6 +30,6 @@ grep 'COMPILE. [^-]' Makefile.in && exit
grep '[^-]foo\.o' Makefile.in && exit 1
# Regression test for missing space.
-fgrep ')-c' Makefile.in && exit 1
+$FGREP ')-c' Makefile.in && exit 1
exit 0
Index: tests/specflags3.test
===================================================================
RCS file: /cvs/automake/automake/tests/specflags3.test,v
retrieving revision 1.4
diff -p -u -r1.4 specflags3.test
--- tests/specflags3.test 27 Apr 2001 14:03:26 -0000 1.4
+++ tests/specflags3.test 30 May 2002 05:50:37 -0000
@@ -23,11 +23,11 @@ END
$ACLOCAL || exit 1
$AUTOMAKE || exit 1
-fgrep -e '-o foo-foo' Makefile.in || exit 1
+$FGREP -e '-o foo-foo' Makefile.in || exit 1
-fgrep 'foo.o.o' Makefile.in && exit 1
-fgrep 'foo.$(OBJEXT).$(OBJEXT)' Makefile.in && exit 1
+$FGREP 'foo.o.o' Makefile.in && exit 1
+$FGREP 'foo.$(OBJEXT).$(OBJEXT)' Makefile.in && exit 1
-fgrep '$(foo_CFLAGS)' Makefile.in || exit 1
+$FGREP '$(foo_CFLAGS)' Makefile.in || exit 1
exit 0
Index: tests/specflags6.test
===================================================================
RCS file: /cvs/automake/automake/tests/specflags6.test,v
retrieving revision 1.2
diff -p -u -r1.2 specflags6.test
--- tests/specflags6.test 2 Apr 2002 13:33:45 -0000 1.2
+++ tests/specflags6.test 30 May 2002 05:50:37 -0000
@@ -26,7 +26,7 @@ END
$ACLOCAL || exit 1
$AUTOMAKE || exit 1
-uncondval=`fgrep 'foo-foo.o: foo.c' Makefile.in`
+uncondval=`$FGREP 'foo-foo.o: foo.c' Makefile.in`
cat >> Makefile.am << 'END'
foo_SOURCES += $(BAR_SRCS)
@@ -34,6 +34,6 @@ END
$AUTOMAKE || exit 1
-condval=`fgrep 'foo-foo.o: foo.c' Makefile.in`
+condval=`$FGREP 'foo-foo.o: foo.c' Makefile.in`
test "x$uncondval" = "x$condval"
Index: tests/subobj.test
===================================================================
RCS file: /cvs/automake/automake/tests/subobj.test,v
retrieving revision 1.5
diff -p -u -r1.5 subobj.test
--- tests/subobj.test 9 Apr 2001 14:50:53 -0000 1.5
+++ tests/subobj.test 30 May 2002 05:50:37 -0000
@@ -20,7 +20,7 @@ END
$ACLOCAL || exit 1
$AUTOMAKE || exit 1
-fgrep 'generic/a.$(OBJEXT)' Makefile.in || exit 1
+$FGREP 'generic/a.$(OBJEXT)' Makefile.in || exit 1
grep '[^/]a\.\$(OBJEXT)' Makefile.in && exit 1
# Opportunistically test for a different bug.
Index: tests/subobj2.test
===================================================================
RCS file: /cvs/automake/automake/tests/subobj2.test,v
retrieving revision 1.3
diff -p -u -r1.3 subobj2.test
--- tests/subobj2.test 9 Apr 2001 14:50:53 -0000 1.3
+++ tests/subobj2.test 30 May 2002 05:50:37 -0000
@@ -19,6 +19,6 @@ END
$ACLOCAL || exit 1
$AUTOMAKE || exit 1
-fgrep 'generic/a.$(OBJEXT)' Makefile.in || exit 1
+$FGREP 'generic/a.$(OBJEXT)' Makefile.in || exit 1
grep '[^/]a\.\$(OBJEXT)' Makefile.in && exit 1
-fgrep -e '-c -o' Makefile.in
+$FGREP -e '-c -o' Makefile.in
Index: tests/suffix3.test
===================================================================
RCS file: /cvs/automake/automake/tests/suffix3.test,v
retrieving revision 1.4
diff -p -u -r1.4 suffix3.test
--- tests/suffix3.test 8 Nov 2001 15:25:58 -0000 1.4
+++ tests/suffix3.test 30 May 2002 05:50:37 -0000
@@ -21,8 +21,8 @@ $AUTOMAKE || exit 1
# The foo.cc intermediate step is implicit, it's a mistake if
# Automake requires this file somewhere.
-fgrep foo.cc Makefile.in && exit 1
+$FGREP foo.cc Makefile.in && exit 1
# However Automake must figure that foo.zoo is eventually
# transformed into foo.o, and use this latter file (to link foo).
-fgrep 'foo.$(OBJEXT)' Makefile.in || exit 1
+$FGREP 'foo.$(OBJEXT)' Makefile.in || exit 1
exit 0
Index: tests/texinfo.test
===================================================================
RCS file: /cvs/automake/automake/tests/texinfo.test,v
retrieving revision 1.6
diff -p -u -r1.6 texinfo.test
--- tests/texinfo.test 20 Oct 2001 11:17:17 -0000 1.6
+++ tests/texinfo.test 30 May 2002 05:50:37 -0000
@@ -17,5 +17,5 @@ echo '@setfilename textutils.info' > tex
$ACLOCAL || exit 1
$AUTOMAKE || exit 1
-fgrep -v @SET_MAKE@ Makefile.in > Makefile.sed
+$FGREP -v @SET_MAKE@ Makefile.in > Makefile.sed
$MAKE -s -f Makefile.sed SHELL=/bin/sh magic | grep 'texinfo\.tex'
Index: tests/texinfo6.test
===================================================================
RCS file: /cvs/automake/automake/tests/texinfo6.test,v
retrieving revision 1.2
diff -p -u -r1.2 texinfo6.test
--- tests/texinfo6.test 20 Oct 2001 11:17:18 -0000 1.2
+++ tests/texinfo6.test 30 May 2002 05:50:37 -0000
@@ -13,4 +13,4 @@ echo '@setfilename foo.info' > foo.txi
$ACLOCAL || exit 1
$AUTOMAKE || exit 1
-fgrep '.txi.info' Makefile.in
+$FGREP '.txi.info' Makefile.in
Index: tests/texinfo8.test
===================================================================
RCS file: /cvs/automake/automake/tests/texinfo8.test,v
retrieving revision 1.9
diff -p -u -r1.9 texinfo8.test
--- tests/texinfo8.test 28 Oct 2001 14:00:28 -0000 1.9
+++ tests/texinfo8.test 30 May 2002 05:50:37 -0000
@@ -29,7 +29,7 @@ END
$ACLOCAL || exit 1
$AUTOMAKE -a || exit 1
-fgrep -v @SET_MAKE@ sub/Makefile.in > sub/Makefile.sed
+$FGREP -v @SET_MAKE@ sub/Makefile.in > sub/Makefile.sed
test -f sub/texinfo.tex &&
$MAKE -s -f sub/Makefile.sed SHELL=/bin/sh magic | grep 'texinfo\.tex'
stat=$?
Index: tests/vtexi.test
===================================================================
RCS file: /cvs/automake/automake/tests/vtexi.test,v
retrieving revision 1.9
diff -p -u -r1.9 vtexi.test
--- tests/vtexi.test 20 Oct 2001 11:17:18 -0000 1.9
+++ tests/vtexi.test 30 May 2002 05:50:37 -0000
@@ -34,8 +34,8 @@ grep '^textutils\.info: textutils\.texi
# When running the first version of configure.ac aware automake,
# @CONFIGURE_AC@ was not properly substitued.
-egrep '^\$\(srcdir\)/stamp-vti:.*textutils\.texi( .*)?$' Makefile.in
-egrep '^\$\(srcdir\)/stamp-vti:.*\$\(top_srcdir\)/configure\.in( .*)?$'
Makefile.in
+$EGREP '^\$\(srcdir\)/stamp-vti:.*textutils\.texi( .*)?$' Makefile.in
+$EGREP '^\$\(srcdir\)/stamp-vti:.*\$\(top_srcdir\)/configure\.in( .*)?$'
Makefile.in
# Check that the path to mdate-sh is correct. Over escaping of `$'
Index: tests/yacc3.test
===================================================================
RCS file: /cvs/automake/automake/tests/yacc3.test,v
retrieving revision 1.3
diff -p -u -r1.3 yacc3.test
--- tests/yacc3.test 24 Jun 2001 03:38:27 -0000 1.3
+++ tests/yacc3.test 30 May 2002 05:50:37 -0000
@@ -21,7 +21,7 @@ END
$ACLOCAL || exit 1
$AUTOMAKE || exit 1
-fgrep -v @SET_MAKE@ Makefile.in > Makefile.sed
+$FGREP -v @SET_MAKE@ Makefile.in > Makefile.sed
# It should not be disted here
grep 'zardoz.h' Makefile.in && exit 1
Index: tests/yacc6.test
===================================================================
RCS file: /cvs/automake/automake/tests/yacc6.test,v
retrieving revision 1.2
diff -p -u -r1.2 yacc6.test
--- tests/yacc6.test 20 Oct 2001 11:15:56 -0000 1.2
+++ tests/yacc6.test 30 May 2002 05:50:37 -0000
@@ -30,5 +30,5 @@ END
$ACLOCAL || exit 1
$AUTOMAKE -a || exit 1
test -f ylwrap || exit 1
-fgrep '(srcdir)/ylwrap' sub/Makefile.in && exit 1
+$FGREP '(srcdir)/ylwrap' sub/Makefile.in && exit 1
exit 0
- Automake patch to not assume egrep or fgrep,
Paul Eggert <=