From 8c0c66dd8ec55370dd8911399597efbace07fb69 Mon Sep 17 00:00:00 2001
From: Oliver Burn <oliver@puppycrawl.com>
Date: Fri, 2 Jul 2010 02:41:34 +0000
Subject: [PATCH] Clean up how the ant version is detected. Thanks to Martin
 von Gagern for patch #3023250.

---
 build.xml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/build.xml b/build.xml
index d6275dbac..f8ed31e93 100644
--- a/build.xml
+++ b/build.xml
@@ -688,12 +688,7 @@ For users of JDK 1.5 at least version 1.6.2 of Ant is required.
   <!-- Targets to verify that ANT version if at least 1.7 -->
   <target name="-check.ant17">
     <echo>version is ${ant.version}</echo>
-    <condition property="have.ant17">
-      <or>
-        <contains string="${ant.version}"
-                  substring="Apache Ant version 1.7"/>
-      </or>
-    </condition>
+    <antversion atleast="1.7" property="have.ant17"/>
   </target>
 
   <target name="-require.ant17" depends="-check.ant17" unless="have.ant17">