no accidental config subs in automake

diff --git a/ChangeLog b/ChangeLog
index 676bd9e..4a97beb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 Sun Apr 27 11:03:36 1997  Tom Tromey  <tromey@cygnus.com>
 
+       * Makefile.am: Check to make sure there are no accidental
+       configure substitutions.
+
+       * automake.in (handle_texinfo): Don't allow configure substitution
+       on @MAKEINFO@ here.
+
        * automake.in (handle_yacc_lex_cxx): ._c and ._o files both depend
        on $(ANSI2KNR).
 

diff --git a/Makefile.am b/Makefile.am
index d4603bf..49d04d7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -51,6 +51,14 @@ perl4-check: automake aclocal
 # Some simple checks, and then ordinary check.  These are only really
 # guaranteed to work on my machine.
 maintainer-check: automake aclocal
+## This check avoids accidental configure substitutions in the source.
+## There are exactly 8 lines that should be modified.  This works out
+## to 24 lines of diffs.
+       @if test `diff automake.in automake | wc -l` -ne 24; then \
+         echo "found too many diffs between automake.in and automake"; 1>&2; \
+         diff -c automake.in automake; \
+         exit 1; \
+       fi
 ## Syntax check with default Perl (on my machine, Perl 5).
        $(PERL) -c -w automake
        $(PERL) -c -w aclocal

diff --git a/Makefile.in b/Makefile.in
index 486f34d..edc3741 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -510,6 +510,11 @@ perl4-check: automake aclocal
 # Some simple checks, and then ordinary check.  These are only really
 # guaranteed to work on my machine.
 maintainer-check: automake aclocal
+       @if test `diff automake.in automake | wc -l` -ne 24; then \
+         echo "found too many diffs between automake.in and automake"; 1>&2; \
+         diff -c automake.in automake; \
+         exit 1; \
+       fi
        $(PERL) -c -w automake
        $(PERL) -c -w aclocal
        @if test `fgrep '$${' $(srcdir)/[a-z]*.am | fgrep -v '$$$$' | wc -l` -ne 0; then \

diff --git a/automake.in b/automake.in
index 9b3b3ea..4a1e556 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -1943,7 +1943,9 @@ sub handle_texinfo
     # intimate knowledge of the structure of the texinfo distribution.
     &define_program_variable ('MAKEINFO', 'build', 'texinfo/makeinfo',
                              'makeinfo',
-                             '@MAKEINFO@');
+                             # Circumlocution to avoid accidental
+                             # configure substitution.
+                             '@MAKE' . 'INFO@');
     &define_program_variable ('TEXI2DVI', 'src', 'texinfo/util',
                              'texi2dvi');
 

diff --git a/lib/am/Makefile.am b/lib/am/Makefile.am
index d4603bf..49d04d7 100644 (file)
--- a/lib/am/Makefile.am
+++ b/lib/am/Makefile.am
@@ -51,6 +51,14 @@ perl4-check: automake aclocal
 # Some simple checks, and then ordinary check.  These are only really
 # guaranteed to work on my machine.
 maintainer-check: automake aclocal
+## This check avoids accidental configure substitutions in the source.
+## There are exactly 8 lines that should be modified.  This works out
+## to 24 lines of diffs.
+       @if test `diff automake.in automake | wc -l` -ne 24; then \
+         echo "found too many diffs between automake.in and automake"; 1>&2; \
+         diff -c automake.in automake; \
+         exit 1; \
+       fi
 ## Syntax check with default Perl (on my machine, Perl 5).
        $(PERL) -c -w automake
        $(PERL) -c -w aclocal