Mercurial > hg > octave-lyh
annotate build-aux/OctJavaQry.java @ 15766:fafd51a1b0f0
build: Add more searching for Java libjvm.so.
On Macs, look for jni.h in a list of possible directories.
* configure.ac: Search for libjvm in JAVA_LDPATH, JAVA_BOOTPATH, and heuristic
list of directories. Search for jni.h in possible list of directories on Mac
platforms.
* build-aux/OctJavaQry.java: Add JAVA_BOOTPATH query option.
* build-aux/OctJavaQry.class: Add JAVA_BOOTPATH query option.
author | Rik <rik@octave.org> |
---|---|
date | Tue, 11 Dec 2012 14:06:09 -0800 |
parents | 56239ff815a3 |
children |
rev | line source |
---|---|
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
diff
changeset
|
1 // Code used by configure script to locate Java installation variables. |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
diff
changeset
|
2 // Only compiled code, OctJavaQry.class, is distributed. |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
diff
changeset
|
3 public class OctJavaQry |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
diff
changeset
|
4 { |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
diff
changeset
|
5 public static void main (String[] args) |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
diff
changeset
|
6 { |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
diff
changeset
|
7 if (args.length > 0) |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
diff
changeset
|
8 { |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
diff
changeset
|
9 if (args[0].equals ("JAVA_HOME")) |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
diff
changeset
|
10 { |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
diff
changeset
|
11 System.out.println (System.getProperty ("java.home")); |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
diff
changeset
|
12 } |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
diff
changeset
|
13 else if (args[0].equals ("JAVA_LDPATH")) |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
diff
changeset
|
14 { |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
diff
changeset
|
15 System.out.println (System.getProperty ("java.library.path")); |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
diff
changeset
|
16 } |
15766
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
17 else if (args[0].equals ("JAVA_BOOTPATH")) |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
18 { |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
19 System.out.println (System.getProperty ("sun.boot.library.path")); |
fafd51a1b0f0
build: Add more searching for Java libjvm.so.
Rik <rik@octave.org>
parents:
15763
diff
changeset
|
20 } |
15763
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
diff
changeset
|
21 } |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
diff
changeset
|
22 } |
56239ff815a3
build: Overhaul auto-detection of Java when JAVA_HOME is not set.
Rik <rik@octave.org>
parents:
diff
changeset
|
23 } |