From f7ef16feb40d3ea8b126ec29b31dae5cec31faf0 Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Fri, 10 May 2013 23:01:27 +0200 Subject: [PATCH] options: tiny simplification in dealing with erroneous opts * lib/Automake/Options.pm (_process_option_list): Here, when an invalid option is detected, there's no need to call &error with the "uniq_scope => US_GLOBAL" switch. In fact, if the same erroneous option 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 happens when "uniq_scope => US_GLOBAL" is used). Signed-off-by: Stefano Lattarini --- 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 d578c9bba..dcdc119af 100644 --- a/lib/Automake/Options.pm +++ b/lib/Automake/Options.pm @@ -384,8 +384,7 @@ sub _process_option_list (\%@) } elsif (! _is_valid_easy_option $_) { - error ($where, "option '$_' not recognized", - uniq_scope => US_GLOBAL); + error ($where, "option '$_' not recognized"); return 1; } } -- 2.47.2