From 1d031367d929636ccc83dc860221a54e6864bbf5 Mon Sep 17 00:00:00 2001
From: Bill Hoffman <bill.hoffman@kitware.com>
Date: Fri, 23 Sep 2005 14:38:51 -0400
Subject: [PATCH] ENH: java fixes from Mathieu

---
 Modules/FindJNI.cmake  | 5 +++++
 Modules/FindJava.cmake | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake
index 57cfe3783..70d786c4a 100644
--- a/Modules/FindJNI.cmake
+++ b/Modules/FindJNI.cmake
@@ -11,23 +11,28 @@
 SET(JAVA_AWT_LIBRARY_DIRECTORIES
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/lib"
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/lib"
+  $ENV{JAVA_HOME}/jre/lib/i386
+  $ENV{JAVA_HOME}/jre/lib/amd64
   /usr/lib
   /usr/local/lib
   /usr/lib/java/jre/lib/i386
   /usr/local/lib/java/jre/lib/i386
   /usr/lib/j2sdk1.4-sun/jre/lib/i386
   /usr/lib/j2sdk1.5-sun/jre/lib/i386
+  /opt/sun-jdk-1.5.0.04/jre/lib/amd64
   )
 
 SET(JAVA_AWT_INCLUDE_DIRECTORIES
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/include"
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/include"
+  $ENV{JAVA_HOME}/include
   /usr/include 
   /usr/local/include
   /usr/lib/java/include
   /usr/local/lib/java/include
   /usr/lib/j2sdk1.4-sun/include
   /usr/lib/j2sdk1.5-sun/include
+  /opt/sun-jdk-1.5.0.04/include
   )
 
 FOREACH(JAVA_PROG "${JAVA_RUNTIME}" "${JAVA_COMPILE}" "${JAVA_ARCHIVE}")
diff --git a/Modules/FindJava.cmake b/Modules/FindJava.cmake
index ba59644bc..466e8f638 100644
--- a/Modules/FindJava.cmake
+++ b/Modules/FindJava.cmake
@@ -16,6 +16,7 @@ SET(JAVA_BIN_PATH
     "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.5;JavaHome]/bin"
     "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/bin"
     "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/bin"
+  $ENV{JAVA_HOME}/bin
   /usr/bin
   /usr/lib/java/bin
   /usr/share/java/bin
@@ -25,6 +26,7 @@ SET(JAVA_BIN_PATH
   /usr/lib/j2sdk1.4-sun/bin
   /usr/java/j2sdk1.4.2_09/bin
   /usr/lib/j2sdk1.5-sun/bin
+  /opt/sun-jdk-1.5.0.04/bin
   )
 FIND_PROGRAM(JAVA_RUNTIME
   NAMES java