Re: JAVAROOT was already defined

[Alexandre Duret-Lutz]

>>> "Simon" == Simon Josefsson <address@hidden> writes:

[...]
 Simon> I don't understand the warning.  JAVAROOT appears to be documented as
 Simon> a user variable.  Am I not allowed to modify it?  
[...]

Thanks for the report.  I'm installing the following fix on HEAD
and branch-1-8.

2004-03-19  Alexandre Duret-Lutz  <address@hidden>

        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.

Index: NEWS
===================================================================
RCS file: /cvs/automake/automake/NEWS,v
retrieving revision 1.256.2.34
diff -u -r1.256.2.34 NEWS
--- NEWS        7 Mar 2004 18:10:08 -0000       1.256.2.34
+++ NEWS        19 Mar 2004 20:29:51 -0000
@@ -1,4 +1,8 @@
 Bugs fixed in 1.8.3a:
+
+* Bugs introduced by 1.8:
+
+  - Do not warn when JAVAROOT is overridden, this is legitimate.
 
 Bugs fixed in 1.8.3:
 
Index: lib/Automake/Variable.pm
===================================================================
RCS file: /cvs/automake/automake/lib/Automake/Variable.pm,v
retrieving revision 1.27.2.3
diff -u -r1.27.2.3 Variable.pm
--- lib/Automake/Variable.pm    29 Feb 2004 19:10:40 -0000      1.27.2.3
+++ lib/Automake/Variable.pm    19 Mar 2004 20:29:52 -0000
@@ -188,7 +188,8 @@
    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
Index: tests/java2.test
===================================================================
RCS file: /cvs/automake/automake/tests/java2.test,v
retrieving revision 1.4
diff -u -r1.4 java2.test
--- tests/java2.test    14 Nov 2003 21:25:58 -0000      1.4
+++ tests/java2.test    19 Mar 2004 20:29:52 -0000
@@ -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 @@
 
 $ACLOCAL
 $AUTOCONF
-$AUTOMAKE -Wno-override
+$AUTOMAKE
 ./configure
 $MAKE

-- 
Alexandre Duret-Lutz