summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Baer <WBaer@gmx.de>2006-01-19 18:39:19 +0000
committerWolfgang Baer <WBaer@gmx.de>2006-01-19 18:39:19 +0000
commit3f7c031be5da9147311fbdfc88967a0ef76e8fab (patch)
tree5b106f926d3c3a727d17a5cb42f52f6bfe07912c
parentd1b8c360cff57a4f4f638199c7471ef7f85c8434 (diff)
downloadclasspath-3f7c031be5da9147311fbdfc88967a0ef76e8fab.tar.gz
2006-01-19 Wolfgang Baer <WBaer@gmx.de>
* m4/acinclude.m4: Test also for ecj found before exiting configure with no javac found error message.
-rw-r--r--ChangeLog5
-rw-r--r--m4/acinclude.m44
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d07d0333e..af18a8f42 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-19 Wolfgang Baer <WBaer@gmx.de>
+
+ * m4/acinclude.m4: Test also for ecj found before exiting configure
+ with no javac found error message.
+
2006-01-19 Ito Kazumitsu <kaz@maczuka.gcd.org>
Fixes bug #23212
diff --git a/m4/acinclude.m4 b/m4/acinclude.m4
index 96af881d5..4317844aa 100644
--- a/m4/acinclude.m4
+++ b/m4/acinclude.m4
@@ -23,9 +23,9 @@ AC_DEFUN([CLASSPATH_FIND_JAVAC],
AM_CONDITIONAL(FOUND_KJC, test "x${user_specified_javac}" = xkjc)
AM_CONDITIONAL(FOUND_GCJX, test "x${user_specified_javac}" = xgcjx)
- if test "x${GCJ}" = x && test "x${JIKES}" = x && test "x${user_specified_javac}" != xkjc && test "x${user_specified_javac}" != xgcjx; then
+ if test "x${GCJ}" = x && test "x${JIKES}" = x && test "x${user_specified_javac}" != xkjc && test "x${user_specified_javac}" != xgcjx && test "x${user_specified_javac}" != xecj; then
# FIXME: use autoconf error function
- echo "configure: cannot find javac, try --with-gcj, --with-jikes, --with-kjc, or --with-gcjx" 1>&2
+ echo "configure: cannot find javac, try --with-gcj, --with-jikes, --with-kjc, --with-ecj, or --with-gcjx" 1>&2
exit 1
fi
])