From b1d849c109f167ff8d36563ec73e88fb795e5a08 Mon Sep 17 00:00:00 2001
From: Matthias Klose <doko@ubuntu.com>
Date: Mon, 4 Jun 2007 10:05:52 +0000
Subject: 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
---
 libjava/classpath/m4/acinclude.m4 | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'libjava/classpath/m4/acinclude.m4')

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 -----------------------------------------------------------
-- 
cgit v1.1