summaryrefslogtreecommitdiff
path: root/aclocal
diff options
context:
space:
mode:
authorNasko Vasilev <nasko.vasilev@betvictor.com>2017-09-12 00:40:49 +0200
committerJames E. King, III <jking@apache.org>2017-09-21 09:20:46 -0700
commit12fcb0d30ed1f45b09a31616cd867e9926bf5a05 (patch)
treee4bea85b490069ae077c6a8b466d2028209d7ae7 /aclocal
parentac61a4211204ec2785362fc325b500d805ae2bba (diff)
downloadthrift-12fcb0d30ed1f45b09a31616cd867e9926bf5a05.tar.gz
THRIFT-4232 ./configure does bad ant version check
This closes #1354
Diffstat (limited to 'aclocal')
-rw-r--r--aclocal/ax_javac_and_java.m42
1 files changed, 1 insertions, 1 deletions
diff --git a/aclocal/ax_javac_and_java.m4 b/aclocal/ax_javac_and_java.m4
index f341f50e7..020396006 100644
--- a/aclocal/ax_javac_and_java.m4
+++ b/aclocal/ax_javac_and_java.m4
@@ -118,7 +118,7 @@ AC_DEFUN([AX_CHECK_JAVA_CLASS],
AC_DEFUN([AX_CHECK_ANT_VERSION],
[
AC_MSG_CHECKING(for ant version > $2)
- ANT_VALID=`expr $($1 -version 2>/dev/null | sed -n 's/.*version \(@<:@0-9\.@:>@*\).*/\1/p') \>= $2`
+ ANT_VALID=`expr "x$(printf "$2\n$($1 -version 2>/dev/null | sed -n 's/.*version \(@<:@0-9\.@:>@*\).*/\1/p')" | sort -t '.' -k 1,1 -k 2,2 -k 3,3 -g | sed -n 1p)" = "x$2"`
if test "x$ANT_VALID" = "x1" ; then
AC_MSG_RESULT(yes)
else