[cp-patches] FYI: More ANTLR fixes

[Andrew John Hughes]

This patch fixes two issues: it removes some redundant
broken checks from m4/ac_prog_antlr.m4 and ensures that
gjdoc_gendir is used when executing antlr to generate the
parser.

ChangeLog:

2008-10-20  Andrew John Hughes  <[EMAIL PROTECTED]>

        * m4/ac_prog_antlr.m4:
        Remove redundant checks.
        * tools/Makefile.am:
        Use gjdoc_gendir when calling antlr.

-- 
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.5
diff -u -u -r1.5 ac_prog_antlr.m4
--- m4/ac_prog_antlr.m4 9 Oct 2008 21:05:46 -0000       1.5
+++ m4/ac_prog_antlr.m4 20 Oct 2008 21:59:46 -0000
@@ -35,19 +35,12 @@
     antlr_version_major=`echo $antlr_version_str | sed 
"$antlr_version_regex\\1/"`
     antlr_version_minor=`echo $antlr_version_str | sed 
"$antlr_version_regex\\2/"`
     antlr_version_micro=`echo $antlr_version_str | sed 
"$antlr_version_regex\\3/"`
-    (test $antlr_version_major -gt $1 ||
+    (test $antlr_version_major -gt $1 || \
     (test $antlr_version_major -eq $1 && \
      test $antlr_version_minor -gt $2) || \
     (test $antlr_version_major -eq $1 && \
      test $antlr_version_minor -eq $2 && \
-     test $antlr_version_micro -ge $3)) && \
-    (test -z $ANTLR_JAR || \
-     (test $antlr_version_major -gt $antlr_use_major ||
-      (test $antlr_version_major -eq $antlr_use_major && \
-       test $antlr_version_minor -gt $antlr_use_minor) || \
-      (test $antlr_version_major -eq $antlr_use_major && \
-       test $antlr_version_minor -eq $antlr_use_minor && \
-       test $antlr_version_micro -ge $antlr_use_micro)))
-    fi
-  AC_MSG_RESULT($antlr_use_major.$antlr_use_minor.$antlr_use_micro)
+     test $antlr_version_micro -ge $3))
+  fi
+  AC_MSG_RESULT($antlr_version_major.$antlr_version_minor.$antlr_version_micro)
 ])
Index: tools/Makefile.am
===================================================================
RCS file: /sources/classpath/classpath/tools/Makefile.am,v
retrieving revision 1.59
diff -u -u -r1.59 Makefile.am
--- tools/Makefile.am   9 Oct 2008 21:05:46 -0000       1.59
+++ tools/Makefile.am   20 Oct 2008 21:59:49 -0000
@@ -316,8 +316,8 @@
 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 \
+       @mkdir_p@ $(gjdoc_gendir)/gnu/classpath/tools/gjdoc/expr
+       $(ANTLR) -o $(gjdoc_gendir)/gnu/classpath/tools/gjdoc/expr/ \
          $(srcdir)/gnu/classpath/tools/gjdoc/expr/java-expression.g
 endif
 endif