FYI: maintainer-check for [ef]grep

[Alexandre Duret-Lutz]

This adds the check for fgrep and egrep in Maintainer-check.

Running maintainer-check I've also found I forgot to add
SHELL=/bin/sh in cond22.test.  I'll commit this second part
of the patch on branch-1-6 too.

Index: ChangeLog
===================================================================
RCS file: /cvs/automake/automake/ChangeLog,v
retrieving revision 1.1849
diff -u -r1.1849 ChangeLog
--- ChangeLog   31 May 2002 17:46:15 -0000      1.1849
+++ ChangeLog   31 May 2002 18:00:43 -0000
@@ -1,3 +1,9 @@
+2002-05-31  Alexandre Duret-Lutz  <address@hidden>
+
+       * Makefile.am (maintainer-check): Check for egrep and fgrep.
+
+       * test/cond22.test: Set SHELL when calling $MAKE -e.
+
 2002-05-31  Richard Boulton <address@hidden>
 
        Fix PR automake/326:
Index: Makefile.am
===================================================================
RCS file: /cvs/automake/automake/Makefile.am,v
retrieving revision 1.192
diff -u -r1.192 Makefile.am
--- Makefile.am 30 May 2002 05:51:33 -0000      1.192
+++ Makefile.am 31 May 2002 18:00:43 -0000
@@ -202,6 +202,15 @@
          echo 'Do not use "sleep 1" in the above tests.  Use "sleep 2" 
instead.' 1>&2; \
          exit 1; \
        fi
+## fgrep and egrep are not required by POSIX.
+       @if grep -E '\b[ef]grep\b' $(srcdir)/tests/*.test ; then \
+         echo 'Do not use egrep or fgrep in test cases.  Use $FGREP or 
$EGREP.' 1>&2; \
+         exit 1; \
+       fi
+       @if grep -E '\b[ef]grep\b' $(srcdir)/lib/am/*.am $(srcdir)/m4/*.m4; 
then \
+         echo 'Do not use egrep or fgrep in the above files, they are not 
portable.' 1>&2; \
+         exit 1; \
+       fi
 
 
 # Tag before making distribution.  Also, don't make a distribution if
Index: tests/cond22.test
===================================================================
RCS file: /cvs/automake/automake/tests/cond22.test,v
retrieving revision 1.1
diff -u -r1.1 cond22.test
--- tests/cond22.test   31 May 2002 17:46:22 -0000      1.1
+++ tests/cond22.test   31 May 2002 18:00:44 -0000
@@ -50,6 +50,6 @@
 $AUTOCONF
 $AUTOMAKE
 ./configure
-OBJEXT=oo $MAKE -e echo > output
+OBJEXT=oo $MAKE -e SHELL=/bin/sh echo > output
 cat output
 $FGREP 'BEG: one.oo two.oo three.oo three2.oo :END' output

-- 
Alexandre Duret-Lutz