From: billbarker <billbarker@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 10 Apr 2006 01:36:19 +0000 (+0000)
Subject: Restore the ability to build with the Mail Resources
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=357ba3e5eff68b7e14bc9cb960edcb1ad01ca69a;p=tomcat7.0

Restore the ability to build with the Mail Resources

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@392872 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/build.xml b/build.xml
index ae230aa89..2f07f5ffc 100644
--- a/build.xml
+++ b/build.xml
@@ -60,7 +60,15 @@
   <target name="build-prepare">
 
     <available classname="junit.framework.TestCase" property="junit.present" />
-
+    <condition property="javamail.present">
+      <and>
+        <available classname="javax.activation.DataSource"
+         classpath="${activation.jar}" />
+        <available classname="javax.mail.Service"
+         classpath="${mail.jar}" />
+      </and>
+    </condition>
+    
     <mkdir dir="${tomcat.classes}"/>
     
     <mkdir dir="${tomcat.build}"/>
@@ -82,8 +90,10 @@
            excludes="**/CVS/**,**/.svn/**">
       <classpath refid="tomcat.classpath" />
       <exclude name="org/apache/tomcat/util/net/puretls/**" />
-      <exclude name="org/apache/naming/factory/MailSessionFactory.java"/>
-      <exclude name="org/apache/naming/factory/SendMailFactory.java"/>
+      <exclude name="org/apache/naming/factory/MailSessionFactory.java"
+              unless="javamail.present" />
+      <exclude name="org/apache/naming/factory/SendMailFactory.java"
+              unless="javamail.present" />
     </javac>
     <!-- Copy static resource files -->
     <filter token="VERSION" value="${version}"/>