diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | m4/ac_prog_antlr.m4 | 15 | ||||
| -rwxr-xr-x | tools/Makefile.am | 4 |
3 files changed, 13 insertions, 13 deletions
@@ -1,3 +1,10 @@ +2008-10-20 Andrew John Hughes <gnu_andrew@member.fsf.org> + + * m4/ac_prog_antlr.m4: + Remove redundant checks. + * tools/Makefile.am: + Use gjdoc_gendir when calling antlr. + 2008-10-17 Robert Lougher <rob.lougher@gmail.com> * native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c diff --git a/m4/ac_prog_antlr.m4 b/m4/ac_prog_antlr.m4 index d813fe15c..e2c10780a 100644 --- a/m4/ac_prog_antlr.m4 +++ b/m4/ac_prog_antlr.m4 @@ -35,19 +35,12 @@ AC_DEFUN([AC_PROG_ANTLR],[ 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) ]) diff --git a/tools/Makefile.am b/tools/Makefile.am index 50909536c..53e918aad 100755 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -316,8 +316,8 @@ $(TOOLS_ZIP): $(ALL_TOOLS_FILES) 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 |