Overriding JAVAROOT is legitimate, do not warn about it.

* lib/Automake/Variable.pm (%_silent_variable_override): Add JAVAROOT.
* tests/java2.test: Run automake without -Wno-override.
Report from Simon Josefsson.

diff --git a/ChangeLog b/ChangeLog
index 551783f86145b60960bd510af5b4ef9a3ed5f98f..84fb986727321b789ccf32ac8402998df2314b53 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-03-19  Alexandre Duret-Lutz  <adl@gnu.org>
+
+       Overriding JAVAROOT is legitimate, do not warn about it.
+       * lib/Automake/Variable.pm (%_silent_variable_override): Add JAVAROOT.
+       * tests/java2.test: Run automake without -Wno-override.
+       Report from Simon Josefsson.
+
 2004-03-14  Alexandre Duret-Lutz  <adl@gnu.org>
 
        * automake.in (handle_texinfo_helper): Typos in comment.

diff --git a/lib/Automake/Variable.pm b/lib/Automake/Variable.pm
index 874339fbd5df4236b89db0d9f79501eb075688b8..332c5b44752e6d8d671ce3f1cbfc3ca62751db94 100644 (file)
--- a/lib/Automake/Variable.pm
+++ b/lib/Automake/Variable.pm
@@ -188,7 +188,8 @@ my %_silent_variable_override =
    AR => 1,
    ARFLAGS => 1,
    DEJATOOL => 1,
-   JAVAC => 1);
+   JAVAC => 1,
+   JAVAROOT => 1);
 
 # This hash records helper variables used to implement conditional '+='.
 # Keys have the form "VAR:CONDITIONS".  The value associated to a key is

diff --git a/tests/java2.test b/tests/java2.test
index 76b922eae77e1c4f0227cb33e1a32b0123285bfe..f9e46e879ff97808b8f6424bf6a3706d9e2fe9a4 100755 (executable)
--- a/tests/java2.test
+++ b/tests/java2.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2002, 2003  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2004  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -48,6 +48,6 @@ END
 
 $ACLOCAL
 $AUTOCONF
-$AUTOMAKE -Wno-override
+$AUTOMAKE
 ./configure
 $MAKE