diff options
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2008-09-30 01:10:05 +0000 |
|---|---|---|
| committer | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2008-09-30 01:10:05 +0000 |
| commit | e93c4ea50e2390957e16c1d4c8de76de1666725f (patch) | |
| tree | 0a747e90db0ff8a48ae33e6819938835975a0a47 | |
| parent | 3ebeb3fe692b9c86bc94dabee45e9c3ed64ba30a (diff) | |
| download | classpath-e93c4ea50e2390957e16c1d4c8de76de1666725f.tar.gz | |
Backport GCJ merge antlr check.
2008-09-29 Matthias Klose <doko@ubuntu.com>
* m4/ac_prog_antlr.m4:
Check for antlr binary as well.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | m4/ac_prog_antlr.m4 | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,8 @@ +2008-09-29 Matthias Klose <doko@ubuntu.com> + + * m4/ac_prog_antlr.m4: + Check for antlr binary as well. + 2008-09-28 Andrew John Hughes <gnu_andrew@member.fsf.org> * configure.ac: diff --git a/m4/ac_prog_antlr.m4 b/m4/ac_prog_antlr.m4 index a13fbd582..356a4f3e0 100644 --- a/m4/ac_prog_antlr.m4 +++ b/m4/ac_prog_antlr.m4 @@ -34,10 +34,10 @@ AC_DEFUN([AC_PROG_ANTLR],[ test -f $ANTLR_JAR || AC_MSG_ERROR([specified ANTLR jar file $ANTLR_JAR not found.]) \ && AC_MSG_NOTICE([using ANTLR parser generator in $ANTLR_JAR]) fi - AC_CHECK_TOOLS([ANTLR], [runantlr]) + AC_CHECK_TOOLS([ANTLR], [runantlr antlr]) if test "x$ANTLR" = x; then if test -z "$JAVA"; then - AC_MSG_ERROR(Failed to find either runantlr or a suitable Java runtime for ANTLR.) + AC_MSG_ERROR(Failed to find either an antlr binary or a suitable Java runtime for ANTLR.) else ANTLR="$JAVA -classpath $ANTLR_JAR antlr.Tool" fi |