diff options
author | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2008-10-20 22:07:19 +0000 |
---|---|---|
committer | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2008-10-20 22:07:19 +0000 |
commit | 893c3329f0fcf2bb039e216948234f8ffcd58f50 (patch) | |
tree | add504b2132da72fa81d2490a373cdfd24561073 /m4 | |
parent | 55a08865d31553e86344976b6eab393919f826b5 (diff) | |
download | classpath-libgcj-import-20081021.tar.gz |
Fix minor build system issues.libgcj-import-20081021
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.
Diffstat (limited to 'm4')
-rw-r--r-- | m4/ac_prog_antlr.m4 | 15 |
1 files changed, 4 insertions, 11 deletions
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) ]) |