From: Kris Jurka <books@ejurka.com>
Date: Mon, 26 Apr 2004 08:28:32 +0000 (+0000)
Subject: Update the build.xml file to support building with the new 1.5 jdk
X-Git-Tag: REL7_4_3~40
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=79e42a6eb2dd18c45b12910d42ff0cba5a85eb7d;p=thirdparty%2Fpostgresql.git

Update the build.xml file to support building with the new 1.5 jdk
and ant 1.6.
---

diff --git a/src/interfaces/jdbc/build.xml b/src/interfaces/jdbc/build.xml
index e15d64a539b..b8914818365 100644
--- a/src/interfaces/jdbc/build.xml
+++ b/src/interfaces/jdbc/build.xml
@@ -6,7 +6,7 @@
 
   This file now requires Ant 1.4.1.  2002-04-18
 
-  $Header: /cvsroot/pgsql/src/interfaces/jdbc/Attic/build.xml,v 1.36.2.1 2003/12/18 03:32:05 davec Exp $
+  $Header: /cvsroot/pgsql/src/interfaces/jdbc/Attic/build.xml,v 1.36.2.2 2004/04/26 08:28:32 jurka Exp $
 
 -->
 
@@ -44,7 +44,10 @@
       </or>
     </condition>
     <condition property="jdbc3">
+      <or>
         <equals arg1="${ant.java.version}" arg2="1.4"/>
+	<equals arg1="${ant.java.version}" arg2="1.5"/>
+      </or>
     </condition>
     <available property="datasource" classname="javax.sql.DataSource"/>
     <available property="ssl" classname="javax.net.ssl.SSLSocketFactory"/>