From 8d5ba037f10c61df187b7f9e9951dab19bdd2daf Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Thu, 12 Dec 2002 07:30:18 +0000
Subject: [PATCH] Added necessary jockeying to cause ant not to freak out if
 JAVA_LIBS is not set.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2057 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 build.xml | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/build.xml b/build.xml
index 5e649c684..756ee2839 100644
--- a/build.xml
+++ b/build.xml
@@ -18,14 +18,24 @@
 
   <!-- we want to access the environment -->
   <property environment="env"/>
-  <property name="java.libraries" value="${env.JAVA_LIBS}"/>
 
-  <!-- declare our classpath -->
-  <path id="classpath">
+  <!-- declare our classpath business -->
+  <path id="base.classpath">
     <pathelement location="${classes.dir}"/>
     <fileset dir="lib" includes="**/*.jar"/>
-    <fileset dir="${java.libraries}" includes="**/*.jar"/>
   </path>
+  <path id="classpath">
+    <path refid="base.classpath"/>
+  </path>
+
+  <!-- include JAVA_LIBS jars in our classpath if it exists -->
+  <target name="check-java-libs" if="env.JAVA_LIBS">
+    <!-- overwrite the classpath with one that contains JAVA_LIBS jars -->
+    <path id="classpath">
+      <path refid="base.classpath"/>
+      <fileset dir="${env.JAVA_LIBS}" includes="**/*.jar"/>
+    </path>
+  </target>
 
   <!-- generates .java files for all .dobj files -->
   <target name="gendobj">
@@ -61,7 +71,7 @@
   </target>
 
   <!-- prepares the application directories -->
-  <target name="prepare" depends="gendobj">
+  <target name="prepare" depends="check-java-libs,gendobj">
     <mkdir dir="${deploy.dir}"/>
     <mkdir dir="${classes.dir}"/>
     <mkdir dir="${classes.dir}/rsrc"/>