r35659 - /packages/scilab/trunk/debian/patches/jvm-powerpc.diff
sylvestre-guest at users.alioth.debian.org
sylvestre-guest at users.alioth.debian.org
Tue Apr 21 09:38:42 UTC 2009
Author: sylvestre-guest
Date: Tue Apr 21 09:38:42 2009
New Revision: 35659
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=35659
Log:
Detection of java under powerpc
Modified:
packages/scilab/trunk/debian/patches/jvm-powerpc.diff
Modified: packages/scilab/trunk/debian/patches/jvm-powerpc.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/patches/jvm-powerpc.diff?rev=35659&op=diff
==============================================================================
--- packages/scilab/trunk/debian/patches/jvm-powerpc.diff (original)
+++ packages/scilab/trunk/debian/patches/jvm-powerpc.diff Tue Apr 21 09:38:42 2009
@@ -1,8 +1,54 @@
-diff --git a/scilab/configure b/scilab/configure
-index a7f2537..3b264ec 100755
---- a/scilab/configure
-+++ b/scilab/configure
-@@ -11743,6 +11743,9 @@ $as_echo "$ac_cv_java_jvm_jni_working" >&6; }
+--- scilab-5.1.1.obsolete.0.483493411521525/configure 2009-04-14 09:30:40.000000000 +0200
++++ scilab-5.1.1/configure 2009-04-21 11:34:11.000000000 +0200
+@@ -10458,8 +10458,9 @@
+ # FIXME: we rely on the cache variable name because
+ # there is no other way.
+ set dummy $CC
+-ac_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
+-if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
++am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
++eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
++if test "$am_t" != yes; then
+ # Losing compiler, so override with the script.
+ # FIXME: It is wrong to rewrite CC.
+ # But if we don't then we get into trouble of one sort or another.
+@@ -11444,7 +11445,7 @@
+ $as_echo_n "checking to see if the java compiler works... " >&6; }
+
+ cat << \EOF > conftest.java
+-// #line 11447 "configure"
++// #line 11448 "configure"
+
+
+ public class conftest {
+@@ -11494,7 +11495,7 @@
+ if test "x$ac_java_jvm_name" = "x" ; then
+
+ cat << \EOF > conftest.java
+-// #line 11497 "configure"
++// #line 11498 "configure"
+ import gnu.java.io.EncodingManager;
+
+ public class conftest {
+@@ -11542,7 +11543,7 @@
+
+
+ cat << \EOF > conftest.java
+-// #line 11545 "configure"
++// #line 11546 "configure"
+ import java.nio.charset.Charset;
+
+ public class conftest {
+@@ -11569,7 +11570,7 @@
+
+
+ cat << \EOF > conftest.java
+-// #line 11572 "configure"
++// #line 11573 "configure"
+ import java.lang.StringBuilder;
+
+ public class conftest {
+@@ -11743,6 +11744,9 @@
# Sun
machine=sparc
;;
@@ -12,376 +58,412 @@
esac
# Check for known JDK installation layouts
-@@ -12861,7 +12864,7 @@ $as_echo_n "checking flexdock... " >&6; }
+@@ -11769,6 +11773,19 @@
+ ac_java_jvm_jni_lib_runtime_path=$D
+ ac_java_jvm_jni_lib_flags="-L$D -ljava -lverify"
+ D=$ac_java_jvm_dir/jre/lib/$machine/client
++ if test ! -f $D/libjvm.so; then # Check if it is in the client or server directory
++ # Try the server directory
++ D=$ac_java_jvm_dir/jre/lib/$machine/server
++ if test ! -f $D/libjvm.so; then
++ { { $as_echo "$as_me:$LINENO: error: Could not find libjvm.so in
++ jre/lib/$machine/client/ or in jre/lib/$machine/server/.
++ Please report to http://bugzilla.scilab.org/" >&5
++$as_echo "$as_me: error: Could not find libjvm.so in
++ jre/lib/$machine/client/ or in jre/lib/$machine/server/.
++ Please report to http://bugzilla.scilab.org/" >&2;}
++ { (exit 1); exit 1; }; }
++ fi
++ fi
+ 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 -ljvm"
+ D=$ac_java_jvm_dir/jre/lib/$machine/native_threads
+@@ -12861,7 +12878,7 @@
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
-// #line 12864 "configure"
-+// #line 12867 "configure"
++// #line 12881 "configure"
import org.flexdock.docking.DockingManager;
public class conftest {
-@@ -12934,7 +12937,7 @@ $as_echo_n "checking looks... " >&6; }
+@@ -12934,7 +12951,7 @@
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
-// #line 12937 "configure"
-+// #line 12940 "configure"
++// #line 12954 "configure"
import com.jgoodies.looks.common.RenderingUtils;
public class conftest {
-@@ -13007,7 +13010,7 @@ $as_echo_n "checking looks2... " >&6; }
+@@ -13007,7 +13024,7 @@
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
-// #line 13010 "configure"
-+// #line 13013 "configure"
++// #line 13027 "configure"
import com.jgoodies.looks.common.RenderingUtils;
public class conftest {
-@@ -13083,7 +13086,7 @@ $as_echo_n "checking skinlf... " >&6; }
+@@ -13083,7 +13100,7 @@
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
-// #line 13086 "configure"
-+// #line 13089 "configure"
++// #line 13103 "configure"
import com.l2fprod.util.AccessUtils;
public class conftest {
-@@ -13156,7 +13159,7 @@ $as_echo_n "checking jogl... " >&6; }
+@@ -13156,7 +13173,7 @@
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
-// #line 13159 "configure"
-+// #line 13162 "configure"
++// #line 13176 "configure"
import javax.media.opengl.glu.GLUnurbs;
public class conftest {
-@@ -13229,7 +13232,7 @@ $as_echo_n "checking jhall... " >&6; }
+@@ -13229,7 +13246,7 @@
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
-// #line 13232 "configure"
-+// #line 13235 "configure"
++// #line 13249 "configure"
import javax.help.JHelp;
public class conftest {
-@@ -13302,7 +13305,7 @@ $as_echo_n "checking javahelp2... " >&6; }
+@@ -13302,7 +13319,7 @@
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
-// #line 13305 "configure"
-+// #line 13308 "configure"
++// #line 13322 "configure"
import javax.help.JHelp;
public class conftest {
-@@ -13376,7 +13379,7 @@ $as_echo_n "checking gluegen-rt... " >&6; }
+@@ -13376,7 +13393,7 @@
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
-// #line 13379 "configure"
-+// #line 13382 "configure"
++// #line 13396 "configure"
import com.sun.gluegen.runtime.CPU;
public class conftest {
-@@ -13449,7 +13452,7 @@ $as_echo_n "checking jrosetta-API... " >&6; }
+@@ -13449,7 +13466,7 @@
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
-// #line 13452 "configure"
-+// #line 13455 "configure"
++// #line 13469 "configure"
import com.artenum.rosetta.interfaces.core.ConsoleConfiguration;
public class conftest {
-@@ -13522,7 +13525,7 @@ $as_echo_n "checking jrosetta-engine... " >&6; }
+@@ -13522,7 +13539,7 @@
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
-// #line 13525 "configure"
-+// #line 13528 "configure"
++// #line 13542 "configure"
import com.artenum.rosetta.core.action.AbstractConsoleAction;
public class conftest {
-@@ -13595,7 +13598,7 @@ $as_echo_n "checking commons-logging... " >&6; }
+@@ -13595,7 +13612,7 @@
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
-// #line 13598 "configure"
-+// #line 13601 "configure"
++// #line 13615 "configure"
import org.apache.commons.logging.LogFactory;
public class conftest {
-@@ -25897,7 +25900,7 @@ CPPFLAGS="$CPPFLAGS -I$CHK_TCL_INCLUDE_PATH"
+@@ -25897,7 +25914,7 @@
{ $as_echo "$as_me:$LINENO: checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later" >&5
$as_echo_n "checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later... " >&6; }
cat > conftest.$ac_ext <<EOF
-#line 25900 "configure"
-+#line 25903 "configure"
++#line 25917 "configure"
#include "confdefs.h"
#include "$CHK_TCL_INCLUDE_PATH/$CHK_TCL_INC_NAME"
-@@ -26456,7 +26459,7 @@ CPPFLAGS="$CPPFLAGS $TCL_INC_PATH -I$CHK_TK_INCLUDE_PATH $X_CFLAGS"
+@@ -26456,7 +26473,7 @@
$as_echo_n "checking if tk is version $CHK_TK_MAJOR.$CHK_TK_MINOR or later... " >&6; }
cat > conftest.$ac_ext <<EOF
-#line 26459 "configure"
-+#line 26462 "configure"
++#line 26476 "configure"
#include "confdefs.h"
#include "$CHK_TK_INCLUDE_PATH/$CHK_TK_INC_NAME"
-@@ -27306,7 +27309,7 @@ $as_echo_n "checking batik-all... " >&6; }
+@@ -27306,7 +27323,7 @@
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
-// #line 27309 "configure"
-+// #line 27312 "configure"
++// #line 27326 "configure"
import org.apache.batik.parser.Parser;
public class conftest {
-@@ -27379,7 +27382,7 @@ $as_echo_n "checking batik... " >&6; }
+@@ -27379,7 +27396,7 @@
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
-// #line 27382 "configure"
-+// #line 27385 "configure"
++// #line 27399 "configure"
import org.apache.batik.parser.Parser;
public class conftest {
-@@ -27454,7 +27457,7 @@ $as_echo_n "checking saxon... " >&6; }
+@@ -27454,7 +27471,7 @@
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
-// #line 27457 "configure"
-+// #line 27460 "configure"
++// #line 27474 "configure"
import com.icl.saxon.Loader;
public class conftest {
-@@ -27527,7 +27530,7 @@ $as_echo_n "checking fop... " >&6; }
+@@ -27527,7 +27544,7 @@
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
-// #line 27530 "configure"
-+// #line 27533 "configure"
++// #line 27547 "configure"
import org.apache.fop.pdf.PDFInfo;
public class conftest {
-@@ -27600,7 +27603,7 @@ $as_echo_n "checking jeuclid-core... " >&6; }
+@@ -27600,7 +27617,7 @@
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
-// #line 27603 "configure"
-+// #line 27606 "configure"
++// #line 27620 "configure"
import net.sourceforge.jeuclid.LayoutContext;
public class conftest {
-@@ -27673,7 +27676,7 @@ $as_echo_n "checking commons-io... " >&6; }
+@@ -27673,7 +27690,7 @@
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
-// #line 27676 "configure"
-+// #line 27679 "configure"
++// #line 27693 "configure"
import org.apache.commons.io.output.CountingOutputStream;
public class conftest {
-@@ -27746,7 +27749,7 @@ $as_echo_n "checking xmlgraphics-commons... " >&6; }
+@@ -27746,7 +27763,7 @@
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
-// #line 27749 "configure"
-+// #line 27752 "configure"
++// #line 27766 "configure"
import org.apache.xmlgraphics.util.Service;
public class conftest {
-@@ -27819,7 +27822,7 @@ $as_echo_n "checking xml-apis-ext... " >&6; }
+@@ -27819,7 +27836,7 @@
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
-// #line 27822 "configure"
-+// #line 27825 "configure"
++// #line 27839 "configure"
import org.w3c.dom.svg.SVGDocument;
public class conftest {
-@@ -27893,7 +27896,7 @@ $as_echo_n "checking avalon-framework... " >&6; }
+@@ -27893,7 +27910,7 @@
export ac_java_classpath="$jar_resolved:$ac_java_classpath"
cat << \EOF > conftest.java
-// #line 27896 "configure"
-+// #line 27899 "configure"
++// #line 27913 "configure"
import org.apache.avalon.framework.configuration.ConfigurationException;
public class conftest {
-@@ -28539,7 +28542,7 @@ ia64-*-hpux*)
+@@ -28539,7 +28556,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 28542 "configure"' > conftest.$ac_ext
-+ echo '#line 28545 "configure"' > conftest.$ac_ext
++ echo '#line 28559 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -30409,11 +30412,11 @@ else
+@@ -30409,11 +30426,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:30412: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:30415: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:30429: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:30416: \$? = $ac_status" >&5
-+ echo "$as_me:30419: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
-@@ -30699,11 +30702,11 @@ else
++ echo "$as_me:30433: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -30699,11 +30716,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:30702: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:30705: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:30719: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:30706: \$? = $ac_status" >&5
-+ echo "$as_me:30709: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
-@@ -30803,11 +30806,11 @@ else
++ echo "$as_me:30723: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -30803,11 +30820,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:30806: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:30809: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:30823: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:30810: \$? = $ac_status" >&5
-+ echo "$as_me:30813: \$? = $ac_status" >&5
++ echo "$as_me:30827: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -33288,7 +33291,7 @@ else
+@@ -33288,7 +33305,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 33291 "configure"
-+#line 33294 "configure"
++#line 33308 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -33388,7 +33391,7 @@ else
+@@ -33388,7 +33405,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 33391 "configure"
-+#line 33394 "configure"
++#line 33408 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -35817,11 +35820,11 @@ else
+@@ -35817,11 +35834,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:35820: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:35823: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:35837: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:35824: \$? = $ac_status" >&5
-+ echo "$as_me:35827: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
-@@ -35921,11 +35924,11 @@ else
++ echo "$as_me:35841: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -35921,11 +35938,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:35924: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:35927: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:35941: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:35928: \$? = $ac_status" >&5
-+ echo "$as_me:35931: \$? = $ac_status" >&5
++ echo "$as_me:35945: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -37519,11 +37522,11 @@ else
+@@ -37519,11 +37536,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:37522: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:37525: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:37539: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:37526: \$? = $ac_status" >&5
-+ echo "$as_me:37529: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
-@@ -37623,11 +37626,11 @@ else
++ echo "$as_me:37543: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -37623,11 +37640,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:37626: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:37629: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:37643: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:37630: \$? = $ac_status" >&5
-+ echo "$as_me:37633: \$? = $ac_status" >&5
++ echo "$as_me:37647: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -39855,11 +39858,11 @@ else
+@@ -39855,11 +39872,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:39858: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:39861: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:39875: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:39862: \$? = $ac_status" >&5
-+ echo "$as_me:39865: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
-@@ -40145,11 +40148,11 @@ else
++ echo "$as_me:39879: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -40145,11 +40162,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:40148: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:40151: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:40165: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:40152: \$? = $ac_status" >&5
-+ echo "$as_me:40155: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
-@@ -40249,11 +40252,11 @@ else
++ echo "$as_me:40169: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -40249,11 +40266,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:40252: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:40255: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:40269: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:40256: \$? = $ac_status" >&5
-+ echo "$as_me:40259: \$? = $ac_status" >&5
++ echo "$as_me:40273: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-diff --git a/scilab/m4/java.m4 b/scilab/m4/java.m4
-index 3d41dab..ba1293f 100644
---- a/scilab/m4/java.m4
-+++ b/scilab/m4/java.m4
-@@ -422,6 +422,9 @@ AC_DEFUN([AC_JAVA_JNI_LIBS], [
+@@ -44811,7 +44828,16 @@
+
+
+ case $ac_file$ac_mode in
+- "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
++ "depfiles":C) test x"$AMDEP_TRUE" != x"" || # Autoconf 2.62 quotes --file arguments for eval, but not when files
++# are listed without --file. Let's play safe and only enable the eval
++# if we detect the quoting.
++case $CONFIG_FILES in
++*\'*) eval set x "$CONFIG_FILES" ;;
++*) set x $CONFIG_FILES ;;
++esac
++shift
++for mf
++do
+ # Strip MF so we end up with the name of the file.
+ mf=`echo "$mf" | sed -e 's/:.*$//'`
+ # Check whether this is an Automake generated Makefile or not.
+--- scilab-5.1.1.obsolete.0.483493411521525/m4/java.m4 2009-04-14 09:30:41.000000000 +0200
++++ scilab-5.1.1/m4/java.m4 2009-04-21 11:33:46.000000000 +0200
+@@ -422,6 +422,9 @@
# Sun
machine=sparc
;;
@@ -391,3 +473,19 @@
esac
# Check for known JDK installation layouts
+@@ -442,6 +445,15 @@
+ ac_java_jvm_jni_lib_runtime_path=$D
+ ac_java_jvm_jni_lib_flags="-L$D -ljava -lverify"
+ D=$ac_java_jvm_dir/jre/lib/$machine/client
++ if test ! -f $D/libjvm.so; then # Check if it is in the client or server directory
++ # Try the server directory
++ D=$ac_java_jvm_dir/jre/lib/$machine/server
++ if test ! -f $D/libjvm.so; then
++ AC_MSG_ERROR([Could not find libjvm.so in
++ jre/lib/$machine/client/ or in jre/lib/$machine/server/.
++ Please report to http://bugzilla.scilab.org/])
++ fi
++ fi
+ 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 -ljvm"
+ D=$ac_java_jvm_dir/jre/lib/$machine/native_threads
More information about the debian-science-commits
mailing list