From a1878e0b67b5f23bbcbe1e1850785239148e8d90 Mon Sep 17 00:00:00 2001 From: Andrew John Hughes Date: Tue, 4 May 2010 17:31:18 +0000 Subject: Cleanup output of javac is gcj test. 2010-05-04 Andrew John Hughes * m4/ac_prog_javac.m4: Capture all output from javac --version to avoid excess output. Make sure no appears when javac is not gcj. --- ChangeLog | 7 +++++++ m4/ac_prog_javac.m4 | 7 +++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ec48b8071..03ff0050e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2010-05-04 Andrew John Hughes + + * m4/ac_prog_javac.m4: + Capture all output from javac --version + to avoid excess output. Make sure no appears + when javac is not gcj. + 2010-05-04 Andrew John Hughes * configure.ac: diff --git a/m4/ac_prog_javac.m4 b/m4/ac_prog_javac.m4 index baf518600..84a72206a 100644 --- a/m4/ac_prog_javac.m4 +++ b/m4/ac_prog_javac.m4 @@ -46,10 +46,13 @@ else fi test "x$JAVAC" = x && AC_MSG_ERROR([no acceptable Java compiler found in \$PATH]) AC_CACHE_CHECK([if $JAVAC is a version of gcj], ac_cv_prog_javac_is_gcj, [ -if $JAVAC --version | grep gcj > /dev/null; then +if $JAVAC --version 2>&1 | grep gcj >&AS_MESSAGE_LOG_FD ; then ac_cv_prog_javac_is_gcj=yes; JAVAC="$JAVAC $GCJ_OPTS"; -fi]) +else + ac_cv_prog_javac_is_gcj=no; +fi +]) AC_SUBST(JAVAC_IS_GCJ, $ac_cv_prog_javac_is_gcj) AM_CONDITIONAL(GCJ_JAVAC, test x"${JAVAC_IS_GCJ}" = xyes) AC_PROG_JAVAC_WORKS -- cgit v1.2.1