diff options
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2008-10-09 21:05:44 +0000 |
|---|---|---|
| committer | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2008-10-09 21:05:44 +0000 |
| commit | c33913d4582d968a8e91925f7ab4c47d6349b3a4 (patch) | |
| tree | f166063b5211f4a6794e45bd0c5dbc8a501dea4c | |
| parent | cae9a32cbcc4c133301d64f49d36709ccbc994da (diff) | |
| download | classpath-c33913d4582d968a8e91925f7ab4c47d6349b3a4.tar.gz | |
Minor ANTLR fixes.
2008-10-06 Andrew John Hughes <gnu_andrew@member.fsf.org>
* m4/ac_prog_antlr:
Check for cantlr as well.
* tools/Makefile.am:
Only build GJDoc parser when both
CREATE_GJDOC and CREATE_GJDOC_PARSER
are on.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | m4/ac_prog_antlr.m4 | 2 | ||||
| -rwxr-xr-x | tools/Makefile.am | 2 |
3 files changed, 12 insertions, 1 deletions
@@ -1,3 +1,12 @@ +2008-10-06 Andrew John Hughes <gnu_andrew@member.fsf.org> + + * m4/ac_prog_antlr: + Check for cantlr as well. + * tools/Makefile.am: + Only build GJDoc parser when both + CREATE_GJDOC and CREATE_GJDOC_PARSER + are on. + 2008-10-02 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 cb7d8cd92..d813fe15c 100644 --- a/m4/ac_prog_antlr.m4 +++ b/m4/ac_prog_antlr.m4 @@ -19,7 +19,7 @@ AC_DEFUN([AC_LIB_ANTLR],[ AC_DEFUN([AC_PROG_ANTLR],[ AC_REQUIRE([AC_PROG_JAVA])dnl - AC_CHECK_TOOLS([ANTLR], [runantlr antlr]) + AC_CHECK_TOOLS([ANTLR], [cantlr runantlr antlr]) if test "x$ANTLR" = x; then if test -z "$JAVA"; then AC_MSG_ERROR(Failed to find either an antlr binary or a suitable Java runtime for ANTLR.) diff --git a/tools/Makefile.am b/tools/Makefile.am index 30c9be6d8..50909536c 100755 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -313,12 +313,14 @@ dist-hook: $(TOOLS_ZIP): $(ALL_TOOLS_FILES) @rm -rf classes asm @mkdir_p@ classes asm +if CREATE_GJDOC if CREATE_GJDOC_PARSER ## Generate antlr sources. @mkdir_p@ generated/gnu/classpath/tools/gjdoc/expr $(ANTLR) -o generated/gnu/classpath/tools/gjdoc/expr \ $(srcdir)/gnu/classpath/tools/gjdoc/expr/java-expression.g endif +endif ## Compile ASM separately as it is latin-1 encoded. find $(srcdir)/external/asm -name '*.java' -print > asm.lst AC=`echo $(JCOMPILER) | sed -e 's/UTF-8/ISO-8859-1/g'`; \ |