+2001-05-05 Tom Tromey <tromey@redhat.com>
+
+ Fix bug reported by Robert Boehne:
+ * automake.in (output_lex_build_rule): Don't let AMDEP_TRUE be
+ substituted.
+ (handle_dependencies): Likewise.
+ * Makefile.am (maintainer-check): Look for AMDEP_TRUE
+ substitution. Correct diff now has 30 lines. Look for space
+ after losing `undef'.
+
2001-05-04 Peter Eisentraut <peter_e@gmx.net>
* m4/sanity.m4: Remove the temp file before possible error exits.
## 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 22; then \
+ @if test `diff $(srcdir)/automake.in automake | wc -l` -ne 30; then \
echo "found too many diffs between automake.in and automake"; 1>&2; \
diff -c $(srcdir)/automake.in automake; \
exit 1; \
exit 1; \
else :; fi
## We never want to use "undef", only "delete", but for $/.
- @if grep -n -w undef $(srcdir)/automake.in | \
+ @if grep -n -w 'undef ' $(srcdir)/automake.in | \
fgrep -v 'undef $$/'; then \
echo "Found undef in automake.in; use delete instead" 1>&2; \
exit 1; \
exit 1; \
;; \
esac
+## Don't let AMDEP_TRUE substitution appear in automake.in.
+ @if grep '@AMDEP''_TRUE@' $(srcdir)/automake.in; then \
+ echo "Don't put AMDEP_TRUE substitution in automake.in" 1>&2; \
+ exit 1; \
+ fi
# Tag before making distribution. Also, don't make a distribution if
# checks fail. Also, make sure the NEWS file is up-to-date.
# Some simple checks, and then ordinary check. These are only really
# guaranteed to work on my machine.
maintainer-check: automake aclocal
- @if test `diff $(srcdir)/automake.in automake | wc -l` -ne 22; then \
+ @if test `diff $(srcdir)/automake.in automake | wc -l` -ne 30; then \
echo "found too many diffs between automake.in and automake"; 1>&2; \
diff -c $(srcdir)/automake.in automake; \
exit 1; \
echo "Found incorrect use of mkinstalldirs in the lines above" 1>&2; \
exit 1; \
else :; fi
- @if grep -n -w undef $(srcdir)/automake.in | \
+ @if grep -n -w 'undef ' $(srcdir)/automake.in | \
fgrep -v 'undef $$/'; then \
echo "Found undef in automake.in; use delete instead" 1>&2; \
exit 1; \
exit 1; \
;; \
esac
+ @if grep '@AMDEP''_TRUE@' $(srcdir)/automake.in; then \
+ echo "Don't put AMDEP_TRUE substitution in automake.in" 1>&2; \
+ exit 1; \
+ fi
# Tag before making distribution. Also, don't make a distribution if
# checks fail. Also, make sure the NEWS file is up-to-date.
$output_rules .= "\n";
foreach my $iter (@deplist)
{
- $output_rules .= '@AMDEP_TRUE@@_am_include@ ' . $iter . "\n";
+ # The strange concatentation is used to avoid
+ # substitutions from our own configure.
+ $output_rules .= ('@AMDEP' . '_TRUE@@_am_include@ '
+ . $iter . "\n");
}
$output_rules .= &file_contents ('depend');
$output_rules .= "\n";
foreach my $iter (@deplist)
{
- $output_rules .= ('@AMDEP_TRUE@@_am_include@ @_am_quote@'
+ # The strange concatentation is used to avoid
+ # substitutions from our own configure.
+ $output_rules .= ('@AMDEP' . '_TRUE@@_am_include@ @_am_quote@'
. $iter . '@_am_quote@' . "\n");
}
echo "configure: warning: ${am_backtick}missing' script is too old or missing" 1>&2
fi
-for ac_prog in mawk gawk nawk awk
+for ac_prog in gawk mawk nawk awk
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
## 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 22; then \
+ @if test `diff $(srcdir)/automake.in automake | wc -l` -ne 30; then \
echo "found too many diffs between automake.in and automake"; 1>&2; \
diff -c $(srcdir)/automake.in automake; \
exit 1; \
exit 1; \
else :; fi
## We never want to use "undef", only "delete", but for $/.
- @if grep -n -w undef $(srcdir)/automake.in | \
+ @if grep -n -w 'undef ' $(srcdir)/automake.in | \
fgrep -v 'undef $$/'; then \
echo "Found undef in automake.in; use delete instead" 1>&2; \
exit 1; \
exit 1; \
;; \
esac
+## Don't let AMDEP_TRUE substitution appear in automake.in.
+ @if grep '@AMDEP''_TRUE@' $(srcdir)/automake.in; then \
+ echo "Don't put AMDEP_TRUE substitution in automake.in" 1>&2; \
+ exit 1; \
+ fi
# Tag before making distribution. Also, don't make a distribution if
# checks fail. Also, make sure the NEWS file is up-to-date.