* lib/Automake/Options.pm (_process_option_list): Here, when an
incompatible version number option is detected, there's no need
to call error() with the "uniq_scope => US_GLOBAL" switch.
In fact, if the same incompatible version number is specified in
AUTOMAKE_OPTIONS in both (say) 'Makefile.am' and 'sub/Makefile.am',
we want each such erroneous usage reported separately, rather than
just the first time it is encountered (as we'd expect to happen
when "uniq_scope => US_GLOBAL" is used).
Ideally, this change should have been folded into the similar
commit 'v1.13.1d-129-gf7ef16f', but we noticed that too late.
Oh well.
Signed-off-by: Stefano Lattarini <stefano.lattar...@gmail.com>
---
lib/Automake/Options.pm | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/lib/Automake/Options.pm b/lib/Automake/Options.pm
index db5661c..fab33f3 100644
--- a/lib/Automake/Options.pm
+++ b/lib/Automake/Options.pm
@@ -379,8 +379,7 @@ sub _process_option_list (\%@)
# Got a version number.
if (Automake::Version::check ($VERSION, $&))
{
- error ($where, "require Automake $_, but have $VERSION",
- uniq_scope => US_GLOBAL);
+ error ($where, "require Automake $_, but have $VERSION");
$ret = 0;
}
}
--
1.8.3.rc0.19.g7e6a0cc
