]>
Commit | Line | Data |
---|---|---|
03f15e65 JR |
1 | --- libgda-5.2.1/getsp.java~ 2013-10-19 14:35:27.000000000 +0200 |
2 | +++ libgda-5.2.1/getsp.java 2013-12-01 10:06:13.393710066 +0100 | |
3 | @@ -10,7 +10,8 @@ | |
4 | } | |
5 | else if (args[0].compareTo("-libs")==0) { | |
6 | String prefix="-L"; | |
7 | - if (args.length>1) prefix=args[1]; | |
8 | + String suffix="/lib/amd64/server"; | |
9 | + if (args.length>1) suffix=args[1]; | |
10 | ||
11 | // we're not using StringTokenizer in case the JVM is very crude | |
12 | int i=0,j,k=0; | |
13 | @@ -25,7 +27,6 @@ | |
14 | while (i<=j) { | |
15 | if (i==j || lp.charAt(i)==ps) { | |
16 | String lib=lp.substring(k,i); | |
17 | - String suffix="/lib/amd64/server"; | |
18 | k=i+1; | |
19 | if (lib.compareTo(".")!=0) | |
20 | r=(r==null)?(prefix+lib+suffix):(r+" "+prefix+lib+suffix); | |
21 | @@ -50,7 +51,9 @@ | |
22 | ||
23 | if (r!=null) System.out.println(r); | |
24 | } else if (args[0].compareTo("-ldpath")==0) { | |
25 | - String lp1=System.getProperty("java.home")+"/lib/amd64/server"; | |
26 | + String suffix="/lib/amd64/server"; | |
27 | + if (args.length>1) suffix=args[1]; | |
28 | + String lp1=System.getProperty("java.home")+suffix; | |
29 | String lp2=System.getProperty("java.library.path"); | |
30 | System.out.println(lp1+":"+lp2); | |
31 | } | |
c541bbbe JB |
32 | --- libgda-5.2.9/m4/java.m4.orig 2019-07-02 19:34:15.673428245 +0200 |
33 | +++ libgda-5.2.9/m4/java.m4 2019-07-02 19:36:58.065881823 +0200 | |
34 | @@ -221,9 +221,9 @@ | |
03f15e65 JR |
35 | JAVA_LD_PATH= |
36 | ;; | |
37 | *) | |
38 | - RUN_JAVA(JAVA_LIBS, [-classpath ${srcdir} getsp -libs]) | |
39 | + RUN_JAVA(JAVA_LIBS, [-classpath ${srcdir} getsp -libs ${_JAVA_SUFFIX}]) | |
c541bbbe | 40 | JAVA_LIBS="${JAVA_LIBS} -L${JAVA_HOME}/lib/server -ljvm" |
03f15e65 JR |
41 | - RUN_JAVA(JAVA_LD_PATH, [-classpath ${srcdir} getsp -ldpath]) |
42 | + RUN_JAVA(JAVA_LD_PATH, [-classpath ${srcdir} getsp -ldpath ${_JAVA_SUFFIX}]) | |
43 | ;; | |
44 | esac | |
45 | # note that we actually don't test JAVA_LIBS - we hope that the detection |