diff options
| author | doko <doko@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-06-04 10:05:52 +0000 |
|---|---|---|
| committer | doko <doko@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-06-04 10:05:52 +0000 |
| commit | 420f57a552b504f68060d11d870b172d708b6a5c (patch) | |
| tree | fcfe76de7bd694593123d2c7f1f17d1d8a634eae /libjava/classpath/m4 | |
| parent | 86e298ff031dcb026a15dc2b16a7634fd099fae6 (diff) | |
| download | gcc-420f57a552b504f68060d11d870b172d708b6a5c.tar.gz | |
2007-06-04 Matthias Klose <doko@ubuntu.com>
* m4/acinclude.m4: Accept GCJ and JIKES.
* configure: Regenerate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@125310 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/classpath/m4')
| -rw-r--r-- | libjava/classpath/m4/acinclude.m4 | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libjava/classpath/m4/acinclude.m4 b/libjava/classpath/m4/acinclude.m4 index 4133327ba58..35daa03a190 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 ----------------------------------------------------------- |