Re: FYI: distinguish user/automake/system aclocal include patch more clearly

[Alexandre Duret-Lutz]

Grumble.

2004-11-09  Alexandre Duret-Lutz  <address@hidden>

        * aclocal.in (parse_arguments): Correctly recognize --print-ac-dir.
        * tests/aclocal.test: Check --print-ac-dir and a unknown option.

Index: aclocal.in
===================================================================
RCS file: /cvs/automake/automake/aclocal.in,v
retrieving revision 1.114
diff -u -r1.114 aclocal.in
--- aclocal.in  9 Nov 2004 10:23:03 -0000       1.114
+++ aclocal.in  9 Nov 2004 20:23:03 -0000
@@ -606,7 +606,7 @@
      'force'           => \$force_output,
      'I=s'             => address@hidden,
      '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,
      );
Index: tests/aclocal.test
===================================================================
RCS file: /cvs/automake/automake/tests/aclocal.test,v
retrieving revision 1.5
diff -u -r1.5 aclocal.test
--- tests/aclocal.test  14 Nov 2003 21:25:58 -0000      1.5
+++ tests/aclocal.test  9 Nov 2004 20:23:03 -0000
@@ -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"

-- 
Alexandre Duret-Lutz