* aclocal.in (parse_arguments): Correctly recognize --print-ac-dir.

* tests/aclocal.test: Check --print-ac-dir and a unknown option.

diff --git a/ChangeLog b/ChangeLog
index bb64eb3..6398f30 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-11-09  Alexandre Duret-Lutz  <adl@gnu.org>
 
+       * aclocal.in (parse_arguments): Correctly recognize --print-ac-dir.
+       * tests/aclocal.test: Check --print-ac-dir and a unknown option.
+
        * aclocal.in (parse_arguments): Fix detection of unexisting default
        $(datadir)/aclocal.  Report from Akim.
 

diff --git a/aclocal.in b/aclocal.in
index 42672bf..336eaac 100644 (file)
--- a/aclocal.in
+++ b/aclocal.in
@@ -606,7 +606,7 @@ sub parse_arguments ()
      'force'           => \$force_output,
      'I=s'             => \@user_includes,
      'output=s'                => \$output_file,
-     'print_ac_dir'     => \$print_and_exit,
+     'print-ac-dir'     => \$print_and_exit,
      'verbose'         => sub { setup_channel 'verb', silent => 0; },
      'W|warnings:s'     => \&parse_warnings,
      );

diff --git a/tests/aclocal.test b/tests/aclocal.test
index df39fee..c73c821 100755 (executable)
--- a/tests/aclocal.test
+++ b/tests/aclocal.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 1998, 2001, 2002  Free Software Foundation, Inc.
+# Copyright (C) 1998, 2001, 2002, 2004  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -22,5 +22,12 @@
 # Alexandre Oliva.
 . ./defs || exit 1
 
-$ACLOCAL --output=fred || exit 1
+set -e
+
+$ACLOCAL --output=fred
 test -f fred
+
+$ACLOCAL --unknown-option 2>stderr && exit 1
+grep help stderr
+
+test "`$ACLOCAL --print-ac-dir`" = "$aclocaldir"