diff options
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2006-12-10 20:25:39 +0000 |
|---|---|---|
| committer | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2006-12-10 20:25:39 +0000 |
| commit | da66af5951b18b6f5e8752cbbe11f5f842332a33 (patch) | |
| tree | a28e126d1415e3689be6c7b2c2d061ae51194195 /m4/acinclude.m4 | |
| parent | ab90923ee693a17e2e0e37b6ba5a84794c9236de (diff) | |
| download | classpath-da66af5951b18b6f5e8752cbbe11f5f842332a33.tar.gz | |
2006-12-10 Andrew John Hughes <gnu_andrew@member.fsf.org>
* Merge of generics-branch to HEAD (woohoo!)
Diffstat (limited to 'm4/acinclude.m4')
| -rw-r--r-- | m4/acinclude.m4 | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/m4/acinclude.m4 b/m4/acinclude.m4 index ead0090b4..3a8abe0b1 100644 --- a/m4/acinclude.m4 +++ b/m4/acinclude.m4 @@ -5,26 +5,27 @@ AC_DEFUN([CLASSPATH_FIND_JAVAC], [ user_specified_javac= - CLASSPATH_WITH_GCJ - CLASSPATH_WITH_JIKES - CLASSPATH_WITH_KJC +dnl CLASSPATH_WITH_GCJ +dnl CLASSPATH_WITH_JIKES +dnl CLASSPATH_WITH_KJC CLASSPATH_WITH_GCJX CLASSPATH_WITH_ECJ if test "x${user_specified_javac}" = x; then - AM_CONDITIONAL(FOUND_GCJ, test "x${GCJ}" != x) - AM_CONDITIONAL(FOUND_JIKES, test "x${JIKES}" != x) +dnl AM_CONDITIONAL(FOUND_GCJ, test "x${GCJ}" != x) +dnl AM_CONDITIONAL(FOUND_JIKES, test "x${JIKES}" != x) AM_CONDITIONAL(FOUND_ECJ, test "x${ECJ}" != x) else - AM_CONDITIONAL(FOUND_GCJ, test "x${user_specified_javac}" = xgcj) - AM_CONDITIONAL(FOUND_JIKES, test "x${user_specified_javac}" = xjikes) +dnl AM_CONDITIONAL(FOUND_GCJ, test "x${user_specified_javac}" = xgcj) +dnl AM_CONDITIONAL(FOUND_JIKES, test "x${user_specified_javac}" = xjikes) AM_CONDITIONAL(FOUND_ECJ, test "x${user_specified_javac}" = xecj) fi - AM_CONDITIONAL(FOUND_KJC, test "x${user_specified_javac}" = xkjc) +dnl 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 && test "x${user_specified_javac}" != xecj; then - AC_MSG_ERROR([cannot find javac, try --with-gcj, --with-jikes, --with-kjc, --with-ecj, or --with-gcjx]) +dnl 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${ECJ}" = x && test "x${user_specified_javac}" != xecj && test "x${user_specified_javac}" != xgcjx; then + AC_MSG_ERROR([cannot find javac, try --with-ecj or --with-gcjx]) fi ]) |