diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | lib/Makefile.am | 2 | ||||
| -rw-r--r-- | m4/acinclude.m4 | 11 |
3 files changed, 19 insertions, 2 deletions
@@ -1,3 +1,11 @@ +2005-12-12 Dalibor Topic <robilad@kaffe.org> + + Fixes bug #25353 + * m4/acinclude.m4: Added JIKESWARNINGS makefile variable. + Only add +Pno-shadow to JIKESWARNINGS if not using jikes 1.19. + * lib/Makefile.am: Use JIKESWARNINGS instead of explicitely + listing the warnings. + 2005-12-12 Chris Burdess <dog@gnu.org> * gnu/xml/stream/SAXParser.java, diff --git a/lib/Makefile.am b/lib/Makefile.am index 255e26e92..f40bbd292 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -19,7 +19,7 @@ if FOUND_GCJ JAVAC = exit 1 else if FOUND_JIKES -JAVAC = $(JIKES) +Pno-shadow +Pno-switchcheck +F $(JIKESENCODING) -bootclasspath '' -extdirs '' -sourcepath '' --classpath $(compile_classpath) -d . @classes +JAVAC = $(JIKES) $(JIKESWARNINGS) +F $(JIKESENCODING) -bootclasspath '' -extdirs '' -sourcepath '' --classpath $(compile_classpath) -d . @classes else if FOUND_KJC ## FIXME: from what I can tell, kjc does not support a -encoding option. diff --git a/m4/acinclude.m4 b/m4/acinclude.m4 index e41321f89..96af881d5 100644 --- a/m4/acinclude.m4 +++ b/m4/acinclude.m4 @@ -135,9 +135,18 @@ AC_DEFUN([CLASSPATH_CHECK_JIKES], JIKESENCODING= if test -n "`$JIKES --help 2>&1 | grep encoding`"; then - JIKESENCODING='-encoding UTF-8' + JIKESENCODING='-encoding UTF-8' fi AC_SUBST(JIKESENCODING) + + JIKESWARNINGS="+Pno-switchcheck" + if test "x$JIKES_VERSION_MAJOR" = x"1" ; then + if ! test "x$JIKES_VERSION_MINOR" = x"19"; then + JIKESWARNINGS="$JIKESWARNINGS +Pno-shadow" + fi + fi + AC_SUBST(JIKESWARNINGS) + fi ]) |