diff options
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2008-06-21 19:51:18 +0000 |
|---|---|---|
| committer | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2008-06-21 19:51:18 +0000 |
| commit | 0a724eb99cf49abfeb5f9b81fb4d39900cef2446 (patch) | |
| tree | 9efc61b01c737e8f7c13458310d59303f3a94089 /m4 | |
| parent | a7f344fa263c92a9e272cc9c33731eebbd0a3654 (diff) | |
| download | classpath-0a724eb99cf49abfeb5f9b81fb4d39900cef2446.tar.gz | |
2008-06-21 Andrew John Hughes <gnu_andrew@member.fsf.org>
* m4/ac_prog_java.m4:
Add CACAO and JamVM.
* m4/ac_prog_javac.m4:
Use variables to store warning options.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/ac_prog_java.m4 | 5 | ||||
| -rw-r--r-- | m4/ac_prog_javac.m4 | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/m4/ac_prog_java.m4 b/m4/ac_prog_java.m4 index dd40a0eed..b0f237d16 100644 --- a/m4/ac_prog_java.m4 +++ b/m4/ac_prog_java.m4 @@ -2,13 +2,14 @@ dnl Available from the GNU Autoconf Macro Archive at: dnl http://www.gnu.org/software/ac-archive/htmldoc/ac_prog_java.html dnl dnl Changes for gjdoc: check for "kaffe, gij, java", not only "kaffe, java" +dnl Changes for GNU Classpath: check for "cacao, jamvm" as well dnl AC_DEFUN([AC_PROG_JAVA],[ AC_REQUIRE([AC_EXEEXT])dnl if test x$JAVAPREFIX = x; then - test x$JAVA = x && AC_CHECK_PROGS(JAVA, kaffe$EXEEXT gij$EXEEXT java$EXEEXT) + test x$JAVA = x && AC_CHECK_PROGS(JAVA, cacao$EXEEXT jamvm$EXEEXT kaffe$EXEEXT gij$EXEEXT java$EXEEXT) else - test x$JAVA = x && AC_CHECK_PROGS(JAVA, kaffe$EXEEXT gij$EXEEXT java$EXEEXT, $JAVAPREFIX) + test x$JAVA = x && AC_CHECK_PROGS(JAVA, cacao$EXEEXT jamvm$EXEEXT kaffe$EXEEXT gij$EXEEXT java$EXEEXT, $JAVAPREFIX) fi test x$JAVA = x && AC_MSG_ERROR([no acceptable Java virtual machine found in \$PATH]) AC_PROG_JAVA_WORKS diff --git a/m4/ac_prog_javac.m4 b/m4/ac_prog_javac.m4 index 2f40d607b..9ec163185 100644 --- a/m4/ac_prog_javac.m4 +++ b/m4/ac_prog_javac.m4 @@ -36,10 +36,12 @@ dnl Modified to remove jikes by Andrew John Hughes on 2008-02-11 AC_DEFUN([AC_PROG_JAVAC],[ AC_REQUIRE([AC_EXEEXT])dnl +ECJ_OPTS="-warn:-deprecation,serial,unusedImport" +JAVAC_OPTS="-Xlint:unchecked,cast,divzero,empty,finally,overrides" if test "x$JAVAPREFIX" = x; then - test "x$JAVAC" = x && AC_CHECK_PROGS(JAVAC, ["ecj$EXEEXT -warn:-deprecation,serial,unusedImport"] ["ecj-3.3$EXEEXT -warn:-deprecation,serial,unusedImport"] ["ecj-3.2$EXEEXT -warn:-deprecation,serial,unusedImport"] ["javac$EXEEXT -Xlint:unchecked"] "gcj$EXEEXT -C") + test "x$JAVAC" = x && AC_CHECK_PROGS(JAVAC, ["ecj$EXEEXT $ECJ_OPTS"] ["ecj-3.3$EXEEXT $ECJ_OPTS"] ["ecj-3.2$EXEEXT $ECJ_OPTS"] ["javac$EXEEXT $JAVAC_OPTS"] "gcj$EXEEXT -C") else - test "x$JAVAC" = x && AC_CHECK_PROGS(JAVAC, ["ecj$EXEEXT -warn:-deprecation,serial,unusedImport"] ["ecj-3.3$EXEEXT -warn:-deprecation,serial,unusedImport"] ["ecj-3.2$EXEEXT -warn:-deprecation,serial,unusedImport"] ["javac$EXEEXT -Xlint:unchecked"] "gcj$EXEEXT -C", $JAVAPREFIX) + test "x$JAVAC" = x && AC_CHECK_PROGS(JAVAC, ["ecj$EXEEXT $ECJ_OPTS"] ["ecj-3.3$EXEEXT $ECJ_OPTS"] ["ecj-3.2$EXEEXT $ECJ_OPTS"] ["javac$EXEEXT $JAVAC_OPTS"] "gcj$EXEEXT -C", $JAVAPREFIX) fi test "x$JAVAC" = x && AC_MSG_ERROR([no acceptable Java compiler found in \$PATH]) AC_PROG_JAVAC_WORKS |