compiles correctly but still doesn't work with jdk 1.4

diff --git a/src/interfaces/jdbc/build.xml b/src/interfaces/jdbc/build.xml
index 37faef3fef79020842823525cb452d42c563373f..3899e992107e98c91a5074756681f2b08a62ec31 100644 (file)
--- a/src/interfaces/jdbc/build.xml
+++ b/src/interfaces/jdbc/build.xml
@@ -37,14 +37,15 @@
       <or>\r
         <equals arg1="${ant.java.version}" arg2="1.2"/>\r
         <equals arg1="${ant.java.version}" arg2="1.3"/>\r
+        <equals arg1="${ant.java.version}" arg2="1.4"/>\r
       </or>\r
     </condition> \r
-    <condition property="jdbc3">\r
-      <equals arg1="${ant.java.version}" arg2="1.4"/>\r
-    </condition>\r
     <condition property="datasource">\r
       <and>\r
-        <equals arg1="${jdbc2}" arg2="true" />        \r
+      <or>\r
+        <equals arg1="${ant.java.version}" arg2="1.2"/>\r
+        <equals arg1="${ant.java.version}" arg2="1.3"/>\r
+      </or>     \r
         <available classname="javax.sql.DataSource"/>\r
       </and>\r
     </condition>\r
@@ -90,7 +91,7 @@
 \r
       <exclude name="${package}/jdbc1/**" unless="jdbc1"/>\r
       <exclude name="${package}/jdbc2/**" unless="jdbc2"/>\r
-\r
+ \r
       <exclude name="${package}/largeobject/PGblob.java" unless="jdbc2" />\r
       <exclude name="${package}/largeobject/PGclob.java" unless="jdbc2" />\r
 \r