This is the mail archive of the java-patches@gcc.gnu.org mailing list for the Java project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[cp-0.98, patch] fix previous commit


Patched the wrong file.

Sorry, Matthias

2008-10-19  Matthias Klose  <doko@ubuntu.com>

	* m4/ac_prog_java.m4: Revert previous change.
	* m4/ac_prog_javac.m4: Apply it here.
	* configure: Regenerate.

Index: m4/ac_prog_java.m4
===================================================================
--- m4/ac_prog_java.m4	(revision 141224)
+++ m4/ac_prog_java.m4	(working copy)
@@ -12,10 +12,6 @@
         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])
-dnl GCJ LOCAL
-if test "$enable_java_maintainer_mode" = yes; then
 AC_PROG_JAVA_WORKS
-fi
-dnl END GCJ LOCAL
 AC_PROVIDE([$0])dnl
 ])
Index: m4/ac_prog_javac.m4
===================================================================
--- m4/ac_prog_javac.m4	(revision 141224)
+++ m4/ac_prog_javac.m4	(working copy)
@@ -52,6 +52,10 @@
 fi])
 AC_SUBST(JAVAC_IS_GCJ, $ac_cv_prog_javac_is_gcj)
 AM_CONDITIONAL(GCJ_JAVAC, test x"${JAVAC_IS_GCJ}" = xyes)
+dnl GCJ LOCAL
+if test "$enable_java_maintainer_mode" = yes; then
 AC_PROG_JAVAC_WORKS
+fi
+dnl END GCJ LOCAL
 AC_PROVIDE([$0])dnl
 ])


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]