prioritise use of javac executable (gcj provides it through alterna…

…tives). On Debian this fixes FTBFS when gcj-jdk and openjdk-7-jdk are installed at the same time because build system will use default `javac` executable provided by current JDK through `update-alternatives` instead of blindly calling GCJ when it is present. Signed-off-by: Dmitry Smirnov <[email protected]>
aledbf · May 12, 2014 · 8b682d1 · 8b682d1
1 parent 89fe035
commit 8b682d1
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/m4/ac_prog_javac.m4 b/m4/ac_prog_javac.m4
@@ -35,9 +35,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, "gcj$EXEEXT -C" guavac$EXEEXT jikes$EXEEXT javac$EXEEXT)
+        test "x$JAVAC" = x && AC_CHECK_PROGS(JAVAC, javac$EXEEXT "gcj$EXEEXT -C" guavac$EXEEXT jikes$EXEEXT)
 else
-        test "x$JAVAC" = x && AC_CHECK_PROGS(JAVAC, "gcj$EXEEXT -C" guavac$EXEEXT jikes$EXEEXT javac$EXEEXT, $JAVAPREFIX)
+        test "x$JAVAC" = x && AC_CHECK_PROGS(JAVAC, javac$EXEEXT "gcj$EXEEXT -C" guavac$EXEEXT jikes$EXEEXT, $JAVAPREFIX)
 fi
 test "x$JAVAC" = x && AC_MSG_ERROR([no acceptable Java compiler found in \$PATH])
 AC_PROG_JAVAC_WORKS