Mercurial > hg > octave-nkf

diff libinterp/octave-value/ov-java.cc @ 15763:56239ff815a3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
build: Overhaul auto-detection of Java when JAVA_HOME is not set. * build-aux/OctJavaQry.class: Compiled code to help configure determine installation directories. Exported in tarball. * build-aux/OctJavaQry.java: Java code to help configure determine installation directories. * Makefile.am: Export OctJavaQry.class code in tarball. * configure.ac: If JAVA_HOME is unset, attempt to find a Java executable. Use java executable and Java code to try and determine necessary directories. * libinterp/octave-value/ov-java.cc: Use JAVA_LDPATH variable to find libjvm.
author Rik <rik@octave.org>
date Mon, 10 Dec 2012 13:15:08 -0800
parents 3216dafbbd48
children e61405133a76
line wrap: on
line diff
--- a/libinterp/octave-value/ov-java.cc
+++ b/libinterp/octave-value/ov-java.cc
@@ -449,9 +449,14 @@
         throw std::string ("unable to find Java Runtime Environment");
     }
 
+#else  // Not Win32 system
+  
+  // JAVA_LDPATH determined by configure and set in config.h
+#if defined (__APPLE__)
+  std::string jvm_lib_path = JAVA_LDPATH + std::string ("/libjvm.dylib");
 #else
-
-  std::string jvm_lib_path = JAVA_HOME + std::string ("/jre/lib/") + JAVA_ARCH + "/server/libjvm.so";
+  std::string jvm_lib_path = JAVA_LDPATH + std::string ("/libjvm.so");
+#endif
 
 #endif