Allow variable override of, rather than by, silent variables.
commitc2594bb50eb2c6f668513af07f8efafd17f37b0e
authorRalf Wildenhues <Ralf.Wildenhues@gmx.de>
Sun, 11 Oct 2009 11:33:43 +0000 (11 13:33 +0200)
committerRalf Wildenhues <Ralf.Wildenhues@gmx.de>
Sun, 11 Oct 2009 11:36:04 +0000 (11 13:36 +0200)
tree8063bd42cc84b0157067590476979ece41e384c7
parent734beb4363d4a8d503c7c0ceabc3297972b015ed
Allow variable override of, rather than by, silent variables.

When overriding variables, check the VAR_SILENT status of the
old condition, not the new one: we allow non-silent overrides
of silent variables (these do not hit ordering bugs in the
automake output), but there is no use case for doing so the
other way round.  Fixes conditional overrides of variables
annotated AM_SUBST_NOTMAKE in configure.ac.

* lib/Automake/Variable.pm (_check_ambiguous_condition): Check
for VAR_SILENT in $ambig_cond not $cond.
* tests/cond44.test, tests/cond45.test: New tests, analogous to
cond23.test and cond24.test.
* tests/Makefile.am: Update.
Spotted originally in binutils/bfd.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
ChangeLog
lib/Automake/Makefile.in
lib/Automake/Variable.pm
tests/Makefile.am
tests/Makefile.in
tests/cond44.test [new file with mode: 0755]
tests/cond45.test [new file with mode: 0755]