From e884c74dc584a62bbede93b2c125a12509db85f7 Mon Sep 17 00:00:00 2001
From: Kevin Jackson <kevj@apache.org>
Date: Fri, 19 Oct 2007 07:00:23 +0000
Subject: [PATCH] -allow use of antlr 3+

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@586281 13f79535-47bb-0310-9956-ffa450edef68
---
 build.xml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/build.xml b/build.xml
index d3c897875..e4b0641f9 100644
--- a/build.xml
+++ b/build.xml
@@ -395,9 +395,12 @@
     <available property="commons.net.present"
       classname="org.apache.commons.net.ftp.FTPClient"
       classpathref="classpath"/>
-    <available property="antlr.present"
-      classname="antlr.Tool"
-      classpathref="classpath"/>
+    <condition property="antlr.present">
+  	  <or>
+  	    <available classname="org.antlr.Tool" classpathref="classpath"/>
+  	    <available classname="antlr.Tool" classpathref="classpath"/>
+      </or>
+  	</condition>
     <available property="stylebook.present"
       classname="org.apache.stylebook.Engine"
       classpathref="classpath"/>