diff options
Diffstat (limited to 'libjava/classpath/m4/ac_prog_javac_works.m4')
| -rw-r--r-- | libjava/classpath/m4/ac_prog_javac_works.m4 | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libjava/classpath/m4/ac_prog_javac_works.m4 b/libjava/classpath/m4/ac_prog_javac_works.m4 index 827ecc9bbdf..a03f476e3f8 100644 --- a/libjava/classpath/m4/ac_prog_javac_works.m4 +++ b/libjava/classpath/m4/ac_prog_javac_works.m4 @@ -31,8 +31,12 @@ public class Object } } EOF -dnl GCJ LOCAL: don't call JAVAC with $JAVACFLAGS -source 1.5 -target 1.5 -if AC_TRY_COMMAND($JAVAC $JAVA_TEST) >/dev/null 2>&1; then +if test x$JAVAC_IS_GCJ = xyes; then + CMD="$JAVAC $JAVACFLAGS -fsource=1.5 -ftarget=1.5 $JAVA_TEST" +else + CMD="$JAVAC $JAVACFLAGS -source 1.5 -target 1.5 $JAVA_TEST" +fi +if AC_TRY_COMMAND($CMD) >/dev/null 2>&1; then ac_cv_prog_javac_works=yes else AC_MSG_ERROR([The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)]) |
