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