--- FindJNI.cmake	2008-08-04 10:52:44.000000000 +0200
+++ FindJNI.cmake.new	2008-08-04 17:56:20.000000000 +0200
@@ -3,14 +3,18 @@
 # include files and libraries are. It also determines what the name of
 # the library is. This code sets the following variables:
 #   
-#  JAVA_AWT_LIB_PATH     = the path to the jawt library
-#  JAVA_JVM_LIB_PATH     = the path to the jvm library
+#  JNI_INCLUDE_DIRS      = the include dirs to use
+#  JNI_LIBRARIES         = the libraries to use
+#  JAVA_AWT_LIBRARY      = the path to the jawt library
+#  JAVA_JVM_LIBRARY      = the path to the jvm library
 #  JAVA_INCLUDE_PATH     = the include path to jni.h
 #  JAVA_INCLUDE_PATH2    = the include path to jni_md.h
 #  JAVA_AWT_INCLUDE_PATH = the include path to jawt.h
-# 
+#
+
 GET_FILENAME_COMPONENT(java_install_version
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit;CurrentVersion]" NAME)
+
 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"
@@ -20,19 +24,26 @@
   $ENV{JAVA_HOME}/jre/lib/ppc
   /usr/lib
   /usr/local/lib
+  /usr/lib/jvm/java/lib
   /usr/lib/java/jre/lib/i386
   /usr/local/lib/java/jre/lib/i386
   /usr/local/share/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
-  /usr/lib/java/jre/lib/amd64
   /usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/amd64
+  /usr/lib/java/jre/lib/amd64
   /usr/local/lib/java/jre/lib/amd64
   /usr/local/share/java/jre/lib/amd64
   /usr/lib/j2sdk1.4-sun/jre/lib/amd64
   /usr/lib/j2sdk1.5-sun/jre/lib/amd64
+  /usr/lib/java/jre/lib/ppc
+  /usr/local/lib/java/jre/lib/ppc
+  /usr/local/share/java/jre/lib/ppc
+  /usr/lib/j2sdk1.4-sun/jre/lib/ppc
+  /usr/lib/j2sdk1.5-sun/jre/lib/ppc
   )
+
 SET(JAVA_JVM_LIBRARY_DIRECTORIES)
 FOREACH(dir ${JAVA_AWT_LIBRARY_DIRECTORIES})
   SET(JAVA_JVM_LIBRARY_DIRECTORIES
@@ -53,6 +64,7 @@
   /usr/local/include
   /usr/lib/java/include
   /usr/local/lib/java/include
+  /usr/lib/jvm/java/include
   /usr/lib/jvm/java-6-sun-1.6.0.00/include
   /usr/local/share/java/include
   /usr/lib/j2sdk1.4-sun/include
@@ -131,6 +143,7 @@
   ${JAVA_AWT_INCLUDE_DIRECTORIES}
   ${JAVA_INCLUDE_PATH}/win32
   ${JAVA_INCLUDE_PATH}/linux
+  ${JAVA_INCLUDE_PATH}/freebsd
 )
 
 FIND_PATH(JAVA_AWT_INCLUDE_PATH jawt.h
@@ -145,3 +158,15 @@
   JAVA_INCLUDE_PATH
   JAVA_INCLUDE_PATH2
 )
+
+SET(JNI_LIBRARIES
+  ${JAVA_AWT_LIBRARY}
+  ${JAVA_JVM_LIBRARY}
+)
+
+SET(JNI_INCLUDE_DIRS
+  ${JAVA_INCLUDE_PATH}
+  ${JAVA_INCLUDE_PATH2}
+  ${JAVA_AWT_INCLUDE_PATH}
+)
+