* m4/ac_prog_javac.m4 (AC_PROG_JAVAC): Removed -1.5 from ecj.

* src/lib/Makefile.am (vm.zip): Added -source 1.5 -target 1.5. Thanks
to Mark Wielaard.

diff --git a/m4/ac_prog_javac.m4 b/m4/ac_prog_javac.m4
index 74d2e45713eb34a638867139b2e588f2c73588c8..caa71e53ac0d6e48f8530efaaae6ea8a91fc3faf 100644 (file)
--- a/m4/ac_prog_javac.m4
+++ b/m4/ac_prog_javac.m4
@@ -37,9 +37,9 @@ dnl @license GPLWithACException
 AC_DEFUN([AC_PROG_JAVAC],[
 AC_REQUIRE([AC_EXEEXT])dnl
 if test "x$JAVAPREFIX" = x; then
-        test "x$JAVAC" = x && AC_CHECK_PROGS(JAVAC, "javac$EXEEXT -bootclasspath ${CLASSPATH_CLASSES}" "ecj$EXEEXT -bootclasspath ${CLASSPATH_CLASSES} -1.5" "gcj$EXEEXT -C -bootclasspath ${CLASSPATH_CLASSES}" "jikes$EXEEXT -bootclasspath ${CLASSPATH_CLASSES}")
+        test "x$JAVAC" = x && AC_CHECK_PROGS(JAVAC, "javac$EXEEXT -bootclasspath ${CLASSPATH_CLASSES}" "ecj$EXEEXT -bootclasspath ${CLASSPATH_CLASSES}" "gcj$EXEEXT -C -bootclasspath ${CLASSPATH_CLASSES}" "jikes$EXEEXT -bootclasspath ${CLASSPATH_CLASSES}")
 else
-        test "x$JAVAC" = x && AC_CHECK_PROGS(JAVAC, "javac$EXEEXT -bootclasspath ${CLASSPATH_CLASSES}" "ecj$EXEEXT -bootclasspath ${CLASSPATH_CLASSES} -1.5" "gcj$EXEEXT -C -bootclasspath ${CLASSPATH_CLASSES}" "jikes$EXEEXT -bootclasspath ${CLASSPATH_CLASSES}", $JAVAPREFIX)
+        test "x$JAVAC" = x && AC_CHECK_PROGS(JAVAC, "javac$EXEEXT -bootclasspath ${CLASSPATH_CLASSES}" "ecj$EXEEXT -bootclasspath ${CLASSPATH_CLASSES}" "gcj$EXEEXT -C -bootclasspath ${CLASSPATH_CLASSES}" "jikes$EXEEXT -bootclasspath ${CLASSPATH_CLASSES}", $JAVAPREFIX)
 fi
 test "x$JAVAC" = x && AC_MSG_ERROR([no acceptable Java compiler found in \$PATH])
 AC_PROG_JAVAC_WORKS

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 61f7de9990f454edf8c81ac496d7fbeb04f007d4..7baa5c67804f1ea8532ca9f3322027d2fa6e4f10 100644 (file)
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -22,7 +22,7 @@
 ## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 ## 02110-1301, USA.
 ##
-## $Id: Makefile.am 8249 2007-07-31 12:59:03Z panzi $
+## $Id: Makefile.am 8252 2007-08-01 22:47:17Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
@@ -89,7 +89,7 @@ VM_ZIP = ../vm.zip
 
 vm.zip: $(VM_JAVA_FILES)
        $(mkdir_p) classes
-       $(JAVAC) -d classes $(VM_JAVA_FILES)
+       $(JAVAC) -source 1.5 -target 1.5 -d classes $(VM_JAVA_FILES)
        @if test "$(JAR)" = "zip" -o "$(JAR)" = "zip.exe"; then \
            cd classes && $(JAR) -r -D $(VM_ZIP) .; \
        else \