blob: d057db61a5e74f74ca4656f96a4b90c076eac624 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
|
--- ./configure.orig 2011-07-20 08:15:42.000000000 +0000
+++ ./configure 2013-10-23 11:59:48.722499060 +0000
@@ -10719,7 +10719,7 @@
ac_java_jvm_jni_lib_flags="$ac_java_jvm_jni_lib_flags -L$D -ljvm"
D=$ac_java_jvm_dir/jre/lib/$machine/native_threads
ac_java_jvm_jni_lib_runtime_path="${ac_java_jvm_jni_lib_runtime_path}:$D"
- ac_java_jvm_jni_lib_flags="$ac_java_jvm_jni_lib_flags -L$D -lhpi"
+ ac_java_jvm_jni_lib_flags="$ac_java_jvm_jni_lib_flags -L$D -ljvm"
fi
fi
@@ -10850,7 +10850,7 @@
ac_java_jvm_jni_lib_flags="$ac_java_jvm_jni_lib_flags -L$D -ljvm"
D=$ac_java_jvm_dir/jre/lib/mipsel/native_threads
ac_java_jvm_jni_lib_runtime_path="${ac_java_jvm_jni_lib_runtime_path}:$D"
- ac_java_jvm_jni_lib_flags="$ac_java_jvm_jni_lib_flags -L$D -lhpi"
+ ac_java_jvm_jni_lib_flags="$ac_java_jvm_jni_lib_flags -L$D -ljvm"
fi
fi
@@ -12226,14 +12226,15 @@
public class conftest {
public static void main(String[] argv) {
- String minVersion="1.8.4";
+ int minVersion=10804;
int[] vers = new int[3];
try { H5.H5get_libversion(vers); }
catch (Throwable ex) {System.exit(-1);}
String ver = vers[0] + "."+ vers[1] +"."+vers[2];
+ int Version = 10000*vers[0] + 100*vers[1] + vers[2];
System.out.println(ver);
- if (minVersion.compareTo(ver) > 0) {
+ if (minVersion > Version) {
System.exit(-1);
}
@@ -12281,14 +12281,15 @@
public class conftest {
public static void main(String[] argv) {
- String minVersion="1.8.4";
+ int minVersion=10804;
int[] vers = new int[3];
try { H5.H5get_libversion(vers); }
catch (Throwable ex) {System.exit(-1);}
String ver = vers[0] + "."+ vers[1] +"."+vers[2];
+ int Version = 10000*vers[0] + 100*vers[1] + vers[2];
System.out.println(ver);
- if (minVersion.compareTo(ver) != 0) {
+ if (minVersion > Version) {
System.exit(-1);
}
|
