This adds a check for cantlr (some Debian specific binary
suggested by doko) and ensures that the parser is only generated
when both GJDoc and GJDoc parser building are turned on.
ChangeLog:
2008-10-06 Andrew John Hughes <[EMAIL PROTECTED]>
* 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.
--
Andrew :)
Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8
Index: m4/ac_prog_antlr.m4
===================================================================
RCS file: /sources/classpath/classpath/m4/ac_prog_antlr.m4,v
retrieving revision 1.4
diff -u -u -r1.4 ac_prog_antlr.m4
--- m4/ac_prog_antlr.m4 5 Oct 2008 21:19:19 -0000 1.4
+++ m4/ac_prog_antlr.m4 9 Oct 2008 21:01:11 -0000
@@ -19,7 +19,7 @@
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.)
Index: tools/Makefile.am
===================================================================
RCS file: /sources/classpath/classpath/tools/Makefile.am,v
retrieving revision 1.58
diff -u -u -r1.58 Makefile.am
--- tools/Makefile.am 5 Oct 2008 21:19:19 -0000 1.58
+++ tools/Makefile.am 9 Oct 2008 21:01:13 -0000
@@ -313,12 +313,14 @@
$(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'`; \
