summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Wielaard <mark@klomp.org>2007-04-20 12:13:11 +0000
committerMark Wielaard <mark@klomp.org>2007-04-20 12:13:11 +0000
commitf2c4696e60c7c8a4b74083d277091556270eb833 (patch)
treefc0812ccd23a81ba810127c92465dd691e6788d8
parent1614dde5a56c6dc1c980d8075b027ef1b74cea24 (diff)
downloadclasspath-f2c4696e60c7c8a4b74083d277091556270eb833.tar.gz
2007-04-19 Andrew John Hughes <gnu_andrew@member.fsf.org>
* m4/acinclude.m4 (CLASSPATH_FIND_JAVAC): Allow detected JAVAC.
-rw-r--r--ChangeLog5
-rw-r--r--m4/acinclude.m42
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 5f08b264c..e242b9562 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-19 Andrew John Hughes <gnu_andrew@member.fsf.org>
+
+ * m4/acinclude.m4
+ (CLASSPATH_FIND_JAVAC): Allow detected JAVAC.
+
2007-04-19 Casey Marshall <csm@gnu.org>
PR classpath/31626:
diff --git a/m4/acinclude.m4 b/m4/acinclude.m4
index 17dad2fd5..a8339bf29 100644
--- a/m4/acinclude.m4
+++ b/m4/acinclude.m4
@@ -25,7 +25,7 @@ dnl AM_CONDITIONAL(FOUND_JIKES, test "x${user_specified_javac}" = xjikes)
dnl 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${user_specified_javac}" != xecj; then
+ if test "x${ECJ}" = x && test "x${JAVAC}" = x && test "x${user_specified_javac}" != xecj; then
AC_MSG_ERROR([cannot find javac, try --with-ecj])
fi
])