This patch makes a few minor revisions to the build system checks: * gcjh (unversioned) is removed as it fails to generate the headers correctly (spotted by Dalibor) * check for ecj-3.2 ande ecj-3.3 (installed by Gentoo for one) * add -Xlint:unchecked to javac so it gives similar warnings to ecj
ChangeLog:
2008-02-21 Andrew John Hughes <[EMAIL PROTECTED]>
* 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.
--
Andrew :)
Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8
Index: m4/ac_prog_javac.m4
===================================================================
RCS file: /sources/classpath/classpath/m4/ac_prog_javac.m4,v
retrieving revision 1.3
diff -u -3 -p -u -r1.3 ac_prog_javac.m4
--- m4/ac_prog_javac.m4 17 Feb 2008 15:50:49 -0000 1.3
+++ m4/ac_prog_javac.m4 21 Feb 2008 20:50:27 -0000
@@ -37,9 +37,9 @@ dnl Modified to remove jikes by Andrew J
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
Index: m4/acinclude.m4
===================================================================
RCS file: /sources/classpath/classpath/m4/acinclude.m4,v
retrieving revision 1.34
diff -u -3 -p -u -r1.34 acinclude.m4
--- m4/acinclude.m4 21 Feb 2008 13:36:16 -0000 1.34
+++ m4/acinclude.m4 21 Feb 2008 20:50:27 -0000
@@ -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
signature.asc
Description: Digital signature
