diff options
Diffstat (limited to 'libjava/classpath/m4/ac_prog_javac.m4')
| -rw-r--r-- | libjava/classpath/m4/ac_prog_javac.m4 | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/libjava/classpath/m4/ac_prog_javac.m4 b/libjava/classpath/m4/ac_prog_javac.m4 index 0c505dae840..2162c1d8d8a 100644 --- a/libjava/classpath/m4/ac_prog_javac.m4 +++ b/libjava/classpath/m4/ac_prog_javac.m4 @@ -34,7 +34,7 @@ dnl @license GPLWithACException dnl dnl Modified to remove jikes by Andrew John Hughes on 2008-02-11 -AC_DEFUN([AC_PROG_JAVAC],[ +AC_DEFUN_ONCE([AC_PROG_JAVAC],[ AC_REQUIRE([AC_EXEEXT])dnl ECJ_OPTS="-warn:-deprecation,serial,unusedImport" JAVAC_OPTS="-Xlint:unchecked,cast,divzero,empty,finally,overrides" @@ -46,16 +46,15 @@ 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) -dnl GCJ LOCAL -if test "$enable_java_maintainer_mode" = yes; then -AC_PROG_JAVAC_WORKS -fi dnl END GCJ LOCAL AC_PROVIDE([$0])dnl ]) |
