diff options
| author | Tom Tromey <tromey@redhat.com> | 2005-06-17 19:32:12 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@redhat.com> | 2005-06-17 19:32:12 +0000 |
| commit | 59ce7aee94a42c2eed46e14bb6d071dd67f31199 (patch) | |
| tree | c1e4b68f6ba35e32f8a0804bae2a5916b504f74f | |
| parent | e7a61480c54b1c40ff62ced13e3a2f50a875183c (diff) | |
| download | classpath-59ce7aee94a42c2eed46e14bb6d071dd67f31199.tar.gz | |
* lib/Makefile.am (JAVAC): Use JIKESENCODING.
* m4/acinclude.m4 (CLASSPATH_CHECK_JIKES): Check for -encoding
option to jikes.
(JIKESENCODING): New subst.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | lib/Makefile.am | 2 | ||||
| -rw-r--r-- | m4/acinclude.m4 | 6 |
3 files changed, 14 insertions, 1 deletions
@@ -1,3 +1,10 @@ +2005-06-17 Tom Tromey <tromey@redhat.com> + + * lib/Makefile.am (JAVAC): Use JIKESENCODING. + * m4/acinclude.m4 (CLASSPATH_CHECK_JIKES): Check for -encoding + option to jikes. + (JIKESENCODING): New subst. + 2005-06-17 Keith Seitz <keiths@redhat.com> * gnu/classpath/jdwp/exception/VmDeadException.java: New file. diff --git a/lib/Makefile.am b/lib/Makefile.am index 747c391be..bb3f65cdb 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -22,7 +22,7 @@ JAVAC = $(GCJF) -C -d . @classes.standard \ && $(GCJF) -C -d . @classes.standardx else if FOUND_JIKES -JAVAC = $(JIKES) +Pno-shadow +Pno-switchcheck +F -encoding UTF-8 -bootclasspath '' -extdirs '' -sourcepath '' --classpath $(compile_classpath) -d . @classes +JAVAC = $(JIKES) +Pno-shadow +Pno-switchcheck +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 b8cef4f67..888adb076 100644 --- a/m4/acinclude.m4 +++ b/m4/acinclude.m4 @@ -157,6 +157,12 @@ AC_DEFUN([CLASSPATH_CHECK_JIKES], else AC_MSG_WARN($JIKES_VERSION: jikes 1.19 or higher required) fi + + JIKESENCODING= + if test -n "`$JIKES --help 2>&1 | grep encoding`"; then + JIKESENCODING='-encoding UTF-8' + fi + AC_SUBST(JIKESENCODING) fi ]) |