Patch: FYI: maintainer-check cleanups

[Tom Tromey]

I'm checking this in.

This fixes a maintainer-check problem introduced by my last patch,
plus one from somewhere else.  It also adds a new test to make sure
that generation of automake and aclocal doesn't fail if new
substitutions are added.

Tom

Index: ChangeLog
from  Tom Tromey  <address@hidden>
        * tests/subdircond3.test: Pass flags to make in environment.
        * tests/subdircond2.test: Pass flags to make in environment.
        * Makefile.am (maintainer-check): Add a new check for @...@
        substitutions.  Updated correct number of diffs between source and
        build trees.

Index: Makefile.am
===================================================================
RCS file: /cvs/automake/automake/Makefile.am,v
retrieving revision 1.200
diff -u -r1.200 Makefile.am
--- Makefile.am 15 Sep 2002 20:34:14 -0000 1.200
+++ Makefile.am 15 Sep 2002 20:44:43 -0000
@@ -87,7 +87,7 @@
 ## This check avoids accidental configure substitutions in the source.
 ## There are exactly 7 lines that should be modified.  This works out
 ## to 22 lines of diffs.
-       @if test `diff $(srcdir)/automake.in automake | wc -l` -ne 28; then \
+       @if test `diff $(srcdir)/automake.in automake | wc -l` -ne 24; then \
          echo "found too many diffs between automake.in and automake"; 1>&2; \
          diff -c $(srcdir)/automake.in automake; \
          exit 1; \
@@ -239,6 +239,17 @@
        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
+## Try to make sure all @...@ substitutions are covered by our
+## substitution rule.
+       @if test `grep -E '@[A-Za-z_0-9]+@' aclocal | wc -l` -ne 0; then \
+         echo "Unresolved @...@ substitution in aclocal" 1>&2; \
+         exit 1; \
+       fi
+## In automake there are a few valid ones.
+       @if test `grep -E '@[A-Za-z_0-9]+@' automake | wc -l` -ne 4; then \
+         echo "Unresolved @...@ substitution in aclocal" 1>&2; \
          exit 1; \
        fi
 
Index: tests/subdircond2.test
===================================================================
RCS file: /cvs/automake/automake/tests/subdircond2.test,v
retrieving revision 1.2
diff -u -r1.2 subdircond2.test
--- tests/subdircond2.test 8 Sep 2002 13:07:56 -0000 1.2
+++ tests/subdircond2.test 15 Sep 2002 20:44:44 -0000
@@ -91,5 +91,5 @@
 ./configure
 $MAKE distcheck
 test -f sanity1
-$MAKE DISTCHECK_CONFIGURE_FLAGS=want_opt=yes distcheck
+DISTCHECK_CONFIGURE_FLAGS=want_opt=yes $MAKE distcheck
 test -f sanity2
Index: tests/subdircond3.test
===================================================================
RCS file: /cvs/automake/automake/tests/subdircond3.test,v
retrieving revision 1.2
diff -u -r1.2 subdircond3.test
--- tests/subdircond3.test 8 Sep 2002 13:07:56 -0000 1.2
+++ tests/subdircond3.test 15 Sep 2002 20:44:44 -0000
@@ -92,5 +92,5 @@
 ./configure
 $MAKE distcheck
 test -f sanity1
-$MAKE DISTCHECK_CONFIGURE_FLAGS=want_opt=yes distcheck
+DISTCHECK_CONFIGURE_FLAGS=want_opt=yes $MAKE distcheck
 test -f sanity2