[Lunar-commits] <moonbase> pilot-link: just a twiddle with the DEPENDS and BUILD.

[Dennis 'stumbles' Veatch]

commit b37bdb42f0e7aeebae1a835bc51b513a622d1997
Author: Dennis 'stumbles' Veatch <stumbles at lunar-linux.org>
Date:   Fri Feb 13 21:26:28 2009 -0500

    pilot-link: just a twiddle with the DEPENDS and BUILD.
---
 utils/pilot-link/BUILD   |   13 +++++++++++++
 utils/pilot-link/DEPENDS |    1 +
 2 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/utils/pilot-link/BUILD b/utils/pilot-link/BUILD
index 9f3d5d4..232dbb1 100644
--- a/utils/pilot-link/BUILD
+++ b/utils/pilot-link/BUILD
@@ -1,8 +1,21 @@
 (
 
   bad_flags -Werror &&
+
   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/*
 
 ) > $C_FIFO 2>&1
diff --git a/utils/pilot-link/DEPENDS b/utils/pilot-link/DEPENDS
index 5366e5c..510bf2e 100644
--- a/utils/pilot-link/DEPENDS
+++ b/utils/pilot-link/DEPENDS
@@ -8,3 +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"