[Lunar-commits] <moonbase> pilot-link: adjusting the DEPENDS for java to allow a simpler BUILD.

[Dennis 'stumbles' Veatch]

commit 5dd1ed38e6e7168937ffc477e9377a570f92730c
Author: Dennis 'stumbles' Veatch <stumbles at lunar-linux.org>
Date:   Wed Apr 1 09:21:41 2009 -0400

    pilot-link: adjusting the DEPENDS for java to allow a simpler BUILD.
---
 utils/pilot-link/BUILD   |   10 ----------
 utils/pilot-link/DEPENDS |    2 +-
 2 files changed, 1 insertions(+), 11 deletions(-)

diff --git a/utils/pilot-link/BUILD b/utils/pilot-link/BUILD
index 232dbb1..8a873db 100644
--- a/utils/pilot-link/BUILD
+++ b/utils/pilot-link/BUILD
@@ -4,16 +4,6 @@
 
   OPTS="$OPTS --enable-conduits --with-libpng=/usr --enable-threads" &&
 
-  if module_installed sun-jdk; then
-    JAVA_VERSION=`installed_version sun-jdk`;
-    export JAVA_HOME="/usr/lib/jdk${JAVA_VERSION}";
-    OPTS="$OPTS --with-java=$JAVA_HOME"
-  else
-    JAVA_VERSION=`installed_version j2sdk`;
-    export JAVA_HOME="/usr/lib/j2sdk${JAVA_VERSION}";
-    OPTS="$OPTS --with-java=$JAVA_HOME"
-  fi &&
-
   default_build &&
 
   gather_docs doc/*
diff --git a/utils/pilot-link/DEPENDS b/utils/pilot-link/DEPENDS
index 510bf2e..36e64e9 100644
--- a/utils/pilot-link/DEPENDS
+++ b/utils/pilot-link/DEPENDS
@@ -8,4 +8,4 @@ optional_depends "tcl"         "--with-tcl=/usr/lib  --with-tclinclude=/usr/incl
                                "--without-tcl"      "for tcl scripting support"
 
 optional_depends "bluez-utils" "--with-bluez"       "--without-bluez"      "for bluetooth support"
-optional_depends "%JAVA_SDK"   ""                   ""                     "for java support"
+optional_depends "%JAVA_SDK"   "--with-java=$JAVA_HOME" "--without-java"   "for java support"