bobh 2002/08/14 14:39:42
Modified: catalina build.xml
Log:
make Tyrex only compile if JTA is present (this was breaking my build.)
Revision Changes Path
1.16 +7 -4 jakarta-tomcat-catalina/catalina/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/build.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- build.xml 13 Aug 2002 16:26:11 -0000 1.15
+++ build.xml 14 Aug 2002 21:39:42 -0000 1.16
@@ -348,10 +348,13 @@
</condition>
<property name="compile.ssi" value="true"/>
<condition property="compile.tyrex">
- <or>
- <equals arg1="${full.dist}" arg2="on" />
- <equals arg1="${tyrex.present}" arg2="true" />
- </or>
+ <and>
+ <equals arg1="${jta.present}" arg2="true" />
+ <or>
+ <equals arg1="${full.dist}" arg2="on" />
+ <equals arg1="${tyrex.present}" arg2="true" />
+ </or>
+ </and>
</condition>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
