* automake.in (check_gnu_standards): Use no-installman and

no-installinfo's locations.
(process_option_list): Fill %options with locations.
(check_cygnus) Fill $options{'no-installinfo'} and
$options{'no-dependencies'} with $cygnus_mode, so that it
remains a Location.
* tests/gnuwarn2.test: New file.
* tests/Makefile.am (TESTS): Add gnuwarn2.test.

diff --git a/ChangeLog b/ChangeLog
index c2fa937..99bd37d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2003-06-05  Alexandre Duret-Lutz  <adl@gnu.org>
+
+       * automake.in (check_gnu_standards): Use no-installman and
+       no-installinfo's locations.
+       (process_option_list): Fill %options with locations.
+       (check_cygnus) Fill $options{'no-installinfo'} and
+       $options{'no-dependencies'} with $cygnus_mode, so that it
+       remains a Location.
+       * tests/gnuwarn2.test: New file.
+       * tests/Makefile.am (TESTS): Add gnuwarn2.test.
+
 2003-06-04  Alexandre Duret-Lutz  <adl@gnu.org>
 
        * automake.in (process_option_list): Record the location

diff --git a/automake.in b/automake.in
index 177df8b..a50d627 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -1386,14 +1386,14 @@ sub process_option_list
 
   foreach (@list)
     {
-      $options{$_} = 1;
+      $options{$_} = $where;
       if ($_ eq 'gnits' || $_ eq 'gnu' || $_ eq 'foreign')
        {
          &set_strictness ($_);
        }
       elsif ($_ eq 'cygnus')
        {
-         $cygnus_mode = 1;
+         $cygnus_mode = $where;
        }
       elsif (/^(.*\/)?ansi2knr$/)
        {
@@ -5145,8 +5145,8 @@ sub check_cygnus
   return unless $cygnus_mode;
 
   &set_strictness ('foreign');
-  $options{'no-installinfo'} = 1;
-  $options{'no-dependencies'} = 1;
+  $options{'no-installinfo'} = $cygnus_mode;
+  $options{'no-dependencies'} = $cygnus_mode;
   $use_dependencies = 0;
 
   err_ac "`AM_MAINTAINER_MODE' required when --cygnus specified"
@@ -5172,8 +5172,8 @@ sub check_gnu_standards
 
   for my $opt ('no-installman', 'no-installinfo')
     {
-      msg_var ('error-gnu', 'AUTOMAKE_OPTIONS',
-              "option `$opt' disallowed by GNU standards")
+      msg ('error-gnu', $options{$opt},
+          "option `$opt' disallowed by GNU standards")
        if (defined $options{$opt});
     }
 }

diff --git a/tests/Makefile.am b/tests/Makefile.am
index c0da6c6..67bc094 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -205,6 +205,7 @@ getopt.test \
 gettext.test \
 gettext2.test \
 gnuwarn.test \
+gnuwarn2.test \
 gnits.test \
 gnits2.test \
 gnits3.test \

diff --git a/tests/Makefile.in b/tests/Makefile.in
index dec5c15..24cd08a 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -316,6 +316,7 @@ getopt.test \
 gettext.test \
 gettext2.test \
 gnuwarn.test \
+gnuwarn2.test \
 gnits.test \
 gnits2.test \
 gnits3.test \

diff --git a/tests/gnuwarn2.test b/tests/gnuwarn2.test
new file mode 100755 (executable)
index 0000000..bf3753b
--- /dev/null
+++ b/tests/gnuwarn2.test
@@ -0,0 +1,49 @@
+#! /bin/sh
+# Copyright (C) 2003  Free Software Foundation, Inc.
+#
+# This file is part of GNU Automake.
+#
+# GNU Automake is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# GNU Automake is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Automake; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
+# Check diagnostics about no-installman being disallowed in `gnu'.
+
+. ./defs || exit 1
+
+set -e
+
+cat > configure.in << 'END'
+AC_INIT([gnuwarn2], [1.0])
+AM_INIT_AUTOMAKE([no-installman])
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
+END
+
+# --gnu files
+: > NEWS
+: > README
+: > AUTHORS
+: > ChangeLog
+: > COPYING
+: > INSTSALL
+
+cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = gnu
+END
+
+$ACLOCAL
+$AUTOMAKE 2>stderr && exit 1
+cat stderr
+grep 'configure.in:2:.*no-installman' stderr