diff options
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2008-02-21 21:07:18 +0000 |
|---|---|---|
| committer | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2008-02-21 21:07:18 +0000 |
| commit | d9520a4e040cfc8f30f66124cce3c1e418d47ada (patch) | |
| tree | ab63a377ccd952d81163946629bf96d50fe3eb93 | |
| parent | b8383950fa04a3b6c36b884f0786bbf86c39caa0 (diff) | |
| download | classpath-d9520a4e040cfc8f30f66124cce3c1e418d47ada.tar.gz | |
2008-02-21 Andrew John Hughes <gnu_andrew@member.fsf.org>
* m4/acinclude.m4:
Remove check for gcjh.
* m4/ac_prog_javac.m4:
Check for ecj-3.2 and ecj-3.3, and add
-Xlint:unchecked for javac.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | m4/ac_prog_javac.m4 | 4 | ||||
| -rw-r--r-- | m4/acinclude.m4 | 2 |
3 files changed, 11 insertions, 3 deletions
@@ -1,5 +1,13 @@ 2008-02-21 Andrew John Hughes <gnu_andrew@member.fsf.org> + * m4/acinclude.m4: + Remove check for gcjh. + * m4/ac_prog_javac.m4: + Check for ecj-3.2 and ecj-3.3, and add + -Xlint:unchecked for javac. + +2008-02-21 Andrew John Hughes <gnu_andrew@member.fsf.org> + * gnu/javax/management/Translator.java: (fromJava(Object[],Method)): Don't cast to Class<?>. (fromJava(Object,Type)): Use ParameterizedType diff --git a/m4/ac_prog_javac.m4 b/m4/ac_prog_javac.m4 index fced86850..2f40d607b 100644 --- a/m4/ac_prog_javac.m4 +++ b/m4/ac_prog_javac.m4 @@ -37,9 +37,9 @@ dnl Modified to remove jikes by Andrew John Hughes on 2008-02-11 AC_DEFUN([AC_PROG_JAVAC],[ AC_REQUIRE([AC_EXEEXT])dnl if test "x$JAVAPREFIX" = x; then - test "x$JAVAC" = x && AC_CHECK_PROGS(JAVAC, ["ecj$EXEEXT -warn:-deprecation,serial,unusedImport"] javac$EXEEXT "gcj$EXEEXT -C") + 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") else - test "x$JAVAC" = x && AC_CHECK_PROGS(JAVAC, ["ecj$EXEEXT -warn:-deprecation,serial,unusedImport"] javac$EXEEXT "gcj$EXEEXT -C", $JAVAPREFIX) + 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) fi test "x$JAVAC" = x && AC_MSG_ERROR([no acceptable Java compiler found in \$PATH]) AC_PROG_JAVAC_WORKS diff --git a/m4/acinclude.m4 b/m4/acinclude.m4 index fa2bbe016..476a03467 100644 --- a/m4/acinclude.m4 +++ b/m4/acinclude.m4 @@ -30,7 +30,7 @@ AC_DEFUN([CLASSPATH_CHECK_JAVAH], AC_PATH_PROG(USER_JAVAH, "$1") fi else - AC_PATH_PROGS([USER_JAVAH],[gjavah gjavah-4.3 gjavah-4.2 gjavah-4.1 gcjh-wrapper-4.1 gcjh-4.1 gcjh javah]) + AC_PATH_PROGS([USER_JAVAH],[gjavah gjavah-4.3 gjavah-4.2 gjavah-4.1 gcjh-wrapper-4.1 gcjh-4.1 javah]) fi if test "x${USER_JAVAH}" = x; then |