From 9651abe692e6b0c331dacca95180d4f9efd14c43 Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Fri, 19 Mar 2004 20:34:28 +0000 Subject: [PATCH] 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. --- ChangeLog | 7 +++++++ lib/Automake/Variable.pm | 3 ++- tests/java2.test | 4 ++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 551783f8..84fb9867 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2004-03-19 Alexandre Duret-Lutz + + 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 * automake.in (handle_texinfo_helper): Typos in comment. diff --git a/lib/Automake/Variable.pm b/lib/Automake/Variable.pm index 874339fb..332c5b44 100644 --- 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 76b922ea..f9e46e87 100755 --- 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 -- 2.43.5