summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClément DAVID <clement.david@scilab.org>2011-02-25 13:54:31 +0100
committerSylvestre Ledru <sylvestre.ledru@scilab.org>2011-03-04 12:17:32 +0100
commit9c6939ffb7895a0ad956a5e703667b336966b6ef (patch)
tree91a985c1669070653e104d9c2bd425179fe49e36
parent118611f15e9be854bebda0e3daf63eddc920b70f (diff)
downloadscilab-9c6939ffb7895a0ad956a5e703667b336966b6ef.zip
scilab-9c6939ffb7895a0ad956a5e703667b336966b6ef.tar.gz
Configure: use --enable-debug-java for generating java debug information and not anything else.
Change-Id: Iff659462abd97633f65758919c1de209e1c3b0b1
-rw-r--r--scilab/.gitignore1
-rw-r--r--scilab/Makefile.in12
-rw-r--r--scilab/build.incl.xml168
-rwxr-xr-xscilab/configure135
-rw-r--r--scilab/configure.ac31
-rw-r--r--scilab/contrib/Makefile.in2
-rw-r--r--scilab/etc/.gitignore1
-rw-r--r--scilab/etc/jvm_options.xml (renamed from scilab/etc/jvm_options.xml.in)31
-rw-r--r--scilab/etc/jvm_options.xml.vc40
-rw-r--r--scilab/libs/MALLOC/Makefile.in2
-rw-r--r--scilab/libs/Makefile.in2
-rw-r--r--scilab/libs/doublylinkedlist/Makefile.in2
-rw-r--r--scilab/libs/dynamiclibrary/Makefile.in2
-rw-r--r--scilab/libs/hashtable/Makefile.in2
-rw-r--r--scilab/libs/libst/Makefile.in2
-rw-r--r--scilab/modules/Makefile.in2
-rw-r--r--scilab/modules/action_binding/Makefile.in2
-rw-r--r--scilab/modules/api_scilab/Makefile.in2
-rw-r--r--scilab/modules/arnoldi/Makefile.in2
-rw-r--r--scilab/modules/atoms/Makefile.in2
-rw-r--r--scilab/modules/boolean/Makefile.in2
-rw-r--r--scilab/modules/cacsd/Makefile.in2
-rw-r--r--scilab/modules/call_scilab/Makefile.in2
-rw-r--r--scilab/modules/commons/Makefile.in2
-rw-r--r--scilab/modules/compatibility_functions/Makefile.in2
-rw-r--r--scilab/modules/completion/Makefile.in2
-rw-r--r--scilab/modules/console/Makefile.in2
-rw-r--r--scilab/modules/core/Makefile.in2
-rw-r--r--scilab/modules/data_structures/Makefile.in2
-rw-r--r--scilab/modules/demo_tools/Makefile.in2
-rw-r--r--scilab/modules/development_tools/Makefile.in2
-rw-r--r--scilab/modules/development_tools/src/fake/Makefile.in2
-rw-r--r--scilab/modules/differential_equations/Makefile.in2
-rw-r--r--scilab/modules/double/Makefile.in2
-rw-r--r--scilab/modules/dynamic_link/Makefile.in2
-rw-r--r--scilab/modules/elementary_functions/Makefile.in2
-rw-r--r--scilab/modules/fftw/Makefile.in2
-rw-r--r--scilab/modules/fileio/Makefile.in2
-rw-r--r--scilab/modules/functions/Makefile.in2
-rw-r--r--scilab/modules/genetic_algorithms/Makefile.in2
-rw-r--r--scilab/modules/graph/Makefile.in2
-rw-r--r--scilab/modules/graphic_export/Makefile.in2
-rw-r--r--scilab/modules/graphics/Makefile.in2
-rw-r--r--scilab/modules/gui/Makefile.in2
-rw-r--r--scilab/modules/hdf5/Makefile.in2
-rw-r--r--scilab/modules/helptools/Makefile.in2
-rw-r--r--scilab/modules/history_browser/Makefile.in2
-rw-r--r--scilab/modules/history_manager/Makefile.in2
-rw-r--r--scilab/modules/integer/Makefile.in2
-rw-r--r--scilab/modules/interpolation/Makefile.in2
-rw-r--r--scilab/modules/intersci/Makefile.in2
-rw-r--r--scilab/modules/io/Makefile.in2
-rw-r--r--scilab/modules/javasci/Makefile.in2
-rw-r--r--scilab/modules/jvm/Makefile.in2
-rw-r--r--scilab/modules/linear_algebra/Makefile.in2
-rw-r--r--scilab/modules/localization/Makefile.in2
-rw-r--r--scilab/modules/m2sci/Makefile.in2
-rw-r--r--scilab/modules/maple2scilab/Makefile.in2
-rw-r--r--scilab/modules/matio/Makefile.in2
-rw-r--r--scilab/modules/mexlib/Makefile.in2
-rw-r--r--scilab/modules/modules_manager/Makefile.in2
-rw-r--r--scilab/modules/optimization/Makefile.in2
-rw-r--r--scilab/modules/output_stream/Makefile.in2
-rw-r--r--scilab/modules/overloading/Makefile.in2
-rw-r--r--scilab/modules/parallel/Makefile.in2
-rw-r--r--scilab/modules/parameters/Makefile.in2
-rw-r--r--scilab/modules/polynomials/Makefile.in2
-rw-r--r--scilab/modules/pvm/Makefile.in2
-rw-r--r--scilab/modules/randlib/Makefile.in2
-rw-r--r--scilab/modules/renderer/Makefile.in2
-rw-r--r--scilab/modules/scicos/Makefile.in2
-rw-r--r--scilab/modules/scicos_blocks/Makefile.in2
-rw-r--r--scilab/modules/scinotes/Makefile.in2
-rw-r--r--scilab/modules/shell/Makefile.in2
-rw-r--r--scilab/modules/signal_processing/Makefile.in2
-rw-r--r--scilab/modules/simulated_annealing/Makefile.in2
-rw-r--r--scilab/modules/sound/Makefile.in2
-rw-r--r--scilab/modules/sparse/Makefile.in2
-rw-r--r--scilab/modules/special_functions/Makefile.in2
-rw-r--r--scilab/modules/spreadsheet/Makefile.in2
-rw-r--r--scilab/modules/statistics/Makefile.in2
-rw-r--r--scilab/modules/string/Makefile.in2
-rw-r--r--scilab/modules/symbolic/Makefile.in2
-rw-r--r--scilab/modules/tclsci/Makefile.in2
-rw-r--r--scilab/modules/texmacs/Makefile.in2
-rw-r--r--scilab/modules/time/Makefile.in2
-rw-r--r--scilab/modules/types/Makefile.in2
-rw-r--r--scilab/modules/ui_data/Makefile.in2
-rw-r--r--scilab/modules/umfpack/Makefile.in2
-rw-r--r--scilab/modules/windows_tools/Makefile.in2
-rw-r--r--scilab/modules/xcos/Makefile.in2
-rw-r--r--scilab/scilab.properties.in3
92 files changed, 229 insertions, 359 deletions
diff --git a/scilab/.gitignore b/scilab/.gitignore
index db24e42..5ab98af 100644
--- a/scilab/.gitignore
+++ b/scilab/.gitignore
@@ -137,6 +137,7 @@ mainsci.o
137autom4te.cache 137autom4te.cache
138.deps 138.deps
139/locale 139/locale
140scilab.properties
140scilab-lib.properties 141scilab-lib.properties
141scilab-lib-doc.properties 142scilab-lib-doc.properties
142scilab.pc 143scilab.pc
diff --git a/scilab/Makefile.in b/scilab/Makefile.in
index 73a5d3c..415ca26 100644
--- a/scilab/Makefile.in
+++ b/scilab/Makefile.in
@@ -72,10 +72,10 @@ bin_PROGRAMS = scilab-bin$(EXEEXT) scilab-cli-bin$(EXEEXT) \
72DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \ 72DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
73 $(srcdir)/Makefile.in $(srcdir)/scilab-lib-doc.properties.in \ 73 $(srcdir)/Makefile.in $(srcdir)/scilab-lib-doc.properties.in \
74 $(srcdir)/scilab-lib.properties.in $(srcdir)/scilab.pc.in \ 74 $(srcdir)/scilab-lib.properties.in $(srcdir)/scilab.pc.in \
75 $(srcdir)/scilab.properties.in \
75 $(top_srcdir)/Makefile.call_scilab.am $(top_srcdir)/configure \ 76 $(top_srcdir)/Makefile.call_scilab.am $(top_srcdir)/configure \
76 $(top_srcdir)/etc/Info.plist.in \ 77 $(top_srcdir)/etc/Info.plist.in \
77 $(top_srcdir)/etc/classpath.xml.in \ 78 $(top_srcdir)/etc/classpath.xml.in \
78 $(top_srcdir)/etc/jvm_options.xml.in \
79 $(top_srcdir)/etc/modules.xml.in \ 79 $(top_srcdir)/etc/modules.xml.in \
80 $(top_srcdir)/modules/core/includes/machine.h.in \ 80 $(top_srcdir)/modules/core/includes/machine.h.in \
81 $(top_srcdir)/modules/core/includes/version.h.in \ 81 $(top_srcdir)/modules/core/includes/version.h.in \
@@ -115,8 +115,8 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
115mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs 115mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
116CONFIG_HEADER = $(top_builddir)/modules/core/includes/machine.h 116CONFIG_HEADER = $(top_builddir)/modules/core/includes/machine.h
117CONFIG_CLEAN_FILES = modules/helptools/macros/xmlfiletohtml.sci \ 117CONFIG_CLEAN_FILES = modules/helptools/macros/xmlfiletohtml.sci \
118 scilab.pc etc/modules.xml etc/classpath.xml \ 118 scilab.pc etc/modules.xml etc/classpath.xml etc/Info.plist \
119 etc/jvm_options.xml etc/Info.plist scilab-lib.properties \ 119 scilab.properties scilab-lib.properties \
120 scilab-lib-doc.properties modules/helptools/etc/SciDocConf.xml \ 120 scilab-lib-doc.properties modules/helptools/etc/SciDocConf.xml \
121 modules/core/includes/version.h 121 modules/core/includes/version.h
122CONFIG_CLEAN_VPATH_FILES = 122CONFIG_CLEAN_VPATH_FILES =
@@ -399,10 +399,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
399JAR = @JAR@ 399JAR = @JAR@
400JAVA = @JAVA@ 400JAVA = @JAVA@
401JAVAC = @JAVAC@ 401JAVAC = @JAVAC@
402JAVAC_DEBUG = @JAVAC_DEBUG@
402JAVADOC = @JAVADOC@ 403JAVADOC = @JAVADOC@
403JAVAH = @JAVAH@ 404JAVAH = @JAVAH@
404JAVASCI_ENABLE = @JAVASCI_ENABLE@ 405JAVASCI_ENABLE = @JAVASCI_ENABLE@
405JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
406JAVA_ENABLE = @JAVA_ENABLE@ 406JAVA_ENABLE = @JAVA_ENABLE@
407JAVA_G = @JAVA_G@ 407JAVA_G = @JAVA_G@
408JAVA_HOME = @JAVA_HOME@ 408JAVA_HOME = @JAVA_HOME@
@@ -775,10 +775,10 @@ etc/modules.xml: $(top_builddir)/config.status $(top_srcdir)/etc/modules.xml.in
775 cd $(top_builddir) && $(SHELL) ./config.status $@ 775 cd $(top_builddir) && $(SHELL) ./config.status $@
776etc/classpath.xml: $(top_builddir)/config.status $(top_srcdir)/etc/classpath.xml.in 776etc/classpath.xml: $(top_builddir)/config.status $(top_srcdir)/etc/classpath.xml.in
777 cd $(top_builddir) && $(SHELL) ./config.status $@ 777 cd $(top_builddir) && $(SHELL) ./config.status $@
778etc/jvm_options.xml: $(top_builddir)/config.status $(top_srcdir)/etc/jvm_options.xml.in
779 cd $(top_builddir) && $(SHELL) ./config.status $@
780etc/Info.plist: $(top_builddir)/config.status $(top_srcdir)/etc/Info.plist.in 778etc/Info.plist: $(top_builddir)/config.status $(top_srcdir)/etc/Info.plist.in
781 cd $(top_builddir) && $(SHELL) ./config.status $@ 779 cd $(top_builddir) && $(SHELL) ./config.status $@
780scilab.properties: $(top_builddir)/config.status $(srcdir)/scilab.properties.in
781 cd $(top_builddir) && $(SHELL) ./config.status $@
782scilab-lib.properties: $(top_builddir)/config.status $(srcdir)/scilab-lib.properties.in 782scilab-lib.properties: $(top_builddir)/config.status $(srcdir)/scilab-lib.properties.in
783 cd $(top_builddir) && $(SHELL) ./config.status $@ 783 cd $(top_builddir) && $(SHELL) ./config.status $@
784scilab-lib-doc.properties: $(top_builddir)/config.status $(srcdir)/scilab-lib-doc.properties.in 784scilab-lib-doc.properties: $(top_builddir)/config.status $(srcdir)/scilab-lib-doc.properties.in
diff --git a/scilab/build.incl.xml b/scilab/build.incl.xml
index aff25fd..7475224 100644
--- a/scilab/build.incl.xml
+++ b/scilab/build.incl.xml
@@ -1,70 +1,53 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<?xml version="1.0" encoding="UTF-8"?>
2<!-- Common definitions of Java compilation for Scilab --> 2<!-- Common definitions of Java compilation for Scilab -->
3<project name="common"> 3<project name="common">
4
5 <!-- Base of Scilab source tree --> 4 <!-- Base of Scilab source tree -->
6 <property name="base.dir" location="../../" /> 5 <property name="base.dir" location="../../"/>
7
8 <!-- Where the module should be created (modules/xxx/jar) --> 6 <!-- Where the module should be created (modules/xxx/jar) -->
9 <property name="build.jar.dir" value="jar/" /> 7 <property name="build.jar.dir" value="jar/"/>
10
11 <!-- Where the thirdparty libraries could be found --> 8 <!-- Where the thirdparty libraries could be found -->
12 <property name="thirdparty.dir" location="${base.dir}/thirdparty/" /> 9 <property name="thirdparty.dir" location="${base.dir}/thirdparty/"/>
13
14 <!-- The building directory --> 10 <!-- The building directory -->
15 <property name="build.dir" location="build/"/> 11 <property name="build.dir" location="build/"/>
16
17 <!-- The building test directory --> 12 <!-- The building test directory -->
18 <property name="build.test.dir" location="${build.dir}/test"/> 13 <property name="build.test.dir" location="${build.dir}/test"/>
19
20 <!-- Where builded classes will be generated --> 14 <!-- Where builded classes will be generated -->
21 <property name="classes.dir" location="${build.dir}/classes" /> 15 <property name="classes.dir" location="${build.dir}/classes"/>
22
23 <!-- Where builded test classes will be generated --> 16 <!-- Where builded test classes will be generated -->
24 <property name="classes.test.dir" location="${build.test.dir}/classes" /> 17 <property name="classes.test.dir" location="${build.test.dir}/classes"/>
25
26 <!-- Where we store cache files --> 18 <!-- Where we store cache files -->
27 <property name="cache.dir" location="${build.dir}/cachefile" /> 19 <property name="cache.dir" location="${build.dir}/cachefile"/>
28
29 <!-- Where we can find the sources --> 20 <!-- Where we can find the sources -->
30 <property name="src.dir" location="src/java/" /> 21 <property name="src.dir" location="src/java/"/>
31
32 <!-- Where we can find the test sources --> 22 <!-- Where we can find the test sources -->
33 <property name="src.test.dir" location="tests/java/" /> 23 <property name="src.test.dir" location="tests/java/"/>
34
35 <!-- Check style definitions --> 24 <!-- Check style definitions -->
36 <property name = "checkstyle.config.file" value = "${base.dir}/checkstyle/scilab_checkstyle_convention.xml" /> 25 <property name="checkstyle.config.file" value="${base.dir}/checkstyle/scilab_checkstyle_convention.xml"/>
37 <property name = "checkstyle.stylesheet" value = "${thirdparty.dir}/checkstyle/contrib/checkstyle-noframes-sorted.xsl" /> 26 <property name="checkstyle.stylesheet" value="${thirdparty.dir}/checkstyle/contrib/checkstyle-noframes-sorted.xsl"/>
38 <property name = "checkstyle.report.dir" value = "${build.dir}/checkstyle" /> 27 <property name="checkstyle.report.dir" value="${build.dir}/checkstyle"/>
39 <property name = "checkstyle.xml.report.file" value = "${checkstyle.report.dir}/checkstyle_errors.xml" /> 28 <property name="checkstyle.xml.report.file" value="${checkstyle.report.dir}/checkstyle_errors.xml"/>
40 <property name = "checkstyle.html.report.file" value = "${checkstyle.report.dir}/checkstyle_errors.htm" /> 29 <property name="checkstyle.html.report.file" value="${checkstyle.report.dir}/checkstyle_errors.htm"/>
41 30 <property name="modules.dir" value="${base.dir}/modules"/>
42 <property name="modules.dir" value="${base.dir}/modules" /> 31 <!-- JAR names -->
43
44 <property file="${base.dir}/scilab-lib.properties"/> 32 <property file="${base.dir}/scilab-lib.properties"/>
45
46 <property file="${base.dir}/scilab-lib-doc.properties"/> 33 <property file="${base.dir}/scilab-lib-doc.properties"/>
47 34 <!-- Configure ANT flags -->
48 35 <property file="${base.dir}/scilab.properties"/>
49 <path id="checkstyle.classpath"> 36 <path id="checkstyle.classpath">
50 <pathelement location="${checkstyle.jar}"/> 37 <pathelement location="${checkstyle.jar}"/>
51 <pathelement location="${commons-logging.jar}"/> 38 <pathelement location="${commons-logging.jar}"/>
52 <pathelement location="${commons-beanutils.jar}"/> 39 <pathelement location="${commons-beanutils.jar}"/>
53 <pathelement location="${antlr.jar}"/> 40 <pathelement location="${antlr.jar}"/>
54 </path> 41 </path>
55
56 <path id="unittest.classpath"> 42 <path id="unittest.classpath">
57 <pathelement location="${testng.jar}"/> 43 <pathelement location="${testng.jar}"/>
58 <pathelement location="${bsh.jar}"/> 44 <pathelement location="${bsh.jar}"/>
59 <pathelement location="${junit.jar}"/> 45 <pathelement location="${junit.jar}"/>
60 <pathelement location="${qdox.jar}"/> 46 <pathelement location="${qdox.jar}"/>
61 </path> 47 </path>
62
63
64
65 <path id="compile.classpath"> 48 <path id="compile.classpath">
66 <pathelement location="${library.types.dir}/${library.types.name}"/> 49 <pathelement location="${library.types.dir}/${library.types.name}"/>
67 <pathelement location="${library.types.dir}/${library.output_stream.name}"/> 50 <pathelement location="${library.types.dir}/${library.output_stream.name}"/>
68 <pathelement location="${library.graph.dir}/${library.graph.name}"/> 51 <pathelement location="${library.graph.dir}/${library.graph.name}"/>
69 <pathelement location="${library.xcos.dir}/${library.xcos.name}"/> 52 <pathelement location="${library.xcos.dir}/${library.xcos.name}"/>
70 <pathelement location="${library.hdf5.dir}/${library.hdf5.name}"/> 53 <pathelement location="${library.hdf5.dir}/${library.hdf5.name}"/>
@@ -75,107 +58,63 @@
75 <pathelement location="${library.completion.dir}/${library.completion.name}"/> 58 <pathelement location="${library.completion.dir}/${library.completion.name}"/>
76 <pathelement location="${library.console.dir}/${library.console.name}"/> 59 <pathelement location="${library.console.dir}/${library.console.name}"/>
77 <pathelement location="${library.action_binding.dir}/${library.action_binding.name}"/> 60 <pathelement location="${library.action_binding.dir}/${library.action_binding.name}"/>
78
79 <pathelement location="${library.gui.dir}/${library.gui.name}"/> 61 <pathelement location="${library.gui.dir}/${library.gui.name}"/>
80 <pathelement location="${library.commons.dir}/${library.commons.name}"/> 62 <pathelement location="${library.commons.dir}/${library.commons.name}"/>
81 <pathelement location="${library.jvm.dir}/${library.jvm.name}"/> 63 <pathelement location="${library.jvm.dir}/${library.jvm.name}"/>
82 <pathelement location="${library.renderer.dir}/${library.renderer.name}"/> 64 <pathelement location="${library.renderer.dir}/${library.renderer.name}"/>
83 <pathelement location="${library.graphic_export.dir}/${library.graphic_export.name}"/> 65 <pathelement location="${library.graphic_export.dir}/${library.graphic_export.name}"/>
84 <pathelement location="${library.core.dir}/${library.core.name}"/> 66 <pathelement location="${library.core.dir}/${library.core.name}"/>
85
86 <!-- Not use at build time but used for unitary tests --> 67 <!-- Not use at build time but used for unitary tests -->
87 <pathelement location="${library.javasci.dir}/${library.javasci.name}"/> 68 <pathelement location="${library.javasci.dir}/${library.javasci.name}"/>
88 <pathelement location="${library.javasci.dir}/${library.javasci-v1.name}"/> 69 <pathelement location="${library.javasci.dir}/${library.javasci-v1.name}"/>
89
90
91 <pathelement location="${commons-logging.jar}"/> 70 <pathelement location="${commons-logging.jar}"/>
92
93 <pathelement location="${flexdock.jar}"/> 71 <pathelement location="${flexdock.jar}"/>
94
95 <pathelement location="${gluegen.jar}"/> 72 <pathelement location="${gluegen.jar}"/>
96
97 <pathelement location="${jrosetta-API.jar}"/> 73 <pathelement location="${jrosetta-API.jar}"/>
98
99 <pathelement location="${jrosetta-engine.jar}"/> 74 <pathelement location="${jrosetta-engine.jar}"/>
100
101 <pathelement location="${jogl.jar}"/> 75 <pathelement location="${jogl.jar}"/>
102
103 <pathelement location="${jhdf5.jar}"/> 76 <pathelement location="${jhdf5.jar}"/>
104
105 <pathelement location="${jhall.jar}"/> 77 <pathelement location="${jhall.jar}"/>
106
107 <pathelement location="${jgraphx.jar}"/> 78 <pathelement location="${jgraphx.jar}"/>
108 79 <!-- Only usefull for the documentation -->
109 <!-- Only usefull for the documentation -->
110 <pathelement location="${library.helptools.dir}/${library.helptools.name}"/> 80 <pathelement location="${library.helptools.dir}/${library.helptools.name}"/>
111
112 <pathelement location="${batik.jar}"/> 81 <pathelement location="${batik.jar}"/>
113 82 <pathelement location="${xml_apis_ext.jar}"/>
114 <pathelement location="${xml_apis_ext.jar}" />
115
116 <pathelement location="${saxon.jar}"/> 83 <pathelement location="${saxon.jar}"/>
117
118 <pathelement location="${fop.jar}"/> 84 <pathelement location="${fop.jar}"/>
119
120 <pathelement location="${jlatexmath-fop.jar}"/> 85 <pathelement location="${jlatexmath-fop.jar}"/>
121
122 <pathelement location="${avalon-framework.jar}"/> 86 <pathelement location="${avalon-framework.jar}"/>
123
124 <pathelement location="${avalon-framework-impl.jar}"/> 87 <pathelement location="${avalon-framework-impl.jar}"/>
125
126 <pathelement location="${jeuclid-core.jar}"/> 88 <pathelement location="${jeuclid-core.jar}"/>
127
128 <pathelement location="${jlatexmath.jar}"/> 89 <pathelement location="${jlatexmath.jar}"/>
129 </path> 90 </path>
130
131 <taskdef resource="checkstyletask.properties" classpathref="checkstyle.classpath"/> 91 <taskdef resource="checkstyletask.properties" classpathref="checkstyle.classpath"/>
132
133 <!-- Checkstyle process --> 92 <!-- Checkstyle process -->
134 93 <target name="checkstyle" depends="checkstyle-init" description="Generates a report of code convention violations.">
135 <target 94 <checkstyle config="${checkstyle.config.file}" failOnViolation="false">
136 name = "checkstyle" 95 <fileset dir="${src.dir}" includes="**/*.java"/>
137 depends = "checkstyle-init"
138 description = "Generates a report of code convention violations.">
139 <checkstyle
140 config = "${checkstyle.config.file}"
141 failOnViolation = "false">
142 <fileset
143 dir = "${src.dir}"
144 includes = "**/*.java"/>
145 <!-- Location of cache-file. --> 96 <!-- Location of cache-file. -->
146 <property 97 <property key="checkstyle.cache.file" file="${cache.dir}"/>
147 key = "checkstyle.cache.file"
148 file = "${cache.dir}"/>
149 <formatter type="plain"/> 98 <formatter type="plain"/>
150 <formatter 99 <formatter type="xml" toFile="${checkstyle.xml.report.file}"/>
151 type = "xml"
152 toFile = "${checkstyle.xml.report.file}"/>
153 </checkstyle> 100 </checkstyle>
154 <xslt 101 <xslt in="${checkstyle.xml.report.file}" out="${checkstyle.html.report.file}" style="${checkstyle.stylesheet}"/>
155 in = "${checkstyle.xml.report.file}"
156 out = "${checkstyle.html.report.file}"
157 style = "${checkstyle.stylesheet}" />
158 </target> 102 </target>
159
160 <!-- Create the build directory --> 103 <!-- Create the build directory -->
161
162 <target name="checkstyle-init"> 104 <target name="checkstyle-init">
163 <mkdir dir="${checkstyle.report.dir}"/> 105 <mkdir dir="${checkstyle.report.dir}"/>
164 </target> 106 </target>
165
166 <!-- Delete the build directory --> 107 <!-- Delete the build directory -->
167
168 <target name="checkstyle-clean"> 108 <target name="checkstyle-clean">
169 <delete dir="${checkstyle.report.dir}"/> 109 <delete dir="${checkstyle.report.dir}"/>
170 </target> 110 </target>
171
172 <target name="test" depends="existing-tests, compile-test, validate" if="test-present"> 111 <target name="test" depends="existing-tests, compile-test, validate" if="test-present">
173 <taskdef name="testng" classpathref="unittest.classpath" classname="org.testng.TestNGAntTask" /> 112 <taskdef name="testng" classpathref="unittest.classpath" classname="org.testng.TestNGAntTask"/>
174 <testng verbose="2" haltonfailure="true"> 113 <testng verbose="2" haltonfailure="true">
175 <classpath> 114 <classpath>
176 <path refid="unittest.classpath" /> 115 <path refid="unittest.classpath"/>
177 <path refid="compile.classpath" /> 116 <path refid="compile.classpath"/>
178 <pathelement location="${classes.test.dir}" /> 117 <pathelement location="${classes.test.dir}"/>
179 </classpath> 118 </classpath>
180 <classfileset dir="${build.test.dir}" includes="**/*.class"/> 119 <classfileset dir="${build.test.dir}" includes="**/*.class"/>
181 <jvmarg value="-DtestngTests=1"/> 120 <jvmarg value="-DtestngTests=1"/>
@@ -183,11 +122,9 @@
183 <jvmarg value="-Djava.library.path=${base.dir}/modules/.libs/:${base.dir}/modules/javasci/.libs/:${base.dir}/modules/localization/.libs/:${base.dir}/thirdparty/:${base.dir}/bin/:/usr/lib/jni/:/usr/lib64/jni:"/> 122 <jvmarg value="-Djava.library.path=${base.dir}/modules/.libs/:${base.dir}/modules/javasci/.libs/:${base.dir}/modules/localization/.libs/:${base.dir}/thirdparty/:${base.dir}/bin/:/usr/lib/jni/:/usr/lib64/jni:"/>
184 </testng> 123 </testng>
185 </target> 124 </target>
186
187 <target name="validate"> 125 <target name="validate">
188 <!-- Empty target to be override by other build.xml --> 126 <!-- Empty target to be override by other build.xml -->
189 </target> 127 </target>
190
191 <target name="init"> 128 <target name="init">
192 <mkdir dir="${classes.dir}"/> 129 <mkdir dir="${classes.dir}"/>
193 <mkdir dir="${classes.test.dir}"/> 130 <mkdir dir="${classes.test.dir}"/>
@@ -195,67 +132,38 @@
195 <!-- Create the time stamp --> 132 <!-- Create the time stamp -->
196 <tstamp/> 133 <tstamp/>
197 </target> 134 </target>
198
199 <!-- Clean sources --> 135 <!-- Clean sources -->
200 <target name="clean" description="Clean built files" depends="clean-test"> 136 <target name="clean" description="Clean built files" depends="clean-test">
201 <delete dir="${build.dir}"/> 137 <delete dir="${build.dir}"/>
202 <delete dir="${build.jar.dir}"/> 138 <delete dir="${build.jar.dir}"/>
203 <delete file="${build.jar.dir}/${library.name}"/> 139 <delete file="${build.jar.dir}/${library.name}"/>
204 </target> 140 </target>
205
206 <!-- Clean test --> 141 <!-- Clean test -->
207 <target name="clean-test" description="Clean test files"> 142 <target name="clean-test" description="Clean test files">
208 <delete dir="${build.test.dir}"/> 143 <delete dir="${build.test.dir}"/>
209 </target> 144 </target>
210
211 <!-- Compile sources --> 145 <!-- Compile sources -->
212 <target name="compile" description="Build sources" depends="init"> 146 <target name="compile" description="Build sources" depends="init">
213 <javac 147 <javac srcdir="${src.dir}" destdir="${classes.dir}" classpathref="compile.classpath" deprecation="on" debug="${build.debug}" verbose="off" listfiles="on" includeAntRuntime="no" source="5"/>
214 srcdir="${src.dir}"
215 destdir="${classes.dir}"
216 classpathref="compile.classpath"
217 deprecation="on"
218 debug="off"
219 verbose="off"
220 listfiles="on"
221 includeAntRuntime="no"
222 source="5"
223 />
224 </target> 148 </target>
225
226 <target name="existing-tests"> 149 <target name="existing-tests">
227 <available property="test-present" 150 <available property="test-present" file="${src.test.dir}"/>
228 file="${src.test.dir}"
229 />
230 </target> 151 </target>
231
232 <!-- Compile test sources --> 152 <!-- Compile test sources -->
233 <target name="compile-test" description="Build tests" depends="existing-tests, clean-test, jar" if="test-present"> 153 <target name="compile-test" description="Build tests" depends="existing-tests, clean-test, jar" if="test-present">
234 <!-- clean the test to make sure it will build properly --> 154 <!-- clean the test to make sure it will build properly -->
235 <javac 155 <javac srcdir="${src.test.dir}" destdir="${classes.test.dir}" deprecation="on" debug="${build.debug}" verbose="off" listfiles="on" includeAntRuntime="no" source="5">
236 srcdir="${src.test.dir}"
237 destdir="${classes.test.dir}"
238 deprecation="on"
239 debug="off"
240 verbose="off"
241 listfiles="on"
242 includeAntRuntime="no"
243 source="5"
244 >
245 <classpath> 156 <classpath>
246 <path refid="unittest.classpath" /> 157 <path refid="unittest.classpath"/>
247 <path refid="compile.classpath" /> 158 <path refid="compile.classpath"/>
248 </classpath> 159 </classpath>
249 </javac> 160 </javac>
250 </target> 161 </target>
251
252 <!-- Create the jar --> 162 <!-- Create the jar -->
253 <target name="jar" description="Build the jar file" depends="compile"> 163 <target name="jar" description="Build the jar file" depends="compile">
254
255 <jar destfile="${build.jar.dir}/${library.name}" basedir="${classes.dir}"> 164 <jar destfile="${build.jar.dir}/${library.name}" basedir="${classes.dir}">
256 <manifest> 165 <manifest>
257 </manifest> 166 </manifest>
258 </jar> 167 </jar>
259 </target> 168 </target>
260
261</project> 169</project>
diff --git a/scilab/configure b/scilab/configure
index 46c0194..de87c27 100755
--- a/scilab/configure
+++ b/scilab/configure
@@ -740,7 +740,7 @@ PYTHON
740SWIG_JAVA 740SWIG_JAVA
741SWIG_RUNTIME_LIBS_DIR 741SWIG_RUNTIME_LIBS_DIR
742SWIG_BIN 742SWIG_BIN
743JAVA_DEBUG_OPTIONS 743JAVAC_DEBUG
744JAVA_HOME 744JAVA_HOME
745JAVA_JNI_LIBS 745JAVA_JNI_LIBS
746JAVA_JNI_INCLUDE 746JAVA_JNI_INCLUDE
@@ -1637,7 +1637,7 @@ Optional Features:
1637 --disable-dependency-tracking speeds up one-time build 1637 --disable-dependency-tracking speeds up one-time build
1638 --enable-dependency-tracking do not reject slow dependency extractors 1638 --enable-dependency-tracking do not reject slow dependency extractors
1639 --enable-debug Do not optimize and print warning messages 1639 --enable-debug Do not optimize and print warning messages
1640 (C/C++/Fortran code) 1640 (C/C++/Fortran/Java code)
1641 --enable-debug-C Do not optimize and print warning messages (C code) 1641 --enable-debug-C Do not optimize and print warning messages (C code)
1642 --enable-debug-CXX Do not optimize and print warning messages (C++ 1642 --enable-debug-CXX Do not optimize and print warning messages (C++
1643 code) 1643 code)
@@ -8971,6 +8971,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
8971ac_compiler_gnu=$ac_cv_c_compiler_gnu 8971ac_compiler_gnu=$ac_cv_c_compiler_gnu
8972 8972
8973 8973
8974
8974# If this option is provided, enable the debug on C & C++ 8975# If this option is provided, enable the debug on C & C++
8975if test "$enable_stop_on_warning" = yes; then 8976if test "$enable_stop_on_warning" = yes; then
8976 enable_debug_C=yes 8977 enable_debug_C=yes
@@ -8981,6 +8982,7 @@ if test "$enable_debug" = yes; then
8981 enable_debug_fortran=yes 8982 enable_debug_fortran=yes
8982 enable_debug_C=yes 8983 enable_debug_C=yes
8983 enable_debug_CXX=yes 8984 enable_debug_CXX=yes
8985 enable_debug_java=yes
8984else 8986else
8985 enable_debug=no 8987 enable_debug=no
8986fi 8988fi
@@ -10164,7 +10166,7 @@ $as_echo "$ac_java_classpath" >&6; }
10164$as_echo_n "checking to see if the java compiler works... " >&6; } 10166$as_echo_n "checking to see if the java compiler works... " >&6; }
10165 10167
10166 cat << \EOF > conftest.java 10168 cat << \EOF > conftest.java
10167// #line 10167 "configure" 10169// #line 10169 "configure"
10168 10170
10169 10171
10170public class conftest { 10172public class conftest {
@@ -10230,7 +10232,7 @@ $as_echo_n "checking type of jvm... " >&6; }
10230 if test "x$ac_java_jvm_name" = "x" ; then 10232 if test "x$ac_java_jvm_name" = "x" ; then
10231 10233
10232 cat << \EOF > conftest.java 10234 cat << \EOF > conftest.java
10233// #line 10233 "configure" 10235// #line 10235 "configure"
10234import gnu.java.io.EncodingManager; 10236import gnu.java.io.EncodingManager;
10235 10237
10236public class conftest { 10238public class conftest {
@@ -10294,7 +10296,7 @@ $as_echo_n "checking java API version... " >&6; }
10294 10296
10295 10297
10296 cat << \EOF > conftest.java 10298 cat << \EOF > conftest.java
10297// #line 10297 "configure" 10299// #line 10299 "configure"
10298import java.nio.charset.Charset; 10300import java.nio.charset.Charset;
10299 10301
10300public class conftest { 10302public class conftest {
@@ -10339,7 +10341,7 @@ EOF
10339 10341
10340 10342
10341 cat << \EOF > conftest.java 10343 cat << \EOF > conftest.java
10342// #line 10342 "configure" 10344// #line 10344 "configure"
10343import java.lang.StringBuilder; 10345import java.lang.StringBuilder;
10344 10346
10345public class conftest { 10347public class conftest {
@@ -11708,7 +11710,7 @@ $as_echo_n "checking jgraphx... " >&6; }
11708 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11710 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11709 11711
11710 cat << \EOF > conftest.java 11712 cat << \EOF > conftest.java
11711// #line 11711 "configure" 11713// #line 11713 "configure"
11712import com.mxgraph.model.mxCell; 11714import com.mxgraph.model.mxCell;
11713 11715
11714public class conftest { 11716public class conftest {
@@ -11802,7 +11804,7 @@ $as_echo_n "checking minimal version (1.4.1.0) of jgraphx... " >&6; }
11802 if test "x=" == "x"; then 11804 if test "x=" == "x"; then
11803 11805
11804 cat << \EOF > conftest.java 11806 cat << \EOF > conftest.java
11805// #line 11805 "configure" 11807// #line 11807 "configure"
11806import com.mxgraph.view.mxGraph; 11808import com.mxgraph.view.mxGraph;
11807 11809
11808public class conftest { 11810public class conftest {
@@ -11853,7 +11855,7 @@ EOF
11853 else 11855 else
11854 11856
11855 cat << \EOF > conftest.java 11857 cat << \EOF > conftest.java
11856// #line 11856 "configure" 11858// #line 11858 "configure"
11857import com.mxgraph.view.mxGraph; 11859import com.mxgraph.view.mxGraph;
11858 11860
11859public class conftest { 11861public class conftest {
@@ -11926,7 +11928,7 @@ $as_echo_n "checking flexdock... " >&6; }
11926 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11928 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11927 11929
11928 cat << \EOF > conftest.java 11930 cat << \EOF > conftest.java
11929// #line 11929 "configure" 11931// #line 11931 "configure"
11930import org.flexdock.docking.DockingManager; 11932import org.flexdock.docking.DockingManager;
11931 11933
11932public class conftest { 11934public class conftest {
@@ -12020,7 +12022,7 @@ $as_echo_n "checking minimal version (0.5.2) of flexdock... " >&6; }
12020 if test "x" == "x"; then 12022 if test "x" == "x"; then
12021 12023
12022 cat << \EOF > conftest.java 12024 cat << \EOF > conftest.java
12023// #line 12023 "configure" 12025// #line 12025 "configure"
12024import org.flexdock.util.Utilities; 12026import org.flexdock.util.Utilities;
12025 12027
12026public class conftest { 12028public class conftest {
@@ -12071,7 +12073,7 @@ EOF
12071 else 12073 else
12072 12074
12073 cat << \EOF > conftest.java 12075 cat << \EOF > conftest.java
12074// #line 12074 "configure" 12076// #line 12076 "configure"
12075import org.flexdock.util.Utilities; 12077import org.flexdock.util.Utilities;
12076 12078
12077public class conftest { 12079public class conftest {
@@ -12144,7 +12146,7 @@ $as_echo_n "checking looks... " >&6; }
12144 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12146 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12145 12147
12146 cat << \EOF > conftest.java 12148 cat << \EOF > conftest.java
12147// #line 12147 "configure" 12149// #line 12149 "configure"
12148import com.jgoodies.looks.common.RenderingUtils; 12150import com.jgoodies.looks.common.RenderingUtils;
12149 12151
12150public class conftest { 12152public class conftest {
@@ -12251,7 +12253,7 @@ $as_echo_n "checking jgoodies-looks... " >&6; }
12251 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12253 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12252 12254
12253 cat << \EOF > conftest.java 12255 cat << \EOF > conftest.java
12254// #line 12254 "configure" 12256// #line 12256 "configure"
12255import com.jgoodies.looks.common.RenderingUtils; 12257import com.jgoodies.looks.common.RenderingUtils;
12256 12258
12257public class conftest { 12259public class conftest {
@@ -12359,7 +12361,7 @@ $as_echo_n "checking skinlf... " >&6; }
12359 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12361 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12360 12362
12361 cat << \EOF > conftest.java 12363 cat << \EOF > conftest.java
12362// #line 12362 "configure" 12364// #line 12364 "configure"
12363import com.l2fprod.util.AccessUtils; 12365import com.l2fprod.util.AccessUtils;
12364 12366
12365public class conftest { 12367public class conftest {
@@ -12466,7 +12468,7 @@ $as_echo_n "checking jogl... " >&6; }
12466 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12468 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12467 12469
12468 cat << \EOF > conftest.java 12470 cat << \EOF > conftest.java
12469// #line 12469 "configure" 12471// #line 12471 "configure"
12470import javax.media.opengl.glu.GLUnurbs; 12472import javax.media.opengl.glu.GLUnurbs;
12471 12473
12472public class conftest { 12474public class conftest {
@@ -12678,7 +12680,7 @@ $as_echo_n "checking gluegen-rt... " >&6; }
12678 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12680 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12679 12681
12680 cat << \EOF > conftest.java 12682 cat << \EOF > conftest.java
12681// #line 12681 "configure" 12683// #line 12683 "configure"
12682import com.sun.gluegen.runtime.CPU; 12684import com.sun.gluegen.runtime.CPU;
12683 12685
12684public class conftest { 12686public class conftest {
@@ -12839,7 +12841,7 @@ $as_echo_n "checking jhall... " >&6; }
12839 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12841 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12840 12842
12841 cat << \EOF > conftest.java 12843 cat << \EOF > conftest.java
12842// #line 12842 "configure" 12844// #line 12844 "configure"
12843import javax.help.JHelp; 12845import javax.help.JHelp;
12844 12846
12845public class conftest { 12847public class conftest {
@@ -12946,7 +12948,7 @@ $as_echo_n "checking javahelp2... " >&6; }
12946 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12948 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12947 12949
12948 cat << \EOF > conftest.java 12950 cat << \EOF > conftest.java
12949// #line 12949 "configure" 12951// #line 12951 "configure"
12950import javax.help.JHelp; 12952import javax.help.JHelp;
12951 12953
12952public class conftest { 12954public class conftest {
@@ -13054,7 +13056,7 @@ $as_echo_n "checking jrosetta-API... " >&6; }
13054 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 13056 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13055 13057
13056 cat << \EOF > conftest.java 13058 cat << \EOF > conftest.java
13057// #line 13057 "configure" 13059// #line 13059 "configure"
13058import com.artenum.rosetta.interfaces.core.ConsoleConfiguration; 13060import com.artenum.rosetta.interfaces.core.ConsoleConfiguration;
13059 13061
13060public class conftest { 13062public class conftest {
@@ -13161,7 +13163,7 @@ $as_echo_n "checking jrosetta-engine... " >&6; }
13161 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 13163 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13162 13164
13163 cat << \EOF > conftest.java 13165 cat << \EOF > conftest.java
13164// #line 13164 "configure" 13166// #line 13166 "configure"
13165import com.artenum.rosetta.core.action.AbstractConsoleAction; 13167import com.artenum.rosetta.core.action.AbstractConsoleAction;
13166 13168
13167public class conftest { 13169public class conftest {
@@ -13270,7 +13272,7 @@ $as_echo_n "checking jeuclid-core... " >&6; }
13270 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 13272 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13271 13273
13272 cat << \EOF > conftest.java 13274 cat << \EOF > conftest.java
13273// #line 13273 "configure" 13275// #line 13275 "configure"
13274import net.sourceforge.jeuclid.LayoutContext; 13276import net.sourceforge.jeuclid.LayoutContext;
13275 13277
13276public class conftest { 13278public class conftest {
@@ -13379,7 +13381,7 @@ $as_echo_n "checking fop... " >&6; }
13379 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 13381 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13380 13382
13381 cat << \EOF > conftest.java 13383 cat << \EOF > conftest.java
13382// #line 13382 "configure" 13384// #line 13384 "configure"
13383import org.apache.fop.pdf.PDFInfo; 13385import org.apache.fop.pdf.PDFInfo;
13384 13386
13385public class conftest { 13387public class conftest {
@@ -13486,7 +13488,7 @@ $as_echo_n "checking batik-all... " >&6; }
13486 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 13488 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13487 13489
13488 cat << \EOF > conftest.java 13490 cat << \EOF > conftest.java
13489// #line 13489 "configure" 13491// #line 13491 "configure"
13490import org.apache.batik.parser.Parser; 13492import org.apache.batik.parser.Parser;
13491 13493
13492public class conftest { 13494public class conftest {
@@ -13593,7 +13595,7 @@ $as_echo_n "checking batik... " >&6; }
13593 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 13595 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13594 13596
13595 cat << \EOF > conftest.java 13597 cat << \EOF > conftest.java
13596// #line 13596 "configure" 13598// #line 13598 "configure"
13597import org.apache.batik.parser.Parser; 13599import org.apache.batik.parser.Parser;
13598 13600
13599public class conftest { 13601public class conftest {
@@ -13687,7 +13689,7 @@ $as_echo_n "checking minimal version (1.7) of batik... " >&6; }
13687 if test "x" == "x"; then 13689 if test "x" == "x"; then
13688 13690
13689 cat << \EOF > conftest.java 13691 cat << \EOF > conftest.java
13690// #line 13690 "configure" 13692// #line 13692 "configure"
13691import org.apache.batik.Version; 13693import org.apache.batik.Version;
13692 13694
13693public class conftest { 13695public class conftest {
@@ -13738,7 +13740,7 @@ EOF
13738 else 13740 else
13739 13741
13740 cat << \EOF > conftest.java 13742 cat << \EOF > conftest.java
13741// #line 13741 "configure" 13743// #line 13743 "configure"
13742import org.apache.batik.Version; 13744import org.apache.batik.Version;
13743 13745
13744public class conftest { 13746public class conftest {
@@ -13811,7 +13813,7 @@ $as_echo_n "checking commons-io... " >&6; }
13811 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 13813 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13812 13814
13813 cat << \EOF > conftest.java 13815 cat << \EOF > conftest.java
13814// #line 13814 "configure" 13816// #line 13816 "configure"
13815import org.apache.commons.io.output.CountingOutputStream; 13817import org.apache.commons.io.output.CountingOutputStream;
13816 13818
13817public class conftest { 13819public class conftest {
@@ -13918,7 +13920,7 @@ $as_echo_n "checking xmlgraphics-commons... " >&6; }
13918 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 13920 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13919 13921
13920 cat << \EOF > conftest.java 13922 cat << \EOF > conftest.java
13921// #line 13921 "configure" 13923// #line 13923 "configure"
13922import org.apache.xmlgraphics.util.Service; 13924import org.apache.xmlgraphics.util.Service;
13923 13925
13924public class conftest { 13926public class conftest {
@@ -14025,7 +14027,7 @@ $as_echo_n "checking avalon-framework... " >&6; }
14025 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 14027 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
14026 14028
14027 cat << \EOF > conftest.java 14029 cat << \EOF > conftest.java
14028// #line 14028 "configure" 14030// #line 14030 "configure"
14029import org.apache.avalon.framework.configuration.ConfigurationException; 14031import org.apache.avalon.framework.configuration.ConfigurationException;
14030 14032
14031public class conftest { 14033public class conftest {
@@ -14132,7 +14134,7 @@ $as_echo_n "checking xml-apis-ext... " >&6; }
14132 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 14134 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
14133 14135
14134 cat << \EOF > conftest.java 14136 cat << \EOF > conftest.java
14135// #line 14135 "configure" 14137// #line 14137 "configure"
14136import org.w3c.dom.svg.SVGDocument; 14138import org.w3c.dom.svg.SVGDocument;
14137 14139
14138public class conftest { 14140public class conftest {
@@ -14239,7 +14241,7 @@ $as_echo_n "checking xml-commons-apis-ext... " >&6; }
14239 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 14241 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
14240 14242
14241 cat << \EOF > conftest.java 14243 cat << \EOF > conftest.java
14242// #line 14242 "configure" 14244// #line 14244 "configure"
14243import org.w3c.dom.svg.SVGDocument; 14245import org.w3c.dom.svg.SVGDocument;
14244 14246
14245public class conftest { 14247public class conftest {
@@ -14350,7 +14352,7 @@ $as_echo_n "checking commons-logging... " >&6; }
14350 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 14352 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
14351 14353
14352 cat << \EOF > conftest.java 14354 cat << \EOF > conftest.java
14353// #line 14353 "configure" 14355// #line 14355 "configure"
14354import org.apache.commons.logging.LogFactory; 14356import org.apache.commons.logging.LogFactory;
14355 14357
14356public class conftest { 14358public class conftest {
@@ -14457,7 +14459,7 @@ $as_echo_n "checking jlatexmath... " >&6; }
14457 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 14459 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
14458 14460
14459 cat << \EOF > conftest.java 14461 cat << \EOF > conftest.java
14460// #line 14460 "configure" 14462// #line 14462 "configure"
14461import org.scilab.forge.jlatexmath.TeXFormula; 14463import org.scilab.forge.jlatexmath.TeXFormula;
14462 14464
14463public class conftest { 14465public class conftest {
@@ -14551,7 +14553,7 @@ $as_echo_n "checking minimal version (0.9.4) of jlatexmath... " >&6; }
14551 if test "x" == "x"; then 14553 if test "x" == "x"; then
14552 14554
14553 cat << \EOF > conftest.java 14555 cat << \EOF > conftest.java
14554// #line 14554 "configure" 14556// #line 14556 "configure"
14555import org.scilab.forge.jlatexmath.TeXFormula; 14557import org.scilab.forge.jlatexmath.TeXFormula;
14556 14558
14557public class conftest { 14559public class conftest {
@@ -14602,7 +14604,7 @@ EOF
14602 else 14604 else
14603 14605
14604 cat << \EOF > conftest.java 14606 cat << \EOF > conftest.java
14605// #line 14605 "configure" 14607// #line 14607 "configure"
14606import org.scilab.forge.jlatexmath.TeXFormula; 14608import org.scilab.forge.jlatexmath.TeXFormula;
14607 14609
14608public class conftest { 14610public class conftest {
@@ -14681,7 +14683,7 @@ $as_echo_n "checking checkstyle... " >&6; }
14681 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 14683 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
14682 14684
14683 cat << \EOF > conftest.java 14685 cat << \EOF > conftest.java
14684// #line 14684 "configure" 14686// #line 14686 "configure"
14685import com.puppycrawl.tools.checkstyle.CheckStyleTask; 14687import com.puppycrawl.tools.checkstyle.CheckStyleTask;
14686 14688
14687public class conftest { 14689public class conftest {
@@ -14788,7 +14790,7 @@ $as_echo_n "checking commons-beanutils... " >&6; }
14788 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 14790 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
14789 14791
14790 cat << \EOF > conftest.java 14792 cat << \EOF > conftest.java
14791// #line 14791 "configure" 14793// #line 14793 "configure"
14792import org.apache.commons.beanutils.Converter; 14794import org.apache.commons.beanutils.Converter;
14793 14795
14794public class conftest { 14796public class conftest {
@@ -14895,7 +14897,7 @@ $as_echo_n "checking antlr... " >&6; }
14895 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 14897 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
14896 14898
14897 cat << \EOF > conftest.java 14899 cat << \EOF > conftest.java
14898// #line 14898 "configure" 14900// #line 14900 "configure"
14899import antlr.TokenStreamException; 14901import antlr.TokenStreamException;
14900 14902
14901public class conftest { 14903public class conftest {
@@ -15002,7 +15004,7 @@ $as_echo_n "checking testng... " >&6; }
15002 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 15004 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
15003 15005
15004 cat << \EOF > conftest.java 15006 cat << \EOF > conftest.java
15005// #line 15005 "configure" 15007// #line 15007 "configure"
15006import org.testng.TestNG; 15008import org.testng.TestNG;
15007 15009
15008public class conftest { 15010public class conftest {
@@ -15109,7 +15111,7 @@ $as_echo_n "checking qdox... " >&6; }
15109 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 15111 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
15110 15112
15111 cat << \EOF > conftest.java 15113 cat << \EOF > conftest.java
15112// #line 15112 "configure" 15114// #line 15114 "configure"
15113import com.thoughtworks.qdox.tools.QDoxTester; 15115import com.thoughtworks.qdox.tools.QDoxTester;
15114 15116
15115public class conftest { 15117public class conftest {
@@ -15216,7 +15218,7 @@ $as_echo_n "checking bsh... " >&6; }
15216 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 15218 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
15217 15219
15218 cat << \EOF > conftest.java 15220 cat << \EOF > conftest.java
15219// #line 15219 "configure" 15221// #line 15221 "configure"
15220import bsh.Console; 15222import bsh.Console;
15221 15223
15222public class conftest { 15224public class conftest {
@@ -15323,7 +15325,7 @@ $as_echo_n "checking junit... " >&6; }
15323 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 15325 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
15324 15326
15325 cat << \EOF > conftest.java 15327 cat << \EOF > conftest.java
15326// #line 15326 "configure" 15328// #line 15328 "configure"
15327import junit.framework.Assert; 15329import junit.framework.Assert;
15328 15330
15329public class conftest { 15331public class conftest {
@@ -15424,11 +15426,12 @@ $as_echo "$as_me: WARNING: We do not support $ac_java_jvm_name yet" >&2;}
15424 15426
15425 15427
15426 if test "$enable_debug_java" = yes; then 15428 if test "$enable_debug_java" = yes; then
15427 JAVA_DEBUG_OPTIONS="<option value='-verbose:jni'/> 15429 JAVAC_DEBUG="on"
15428 <option value='-Xcheck:jni'/>" 15430 else
15429 15431 JAVAC_DEBUG="off"
15430 fi 15432 fi
15431 15433
15434
15432 if test "$enable_build_swig" != no -a "$enable_build_swig" != ""; then 15435 if test "$enable_build_swig" != no -a "$enable_build_swig" != ""; then
15433 15436
15434 # Extract the first word of "swig", so it can be a program name with args. 15437 # Extract the first word of "swig", so it can be a program name with args.
@@ -19343,7 +19346,7 @@ $as_echo_n "checking jhdf5... " >&6; }
19343 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 19346 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
19344 19347
19345 cat << \EOF > conftest.java 19348 cat << \EOF > conftest.java
19346// #line 19346 "configure" 19349// #line 19349 "configure"
19347import ncsa.hdf.hdf5lib.HDF5Constants; 19350import ncsa.hdf.hdf5lib.HDF5Constants;
19348 19351
19349public class conftest { 19352public class conftest {
@@ -19492,7 +19495,7 @@ $as_echo_n "checking minimal version (1.8.4) of hdf5... " >&6; }
19492 if test "x" == "x"; then 19495 if test "x" == "x"; then
19493 19496
19494 cat << \EOF > conftest.java 19497 cat << \EOF > conftest.java
19495// #line 19495 "configure" 19498// #line 19498 "configure"
19496import ncsa.hdf.hdf5lib.H5; 19499import ncsa.hdf.hdf5lib.H5;
19497 19500
19498public class conftest { 19501public class conftest {
@@ -19547,7 +19550,7 @@ EOF
19547 else 19550 else
19548 19551
19549 cat << \EOF > conftest.java 19552 cat << \EOF > conftest.java
19550// #line 19550 "configure" 19553// #line 19553 "configure"
19551import ncsa.hdf.hdf5lib.H5; 19554import ncsa.hdf.hdf5lib.H5;
19552 19555
19553public class conftest { 19556public class conftest {
@@ -24208,7 +24211,7 @@ CPPFLAGS="$CPPFLAGS -I$CHK_TCL_INCLUDE_PATH"
24208{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later" >&5 24211{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later" >&5
24209$as_echo_n "checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later... " >&6; } 24212$as_echo_n "checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later... " >&6; }
24210cat > conftest.$ac_ext <<EOF 24213cat > conftest.$ac_ext <<EOF
24211#line 24211 "configure" 24214#line 24214 "configure"
24212#include "confdefs.h" 24215#include "confdefs.h"
24213 24216
24214#include "$CHK_TCL_INCLUDE_PATH/$CHK_TCL_INC_NAME" 24217#include "$CHK_TCL_INCLUDE_PATH/$CHK_TCL_INC_NAME"
@@ -24518,7 +24521,7 @@ CPPFLAGS="$CPPFLAGS $TCL_INC_PATH -I$CHK_TK_INCLUDE_PATH $X_CFLAGS"
24518$as_echo_n "checking if tk is version $CHK_TK_MAJOR.$CHK_TK_MINOR or later... " >&6; } 24521$as_echo_n "checking if tk is version $CHK_TK_MAJOR.$CHK_TK_MINOR or later... " >&6; }
24519 24522
24520cat > conftest.$ac_ext <<EOF 24523cat > conftest.$ac_ext <<EOF
24521#line 24521 "configure" 24524#line 24524 "configure"
24522#include "confdefs.h" 24525#include "confdefs.h"
24523 24526
24524#include "$CHK_TK_INCLUDE_PATH/$CHK_TK_INC_NAME" 24527#include "$CHK_TK_INCLUDE_PATH/$CHK_TK_INC_NAME"
@@ -25099,7 +25102,7 @@ $as_echo_n "checking saxon... " >&6; }
25099 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 25102 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
25100 25103
25101 cat << \EOF > conftest.java 25104 cat << \EOF > conftest.java
25102// #line 25102 "configure" 25105// #line 25105 "configure"
25103import com.icl.saxon.Loader; 25106import com.icl.saxon.Loader;
25104 25107
25105public class conftest { 25108public class conftest {
@@ -25206,7 +25209,7 @@ $as_echo_n "checking jlatexmath-fop... " >&6; }
25206 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 25209 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
25207 25210
25208 cat << \EOF > conftest.java 25211 cat << \EOF > conftest.java
25209// #line 25209 "configure" 25212// #line 25212 "configure"
25210import org.scilab.forge.jlatexmath.fop.JLaTeXMathObj; 25213import org.scilab.forge.jlatexmath.fop.JLaTeXMathObj;
25211 25214
25212public class conftest { 25215public class conftest {
@@ -31513,7 +31516,7 @@ else
31513 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 31516 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
31514 lt_status=$lt_dlunknown 31517 lt_status=$lt_dlunknown
31515 cat > conftest.$ac_ext <<_LT_EOF 31518 cat > conftest.$ac_ext <<_LT_EOF
31516#line 31516 "configure" 31519#line 31519 "configure"
31517#include "confdefs.h" 31520#include "confdefs.h"
31518 31521
31519#if HAVE_DLFCN_H 31522#if HAVE_DLFCN_H
@@ -31619,7 +31622,7 @@ else
31619 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 31622 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
31620 lt_status=$lt_dlunknown 31623 lt_status=$lt_dlunknown
31621 cat > conftest.$ac_ext <<_LT_EOF 31624 cat > conftest.$ac_ext <<_LT_EOF
31622#line 31622 "configure" 31625#line 31625 "configure"
31623#include "confdefs.h" 31626#include "confdefs.h"
31624 31627
31625#if HAVE_DLFCN_H 31628#if HAVE_DLFCN_H
@@ -37647,7 +37650,7 @@ if test "$enable_stop_on_warning" = yes; then
37647 CPPFLAGS="$CPPFLAGS -Werror -O0" 37650 CPPFLAGS="$CPPFLAGS -Werror -O0"
37648fi 37651fi
37649 37652
37650ac_config_files="$ac_config_files libs/MALLOC/Makefile libs/dynamiclibrary/Makefile libs/doublylinkedlist/Makefile libs/hashtable/Makefile libs/libst/Makefile contrib/Makefile modules/helptools/Makefile modules/helptools/macros/xmlfiletohtml.sci modules/data_structures/Makefile modules/differential_equations/Makefile modules/optimization/Makefile modules/elementary_functions/Makefile modules/special_functions/Makefile modules/io/Makefile modules/shell/Makefile modules/completion/Makefile modules/history_manager/Makefile modules/jvm/Makefile modules/commons/Makefile modules/sound/Makefile modules/statistics/Makefile modules/mexlib/Makefile modules/sparse/Makefile modules/linear_algebra/Makefile modules/polynomials/Makefile modules/symbolic/Makefile modules/signal_processing/Makefile modules/arnoldi/Makefile modules/interpolation/Makefile modules/intersci/Makefile modules/localization/Makefile modules/cacsd/Makefile modules/boolean/Makefile modules/integer/Makefile modules/double/Makefile modules/fileio/Makefile modules/spreadsheet/Makefile modules/string/Makefile modules/time/Makefile modules/graphics/Makefile modules/graphic_export/Makefile modules/renderer/Makefile modules/action_binding/Makefile modules/gui/Makefile modules/pvm/Makefile modules/randlib/Makefile modules/tclsci/Makefile modules/windows_tools/Makefile modules/core/Makefile modules/api_scilab/Makefile modules/call_scilab/Makefile modules/types/Makefile modules/hdf5/Makefile modules/fftw/Makefile modules/umfpack/Makefile modules/scicos/Makefile modules/scicos_blocks/Makefile modules/functions/Makefile modules/dynamic_link/Makefile modules/overloading/Makefile modules/javasci/Makefile modules/maple2scilab/Makefile modules/m2sci/Makefile modules/compatibility_functions/Makefile modules/texmacs/Makefile modules/development_tools/Makefile modules/output_stream/Makefile modules/console/Makefile modules/demo_tools/Makefile modules/genetic_algorithms/Makefile modules/simulated_annealing/Makefile modules/parameters/Makefile modules/matio/Makefile modules/atoms/Makefile modules/xcos/Makefile modules/scinotes/Makefile modules/ui_data/Makefile modules/graph/Makefile modules/parallel/Makefile modules/modules_manager/Makefile modules/history_browser/Makefile modules/Makefile libs/Makefile Makefile scilab.pc etc/modules.xml etc/classpath.xml etc/jvm_options.xml etc/Info.plist scilab-lib.properties scilab-lib-doc.properties modules/helptools/etc/SciDocConf.xml modules/core/includes/version.h" 37653ac_config_files="$ac_config_files libs/MALLOC/Makefile libs/dynamiclibrary/Makefile libs/doublylinkedlist/Makefile libs/hashtable/Makefile libs/libst/Makefile contrib/Makefile modules/helptools/Makefile modules/helptools/macros/xmlfiletohtml.sci modules/data_structures/Makefile modules/differential_equations/Makefile modules/optimization/Makefile modules/elementary_functions/Makefile modules/special_functions/Makefile modules/io/Makefile modules/shell/Makefile modules/completion/Makefile modules/history_manager/Makefile modules/jvm/Makefile modules/commons/Makefile modules/sound/Makefile modules/statistics/Makefile modules/mexlib/Makefile modules/sparse/Makefile modules/linear_algebra/Makefile modules/polynomials/Makefile modules/symbolic/Makefile modules/signal_processing/Makefile modules/arnoldi/Makefile modules/interpolation/Makefile modules/intersci/Makefile modules/localization/Makefile modules/cacsd/Makefile modules/boolean/Makefile modules/integer/Makefile modules/double/Makefile modules/fileio/Makefile modules/spreadsheet/Makefile modules/string/Makefile modules/time/Makefile modules/graphics/Makefile modules/graphic_export/Makefile modules/renderer/Makefile modules/action_binding/Makefile modules/gui/Makefile modules/pvm/Makefile modules/randlib/Makefile modules/tclsci/Makefile modules/windows_tools/Makefile modules/core/Makefile modules/api_scilab/Makefile modules/call_scilab/Makefile modules/types/Makefile modules/hdf5/Makefile modules/fftw/Makefile modules/umfpack/Makefile modules/scicos/Makefile modules/scicos_blocks/Makefile modules/functions/Makefile modules/dynamic_link/Makefile modules/overloading/Makefile modules/javasci/Makefile modules/maple2scilab/Makefile modules/m2sci/Makefile modules/compatibility_functions/Makefile modules/texmacs/Makefile modules/development_tools/Makefile modules/output_stream/Makefile modules/console/Makefile modules/demo_tools/Makefile modules/genetic_algorithms/Makefile modules/simulated_annealing/Makefile modules/parameters/Makefile modules/matio/Makefile modules/atoms/Makefile modules/xcos/Makefile modules/scinotes/Makefile modules/ui_data/Makefile modules/graph/Makefile modules/parallel/Makefile modules/modules_manager/Makefile modules/history_browser/Makefile modules/Makefile libs/Makefile Makefile scilab.pc etc/modules.xml etc/classpath.xml etc/Info.plist scilab.properties scilab-lib.properties scilab-lib-doc.properties modules/helptools/etc/SciDocConf.xml modules/core/includes/version.h"
37651 37654
37652 37655
37653# Detection of the module for the future version of Scilab 6 37656# Detection of the module for the future version of Scilab 6
@@ -39070,8 +39073,8 @@ do
39070 "scilab.pc") CONFIG_FILES="$CONFIG_FILES scilab.pc" ;; 39073 "scilab.pc") CONFIG_FILES="$CONFIG_FILES scilab.pc" ;;
39071 "etc/modules.xml") CONFIG_FILES="$CONFIG_FILES etc/modules.xml" ;; 39074 "etc/modules.xml") CONFIG_FILES="$CONFIG_FILES etc/modules.xml" ;;
39072 "etc/classpath.xml") CONFIG_FILES="$CONFIG_FILES etc/classpath.xml" ;; 39075 "etc/classpath.xml") CONFIG_FILES="$CONFIG_FILES etc/classpath.xml" ;;
39073 "etc/jvm_options.xml") CONFIG_FILES="$CONFIG_FILES etc/jvm_options.xml" ;;
39074 "etc/Info.plist") CONFIG_FILES="$CONFIG_FILES etc/Info.plist" ;; 39076 "etc/Info.plist") CONFIG_FILES="$CONFIG_FILES etc/Info.plist" ;;
39077 "scilab.properties") CONFIG_FILES="$CONFIG_FILES scilab.properties" ;;
39075 "scilab-lib.properties") CONFIG_FILES="$CONFIG_FILES scilab-lib.properties" ;; 39078 "scilab-lib.properties") CONFIG_FILES="$CONFIG_FILES scilab-lib.properties" ;;
39076 "scilab-lib-doc.properties") CONFIG_FILES="$CONFIG_FILES scilab-lib-doc.properties" ;; 39079 "scilab-lib-doc.properties") CONFIG_FILES="$CONFIG_FILES scilab-lib-doc.properties" ;;
39077 "modules/helptools/etc/SciDocConf.xml") CONFIG_FILES="$CONFIG_FILES modules/helptools/etc/SciDocConf.xml" ;; 39080 "modules/helptools/etc/SciDocConf.xml") CONFIG_FILES="$CONFIG_FILES modules/helptools/etc/SciDocConf.xml" ;;
@@ -40918,15 +40921,15 @@ echo "Host system type : $host"
40918echo "" 40921echo ""
40919echo " Option Value" 40922echo " Option Value"
40920echo "-------------------------------------------------------------------------" 40923echo "-------------------------------------------------------------------------"
40921echo "Shared libraries....... --enable-shared=$libtool_build_shared_libs $libtool_build_shared_libs" 40924echo "Shared libraries....... --enable-shared=$libtool_build_shared_libs"
40922echo "Static libraries....... --enable-static=$libtool_build_static_libs $libtool_build_static_libs" 40925echo "Static libraries....... --enable-static=$libtool_build_static_libs"
40923echo "GNU ld................. --with-gnu-ld=$with_gnu_ld $lt_cv_prog_gnu_ld" 40926echo "GNU ld................. --with-gnu-ld=$with_gnu_ld"
40924echo "Enable debug .......... --enable-debug=$enable_debug $enable_debug" 40927echo "Enable debug .......... --enable-debug=$enable_debug"
40925echo "Enable debug C......... --enable-debug-C=$enable_debug_C $enable_debug_C" 40928echo "Enable debug C......... --enable-debug-C=$enable_debug_C"
40926echo "Enable debug C++....... --enable-debug-CXX=$enable_debug_CXX $enable_debug_CXX" 40929echo "Enable debug C++....... --enable-debug-CXX=$enable_debug_CXX"
40927echo "Enable debug Java...... --enable-debug-java=$enable_debug_java $enable_debug_java" 40930echo "Enable debug Java...... --enable-debug-java=$enable_debug_java"
40928echo "Enable debug Fortran... --enable-debug-fortran=$enable_debug_fortran $enable_debug_fortran" 40931echo "Enable debug Fortran... --enable-debug-fortran=$enable_debug_fortran"
40929echo "Enable stop on warning. --enable-stop-on-warning=$enable_stop_on_warning $enable_stop_on_warning" 40932echo "Enable stop on warning. --enable-stop-on-warning=$enable_stop_on_warning"
40930 40933
40931echo "" 40934echo ""
40932echo "Compiler Configuration:" 40935echo "Compiler Configuration:"
diff --git a/scilab/configure.ac b/scilab/configure.ac
index 2c409e0..e056d61 100644
--- a/scilab/configure.ac
+++ b/scilab/configure.ac
@@ -90,7 +90,7 @@ AC_CANONICAL_HOST
90 90
91 91
92AC_ARG_ENABLE(debug, 92AC_ARG_ENABLE(debug,
93 AC_HELP_STRING([--enable-debug],[Do not optimize and print warning messages (C/C++/Fortran code)])) 93 AC_HELP_STRING([--enable-debug],[Do not optimize and print warning messages (C/C++/Fortran/Java code)]))
94 94
95AC_ARG_ENABLE(debug-C, 95AC_ARG_ENABLE(debug-C,
96 AC_HELP_STRING([--enable-debug-C],[Do not optimize and print warning messages (C code)])) 96 AC_HELP_STRING([--enable-debug-C],[Do not optimize and print warning messages (C code)]))
@@ -306,6 +306,7 @@ esac
306AM_PROG_CC_C_O 306AM_PROG_CC_C_O
307AC_PROG_F77_C_O 307AC_PROG_F77_C_O
308 308
309
309# If this option is provided, enable the debug on C & C++ 310# If this option is provided, enable the debug on C & C++
310if test "$enable_stop_on_warning" = yes; then 311if test "$enable_stop_on_warning" = yes; then
311 enable_debug_C=yes 312 enable_debug_C=yes
@@ -316,6 +317,7 @@ if test "$enable_debug" = yes; then
316 enable_debug_fortran=yes 317 enable_debug_fortran=yes
317 enable_debug_C=yes 318 enable_debug_C=yes
318 enable_debug_CXX=yes 319 enable_debug_CXX=yes
320 enable_debug_java=yes
319else 321else
320 enable_debug=no 322 enable_debug=no
321fi 323fi
@@ -976,10 +978,11 @@ the the JNI libraries."])],
976 978
977 979
978 if test "$enable_debug_java" = yes; then 980 if test "$enable_debug_java" = yes; then
979 JAVA_DEBUG_OPTIONS="<option value='-verbose:jni'/> 981 JAVAC_DEBUG="on"
980 <option value='-Xcheck:jni'/>" 982 else
981 AC_SUBST(JAVA_DEBUG_OPTIONS) 983 JAVAC_DEBUG="off"
982 fi 984 fi
985 AC_SUBST(JAVAC_DEBUG)
983 986
984 if test "$enable_build_swig" != no -a "$enable_build_swig" != ""; then 987 if test "$enable_build_swig" != no -a "$enable_build_swig" != ""; then
985 SWIG_PROG() 988 SWIG_PROG()
@@ -1785,8 +1788,8 @@ Makefile
1785scilab.pc 1788scilab.pc
1786etc/modules.xml 1789etc/modules.xml
1787etc/classpath.xml 1790etc/classpath.xml
1788etc/jvm_options.xml
1789etc/Info.plist 1791etc/Info.plist
1792scilab.properties
1790scilab-lib.properties 1793scilab-lib.properties
1791scilab-lib-doc.properties 1794scilab-lib-doc.properties
1792modules/helptools/etc/SciDocConf.xml 1795modules/helptools/etc/SciDocConf.xml
@@ -1865,15 +1868,15 @@ echo "Host system type : $host"
1865echo "" 1868echo ""
1866echo " Option Value" 1869echo " Option Value"
1867echo "-------------------------------------------------------------------------" 1870echo "-------------------------------------------------------------------------"
1868echo "Shared libraries....... --enable-shared=$libtool_build_shared_libs $libtool_build_shared_libs" 1871echo "Shared libraries....... --enable-shared=$libtool_build_shared_libs"
1869echo "Static libraries....... --enable-static=$libtool_build_static_libs $libtool_build_static_libs" 1872echo "Static libraries....... --enable-static=$libtool_build_static_libs"
1870echo "GNU ld................. --with-gnu-ld=$with_gnu_ld $lt_cv_prog_gnu_ld" 1873echo "GNU ld................. --with-gnu-ld=$with_gnu_ld"
1871echo "Enable debug .......... --enable-debug=$enable_debug $enable_debug" 1874echo "Enable debug .......... --enable-debug=$enable_debug"
1872echo "Enable debug C......... --enable-debug-C=$enable_debug_C $enable_debug_C" 1875echo "Enable debug C......... --enable-debug-C=$enable_debug_C"
1873echo "Enable debug C++....... --enable-debug-CXX=$enable_debug_CXX $enable_debug_CXX" 1876echo "Enable debug C++....... --enable-debug-CXX=$enable_debug_CXX"
1874echo "Enable debug Java...... --enable-debug-java=$enable_debug_java $enable_debug_java" 1877echo "Enable debug Java...... --enable-debug-java=$enable_debug_java"
1875echo "Enable debug Fortran... --enable-debug-fortran=$enable_debug_fortran $enable_debug_fortran" 1878echo "Enable debug Fortran... --enable-debug-fortran=$enable_debug_fortran"
1876echo "Enable stop on warning. --enable-stop-on-warning=$enable_stop_on_warning $enable_stop_on_warning" 1879echo "Enable stop on warning. --enable-stop-on-warning=$enable_stop_on_warning"
1877 1880
1878echo "" 1881echo ""
1879echo "Compiler Configuration:" 1882echo "Compiler Configuration:"
diff --git a/scilab/contrib/Makefile.in b/scilab/contrib/Makefile.in
index 12988ee..98e49b9 100644
--- a/scilab/contrib/Makefile.in
+++ b/scilab/contrib/Makefile.in
@@ -137,10 +137,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
137JAR = @JAR@ 137JAR = @JAR@
138JAVA = @JAVA@ 138JAVA = @JAVA@
139JAVAC = @JAVAC@ 139JAVAC = @JAVAC@
140JAVAC_DEBUG = @JAVAC_DEBUG@
140JAVADOC = @JAVADOC@ 141JAVADOC = @JAVADOC@
141JAVAH = @JAVAH@ 142JAVAH = @JAVAH@
142JAVASCI_ENABLE = @JAVASCI_ENABLE@ 143JAVASCI_ENABLE = @JAVASCI_ENABLE@
143JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
144JAVA_ENABLE = @JAVA_ENABLE@ 144JAVA_ENABLE = @JAVA_ENABLE@
145JAVA_G = @JAVA_G@ 145JAVA_G = @JAVA_G@
146JAVA_HOME = @JAVA_HOME@ 146JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/etc/.gitignore b/scilab/etc/.gitignore
index c1b8653..ffc82b0 100644
--- a/scilab/etc/.gitignore
+++ b/scilab/etc/.gitignore
@@ -1,3 +1,2 @@
1modules.xml 1modules.xml
2classpath.xml 2classpath.xml
3jvm_options.xml
diff --git a/scilab/etc/jvm_options.xml.in b/scilab/etc/jvm_options.xml
index 989d2cf..86be1c3 100644
--- a/scilab/etc/jvm_options.xml.in
+++ b/scilab/etc/jvm_options.xml
@@ -16,28 +16,21 @@ $PATH_SEPARATOR : path separator ';' (windows) ':' linux
16$SCILAB : scilab path (SCI in Scilab) 16$SCILAB : scilab path (SCI in Scilab)
17--> 17-->
18<jvm_options> 18<jvm_options>
19<option value="-Djava.library.path="/> 19 <option value="-Djava.library.path="/>
20<option value="-Djava.class.path=$SCILAB/modules/jvm/jar/org.scilab.modules.jvm.jar"/> 20 <option value="-Djava.class.path=$SCILAB/modules/jvm/jar/org.scilab.modules.jvm.jar"/>
21<option value="-Djava.util.logging.config.file=$SCILAB/etc/logging.properties"/> 21 <option value="-Djava.util.logging.config.file=$SCILAB/etc/logging.properties"/>
22 22 <!-- ENABLE Just In Time java compiler -->
23<!-- ENABLE Just In Time java compiler --> 23 <option value="-Djava.compiler=JIT"/>
24<option value="-Djava.compiler=JIT"/> 24 <!-- Set Java Heap space to 256mb -->
25 25 <option value="-Xmx256m"/>
26<!-- Set Java Heap space to 256mb --> 26 <option value="-Dapple.laf.useScreenMenuBar=true" os="macosx"/>
27<option value="-Xmx256m"/> 27 <!-- DISABLE Just In Time java compiler -->
28 28 <!--
29<option value="-Dapple.laf.useScreenMenuBar=true" os="macosx" />
30
31<!-- DISABLE Just In Time java compiler -->
32<!--
33<option value="-Djava.compiler=NONE"/> 29<option value="-Djava.compiler=NONE"/>
34--> 30-->
35 31 <!-- --enable-debug-java enables also some more checks -->
36<!-- enable-debug-java enables some more checks 32<!--
37<option value='-verbose:jni'/> 33<option value='-verbose:jni'/>
38 <option value='-Xcheck:jni'/> 34 <option value='-Xcheck:jni'/>
39--> 35-->
40@JAVA_DEBUG_OPTIONS@
41
42<!-- comments -->
43</jvm_options> 36</jvm_options>
diff --git a/scilab/etc/jvm_options.xml.vc b/scilab/etc/jvm_options.xml.vc
deleted file mode 100644
index 0901601..0000000
--- a/scilab/etc/jvm_options.xml.vc
+++ /dev/null
@@ -1,40 +0,0 @@
1<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2<!DOCTYPE jvm_options SYSTEM "../modules/jvm/xml/jvm-options.dtd">
3<!-- =================== -->
4<!--
5 Options JVM
6 @author Allan CORNET
7 ===================
8 Don't touch if you do not know what you are doing
9 http://blogs.sun.com/watt/resource/jvm-options-list.html
10 http://java.sun.com/javase/technologies/hotspot/vmoptions.jsp
11 http://java.sun.com/javase/technologies/hotspot/exactoptions.jsp
12 -->
13<!-- =================== -->
14<!--
15$PATH_SEPARATOR : path separator ';' (windows) ':' linux
16$SCILAB : scilab path (SCI in Scilab)
17-->
18<jvm_options>
19<option value="-Djava.library.path=$SCILAB/java/jre"/>
20<option value="-Djava.class.path=$SCILAB/modules/jvm/jar/org.scilab.modules.jvm.jar"/>
21<option value="-Djava.util.logging.config.file=$SCILAB/etc/logging.properties"/>
22
23<!-- ENABLE Just In Time java compiler -->
24<option value="-Djava.compiler=JIT"/>
25
26<!-- Set Java Heap space to 256mb -->
27<option value="-Xmx256m"/>
28
29<!-- DISABLE Just In Time java compiler -->
30<!--
31<option value="-Djava.compiler=NONE"/>
32-->
33
34<!-- comments -->
35<!--
36<option value="-verbose:jni"/>
37<option value="-Xcheck:jni"/>
38-->
39<!-- comments -->
40</jvm_options>
diff --git a/scilab/libs/MALLOC/Makefile.in b/scilab/libs/MALLOC/Makefile.in
index 5342938..401c641 100644
--- a/scilab/libs/MALLOC/Makefile.in
+++ b/scilab/libs/MALLOC/Makefile.in
@@ -203,10 +203,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
203JAR = @JAR@ 203JAR = @JAR@
204JAVA = @JAVA@ 204JAVA = @JAVA@
205JAVAC = @JAVAC@ 205JAVAC = @JAVAC@
206JAVAC_DEBUG = @JAVAC_DEBUG@
206JAVADOC = @JAVADOC@ 207JAVADOC = @JAVADOC@
207JAVAH = @JAVAH@ 208JAVAH = @JAVAH@
208JAVASCI_ENABLE = @JAVASCI_ENABLE@ 209JAVASCI_ENABLE = @JAVASCI_ENABLE@
209JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
210JAVA_ENABLE = @JAVA_ENABLE@ 210JAVA_ENABLE = @JAVA_ENABLE@
211JAVA_G = @JAVA_G@ 211JAVA_G = @JAVA_G@
212JAVA_HOME = @JAVA_HOME@ 212JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/libs/Makefile.in b/scilab/libs/Makefile.in
index 1ed2e64..22586e4 100644
--- a/scilab/libs/Makefile.in
+++ b/scilab/libs/Makefile.in
@@ -175,10 +175,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
175JAR = @JAR@ 175JAR = @JAR@
176JAVA = @JAVA@ 176JAVA = @JAVA@
177JAVAC = @JAVAC@ 177JAVAC = @JAVAC@
178JAVAC_DEBUG = @JAVAC_DEBUG@
178JAVADOC = @JAVADOC@ 179JAVADOC = @JAVADOC@
179JAVAH = @JAVAH@ 180JAVAH = @JAVAH@
180JAVASCI_ENABLE = @JAVASCI_ENABLE@ 181JAVASCI_ENABLE = @JAVASCI_ENABLE@
181JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
182JAVA_ENABLE = @JAVA_ENABLE@ 182JAVA_ENABLE = @JAVA_ENABLE@
183JAVA_G = @JAVA_G@ 183JAVA_G = @JAVA_G@
184JAVA_HOME = @JAVA_HOME@ 184JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/libs/doublylinkedlist/Makefile.in b/scilab/libs/doublylinkedlist/Makefile.in
index dd41a34..c704619 100644
--- a/scilab/libs/doublylinkedlist/Makefile.in
+++ b/scilab/libs/doublylinkedlist/Makefile.in
@@ -205,10 +205,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
205JAR = @JAR@ 205JAR = @JAR@
206JAVA = @JAVA@ 206JAVA = @JAVA@
207JAVAC = @JAVAC@ 207JAVAC = @JAVAC@
208JAVAC_DEBUG = @JAVAC_DEBUG@
208JAVADOC = @JAVADOC@ 209JAVADOC = @JAVADOC@
209JAVAH = @JAVAH@ 210JAVAH = @JAVAH@
210JAVASCI_ENABLE = @JAVASCI_ENABLE@ 211JAVASCI_ENABLE = @JAVASCI_ENABLE@
211JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
212JAVA_ENABLE = @JAVA_ENABLE@ 212JAVA_ENABLE = @JAVA_ENABLE@
213JAVA_G = @JAVA_G@ 213JAVA_G = @JAVA_G@
214JAVA_HOME = @JAVA_HOME@ 214JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/libs/dynamiclibrary/Makefile.in b/scilab/libs/dynamiclibrary/Makefile.in
index 1a36aa3..8295523 100644
--- a/scilab/libs/dynamiclibrary/Makefile.in
+++ b/scilab/libs/dynamiclibrary/Makefile.in
@@ -205,10 +205,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
205JAR = @JAR@ 205JAR = @JAR@
206JAVA = @JAVA@ 206JAVA = @JAVA@
207JAVAC = @JAVAC@ 207JAVAC = @JAVAC@
208JAVAC_DEBUG = @JAVAC_DEBUG@
208JAVADOC = @JAVADOC@ 209JAVADOC = @JAVADOC@
209JAVAH = @JAVAH@ 210JAVAH = @JAVAH@
210JAVASCI_ENABLE = @JAVASCI_ENABLE@ 211JAVASCI_ENABLE = @JAVASCI_ENABLE@
211JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
212JAVA_ENABLE = @JAVA_ENABLE@ 212JAVA_ENABLE = @JAVA_ENABLE@
213JAVA_G = @JAVA_G@ 213JAVA_G = @JAVA_G@
214JAVA_HOME = @JAVA_HOME@ 214JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/libs/hashtable/Makefile.in b/scilab/libs/hashtable/Makefile.in
index 7345bfd..05bceee 100644
--- a/scilab/libs/hashtable/Makefile.in
+++ b/scilab/libs/hashtable/Makefile.in
@@ -203,10 +203,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
203JAR = @JAR@ 203JAR = @JAR@
204JAVA = @JAVA@ 204JAVA = @JAVA@
205JAVAC = @JAVAC@ 205JAVAC = @JAVAC@
206JAVAC_DEBUG = @JAVAC_DEBUG@
206JAVADOC = @JAVADOC@ 207JAVADOC = @JAVADOC@
207JAVAH = @JAVAH@ 208JAVAH = @JAVAH@
208JAVASCI_ENABLE = @JAVASCI_ENABLE@ 209JAVASCI_ENABLE = @JAVASCI_ENABLE@
209JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
210JAVA_ENABLE = @JAVA_ENABLE@ 210JAVA_ENABLE = @JAVA_ENABLE@
211JAVA_G = @JAVA_G@ 211JAVA_G = @JAVA_G@
212JAVA_HOME = @JAVA_HOME@ 212JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/libs/libst/Makefile.in b/scilab/libs/libst/Makefile.in
index a42d602..0b220b1 100644
--- a/scilab/libs/libst/Makefile.in
+++ b/scilab/libs/libst/Makefile.in
@@ -199,10 +199,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
199JAR = @JAR@ 199JAR = @JAR@
200JAVA = @JAVA@ 200JAVA = @JAVA@
201JAVAC = @JAVAC@ 201JAVAC = @JAVAC@
202JAVAC_DEBUG = @JAVAC_DEBUG@
202JAVADOC = @JAVADOC@ 203JAVADOC = @JAVADOC@
203JAVAH = @JAVAH@ 204JAVAH = @JAVAH@
204JAVASCI_ENABLE = @JAVASCI_ENABLE@ 205JAVASCI_ENABLE = @JAVASCI_ENABLE@
205JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
206JAVA_ENABLE = @JAVA_ENABLE@ 206JAVA_ENABLE = @JAVA_ENABLE@
207JAVA_G = @JAVA_G@ 207JAVA_G = @JAVA_G@
208JAVA_HOME = @JAVA_HOME@ 208JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/modules/Makefile.in b/scilab/modules/Makefile.in
index 45aba71..ca76e39 100644
--- a/scilab/modules/Makefile.in
+++ b/scilab/modules/Makefile.in
@@ -265,10 +265,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
265JAR = @JAR@ 265JAR = @JAR@
266JAVA = @JAVA@ 266JAVA = @JAVA@
267JAVAC = @JAVAC@ 267JAVAC = @JAVAC@
268JAVAC_DEBUG = @JAVAC_DEBUG@
268JAVADOC = @JAVADOC@ 269JAVADOC = @JAVADOC@
269JAVAH = @JAVAH@ 270JAVAH = @JAVAH@
270JAVASCI_ENABLE = @JAVASCI_ENABLE@ 271JAVASCI_ENABLE = @JAVASCI_ENABLE@
271JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
272JAVA_ENABLE = @JAVA_ENABLE@ 272JAVA_ENABLE = @JAVA_ENABLE@
273JAVA_G = @JAVA_G@ 273JAVA_G = @JAVA_G@
274JAVA_HOME = @JAVA_HOME@ 274JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/modules/action_binding/Makefile.in b/scilab/modules/action_binding/Makefile.in
index 0da2c87..4a55dc6 100644
--- a/scilab/modules/action_binding/Makefile.in
+++ b/scilab/modules/action_binding/Makefile.in
@@ -251,10 +251,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
251JAR = @JAR@ 251JAR = @JAR@
252JAVA = @JAVA@ 252JAVA = @JAVA@
253JAVAC = @JAVAC@ 253JAVAC = @JAVAC@
254JAVAC_DEBUG = @JAVAC_DEBUG@
254JAVADOC = @JAVADOC@ 255JAVADOC = @JAVADOC@
255JAVAH = @JAVAH@ 256JAVAH = @JAVAH@
256JAVASCI_ENABLE = @JAVASCI_ENABLE@ 257JAVASCI_ENABLE = @JAVASCI_ENABLE@
257JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
258JAVA_ENABLE = @JAVA_ENABLE@ 258JAVA_ENABLE = @JAVA_ENABLE@
259JAVA_G = @JAVA_G@ 259JAVA_G = @JAVA_G@
260JAVA_HOME = @JAVA_HOME@ 260JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/modules/api_scilab/Makefile.in b/scilab/modules/api_scilab/Makefile.in
index 6a2d529..da5c38d 100644
--- a/scilab/modules/api_scilab/Makefile.in
+++ b/scilab/modules/api_scilab/Makefile.in
@@ -219,10 +219,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
219JAR = @JAR@ 219JAR = @JAR@
220JAVA = @JAVA@ 220JAVA = @JAVA@
221JAVAC = @JAVAC@ 221JAVAC = @JAVAC@
222JAVAC_DEBUG = @JAVAC_DEBUG@
222JAVADOC = @JAVADOC@ 223JAVADOC = @JAVADOC@
223JAVAH = @JAVAH@ 224JAVAH = @JAVAH@
224JAVASCI_ENABLE = @JAVASCI_ENABLE@ 225JAVASCI_ENABLE = @JAVASCI_ENABLE@
225JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
226JAVA_ENABLE = @JAVA_ENABLE@ 226JAVA_ENABLE = @JAVA_ENABLE@
227JAVA_G = @JAVA_G@ 227JAVA_G = @JAVA_G@
228JAVA_HOME = @JAVA_HOME@ 228JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/modules/arnoldi/Makefile.in b/scilab/modules/arnoldi/Makefile.in
index 277ef1a..4b45329 100644
--- a/scilab/modules/arnoldi/Makefile.in
+++ b/scilab/modules/arnoldi/Makefile.in
@@ -241,10 +241,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
241JAR = @JAR@ 241JAR = @JAR@
242JAVA = @JAVA@ 242JAVA = @JAVA@
243JAVAC = @JAVAC@ 243JAVAC = @JAVAC@
244JAVAC_DEBUG = @JAVAC_DEBUG@
244JAVADOC = @JAVADOC@ 245JAVADOC = @JAVADOC@
245JAVAH = @JAVAH@ 246JAVAH = @JAVAH@
246JAVASCI_ENABLE = @JAVASCI_ENABLE@ 247JAVASCI_ENABLE = @JAVASCI_ENABLE@
247JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
248JAVA_ENABLE = @JAVA_ENABLE@ 248JAVA_ENABLE = @JAVA_ENABLE@
249JAVA_G = @JAVA_G@ 249JAVA_G = @JAVA_G@
250JAVA_HOME = @JAVA_HOME@ 250JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/modules/atoms/Makefile.in b/scilab/modules/atoms/Makefile.in
index 3aa7f86..194a256 100644
--- a/scilab/modules/atoms/Makefile.in
+++ b/scilab/modules/atoms/Makefile.in
@@ -184,10 +184,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
184JAR = @JAR@ 184JAR = @JAR@
185JAVA = @JAVA@ 185JAVA = @JAVA@
186JAVAC = @JAVAC@ 186JAVAC = @JAVAC@
187JAVAC_DEBUG = @JAVAC_DEBUG@
187JAVADOC = @JAVADOC@ 188JAVADOC = @JAVADOC@
188JAVAH = @JAVAH@ 189JAVAH = @JAVAH@
189JAVASCI_ENABLE = @JAVASCI_ENABLE@ 190JAVASCI_ENABLE = @JAVASCI_ENABLE@
190JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
191JAVA_ENABLE = @JAVA_ENABLE@ 191JAVA_ENABLE = @JAVA_ENABLE@
192JAVA_G = @JAVA_G@ 192JAVA_G = @JAVA_G@
193JAVA_HOME = @JAVA_HOME@ 193JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/modules/boolean/Makefile.in b/scilab/modules/boolean/Makefile.in
index beada0a..b99e5d8 100644
--- a/scilab/modules/boolean/Makefile.in
+++ b/scilab/modules/boolean/Makefile.in
@@ -221,10 +221,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
221JAR = @JAR@ 221JAR = @JAR@
222JAVA = @JAVA@ 222JAVA = @JAVA@
223JAVAC = @JAVAC@ 223JAVAC = @JAVAC@
224JAVAC_DEBUG = @JAVAC_DEBUG@
224JAVADOC = @JAVADOC@ 225JAVADOC = @JAVADOC@
225JAVAH = @JAVAH@ 226JAVAH = @JAVAH@
226JAVASCI_ENABLE = @JAVASCI_ENABLE@ 227JAVASCI_ENABLE = @JAVASCI_ENABLE@
227JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
228JAVA_ENABLE = @JAVA_ENABLE@ 228JAVA_ENABLE = @JAVA_ENABLE@
229JAVA_G = @JAVA_G@ 229JAVA_G = @JAVA_G@
230JAVA_HOME = @JAVA_HOME@ 230JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/modules/cacsd/Makefile.in b/scilab/modules/cacsd/Makefile.in
index b8d5281..aa8a0a1 100644
--- a/scilab/modules/cacsd/Makefile.in
+++ b/scilab/modules/cacsd/Makefile.in
@@ -315,10 +315,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
315JAR = @JAR@ 315JAR = @JAR@
316JAVA = @JAVA@ 316JAVA = @JAVA@
317JAVAC = @JAVAC@ 317JAVAC = @JAVAC@
318JAVAC_DEBUG = @JAVAC_DEBUG@
318JAVADOC = @JAVADOC@ 319JAVADOC = @JAVADOC@
319JAVAH = @JAVAH@ 320JAVAH = @JAVAH@
320JAVASCI_ENABLE = @JAVASCI_ENABLE@ 321JAVASCI_ENABLE = @JAVASCI_ENABLE@
321JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
322JAVA_ENABLE = @JAVA_ENABLE@ 322JAVA_ENABLE = @JAVA_ENABLE@
323JAVA_G = @JAVA_G@ 323JAVA_G = @JAVA_G@
324JAVA_HOME = @JAVA_HOME@ 324JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/modules/call_scilab/Makefile.in b/scilab/modules/call_scilab/Makefile.in
index bf20292..4dd6e45 100644
--- a/scilab/modules/call_scilab/Makefile.in
+++ b/scilab/modules/call_scilab/Makefile.in
@@ -216,10 +216,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
216JAR = @JAR@ 216JAR = @JAR@
217JAVA = @JAVA@ 217JAVA = @JAVA@
218JAVAC = @JAVAC@ 218JAVAC = @JAVAC@
219JAVAC_DEBUG = @JAVAC_DEBUG@
219JAVADOC = @JAVADOC@ 220JAVADOC = @JAVADOC@
220JAVAH = @JAVAH@ 221JAVAH = @JAVAH@
221JAVASCI_ENABLE = @JAVASCI_ENABLE@ 222JAVASCI_ENABLE = @JAVASCI_ENABLE@
222JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
223JAVA_ENABLE = @JAVA_ENABLE@ 223JAVA_ENABLE = @JAVA_ENABLE@
224JAVA_G = @JAVA_G@ 224JAVA_G = @JAVA_G@
225JAVA_HOME = @JAVA_HOME@ 225JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/modules/commons/Makefile.in b/scilab/modules/commons/Makefile.in
index 9254814..a761d6c 100644
--- a/scilab/modules/commons/Makefile.in
+++ b/scilab/modules/commons/Makefile.in
@@ -236,10 +236,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
236JAR = @JAR@ 236JAR = @JAR@
237JAVA = @JAVA@ 237JAVA = @JAVA@
238JAVAC = @JAVAC@ 238JAVAC = @JAVAC@
239JAVAC_DEBUG = @JAVAC_DEBUG@
239JAVADOC = @JAVADOC@ 240JAVADOC = @JAVADOC@
240JAVAH = @JAVAH@ 241JAVAH = @JAVAH@
241JAVASCI_ENABLE = @JAVASCI_ENABLE@ 242JAVASCI_ENABLE = @JAVASCI_ENABLE@
242JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
243JAVA_ENABLE = @JAVA_ENABLE@ 243JAVA_ENABLE = @JAVA_ENABLE@
244JAVA_G = @JAVA_G@ 244JAVA_G = @JAVA_G@
245JAVA_HOME = @JAVA_HOME@ 245JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/modules/compatibility_functions/Makefile.in b/scilab/modules/compatibility_functions/Makefile.in
index 485a943..e24f0e8 100644
--- a/scilab/modules/compatibility_functions/Makefile.in
+++ b/scilab/modules/compatibility_functions/Makefile.in
@@ -181,10 +181,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
181JAR = @JAR@ 181JAR = @JAR@
182JAVA = @JAVA@ 182JAVA = @JAVA@
183JAVAC = @JAVAC@ 183JAVAC = @JAVAC@
184JAVAC_DEBUG = @JAVAC_DEBUG@
184JAVADOC = @JAVADOC@ 185JAVADOC = @JAVADOC@
185JAVAH = @JAVAH@ 186JAVAH = @JAVAH@
186JAVASCI_ENABLE = @JAVASCI_ENABLE@ 187JAVASCI_ENABLE = @JAVASCI_ENABLE@
187JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
188JAVA_ENABLE = @JAVA_ENABLE@ 188JAVA_ENABLE = @JAVA_ENABLE@
189JAVA_G = @JAVA_G@ 189JAVA_G = @JAVA_G@
190JAVA_HOME = @JAVA_HOME@ 190JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/modules/completion/Makefile.in b/scilab/modules/completion/Makefile.in
index a39f511..87e4092 100644
--- a/scilab/modules/completion/Makefile.in
+++ b/scilab/modules/completion/Makefile.in
@@ -243,10 +243,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
243JAR = @JAR@ 243JAR = @JAR@
244JAVA = @JAVA@ 244JAVA = @JAVA@
245JAVAC = @JAVAC@ 245JAVAC = @JAVAC@
246JAVAC_DEBUG = @JAVAC_DEBUG@
246JAVADOC = @JAVADOC@ 247JAVADOC = @JAVADOC@
247JAVAH = @JAVAH@ 248JAVAH = @JAVAH@
248JAVASCI_ENABLE = @JAVASCI_ENABLE@ 249JAVASCI_ENABLE = @JAVASCI_ENABLE@
249JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
250JAVA_ENABLE = @JAVA_ENABLE@ 250JAVA_ENABLE = @JAVA_ENABLE@
251JAVA_G = @JAVA_G@ 251JAVA_G = @JAVA_G@
252JAVA_HOME = @JAVA_HOME@ 252JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/modules/console/Makefile.in b/scilab/modules/console/Makefile.in
index a9c908e..aab1506 100644
--- a/scilab/modules/console/Makefile.in
+++ b/scilab/modules/console/Makefile.in
@@ -255,10 +255,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
255JAR = @JAR@ 255JAR = @JAR@
256JAVA = @JAVA@ 256JAVA = @JAVA@
257JAVAC = @JAVAC@ 257JAVAC = @JAVAC@
258JAVAC_DEBUG = @JAVAC_DEBUG@
258JAVADOC = @JAVADOC@ 259JAVADOC = @JAVADOC@
259JAVAH = @JAVAH@ 260JAVAH = @JAVAH@
260JAVASCI_ENABLE = @JAVASCI_ENABLE@ 261JAVASCI_ENABLE = @JAVASCI_ENABLE@
261JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
262JAVA_ENABLE = @JAVA_ENABLE@ 262JAVA_ENABLE = @JAVA_ENABLE@
263JAVA_G = @JAVA_G@ 263JAVA_G = @JAVA_G@
264JAVA_HOME = @JAVA_HOME@ 264JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/modules/core/Makefile.in b/scilab/modules/core/Makefile.in
index d4f76ae..77705e5 100644
--- a/scilab/modules/core/Makefile.in
+++ b/scilab/modules/core/Makefile.in
@@ -456,10 +456,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
456JAR = @JAR@ 456JAR = @JAR@
457JAVA = @JAVA@ 457JAVA = @JAVA@
458JAVAC = @JAVAC@ 458JAVAC = @JAVAC@
459JAVAC_DEBUG = @JAVAC_DEBUG@
459JAVADOC = @JAVADOC@ 460JAVADOC = @JAVADOC@
460JAVAH = @JAVAH@ 461JAVAH = @JAVAH@
461JAVASCI_ENABLE = @JAVASCI_ENABLE@ 462JAVASCI_ENABLE = @JAVASCI_ENABLE@
462JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
463JAVA_ENABLE = @JAVA_ENABLE@ 463JAVA_ENABLE = @JAVA_ENABLE@
464JAVA_G = @JAVA_G@ 464JAVA_G = @JAVA_G@
465JAVA_HOME = @JAVA_HOME@ 465JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/modules/data_structures/Makefile.in b/scilab/modules/data_structures/Makefile.in
index e0db822..15dfec7 100644
--- a/scilab/modules/data_structures/Makefile.in
+++ b/scilab/modules/data_structures/Makefile.in
@@ -251,10 +251,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
251JAR = @JAR@ 251JAR = @JAR@
252JAVA = @JAVA@ 252JAVA = @JAVA@
253JAVAC = @JAVAC@ 253JAVAC = @JAVAC@
254JAVAC_DEBUG = @JAVAC_DEBUG@
254JAVADOC = @JAVADOC@ 255JAVADOC = @JAVADOC@
255JAVAH = @JAVAH@ 256JAVAH = @JAVAH@
256JAVASCI_ENABLE = @JAVASCI_ENABLE@ 257JAVASCI_ENABLE = @JAVASCI_ENABLE@
257JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
258JAVA_ENABLE = @JAVA_ENABLE@ 258JAVA_ENABLE = @JAVA_ENABLE@
259JAVA_G = @JAVA_G@ 259JAVA_G = @JAVA_G@
260JAVA_HOME = @JAVA_HOME@ 260JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/modules/demo_tools/Makefile.in b/scilab/modules/demo_tools/Makefile.in
index 5c77b7f..ca45690 100644
--- a/scilab/modules/demo_tools/Makefile.in
+++ b/scilab/modules/demo_tools/Makefile.in
@@ -180,10 +180,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
180JAR = @JAR@ 180JAR = @JAR@
181JAVA = @JAVA@ 181JAVA = @JAVA@
182JAVAC = @JAVAC@ 182JAVAC = @JAVAC@
183JAVAC_DEBUG = @JAVAC_DEBUG@
183JAVADOC = @JAVADOC@ 184JAVADOC = @JAVADOC@
184JAVAH = @JAVAH@ 185JAVAH = @JAVAH@
185JAVASCI_ENABLE = @JAVASCI_ENABLE@ 186JAVASCI_ENABLE = @JAVASCI_ENABLE@
186JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
187JAVA_ENABLE = @JAVA_ENABLE@ 187JAVA_ENABLE = @JAVA_ENABLE@
188JAVA_G = @JAVA_G@ 188JAVA_G = @JAVA_G@
189JAVA_HOME = @JAVA_HOME@ 189JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/modules/development_tools/Makefile.in b/scilab/modules/development_tools/Makefile.in
index 587b264..59a557b 100644
--- a/scilab/modules/development_tools/Makefile.in
+++ b/scilab/modules/development_tools/Makefile.in
@@ -179,10 +179,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
179JAR = @JAR@ 179JAR = @JAR@
180JAVA = @JAVA@ 180JAVA = @JAVA@
181JAVAC = @JAVAC@ 181JAVAC = @JAVAC@
182JAVAC_DEBUG = @JAVAC_DEBUG@
182JAVADOC = @JAVADOC@ 183JAVADOC = @JAVADOC@
183JAVAH = @JAVAH@ 184JAVAH = @JAVAH@
184JAVASCI_ENABLE = @JAVASCI_ENABLE@ 185JAVASCI_ENABLE = @JAVASCI_ENABLE@
185JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
186JAVA_ENABLE = @JAVA_ENABLE@ 186JAVA_ENABLE = @JAVA_ENABLE@
187JAVA_G = @JAVA_G@ 187JAVA_G = @JAVA_G@
188JAVA_HOME = @JAVA_HOME@ 188JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/modules/development_tools/src/fake/Makefile.in b/scilab/modules/development_tools/src/fake/Makefile.in
index 933b3e8..45cd4af 100644
--- a/scilab/modules/development_tools/src/fake/Makefile.in
+++ b/scilab/modules/development_tools/src/fake/Makefile.in
@@ -130,10 +130,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
130JAR = @JAR@ 130JAR = @JAR@
131JAVA = @JAVA@ 131JAVA = @JAVA@
132JAVAC = @JAVAC@ 132JAVAC = @JAVAC@
133JAVAC_DEBUG = @JAVAC_DEBUG@
133JAVADOC = @JAVADOC@ 134JAVADOC = @JAVADOC@
134JAVAH = @JAVAH@ 135JAVAH = @JAVAH@
135JAVASCI_ENABLE = @JAVASCI_ENABLE@ 136JAVASCI_ENABLE = @JAVASCI_ENABLE@
136JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
137JAVA_ENABLE = @JAVA_ENABLE@ 137JAVA_ENABLE = @JAVA_ENABLE@
138JAVA_G = @JAVA_G@ 138JAVA_G = @JAVA_G@
139JAVA_HOME = @JAVA_HOME@ 139JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/modules/differential_equations/Makefile.in b/scilab/modules/differential_equations/Makefile.in
index 9099457..6ef27c9 100644
--- a/scilab/modules/differential_equations/Makefile.in
+++ b/scilab/modules/differential_equations/Makefile.in
@@ -261,10 +261,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
261JAR = @JAR@ 261JAR = @JAR@
262JAVA = @JAVA@ 262JAVA = @JAVA@
263JAVAC = @JAVAC@ 263JAVAC = @JAVAC@
264JAVAC_DEBUG = @JAVAC_DEBUG@
264JAVADOC = @JAVADOC@ 265JAVADOC = @JAVADOC@
265JAVAH = @JAVAH@ 266JAVAH = @JAVAH@
266JAVASCI_ENABLE = @JAVASCI_ENABLE@ 267JAVASCI_ENABLE = @JAVASCI_ENABLE@
267JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
268JAVA_ENABLE = @JAVA_ENABLE@ 268JAVA_ENABLE = @JAVA_ENABLE@
269JAVA_G = @JAVA_G@ 269JAVA_G = @JAVA_G@
270JAVA_HOME = @JAVA_HOME@ 270JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/modules/double/Makefile.in b/scilab/modules/double/Makefile.in
index 5a97bce..d52fa46 100644
--- a/scilab/modules/double/Makefile.in
+++ b/scilab/modules/double/Makefile.in
@@ -220,10 +220,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
220JAR = @JAR@ 220JAR = @JAR@
221JAVA = @JAVA@ 221JAVA = @JAVA@
222JAVAC = @JAVAC@ 222JAVAC = @JAVAC@
223JAVAC_DEBUG = @JAVAC_DEBUG@
223JAVADOC = @JAVADOC@ 224JAVADOC = @JAVADOC@
224JAVAH = @JAVAH@ 225JAVAH = @JAVAH@
225JAVASCI_ENABLE = @JAVASCI_ENABLE@ 226JAVASCI_ENABLE = @JAVASCI_ENABLE@
226JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
227JAVA_ENABLE = @JAVA_ENABLE@ 227JAVA_ENABLE = @JAVA_ENABLE@
228JAVA_G = @JAVA_G@ 228JAVA_G = @JAVA_G@
229JAVA_HOME = @JAVA_HOME@ 229JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/modules/dynamic_link/Makefile.in b/scilab/modules/dynamic_link/Makefile.in
index fc0365d..33af92b 100644
--- a/scilab/modules/dynamic_link/Makefile.in
+++ b/scilab/modules/dynamic_link/Makefile.in
@@ -238,10 +238,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
238JAR = @JAR@ 238JAR = @JAR@
239JAVA = @JAVA@ 239JAVA = @JAVA@
240JAVAC = @JAVAC@ 240JAVAC = @JAVAC@
241JAVAC_DEBUG = @JAVAC_DEBUG@
241JAVADOC = @JAVADOC@ 242JAVADOC = @JAVADOC@
242JAVAH = @JAVAH@ 243JAVAH = @JAVAH@
243JAVASCI_ENABLE = @JAVASCI_ENABLE@ 244JAVASCI_ENABLE = @JAVASCI_ENABLE@
244JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
245JAVA_ENABLE = @JAVA_ENABLE@ 245JAVA_ENABLE = @JAVA_ENABLE@
246JAVA_G = @JAVA_G@ 246JAVA_G = @JAVA_G@
247JAVA_HOME = @JAVA_HOME@ 247JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/modules/elementary_functions/Makefile.in b/scilab/modules/elementary_functions/Makefile.in
index 4c39745..dea0b23 100644
--- a/scilab/modules/elementary_functions/Makefile.in
+++ b/scilab/modules/elementary_functions/Makefile.in
@@ -590,10 +590,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
590JAR = @JAR@ 590JAR = @JAR@
591JAVA = @JAVA@ 591JAVA = @JAVA@
592JAVAC = @JAVAC@ 592JAVAC = @JAVAC@
593JAVAC_DEBUG = @JAVAC_DEBUG@
593JAVADOC = @JAVADOC@ 594JAVADOC = @JAVADOC@
594JAVAH = @JAVAH@ 595JAVAH = @JAVAH@
595JAVASCI_ENABLE = @JAVASCI_ENABLE@ 596JAVASCI_ENABLE = @JAVASCI_ENABLE@
596JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
597JAVA_ENABLE = @JAVA_ENABLE@ 597JAVA_ENABLE = @JAVA_ENABLE@
598JAVA_G = @JAVA_G@ 598JAVA_G = @JAVA_G@
599JAVA_HOME = @JAVA_HOME@ 599JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/modules/fftw/Makefile.in b/scilab/modules/fftw/Makefile.in
index 6ef8c3c..8aaaf1d 100644
--- a/scilab/modules/fftw/Makefile.in
+++ b/scilab/modules/fftw/Makefile.in
@@ -239,10 +239,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
239JAR = @JAR@ 239JAR = @JAR@
240JAVA = @JAVA@ 240JAVA = @JAVA@
241JAVAC = @JAVAC@ 241JAVAC = @JAVAC@
242JAVAC_DEBUG = @JAVAC_DEBUG@
242JAVADOC = @JAVADOC@ 243JAVADOC = @JAVADOC@
243JAVAH = @JAVAH@ 244JAVAH = @JAVAH@
244JAVASCI_ENABLE = @JAVASCI_ENABLE@ 245JAVASCI_ENABLE = @JAVASCI_ENABLE@
245JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
246JAVA_ENABLE = @JAVA_ENABLE@ 246JAVA_ENABLE = @JAVA_ENABLE@
247JAVA_G = @JAVA_G@ 247JAVA_G = @JAVA_G@
248JAVA_HOME = @JAVA_HOME@ 248JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/modules/fileio/Makefile.in b/scilab/modules/fileio/Makefile.in
index 9fc56bd..79a6ae3 100644
--- a/scilab/modules/fileio/Makefile.in
+++ b/scilab/modules/fileio/Makefile.in
@@ -274,10 +274,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
274JAR = @JAR@ 274JAR = @JAR@
275JAVA = @JAVA@ 275JAVA = @JAVA@
276JAVAC = @JAVAC@ 276JAVAC = @JAVAC@
277JAVAC_DEBUG = @JAVAC_DEBUG@
277JAVADOC = @JAVADOC@ 278JAVADOC = @JAVADOC@
278JAVAH = @JAVAH@ 279JAVAH = @JAVAH@
279JAVASCI_ENABLE = @JAVASCI_ENABLE@ 280JAVASCI_ENABLE = @JAVASCI_ENABLE@
280JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
281JAVA_ENABLE = @JAVA_ENABLE@ 281JAVA_ENABLE = @JAVA_ENABLE@
282JAVA_G = @JAVA_G@ 282JAVA_G = @JAVA_G@
283JAVA_HOME = @JAVA_HOME@ 283JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/modules/functions/Makefile.in b/scilab/modules/functions/Makefile.in
index 5c9421c..ff08f03 100644
--- a/scilab/modules/functions/Makefile.in
+++ b/scilab/modules/functions/Makefile.in
@@ -229,10 +229,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
229JAR = @JAR@ 229JAR = @JAR@
230JAVA = @JAVA@ 230JAVA = @JAVA@
231JAVAC = @JAVAC@ 231JAVAC = @JAVAC@
232JAVAC_DEBUG = @JAVAC_DEBUG@
232JAVADOC = @JAVADOC@ 233JAVADOC = @JAVADOC@
233JAVAH = @JAVAH@ 234JAVAH = @JAVAH@
234JAVASCI_ENABLE = @JAVASCI_ENABLE@ 235JAVASCI_ENABLE = @JAVASCI_ENABLE@
235JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
236JAVA_ENABLE = @JAVA_ENABLE@ 236JAVA_ENABLE = @JAVA_ENABLE@
237JAVA_G = @JAVA_G@ 237JAVA_G = @JAVA_G@
238JAVA_HOME = @JAVA_HOME@ 238JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/modules/genetic_algorithms/Makefile.in b/scilab/modules/genetic_algorithms/Makefile.in
index e493b3e..6cd0ec5 100644
--- a/scilab/modules/genetic_algorithms/Makefile.in
+++ b/scilab/modules/genetic_algorithms/Makefile.in
@@ -183,10 +183,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
183JAR = @JAR@ 183JAR = @JAR@
184JAVA = @JAVA@ 184JAVA = @JAVA@
185JAVAC = @JAVAC@ 185JAVAC = @JAVAC@
186JAVAC_DEBUG = @JAVAC_DEBUG@
186JAVADOC = @JAVADOC@ 187JAVADOC = @JAVADOC@
187JAVAH = @JAVAH@ 188JAVAH = @JAVAH@
188JAVASCI_ENABLE = @JAVASCI_ENABLE@ 189JAVASCI_ENABLE = @JAVASCI_ENABLE@
189JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
190JAVA_ENABLE = @JAVA_ENABLE@ 190JAVA_ENABLE = @JAVA_ENABLE@
191JAVA_G = @JAVA_G@ 191JAVA_G = @JAVA_G@
192JAVA_HOME = @JAVA_HOME@ 192JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/modules/graph/Makefile.in b/scilab/modules/graph/Makefile.in
index 20508f1..72ef0f1 100644
--- a/scilab/modules/graph/Makefile.in
+++ b/scilab/modules/graph/Makefile.in
@@ -219,10 +219,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
219JAR = @JAR@ 219JAR = @JAR@
220JAVA = @JAVA@ 220JAVA = @JAVA@
221JAVAC = @JAVAC@ 221JAVAC = @JAVAC@
222JAVAC_DEBUG = @JAVAC_DEBUG@
222JAVADOC = @JAVADOC@ 223JAVADOC = @JAVADOC@
223JAVAH = @JAVAH@ 224JAVAH = @JAVAH@
224JAVASCI_ENABLE = @JAVASCI_ENABLE@ 225JAVASCI_ENABLE = @JAVASCI_ENABLE@
225JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
226JAVA_ENABLE = @JAVA_ENABLE@ 226JAVA_ENABLE = @JAVA_ENABLE@
227JAVA_G = @JAVA_G@ 227JAVA_G = @JAVA_G@
228JAVA_HOME = @JAVA_HOME@ 228JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/modules/graphic_export/Makefile.in b/scilab/modules/graphic_export/Makefile.in
index 888c679..ca52a6a 100644
--- a/scilab/modules/graphic_export/Makefile.in
+++ b/scilab/modules/graphic_export/Makefile.in
@@ -256,10 +256,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
256JAR = @JAR@ 256JAR = @JAR@
257JAVA = @JAVA@ 257JAVA = @JAVA@
258JAVAC = @JAVAC@ 258JAVAC = @JAVAC@
259JAVAC_DEBUG = @JAVAC_DEBUG@
259JAVADOC = @JAVADOC@ 260JAVADOC = @JAVADOC@
260JAVAH = @JAVAH@ 261JAVAH = @JAVAH@
261JAVASCI_ENABLE = @JAVASCI_ENABLE@ 262JAVASCI_ENABLE = @JAVASCI_ENABLE@
262JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
263JAVA_ENABLE = @JAVA_ENABLE@ 263JAVA_ENABLE = @JAVA_ENABLE@
264JAVA_G = @JAVA_G@ 264JAVA_G = @JAVA_G@
265JAVA_HOME = @JAVA_HOME@ 265JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/modules/graphics/Makefile.in b/scilab/modules/graphics/Makefile.in
index 42ab2dd..bb8b198 100644
--- a/scilab/modules/graphics/Makefile.in
+++ b/scilab/modules/graphics/Makefile.in
@@ -591,10 +591,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
591JAR = @JAR@ 591JAR = @JAR@
592JAVA = @JAVA@ 592JAVA = @JAVA@
593JAVAC = @JAVAC@ 593JAVAC = @JAVAC@
594JAVAC_DEBUG = @JAVAC_DEBUG@
594JAVADOC = @JAVADOC@ 595JAVADOC = @JAVADOC@
595JAVAH = @JAVAH@ 596JAVAH = @JAVAH@
596JAVASCI_ENABLE = @JAVASCI_ENABLE@ 597JAVASCI_ENABLE = @JAVASCI_ENABLE@
597JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
598JAVA_ENABLE = @JAVA_ENABLE@ 598JAVA_ENABLE = @JAVA_ENABLE@
599JAVA_G = @JAVA_G@ 599JAVA_G = @JAVA_G@
600JAVA_HOME = @JAVA_HOME@ 600JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/modules/gui/Makefile.in b/scilab/modules/gui/Makefile.in
index 939ad58..ef895bb 100644
--- a/scilab/modules/gui/Makefile.in
+++ b/scilab/modules/gui/Makefile.in
@@ -346,10 +346,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
346JAR = @JAR@ 346JAR = @JAR@
347JAVA = @JAVA@ 347JAVA = @JAVA@
348JAVAC = @JAVAC@ 348JAVAC = @JAVAC@
349JAVAC_DEBUG = @JAVAC_DEBUG@
349JAVADOC = @JAVADOC@ 350JAVADOC = @JAVADOC@
350JAVAH = @JAVAH@ 351JAVAH = @JAVAH@
351JAVASCI_ENABLE = @JAVASCI_ENABLE@ 352JAVASCI_ENABLE = @JAVASCI_ENABLE@
352JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
353JAVA_ENABLE = @JAVA_ENABLE@ 353JAVA_ENABLE = @JAVA_ENABLE@
354JAVA_G = @JAVA_G@ 354JAVA_G = @JAVA_G@
355JAVA_HOME = @JAVA_HOME@ 355JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/modules/hdf5/Makefile.in b/scilab/modules/hdf5/Makefile.in
index d3f4d67..bfe1e8e 100644
--- a/scilab/modules/hdf5/Makefile.in
+++ b/scilab/modules/hdf5/Makefile.in
@@ -271,10 +271,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
271JAR = @JAR@ 271JAR = @JAR@
272JAVA = @JAVA@ 272JAVA = @JAVA@
273JAVAC = @JAVAC@ 273JAVAC = @JAVAC@
274JAVAC_DEBUG = @JAVAC_DEBUG@
274JAVADOC = @JAVADOC@ 275JAVADOC = @JAVADOC@
275JAVAH = @JAVAH@ 276JAVAH = @JAVAH@
276JAVASCI_ENABLE = @JAVASCI_ENABLE@ 277JAVASCI_ENABLE = @JAVASCI_ENABLE@
277JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
278JAVA_ENABLE = @JAVA_ENABLE@ 278JAVA_ENABLE = @JAVA_ENABLE@
279JAVA_G = @JAVA_G@ 279JAVA_G = @JAVA_G@
280JAVA_HOME = @JAVA_HOME@ 280JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/modules/helptools/Makefile.in b/scilab/modules/helptools/Makefile.in
index 1e577ae..99a6dcb 100644
--- a/scilab/modules/helptools/Makefile.in
+++ b/scilab/modules/helptools/Makefile.in
@@ -246,10 +246,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
246JAR = @JAR@ 246JAR = @JAR@
247JAVA = @JAVA@ 247JAVA = @JAVA@
248JAVAC = @JAVAC@ 248JAVAC = @JAVAC@
249JAVAC_DEBUG = @JAVAC_DEBUG@
249JAVADOC = @JAVADOC@ 250JAVADOC = @JAVADOC@
250JAVAH = @JAVAH@ 251JAVAH = @JAVAH@
251JAVASCI_ENABLE = @JAVASCI_ENABLE@ 252JAVASCI_ENABLE = @JAVASCI_ENABLE@
252JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
253JAVA_ENABLE = @JAVA_ENABLE@ 253JAVA_ENABLE = @JAVA_ENABLE@
254JAVA_G = @JAVA_G@ 254JAVA_G = @JAVA_G@
255JAVA_HOME = @JAVA_HOME@ 255JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/modules/history_browser/Makefile.in b/scilab/modules/history_browser/Makefile.in
index b006aaf..8f2df34 100644
--- a/scilab/modules/history_browser/Makefile.in
+++ b/scilab/modules/history_browser/Makefile.in
@@ -250,10 +250,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
250JAR = @JAR@ 250JAR = @JAR@
251JAVA = @JAVA@ 251JAVA = @JAVA@
252JAVAC = @JAVAC@ 252JAVAC = @JAVAC@
253JAVAC_DEBUG = @JAVAC_DEBUG@
253JAVADOC = @JAVADOC@ 254JAVADOC = @JAVADOC@
254JAVAH = @JAVAH@ 255JAVAH = @JAVAH@
255JAVASCI_ENABLE = @JAVASCI_ENABLE@ 256JAVASCI_ENABLE = @JAVASCI_ENABLE@
256JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
257JAVA_ENABLE = @JAVA_ENABLE@ 257JAVA_ENABLE = @JAVA_ENABLE@
258JAVA_G = @JAVA_G@ 258JAVA_G = @JAVA_G@
259JAVA_HOME = @JAVA_HOME@ 259JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/modules/history_manager/Makefile.in b/scilab/modules/history_manager/Makefile.in
index 5a332b1..daaeb6c 100644
--- a/scilab/modules/history_manager/Makefile.in
+++ b/scilab/modules/history_manager/Makefile.in
@@ -267,10 +267,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
267JAR = @JAR@ 267JAR = @JAR@
268JAVA = @JAVA@ 268JAVA = @JAVA@
269JAVAC = @JAVAC@ 269JAVAC = @JAVAC@
270JAVAC_DEBUG = @JAVAC_DEBUG@
270JAVADOC = @JAVADOC@ 271JAVADOC = @JAVADOC@
271JAVAH = @JAVAH@ 272JAVAH = @JAVAH@
272JAVASCI_ENABLE = @JAVASCI_ENABLE@ 273JAVASCI_ENABLE = @JAVASCI_ENABLE@
273JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
274JAVA_ENABLE = @JAVA_ENABLE@ 274JAVA_ENABLE = @JAVA_ENABLE@
275JAVA_G = @JAVA_G@ 275JAVA_G = @JAVA_G@
276JAVA_HOME = @JAVA_HOME@ 276JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/modules/integer/Makefile.in b/scilab/modules/integer/Makefile.in
index 0c2cb99..119bc53 100644
--- a/scilab/modules/integer/Makefile.in
+++ b/scilab/modules/integer/Makefile.in
@@ -254,10 +254,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
254JAR = @JAR@ 254JAR = @JAR@
255JAVA = @JAVA@ 255JAVA = @JAVA@
256JAVAC = @JAVAC@ 256JAVAC = @JAVAC@
257JAVAC_DEBUG = @JAVAC_DEBUG@
257JAVADOC = @JAVADOC@ 258JAVADOC = @JAVADOC@
258JAVAH = @JAVAH@ 259JAVAH = @JAVAH@
259JAVASCI_ENABLE = @JAVASCI_ENABLE@ 260JAVASCI_ENABLE = @JAVASCI_ENABLE@
260JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
261JAVA_ENABLE = @JAVA_ENABLE@ 261JAVA_ENABLE = @JAVA_ENABLE@
262JAVA_G = @JAVA_G@ 262JAVA_G = @JAVA_G@
263JAVA_HOME = @JAVA_HOME@ 263JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/modules/interpolation/Makefile.in b/scilab/modules/interpolation/Makefile.in
index 98f617f..e9000ea 100644
--- a/scilab/modules/interpolation/Makefile.in
+++ b/scilab/modules/interpolation/Makefile.in
@@ -236,10 +236,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
236JAR = @JAR@ 236JAR = @JAR@
237JAVA = @JAVA@ 237JAVA = @JAVA@
238JAVAC = @JAVAC@ 238JAVAC = @JAVAC@
239JAVAC_DEBUG = @JAVAC_DEBUG@
239JAVADOC = @JAVADOC@ 240JAVADOC = @JAVADOC@
240JAVAH = @JAVAH@ 241JAVAH = @JAVAH@
241JAVASCI_ENABLE = @JAVASCI_ENABLE@ 242JAVASCI_ENABLE = @JAVASCI_ENABLE@
242JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
243JAVA_ENABLE = @JAVA_ENABLE@ 243JAVA_ENABLE = @JAVA_ENABLE@
244JAVA_G = @JAVA_G@ 244JAVA_G = @JAVA_G@
245JAVA_HOME = @JAVA_HOME@ 245JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/modules/intersci/Makefile.in b/scilab/modules/intersci/Makefile.in
index ac18124..8ce8b92 100644
--- a/scilab/modules/intersci/Makefile.in
+++ b/scilab/modules/intersci/Makefile.in
@@ -221,10 +221,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
221JAR = @JAR@ 221JAR = @JAR@
222JAVA = @JAVA@ 222JAVA = @JAVA@
223JAVAC = @JAVAC@ 223JAVAC = @JAVAC@
224JAVAC_DEBUG = @JAVAC_DEBUG@
224JAVADOC = @JAVADOC@ 225JAVADOC = @JAVADOC@
225JAVAH = @JAVAH@ 226JAVAH = @JAVAH@
226JAVASCI_ENABLE = @JAVASCI_ENABLE@ 227JAVASCI_ENABLE = @JAVASCI_ENABLE@
227JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
228JAVA_ENABLE = @JAVA_ENABLE@ 228JAVA_ENABLE = @JAVA_ENABLE@
229JAVA_G = @JAVA_G@ 229JAVA_G = @JAVA_G@
230JAVA_HOME = @JAVA_HOME@ 230JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/modules/io/Makefile.in b/scilab/modules/io/Makefile.in
index 8440b6f..c7ab53a 100644
--- a/scilab/modules/io/Makefile.in
+++ b/scilab/modules/io/Makefile.in
@@ -233,10 +233,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
233JAR = @JAR@ 233JAR = @JAR@
234JAVA = @JAVA@ 234JAVA = @JAVA@
235JAVAC = @JAVAC@ 235JAVAC = @JAVAC@
236JAVAC_DEBUG = @JAVAC_DEBUG@
236JAVADOC = @JAVADOC@ 237JAVADOC = @JAVADOC@
237JAVAH = @JAVAH@ 238JAVAH = @JAVAH@
238JAVASCI_ENABLE = @JAVASCI_ENABLE@ 239JAVASCI_ENABLE = @JAVASCI_ENABLE@
239JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
240JAVA_ENABLE = @JAVA_ENABLE@ 240JAVA_ENABLE = @JAVA_ENABLE@
241JAVA_G = @JAVA_G@ 241JAVA_G = @JAVA_G@
242JAVA_HOME = @JAVA_HOME@ 242JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/modules/javasci/Makefile.in b/scilab/modules/javasci/Makefile.in
index 39381eb..2376ebd 100644
--- a/scilab/modules/javasci/Makefile.in
+++ b/scilab/modules/javasci/Makefile.in
@@ -247,10 +247,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
247JAR = @JAR@ 247JAR = @JAR@
248JAVA = @JAVA@ 248JAVA = @JAVA@
249JAVAC = @JAVAC@ 249JAVAC = @JAVAC@
250JAVAC_DEBUG = @JAVAC_DEBUG@
250JAVADOC = @JAVADOC@ 251JAVADOC = @JAVADOC@
251JAVAH = @JAVAH@ 252JAVAH = @JAVAH@
252JAVASCI_ENABLE = @JAVASCI_ENABLE@ 253JAVASCI_ENABLE = @JAVASCI_ENABLE@
253JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
254JAVA_ENABLE = @JAVA_ENABLE@ 254JAVA_ENABLE = @JAVA_ENABLE@
255JAVA_G = @JAVA_G@ 255JAVA_G = @JAVA_G@
256JAVA_HOME = @JAVA_HOME@ 256JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/modules/jvm/Makefile.in b/scilab/modules/jvm/Makefile.in
index a861072..97b6ff5 100644
--- a/scilab/modules/jvm/Makefile.in
+++ b/scilab/modules/jvm/Makefile.in
@@ -248,10 +248,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
248JAR = @JAR@ 248JAR = @JAR@
249JAVA = @JAVA@ 249JAVA = @JAVA@
250JAVAC = @JAVAC@ 250JAVAC = @JAVAC@
251JAVAC_DEBUG = @JAVAC_DEBUG@
251JAVADOC = @JAVADOC@ 252JAVADOC = @JAVADOC@
252JAVAH = @JAVAH@ 253JAVAH = @JAVAH@
253JAVASCI_ENABLE = @JAVASCI_ENABLE@ 254JAVASCI_ENABLE = @JAVASCI_ENABLE@
254JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
255JAVA_ENABLE = @JAVA_ENABLE@ 255JAVA_ENABLE = @JAVA_ENABLE@
256JAVA_G = @JAVA_G@ 256JAVA_G = @JAVA_G@
257JAVA_HOME = @JAVA_HOME@ 257JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/modules/linear_algebra/Makefile.in b/scilab/modules/linear_algebra/Makefile.in
index bceaa41..eac9082 100644
--- a/scilab/modules/linear_algebra/Makefile.in
+++ b/scilab/modules/linear_algebra/Makefile.in
@@ -257,10 +257,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
257JAR = @JAR@ 257JAR = @JAR@
258JAVA = @JAVA@ 258JAVA = @JAVA@
259JAVAC = @JAVAC@ 259JAVAC = @JAVAC@
260JAVAC_DEBUG = @JAVAC_DEBUG@
260JAVADOC = @JAVADOC@ 261JAVADOC = @JAVADOC@
261JAVAH = @JAVAH@ 262JAVAH = @JAVAH@
262JAVASCI_ENABLE = @JAVASCI_ENABLE@ 263JAVASCI_ENABLE = @JAVASCI_ENABLE@
263JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
264JAVA_ENABLE = @JAVA_ENABLE@ 264JAVA_ENABLE = @JAVA_ENABLE@
265JAVA_G = @JAVA_G@ 265JAVA_G = @JAVA_G@
266JAVA_HOME = @JAVA_HOME@ 266JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/modules/localization/Makefile.in b/scilab/modules/localization/Makefile.in
index 376a3f2..7341158 100644
--- a/scilab/modules/localization/Makefile.in
+++ b/scilab/modules/localization/Makefile.in
@@ -250,10 +250,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
250JAR = @JAR@ 250JAR = @JAR@
251JAVA = @JAVA@ 251JAVA = @JAVA@
252JAVAC = @JAVAC@ 252JAVAC = @JAVAC@
253JAVAC_DEBUG = @JAVAC_DEBUG@
253JAVADOC = @JAVADOC@ 254JAVADOC = @JAVADOC@
254JAVAH = @JAVAH@ 255JAVAH = @JAVAH@
255JAVASCI_ENABLE = @JAVASCI_ENABLE@ 256JAVASCI_ENABLE = @JAVASCI_ENABLE@
256JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
257JAVA_ENABLE = @JAVA_ENABLE@ 257JAVA_ENABLE = @JAVA_ENABLE@
258JAVA_G = @JAVA_G@ 258JAVA_G = @JAVA_G@
259JAVA_HOME = @JAVA_HOME@ 259JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/modules/m2sci/Makefile.in b/scilab/modules/m2sci/Makefile.in
index d160afc..8f17e9b 100644
--- a/scilab/modules/m2sci/Makefile.in
+++ b/scilab/modules/m2sci/Makefile.in
@@ -178,10 +178,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
178JAR = @JAR@ 178JAR = @JAR@
179JAVA = @JAVA@ 179JAVA = @JAVA@
180JAVAC = @JAVAC@ 180JAVAC = @JAVAC@
181JAVAC_DEBUG = @JAVAC_DEBUG@
181JAVADOC = @JAVADOC@ 182JAVADOC = @JAVADOC@
182JAVAH = @JAVAH@ 183JAVAH = @JAVAH@
183JAVASCI_ENABLE = @JAVASCI_ENABLE@ 184JAVASCI_ENABLE = @JAVASCI_ENABLE@
184JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
185JAVA_ENABLE = @JAVA_ENABLE@ 185JAVA_ENABLE = @JAVA_ENABLE@
186JAVA_G = @JAVA_G@ 186JAVA_G = @JAVA_G@
187JAVA_HOME = @JAVA_HOME@ 187JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/modules/maple2scilab/Makefile.in b/scilab/modules/maple2scilab/Makefile.in
index 6dd206b..de414bd 100644
--- a/scilab/modules/maple2scilab/Makefile.in
+++ b/scilab/modules/maple2scilab/Makefile.in
@@ -178,10 +178,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
178JAR = @JAR@ 178JAR = @JAR@
179JAVA = @JAVA@ 179JAVA = @JAVA@
180JAVAC = @JAVAC@ 180JAVAC = @JAVAC@
181JAVAC_DEBUG = @JAVAC_DEBUG@
181JAVADOC = @JAVADOC@ 182JAVADOC = @JAVADOC@
182JAVAH = @JAVAH@ 183JAVAH = @JAVAH@
183JAVASCI_ENABLE = @JAVASCI_ENABLE@ 184JAVASCI_ENABLE = @JAVASCI_ENABLE@
184JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
185JAVA_ENABLE = @JAVA_ENABLE@ 185JAVA_ENABLE = @JAVA_ENABLE@
186JAVA_G = @JAVA_G@ 186JAVA_G = @JAVA_G@
187JAVA_HOME = @JAVA_HOME@ 187JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/modules/matio/Makefile.in b/scilab/modules/matio/Makefile.in
index 4712652..6ac96d8 100644
--- a/scilab/modules/matio/Makefile.in
+++ b/scilab/modules/matio/Makefile.in
@@ -245,10 +245,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
245JAR = @JAR@ 245JAR = @JAR@
246JAVA = @JAVA@ 246JAVA = @JAVA@
247JAVAC = @JAVAC@ 247JAVAC = @JAVAC@
248JAVAC_DEBUG = @JAVAC_DEBUG@
248JAVADOC = @JAVADOC@ 249JAVADOC = @JAVADOC@
249JAVAH = @JAVAH@ 250JAVAH = @JAVAH@
250JAVASCI_ENABLE = @JAVASCI_ENABLE@ 251JAVASCI_ENABLE = @JAVASCI_ENABLE@
251JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
252JAVA_ENABLE = @JAVA_ENABLE@ 252JAVA_ENABLE = @JAVA_ENABLE@
253JAVA_G = @JAVA_G@ 253JAVA_G = @JAVA_G@
254JAVA_HOME = @JAVA_HOME@ 254JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/modules/mexlib/Makefile.in b/scilab/modules/mexlib/Makefile.in
index a2bab7f..02455b5 100644
--- a/scilab/modules/mexlib/Makefile.in
+++ b/scilab/modules/mexlib/Makefile.in
@@ -222,10 +222,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
222JAR = @JAR@ 222JAR = @JAR@
223JAVA = @JAVA@ 223JAVA = @JAVA@
224JAVAC = @JAVAC@ 224JAVAC = @JAVAC@
225JAVAC_DEBUG = @JAVAC_DEBUG@
225JAVADOC = @JAVADOC@ 226JAVADOC = @JAVADOC@
226JAVAH = @JAVAH@ 227JAVAH = @JAVAH@
227JAVASCI_ENABLE = @JAVASCI_ENABLE@ 228JAVASCI_ENABLE = @JAVASCI_ENABLE@
228JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
229JAVA_ENABLE = @JAVA_ENABLE@ 229JAVA_ENABLE = @JAVA_ENABLE@
230JAVA_G = @JAVA_G@ 230JAVA_G = @JAVA_G@
231JAVA_HOME = @JAVA_HOME@ 231JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/modules/modules_manager/Makefile.in b/scilab/modules/modules_manager/Makefile.in
index 2415b16..8789164 100644
--- a/scilab/modules/modules_manager/Makefile.in
+++ b/scilab/modules/modules_manager/Makefile.in
@@ -179,10 +179,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
179JAR = @JAR@ 179JAR = @JAR@
180JAVA = @JAVA@ 180JAVA = @JAVA@
181JAVAC = @JAVAC@ 181JAVAC = @JAVAC@
182JAVAC_DEBUG = @JAVAC_DEBUG@
182JAVADOC = @JAVADOC@ 183JAVADOC = @JAVADOC@
183JAVAH = @JAVAH@ 184JAVAH = @JAVAH@
184JAVASCI_ENABLE = @JAVASCI_ENABLE@ 185JAVASCI_ENABLE = @JAVASCI_ENABLE@
185JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
186JAVA_ENABLE = @JAVA_ENABLE@ 186JAVA_ENABLE = @JAVA_ENABLE@
187JAVA_G = @JAVA_G@ 187JAVA_G = @JAVA_G@
188JAVA_HOME = @JAVA_HOME@ 188JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/modules/optimization/Makefile.in b/scilab/modules/optimization/Makefile.in
index f3bf8f7..2cf29fd 100644
--- a/scilab/modules/optimization/Makefile.in
+++ b/scilab/modules/optimization/Makefile.in
@@ -247,10 +247,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
247JAR = @JAR@ 247JAR = @JAR@
248JAVA = @JAVA@ 248JAVA = @JAVA@
249JAVAC = @JAVAC@ 249JAVAC = @JAVAC@
250JAVAC_DEBUG = @JAVAC_DEBUG@
250JAVADOC = @JAVADOC@ 251JAVADOC = @JAVADOC@
251JAVAH = @JAVAH@ 252JAVAH = @JAVAH@
252JAVASCI_ENABLE = @JAVASCI_ENABLE@ 253JAVASCI_ENABLE = @JAVASCI_ENABLE@
253JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
254JAVA_ENABLE = @JAVA_ENABLE@ 254JAVA_ENABLE = @JAVA_ENABLE@
255JAVA_G = @JAVA_G@ 255JAVA_G = @JAVA_G@
256JAVA_HOME = @JAVA_HOME@ 256JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/modules/output_stream/Makefile.in b/scilab/modules/output_stream/Makefile.in
index d11db4d..b7b18fa 100644
--- a/scilab/modules/output_stream/Makefile.in
+++ b/scilab/modules/output_stream/Makefile.in
@@ -264,10 +264,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
264JAR = @JAR@ 264JAR = @JAR@
265JAVA = @JAVA@ 265JAVA = @JAVA@
266JAVAC = @JAVAC@ 266JAVAC = @JAVAC@
267JAVAC_DEBUG = @JAVAC_DEBUG@
267JAVADOC = @JAVADOC@ 268JAVADOC = @JAVADOC@
268JAVAH = @JAVAH@ 269JAVAH = @JAVAH@
269JAVASCI_ENABLE = @JAVASCI_ENABLE@ 270JAVASCI_ENABLE = @JAVASCI_ENABLE@
270JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
271JAVA_ENABLE = @JAVA_ENABLE@ 271JAVA_ENABLE = @JAVA_ENABLE@
272JAVA_G = @JAVA_G@ 272JAVA_G = @JAVA_G@
273JAVA_HOME = @JAVA_HOME@ 273JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/modules/overloading/Makefile.in b/scilab/modules/overloading/Makefile.in
index 0a1d336..61d37a5 100644
--- a/scilab/modules/overloading/Makefile.in
+++ b/scilab/modules/overloading/Makefile.in
@@ -179,10 +179,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
179JAR = @JAR@ 179JAR = @JAR@
180JAVA = @JAVA@ 180JAVA = @JAVA@
181JAVAC = @JAVAC@ 181JAVAC = @JAVAC@
182JAVAC_DEBUG = @JAVAC_DEBUG@
182JAVADOC = @JAVADOC@ 183JAVADOC = @JAVADOC@
183JAVAH = @JAVAH@ 184JAVAH = @JAVAH@
184JAVASCI_ENABLE = @JAVASCI_ENABLE@ 185JAVASCI_ENABLE = @JAVASCI_ENABLE@
185JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
186JAVA_ENABLE = @JAVA_ENABLE@ 186JAVA_ENABLE = @JAVA_ENABLE@
187JAVA_G = @JAVA_G@ 187JAVA_G = @JAVA_G@
188JAVA_HOME = @JAVA_HOME@ 188JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/modules/parallel/Makefile.in b/scilab/modules/parallel/Makefile.in
index a897b2a..e092122 100644
--- a/scilab/modules/parallel/Makefile.in
+++ b/scilab/modules/parallel/Makefile.in
@@ -233,10 +233,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
233JAR = @JAR@ 233JAR = @JAR@
234JAVA = @JAVA@ 234JAVA = @JAVA@
235JAVAC = @JAVAC@ 235JAVAC = @JAVAC@
236JAVAC_DEBUG = @JAVAC_DEBUG@
236JAVADOC = @JAVADOC@ 237JAVADOC = @JAVADOC@
237JAVAH = @JAVAH@ 238JAVAH = @JAVAH@
238JAVASCI_ENABLE = @JAVASCI_ENABLE@ 239JAVASCI_ENABLE = @JAVASCI_ENABLE@
239JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
240JAVA_ENABLE = @JAVA_ENABLE@ 240JAVA_ENABLE = @JAVA_ENABLE@
241JAVA_G = @JAVA_G@ 241JAVA_G = @JAVA_G@
242JAVA_HOME = @JAVA_HOME@ 242JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/modules/parameters/Makefile.in b/scilab/modules/parameters/Makefile.in
index 94f8c90..45e382d 100644
--- a/scilab/modules/parameters/Makefile.in
+++ b/scilab/modules/parameters/Makefile.in
@@ -211,10 +211,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
211JAR = @JAR@ 211JAR = @JAR@
212JAVA = @JAVA@ 212JAVA = @JAVA@
213JAVAC = @JAVAC@ 213JAVAC = @JAVAC@
214JAVAC_DEBUG = @JAVAC_DEBUG@
214JAVADOC = @JAVADOC@ 215JAVADOC = @JAVADOC@
215JAVAH = @JAVAH@ 216JAVAH = @JAVAH@
216JAVASCI_ENABLE = @JAVASCI_ENABLE@ 217JAVASCI_ENABLE = @JAVASCI_ENABLE@
217JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
218JAVA_ENABLE = @JAVA_ENABLE@ 218JAVA_ENABLE = @JAVA_ENABLE@
219JAVA_G = @JAVA_G@ 219JAVA_G = @JAVA_G@
220JAVA_HOME = @JAVA_HOME@ 220JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/modules/polynomials/Makefile.in b/scilab/modules/polynomials/Makefile.in
index 0d8d0cf..fe71448 100644
--- a/scilab/modules/polynomials/Makefile.in
+++ b/scilab/modules/polynomials/Makefile.in
@@ -251,10 +251,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
251JAR = @JAR@ 251JAR = @JAR@
252JAVA = @JAVA@ 252JAVA = @JAVA@
253JAVAC = @JAVAC@ 253JAVAC = @JAVAC@
254JAVAC_DEBUG = @JAVAC_DEBUG@
254JAVADOC = @JAVADOC@ 255JAVADOC = @JAVADOC@
255JAVAH = @JAVAH@ 256JAVAH = @JAVAH@
256JAVASCI_ENABLE = @JAVASCI_ENABLE@ 257JAVASCI_ENABLE = @JAVASCI_ENABLE@
257JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
258JAVA_ENABLE = @JAVA_ENABLE@ 258JAVA_ENABLE = @JAVA_ENABLE@
259JAVA_G = @JAVA_G@ 259JAVA_G = @JAVA_G@
260JAVA_HOME = @JAVA_HOME@ 260JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/modules/pvm/Makefile.in b/scilab/modules/pvm/Makefile.in
index adf95a4..0b157fa 100644
--- a/scilab/modules/pvm/Makefile.in
+++ b/scilab/modules/pvm/Makefile.in
@@ -291,10 +291,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
291JAR = @JAR@ 291JAR = @JAR@
292JAVA = @JAVA@ 292JAVA = @JAVA@
293JAVAC = @JAVAC@ 293JAVAC = @JAVAC@
294JAVAC_DEBUG = @JAVAC_DEBUG@
294JAVADOC = @JAVADOC@ 295JAVADOC = @JAVADOC@
295JAVAH = @JAVAH@ 296JAVAH = @JAVAH@
296JAVASCI_ENABLE = @JAVASCI_ENABLE@ 297JAVASCI_ENABLE = @JAVASCI_ENABLE@
297JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
298JAVA_ENABLE = @JAVA_ENABLE@ 298JAVA_ENABLE = @JAVA_ENABLE@
299JAVA_G = @JAVA_G@ 299JAVA_G = @JAVA_G@
300JAVA_HOME = @JAVA_HOME@ 300JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/modules/randlib/Makefile.in b/scilab/modules/randlib/Makefile.in
index 2d0cefe..1ca3488 100644
--- a/scilab/modules/randlib/Makefile.in
+++ b/scilab/modules/randlib/Makefile.in
@@ -225,10 +225,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
225JAR = @JAR@ 225JAR = @JAR@
226JAVA = @JAVA@ 226JAVA = @JAVA@
227JAVAC = @JAVAC@ 227JAVAC = @JAVAC@
228JAVAC_DEBUG = @JAVAC_DEBUG@
228JAVADOC = @JAVADOC@ 229JAVADOC = @JAVADOC@
229JAVAH = @JAVAH@ 230JAVAH = @JAVAH@
230JAVASCI_ENABLE = @JAVASCI_ENABLE@ 231JAVASCI_ENABLE = @JAVASCI_ENABLE@
231JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
232JAVA_ENABLE = @JAVA_ENABLE@ 232JAVA_ENABLE = @JAVA_ENABLE@
233JAVA_G = @JAVA_G@ 233JAVA_G = @JAVA_G@
234JAVA_HOME = @JAVA_HOME@ 234JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/modules/renderer/Makefile.in b/scilab/modules/renderer/Makefile.in
index 51ad13a..4496160 100644
--- a/scilab/modules/renderer/Makefile.in
+++ b/scilab/modules/renderer/Makefile.in
@@ -475,10 +475,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
475JAR = @JAR@ 475JAR = @JAR@
476JAVA = @JAVA@ 476JAVA = @JAVA@
477JAVAC = @JAVAC@ 477JAVAC = @JAVAC@
478JAVAC_DEBUG = @JAVAC_DEBUG@
478JAVADOC = @JAVADOC@ 479JAVADOC = @JAVADOC@
479JAVAH = @JAVAH@ 480JAVAH = @JAVAH@
480JAVASCI_ENABLE = @JAVASCI_ENABLE@ 481JAVASCI_ENABLE = @JAVASCI_ENABLE@
481JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
482JAVA_ENABLE = @JAVA_ENABLE@ 482JAVA_ENABLE = @JAVA_ENABLE@
483JAVA_G = @JAVA_G@ 483JAVA_G = @JAVA_G@
484JAVA_HOME = @JAVA_HOME@ 484JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/modules/scicos/Makefile.in b/scilab/modules/scicos/Makefile.in
index 2fe4955..319596a 100644
--- a/scilab/modules/scicos/Makefile.in
+++ b/scilab/modules/scicos/Makefile.in
@@ -464,10 +464,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
464JAR = @JAR@ 464JAR = @JAR@
465JAVA = @JAVA@ 465JAVA = @JAVA@
466JAVAC = @JAVAC@ 466JAVAC = @JAVAC@
467JAVAC_DEBUG = @JAVAC_DEBUG@
467JAVADOC = @JAVADOC@ 468JAVADOC = @JAVADOC@
468JAVAH = @JAVAH@ 469JAVAH = @JAVAH@
469JAVASCI_ENABLE = @JAVASCI_ENABLE@ 470JAVASCI_ENABLE = @JAVASCI_ENABLE@
470JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
471JAVA_ENABLE = @JAVA_ENABLE@ 471JAVA_ENABLE = @JAVA_ENABLE@
472JAVA_G = @JAVA_G@ 472JAVA_G = @JAVA_G@
473JAVA_HOME = @JAVA_HOME@ 473JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/modules/scicos_blocks/Makefile.in b/scilab/modules/scicos_blocks/Makefile.in
index 6c5a688..259f521 100644
--- a/scilab/modules/scicos_blocks/Makefile.in
+++ b/scilab/modules/scicos_blocks/Makefile.in
@@ -721,10 +721,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
721JAR = @JAR@ 721JAR = @JAR@
722JAVA = @JAVA@ 722JAVA = @JAVA@
723JAVAC = @JAVAC@ 723JAVAC = @JAVAC@
724JAVAC_DEBUG = @JAVAC_DEBUG@
724JAVADOC = @JAVADOC@ 725JAVADOC = @JAVADOC@
725JAVAH = @JAVAH@ 726JAVAH = @JAVAH@
726JAVASCI_ENABLE = @JAVASCI_ENABLE@ 727JAVASCI_ENABLE = @JAVASCI_ENABLE@
727JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
728JAVA_ENABLE = @JAVA_ENABLE@ 728JAVA_ENABLE = @JAVA_ENABLE@
729JAVA_G = @JAVA_G@ 729JAVA_G = @JAVA_G@
730JAVA_HOME = @JAVA_HOME@ 730JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/modules/scinotes/Makefile.in b/scilab/modules/scinotes/Makefile.in
index 9f3fe07..f0ad0d3 100644
--- a/scilab/modules/scinotes/Makefile.in
+++ b/scilab/modules/scinotes/Makefile.in
@@ -244,10 +244,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
244JAR = @JAR@ 244JAR = @JAR@
245JAVA = @JAVA@ 245JAVA = @JAVA@
246JAVAC = @JAVAC@ 246JAVAC = @JAVAC@
247JAVAC_DEBUG = @JAVAC_DEBUG@
247JAVADOC = @JAVADOC@ 248JAVADOC = @JAVADOC@
248JAVAH = @JAVAH@ 249JAVAH = @JAVAH@
249JAVASCI_ENABLE = @JAVASCI_ENABLE@ 250JAVASCI_ENABLE = @JAVASCI_ENABLE@
250JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
251JAVA_ENABLE = @JAVA_ENABLE@ 251JAVA_ENABLE = @JAVA_ENABLE@
252JAVA_G = @JAVA_G@ 252JAVA_G = @JAVA_G@
253JAVA_HOME = @JAVA_HOME@ 253JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/modules/shell/Makefile.in b/scilab/modules/shell/Makefile.in
index b785879..527596b5 100644
--- a/scilab/modules/shell/Makefile.in
+++ b/scilab/modules/shell/Makefile.in
@@ -234,10 +234,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
234JAR = @JAR@ 234JAR = @JAR@
235JAVA = @JAVA@ 235JAVA = @JAVA@
236JAVAC = @JAVAC@ 236JAVAC = @JAVAC@
237JAVAC_DEBUG = @JAVAC_DEBUG@
237JAVADOC = @JAVADOC@ 238JAVADOC = @JAVADOC@
238JAVAH = @JAVAH@ 239JAVAH = @JAVAH@
239JAVASCI_ENABLE = @JAVASCI_ENABLE@ 240JAVASCI_ENABLE = @JAVASCI_ENABLE@
240JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
241JAVA_ENABLE = @JAVA_ENABLE@ 241JAVA_ENABLE = @JAVA_ENABLE@
242JAVA_G = @JAVA_G@ 242JAVA_G = @JAVA_G@
243JAVA_HOME = @JAVA_HOME@ 243JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/modules/signal_processing/Makefile.in b/scilab/modules/signal_processing/Makefile.in
index 8b4cb2e..fee2cd4 100644
--- a/scilab/modules/signal_processing/Makefile.in
+++ b/scilab/modules/signal_processing/Makefile.in
@@ -243,10 +243,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
243JAR = @JAR@ 243JAR = @JAR@
244JAVA = @JAVA@ 244JAVA = @JAVA@
245JAVAC = @JAVAC@ 245JAVAC = @JAVAC@
246JAVAC_DEBUG = @JAVAC_DEBUG@
246JAVADOC = @JAVADOC@ 247JAVADOC = @JAVADOC@
247JAVAH = @JAVAH@ 248JAVAH = @JAVAH@
248JAVASCI_ENABLE = @JAVASCI_ENABLE@ 249JAVASCI_ENABLE = @JAVASCI_ENABLE@
249JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
250JAVA_ENABLE = @JAVA_ENABLE@ 250JAVA_ENABLE = @JAVA_ENABLE@
251JAVA_G = @JAVA_G@ 251JAVA_G = @JAVA_G@
252JAVA_HOME = @JAVA_HOME@ 252JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/modules/simulated_annealing/Makefile.in b/scilab/modules/simulated_annealing/Makefile.in
index 2d5e88c..f27cafe 100644
--- a/scilab/modules/simulated_annealing/Makefile.in
+++ b/scilab/modules/simulated_annealing/Makefile.in
@@ -183,10 +183,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
183JAR = @JAR@ 183JAR = @JAR@
184JAVA = @JAVA@ 184JAVA = @JAVA@
185JAVAC = @JAVAC@ 185JAVAC = @JAVAC@
186JAVAC_DEBUG = @JAVAC_DEBUG@
186JAVADOC = @JAVADOC@ 187JAVADOC = @JAVADOC@
187JAVAH = @JAVAH@ 188JAVAH = @JAVAH@
188JAVASCI_ENABLE = @JAVASCI_ENABLE@ 189JAVASCI_ENABLE = @JAVASCI_ENABLE@
189JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
190JAVA_ENABLE = @JAVA_ENABLE@ 190JAVA_ENABLE = @JAVA_ENABLE@
191JAVA_G = @JAVA_G@ 191JAVA_G = @JAVA_G@
192JAVA_HOME = @JAVA_HOME@ 192JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/modules/sound/Makefile.in b/scilab/modules/sound/Makefile.in
index 787c792..7a0842e 100644
--- a/scilab/modules/sound/Makefile.in
+++ b/scilab/modules/sound/Makefile.in
@@ -208,10 +208,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
208JAR = @JAR@ 208JAR = @JAR@
209JAVA = @JAVA@ 209JAVA = @JAVA@
210JAVAC = @JAVAC@ 210JAVAC = @JAVAC@
211JAVAC_DEBUG = @JAVAC_DEBUG@
211JAVADOC = @JAVADOC@ 212JAVADOC = @JAVADOC@
212JAVAH = @JAVAH@ 213JAVAH = @JAVAH@
213JAVASCI_ENABLE = @JAVASCI_ENABLE@ 214JAVASCI_ENABLE = @JAVASCI_ENABLE@
214JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
215JAVA_ENABLE = @JAVA_ENABLE@ 215JAVA_ENABLE = @JAVA_ENABLE@
216JAVA_G = @JAVA_G@ 216JAVA_G = @JAVA_G@
217JAVA_HOME = @JAVA_HOME@ 217JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/modules/sparse/Makefile.in b/scilab/modules/sparse/Makefile.in
index 6ed8e6e..11190a1 100644
--- a/scilab/modules/sparse/Makefile.in
+++ b/scilab/modules/sparse/Makefile.in
@@ -258,10 +258,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
258JAR = @JAR@ 258JAR = @JAR@
259JAVA = @JAVA@ 259JAVA = @JAVA@
260JAVAC = @JAVAC@ 260JAVAC = @JAVAC@
261JAVAC_DEBUG = @JAVAC_DEBUG@
261JAVADOC = @JAVADOC@ 262JAVADOC = @JAVADOC@
262JAVAH = @JAVAH@ 263JAVAH = @JAVAH@
263JAVASCI_ENABLE = @JAVASCI_ENABLE@ 264JAVASCI_ENABLE = @JAVASCI_ENABLE@
264JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
265JAVA_ENABLE = @JAVA_ENABLE@ 265JAVA_ENABLE = @JAVA_ENABLE@
266JAVA_G = @JAVA_G@ 266JAVA_G = @JAVA_G@
267JAVA_HOME = @JAVA_HOME@ 267JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/modules/special_functions/Makefile.in b/scilab/modules/special_functions/Makefile.in
index 5035972..46e0ab07 100644
--- a/scilab/modules/special_functions/Makefile.in
+++ b/scilab/modules/special_functions/Makefile.in
@@ -232,10 +232,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
232JAR = @JAR@ 232JAR = @JAR@
233JAVA = @JAVA@ 233JAVA = @JAVA@
234JAVAC = @JAVAC@ 234JAVAC = @JAVAC@
235JAVAC_DEBUG = @JAVAC_DEBUG@
235JAVADOC = @JAVADOC@ 236JAVADOC = @JAVADOC@
236JAVAH = @JAVAH@ 237JAVAH = @JAVAH@
237JAVASCI_ENABLE = @JAVASCI_ENABLE@ 238JAVASCI_ENABLE = @JAVASCI_ENABLE@
238JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
239JAVA_ENABLE = @JAVA_ENABLE@ 239JAVA_ENABLE = @JAVA_ENABLE@
240JAVA_G = @JAVA_G@ 240JAVA_G = @JAVA_G@
241JAVA_HOME = @JAVA_HOME@ 241JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/modules/spreadsheet/Makefile.in b/scilab/modules/spreadsheet/Makefile.in
index c2cb7bd..b6a9df4 100644
--- a/scilab/modules/spreadsheet/Makefile.in
+++ b/scilab/modules/spreadsheet/Makefile.in
@@ -219,10 +219,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
219JAR = @JAR@ 219JAR = @JAR@
220JAVA = @JAVA@ 220JAVA = @JAVA@
221JAVAC = @JAVAC@ 221JAVAC = @JAVAC@
222JAVAC_DEBUG = @JAVAC_DEBUG@
222JAVADOC = @JAVADOC@ 223JAVADOC = @JAVADOC@
223JAVAH = @JAVAH@ 224JAVAH = @JAVAH@
224JAVASCI_ENABLE = @JAVASCI_ENABLE@ 225JAVASCI_ENABLE = @JAVASCI_ENABLE@
225JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
226JAVA_ENABLE = @JAVA_ENABLE@ 226JAVA_ENABLE = @JAVA_ENABLE@
227JAVA_G = @JAVA_G@ 227JAVA_G = @JAVA_G@
228JAVA_HOME = @JAVA_HOME@ 228JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/modules/statistics/Makefile.in b/scilab/modules/statistics/Makefile.in
index 6df3834..4279cd0 100644
--- a/scilab/modules/statistics/Makefile.in
+++ b/scilab/modules/statistics/Makefile.in
@@ -239,10 +239,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
239JAR = @JAR@ 239JAR = @JAR@
240JAVA = @JAVA@ 240JAVA = @JAVA@
241JAVAC = @JAVAC@ 241JAVAC = @JAVAC@
242JAVAC_DEBUG = @JAVAC_DEBUG@
242JAVADOC = @JAVADOC@ 243JAVADOC = @JAVADOC@
243JAVAH = @JAVAH@ 244JAVAH = @JAVAH@
244JAVASCI_ENABLE = @JAVASCI_ENABLE@ 245JAVASCI_ENABLE = @JAVASCI_ENABLE@
245JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
246JAVA_ENABLE = @JAVA_ENABLE@ 246JAVA_ENABLE = @JAVA_ENABLE@
247JAVA_G = @JAVA_G@ 247JAVA_G = @JAVA_G@
248JAVA_HOME = @JAVA_HOME@ 248JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/modules/string/Makefile.in b/scilab/modules/string/Makefile.in
index 8145349..ae0dc0c 100644
--- a/scilab/modules/string/Makefile.in
+++ b/scilab/modules/string/Makefile.in
@@ -251,10 +251,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
251JAR = @JAR@ 251JAR = @JAR@
252JAVA = @JAVA@ 252JAVA = @JAVA@
253JAVAC = @JAVAC@ 253JAVAC = @JAVAC@
254JAVAC_DEBUG = @JAVAC_DEBUG@
254JAVADOC = @JAVADOC@ 255JAVADOC = @JAVADOC@
255JAVAH = @JAVAH@ 256JAVAH = @JAVAH@
256JAVASCI_ENABLE = @JAVASCI_ENABLE@ 257JAVASCI_ENABLE = @JAVASCI_ENABLE@
257JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
258JAVA_ENABLE = @JAVA_ENABLE@ 258JAVA_ENABLE = @JAVA_ENABLE@
259JAVA_G = @JAVA_G@ 259JAVA_G = @JAVA_G@
260JAVA_HOME = @JAVA_HOME@ 260JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/modules/symbolic/Makefile.in b/scilab/modules/symbolic/Makefile.in
index cdea6ae..4e8ebda 100644
--- a/scilab/modules/symbolic/Makefile.in
+++ b/scilab/modules/symbolic/Makefile.in
@@ -223,10 +223,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
223JAR = @JAR@ 223JAR = @JAR@
224JAVA = @JAVA@ 224JAVA = @JAVA@
225JAVAC = @JAVAC@ 225JAVAC = @JAVAC@
226JAVAC_DEBUG = @JAVAC_DEBUG@
226JAVADOC = @JAVADOC@ 227JAVADOC = @JAVADOC@
227JAVAH = @JAVAH@ 228JAVAH = @JAVAH@
228JAVASCI_ENABLE = @JAVASCI_ENABLE@ 229JAVASCI_ENABLE = @JAVASCI_ENABLE@
229JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
230JAVA_ENABLE = @JAVA_ENABLE@ 230JAVA_ENABLE = @JAVA_ENABLE@
231JAVA_G = @JAVA_G@ 231JAVA_G = @JAVA_G@
232JAVA_HOME = @JAVA_HOME@ 232JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/modules/tclsci/Makefile.in b/scilab/modules/tclsci/Makefile.in
index 170c347..4a978ec 100644
--- a/scilab/modules/tclsci/Makefile.in
+++ b/scilab/modules/tclsci/Makefile.in
@@ -257,10 +257,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
257JAR = @JAR@ 257JAR = @JAR@
258JAVA = @JAVA@ 258JAVA = @JAVA@
259JAVAC = @JAVAC@ 259JAVAC = @JAVAC@
260JAVAC_DEBUG = @JAVAC_DEBUG@
260JAVADOC = @JAVADOC@ 261JAVADOC = @JAVADOC@
261JAVAH = @JAVAH@ 262JAVAH = @JAVAH@
262JAVASCI_ENABLE = @JAVASCI_ENABLE@ 263JAVASCI_ENABLE = @JAVASCI_ENABLE@
263JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
264JAVA_ENABLE = @JAVA_ENABLE@ 264JAVA_ENABLE = @JAVA_ENABLE@
265JAVA_G = @JAVA_G@ 265JAVA_G = @JAVA_G@
266JAVA_HOME = @JAVA_HOME@ 266JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/modules/texmacs/Makefile.in b/scilab/modules/texmacs/Makefile.in
index 50ed424..09f231e 100644
--- a/scilab/modules/texmacs/Makefile.in
+++ b/scilab/modules/texmacs/Makefile.in
@@ -178,10 +178,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
178JAR = @JAR@ 178JAR = @JAR@
179JAVA = @JAVA@ 179JAVA = @JAVA@
180JAVAC = @JAVAC@ 180JAVAC = @JAVAC@
181JAVAC_DEBUG = @JAVAC_DEBUG@
181JAVADOC = @JAVADOC@ 182JAVADOC = @JAVADOC@
182JAVAH = @JAVAH@ 183JAVAH = @JAVAH@
183JAVASCI_ENABLE = @JAVASCI_ENABLE@ 184JAVASCI_ENABLE = @JAVASCI_ENABLE@
184JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
185JAVA_ENABLE = @JAVA_ENABLE@ 185JAVA_ENABLE = @JAVA_ENABLE@
186JAVA_G = @JAVA_G@ 186JAVA_G = @JAVA_G@
187JAVA_HOME = @JAVA_HOME@ 187JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/modules/time/Makefile.in b/scilab/modules/time/Makefile.in
index f0bb6c4..aab2431 100644
--- a/scilab/modules/time/Makefile.in
+++ b/scilab/modules/time/Makefile.in
@@ -215,10 +215,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
215JAR = @JAR@ 215JAR = @JAR@
216JAVA = @JAVA@ 216JAVA = @JAVA@
217JAVAC = @JAVAC@ 217JAVAC = @JAVAC@
218JAVAC_DEBUG = @JAVAC_DEBUG@
218JAVADOC = @JAVADOC@ 219JAVADOC = @JAVADOC@
219JAVAH = @JAVAH@ 220JAVAH = @JAVAH@
220JAVASCI_ENABLE = @JAVASCI_ENABLE@ 221JAVASCI_ENABLE = @JAVASCI_ENABLE@
221JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
222JAVA_ENABLE = @JAVA_ENABLE@ 222JAVA_ENABLE = @JAVA_ENABLE@
223JAVA_G = @JAVA_G@ 223JAVA_G = @JAVA_G@
224JAVA_HOME = @JAVA_HOME@ 224JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/modules/types/Makefile.in b/scilab/modules/types/Makefile.in
index 8055d75..54f5ffd 100644
--- a/scilab/modules/types/Makefile.in
+++ b/scilab/modules/types/Makefile.in
@@ -219,10 +219,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
219JAR = @JAR@ 219JAR = @JAR@
220JAVA = @JAVA@ 220JAVA = @JAVA@
221JAVAC = @JAVAC@ 221JAVAC = @JAVAC@
222JAVAC_DEBUG = @JAVAC_DEBUG@
222JAVADOC = @JAVADOC@ 223JAVADOC = @JAVADOC@
223JAVAH = @JAVAH@ 224JAVAH = @JAVAH@
224JAVASCI_ENABLE = @JAVASCI_ENABLE@ 225JAVASCI_ENABLE = @JAVASCI_ENABLE@
225JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
226JAVA_ENABLE = @JAVA_ENABLE@ 226JAVA_ENABLE = @JAVA_ENABLE@
227JAVA_G = @JAVA_G@ 227JAVA_G = @JAVA_G@
228JAVA_HOME = @JAVA_HOME@ 228JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/modules/ui_data/Makefile.in b/scilab/modules/ui_data/Makefile.in
index d5ed3e5..06c1a6c 100644
--- a/scilab/modules/ui_data/Makefile.in
+++ b/scilab/modules/ui_data/Makefile.in
@@ -244,10 +244,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
244JAR = @JAR@ 244JAR = @JAR@
245JAVA = @JAVA@ 245JAVA = @JAVA@
246JAVAC = @JAVAC@ 246JAVAC = @JAVAC@
247JAVAC_DEBUG = @JAVAC_DEBUG@
247JAVADOC = @JAVADOC@ 248JAVADOC = @JAVADOC@
248JAVAH = @JAVAH@ 249JAVAH = @JAVAH@
249JAVASCI_ENABLE = @JAVASCI_ENABLE@ 250JAVASCI_ENABLE = @JAVASCI_ENABLE@
250JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
251JAVA_ENABLE = @JAVA_ENABLE@ 251JAVA_ENABLE = @JAVA_ENABLE@
252JAVA_G = @JAVA_G@ 252JAVA_G = @JAVA_G@
253JAVA_HOME = @JAVA_HOME@ 253JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/modules/umfpack/Makefile.in b/scilab/modules/umfpack/Makefile.in
index a57029e..dc5024b 100644
--- a/scilab/modules/umfpack/Makefile.in
+++ b/scilab/modules/umfpack/Makefile.in
@@ -246,10 +246,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
246JAR = @JAR@ 246JAR = @JAR@
247JAVA = @JAVA@ 247JAVA = @JAVA@
248JAVAC = @JAVAC@ 248JAVAC = @JAVAC@
249JAVAC_DEBUG = @JAVAC_DEBUG@
249JAVADOC = @JAVADOC@ 250JAVADOC = @JAVADOC@
250JAVAH = @JAVAH@ 251JAVAH = @JAVAH@
251JAVASCI_ENABLE = @JAVASCI_ENABLE@ 252JAVASCI_ENABLE = @JAVASCI_ENABLE@
252JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
253JAVA_ENABLE = @JAVA_ENABLE@ 253JAVA_ENABLE = @JAVA_ENABLE@
254JAVA_G = @JAVA_G@ 254JAVA_G = @JAVA_G@
255JAVA_HOME = @JAVA_HOME@ 255JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/modules/windows_tools/Makefile.in b/scilab/modules/windows_tools/Makefile.in
index eaffbf4..dfd02ab 100644
--- a/scilab/modules/windows_tools/Makefile.in
+++ b/scilab/modules/windows_tools/Makefile.in
@@ -208,10 +208,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
208JAR = @JAR@ 208JAR = @JAR@
209JAVA = @JAVA@ 209JAVA = @JAVA@
210JAVAC = @JAVAC@ 210JAVAC = @JAVAC@
211JAVAC_DEBUG = @JAVAC_DEBUG@
211JAVADOC = @JAVADOC@ 212JAVADOC = @JAVADOC@
212JAVAH = @JAVAH@ 213JAVAH = @JAVAH@
213JAVASCI_ENABLE = @JAVASCI_ENABLE@ 214JAVASCI_ENABLE = @JAVASCI_ENABLE@
214JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
215JAVA_ENABLE = @JAVA_ENABLE@ 215JAVA_ENABLE = @JAVA_ENABLE@
216JAVA_G = @JAVA_G@ 216JAVA_G = @JAVA_G@
217JAVA_HOME = @JAVA_HOME@ 217JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/modules/xcos/Makefile.in b/scilab/modules/xcos/Makefile.in
index ef6f90e..2dd088f 100644
--- a/scilab/modules/xcos/Makefile.in
+++ b/scilab/modules/xcos/Makefile.in
@@ -256,10 +256,10 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
256JAR = @JAR@ 256JAR = @JAR@
257JAVA = @JAVA@ 257JAVA = @JAVA@
258JAVAC = @JAVAC@ 258JAVAC = @JAVAC@
259JAVAC_DEBUG = @JAVAC_DEBUG@
259JAVADOC = @JAVADOC@ 260JAVADOC = @JAVADOC@
260JAVAH = @JAVAH@ 261JAVAH = @JAVAH@
261JAVASCI_ENABLE = @JAVASCI_ENABLE@ 262JAVASCI_ENABLE = @JAVASCI_ENABLE@
262JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
263JAVA_ENABLE = @JAVA_ENABLE@ 263JAVA_ENABLE = @JAVA_ENABLE@
264JAVA_G = @JAVA_G@ 264JAVA_G = @JAVA_G@
265JAVA_HOME = @JAVA_HOME@ 265JAVA_HOME = @JAVA_HOME@
diff --git a/scilab/scilab.properties.in b/scilab/scilab.properties.in
new file mode 100644
index 0000000..8cae230
--- /dev/null
+++ b/scilab/scilab.properties.in
@@ -0,0 +1,3 @@
1; Definition ANT flags for Scilab
2
3build.debug=@JAVAC_DEBUG@