From 05dd5e46addf2ff26e2ef72cee317bc8b45662a4 Mon Sep 17 00:00:00 2001
From: Bernd Eilers <bei@openoffice.org>
Date: Thu, 30 Aug 2001 11:48:05 +0000
Subject: #80424# added antprj.jar and ant optional task support

---
 solenv/inc/ant.mk | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'solenv/inc/ant.mk')

diff --git a/solenv/inc/ant.mk b/solenv/inc/ant.mk
index 646146a734bb..c197cd15df8d 100644
--- a/solenv/inc/ant.mk
+++ b/solenv/inc/ant.mk
@@ -10,8 +10,15 @@ J2EE_HOME=$(SOLARROOT)$/j2sdkee1.2
 
 # --- ANT build environment  ---------------------------------------
 
-.IF "$(ANT_CLASSPATH)" ==""
-ANT_CLASSPATH:=$(SOLARBINDIR)$/ant.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$/$(SOLARBINDIR)$/xerces.jar
+.IF "$(ANT_OPTIONAL)" ==""
+ANT_OPTIONAL=$(SOLARBINDIR)$/jakarta-ant-1.3-optional.jar
+.ENDIF
+
+.IF "$(ANT_CLASSPATH)"==""
+ANT_CLASSPATH:=$(SOLARBINDIR)$/ant.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$/$(SOLARBINDIR)$/xerces.jar$(PATH_SEPERATOR)$(ANT_OPTIONAL)
+.IF "$(ANTPRJ_BOOTSTRAP)"==""
+ANT_CLASSPATH!:=$(ANT_CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/antprj.jar
+.ENDIF
 .ENDIF
 
 ANT=java -Xmx1024m org.apache.tools.ant.Main -Djava.home=$(JAVA_HOME)
-- 
cgit