diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-05-11 10:25:33 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-05-11 10:35:27 +0200 |
| commit | f233bf8f277775f37b7dd4559af237d129231cbb (patch) | |
| tree | b3722e4ad0cf7565da899e69de77bb5918f43823 /lib/Automake | |
| parent | 9f21b55d38e8983090ce169969a2f8f1f6645583 (diff) | |
| download | automake-f233bf8f277775f37b7dd4559af237d129231cbb.tar.gz | |
options: tiny simplification in dealing with incompatible versions
* 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.lattarini@gmail.com>
Diffstat (limited to 'lib/Automake')
| -rw-r--r-- | lib/Automake/Options.pm | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/Automake/Options.pm b/lib/Automake/Options.pm index db5661cec..fab33f3a3 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; } } |