aboutsummaryrefslogtreecommitdiff
path: root/libjava/classpath/m4
diff options
context:
space:
mode:
authorMatthias Klose <doko@ubuntu.com>2007-06-04 10:05:52 +0000
committerMatthias Klose <doko@gcc.gnu.org>2007-06-04 10:05:52 +0000
commitb1d849c109f167ff8d36563ec73e88fb795e5a08 (patch)
treefcfe76de7bd694593123d2c7f1f17d1d8a634eae /libjava/classpath/m4
parent1a075af13d923352ea6c61cfd645474540788cf5 (diff)
downloadgcc-b1d849c109f167ff8d36563ec73e88fb795e5a08.zip
gcc-b1d849c109f167ff8d36563ec73e88fb795e5a08.tar.gz
gcc-b1d849c109f167ff8d36563ec73e88fb795e5a08.tar.bz2
acinclude.m4: Accept GCJ and JIKES.
2007-06-04 Matthias Klose <doko@ubuntu.com> * m4/acinclude.m4: Accept GCJ and JIKES. * configure: Regenerate. From-SVN: r125310
Diffstat (limited to 'libjava/classpath/m4')
-rw-r--r--libjava/classpath/m4/acinclude.m47
1 files changed, 5 insertions, 2 deletions
diff --git a/libjava/classpath/m4/acinclude.m4 b/libjava/classpath/m4/acinclude.m4
index 4133327..35daa03 100644
--- a/libjava/classpath/m4/acinclude.m4
+++ b/libjava/classpath/m4/acinclude.m4
@@ -24,10 +24,13 @@ AC_DEFUN([CLASSPATH_FIND_JAVAC],
fi
AM_CONDITIONAL(FOUND_KJC, test "x${user_specified_javac}" = xkjc)
-dnl if test "x${GCJ}" = x && test "x${JIKES}" = x && test "x${user_specified_javac}" != xkjc; then
- if test "x${ECJ}" = x && test "x${JAVAC}" = x && test "x${user_specified_javac}" != xecj; then
+ ## GCJ LOCAL
+ if test "x${GCJ}" = x && test "x${JIKES}" = x && test "x${ECJ}" = x \
+ && test "x${JAVAC}" = x && test "x${user_specified_javac}" != xkjc
+ then
AC_MSG_ERROR([cannot find javac, try --with-ecj])
fi
+ ## END GCJ LOCAL
])
dnl -----------------------------------------------------------