summaryrefslogtreecommitdiff
path: root/aclocal.in
diff options
context:
space:
mode:
authorAlexandre Duret-Lutz <adl@gnu.org>2004-11-22 00:03:29 +0000
committerAlexandre Duret-Lutz <adl@gnu.org>2004-11-22 00:03:29 +0000
commit1ec52bab864f7986fcc4e378c58ae0d49c8f0ee7 (patch)
tree1974ee6810bfca11186209a87dc57893d986040c /aclocal.in
parentd6da85a6a6ca544d90dadb95e136ee950322b753 (diff)
downloadautomake-1ec52bab864f7986fcc4e378c58ae0d49c8f0ee7.tar.gz
* aclocal.in (parse_arguments): Diagnose abbreviation ambiguous with
--help or --version. * automake.in (parse_arguments): Likewise. * tests/aclocal.test, tests/automake.test: Check this. Report from Eric Blake.
Diffstat (limited to 'aclocal.in')
-rw-r--r--aclocal.in7
1 files changed, 4 insertions, 3 deletions
diff --git a/aclocal.in b/aclocal.in
index 1f8583a68..5314ffe73 100644
--- a/aclocal.in
+++ b/aclocal.in
@@ -659,9 +659,10 @@ sub parse_arguments ()
or exit 1;
@ARGV = @ARGV_backup;
- # Now *really* process the options. This time we know
- # that --help and --version are not present.
- Getopt::Long::GetOptions %cli_options
+ # Now *really* process the options. This time we know that --help
+ # and --version are not present, but we specify them nonetheless so
+ # that ambiguous abbreviation are diagnosed.
+ Getopt::Long::GetOptions %cli_options, 'version' => sub {}, 'help' => sub {}
or exit 1;
if (@ARGV)