From 8b682d167e4535df582f1c77542e2b1ea0981228 Mon Sep 17 00:00:00 2001 From: Dmitry Smirnov Date: Mon, 12 May 2014 14:08:44 +1000 Subject: [PATCH] prioritise use of `javac` executable (gcj provides it through alternatives). 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 --- m4/ac_prog_javac.m4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/m4/ac_prog_javac.m4 b/m4/ac_prog_javac.m4 index 91463e88028c..f6a2fb27cb84 100644 --- 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 -- 2.47.3