aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKris Jurka <books@ejurka.com>2004-04-26 08:28:32 +0000
committerKris Jurka <books@ejurka.com>2004-04-26 08:28:32 +0000
commit79e42a6eb2dd18c45b12910d42ff0cba5a85eb7d (patch)
treead59f56afc5a32d0e8ae7dca9cc11d6397633790 /src
parent14684ca28f58417c108ff251daf68aae0ce17129 (diff)
downloadpostgresql-79e42a6eb2dd18c45b12910d42ff0cba5a85eb7d.tar.gz
postgresql-79e42a6eb2dd18c45b12910d42ff0cba5a85eb7d.zip
Update the build.xml file to support building with the new 1.5 jdk
and ant 1.6.
Diffstat (limited to 'src')
-rw-r--r--src/interfaces/jdbc/build.xml5
1 files changed, 4 insertions, 1 deletions
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"/>