summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--scilab/CHANGES_5.2.X7
-rw-r--r--scilab/Makefile.in5
-rw-r--r--scilab/aclocal.m41
-rwxr-xr-xscilab/configure95
-rw-r--r--scilab/configure.ac2
-rw-r--r--scilab/contrib/Makefile.in3
-rw-r--r--scilab/libs/MALLOC/Makefile.in3
-rw-r--r--scilab/libs/Makefile.in3
-rw-r--r--scilab/libs/doublylinkedlist/Makefile.in3
-rw-r--r--scilab/libs/dynamiclibrary/Makefile.in3
-rw-r--r--scilab/libs/hashtable/Makefile.in3
-rw-r--r--scilab/libs/libst/Makefile.in3
-rw-r--r--scilab/m4/java-thirdparty.m440
-rw-r--r--scilab/modules/Makefile.in3
-rw-r--r--scilab/modules/action_binding/Makefile.in3
-rw-r--r--scilab/modules/api_scilab/Makefile.in3
-rw-r--r--scilab/modules/arnoldi/Makefile.in3
-rw-r--r--scilab/modules/atoms/Makefile.in3
-rw-r--r--scilab/modules/boolean/Makefile.in3
-rw-r--r--scilab/modules/cacsd/Makefile.in3
-rw-r--r--scilab/modules/call_scilab/Makefile.in3
-rw-r--r--scilab/modules/compatibility_functions/Makefile.in3
-rw-r--r--scilab/modules/completion/Makefile.in3
-rw-r--r--scilab/modules/console/Makefile.in3
-rw-r--r--scilab/modules/core/Makefile.in3
-rw-r--r--scilab/modules/core/src/c/getmemory.c1
-rw-r--r--scilab/modules/data_structures/Makefile.in3
-rw-r--r--scilab/modules/demo_tools/Makefile.in3
-rw-r--r--scilab/modules/development_tools/Makefile.in3
-rw-r--r--scilab/modules/development_tools/src/fake/Makefile.in3
-rw-r--r--scilab/modules/differential_equations/Makefile.in3
-rw-r--r--scilab/modules/double/Makefile.in3
-rw-r--r--scilab/modules/dynamic_link/Makefile.in3
-rw-r--r--scilab/modules/elementary_functions/Makefile.in3
-rw-r--r--scilab/modules/fftw/Makefile.in3
-rw-r--r--scilab/modules/fileio/Makefile.in3
-rw-r--r--scilab/modules/functions/Makefile.in3
-rw-r--r--scilab/modules/genetic_algorithms/Makefile.in3
-rw-r--r--scilab/modules/graphic_export/Makefile.in3
-rw-r--r--scilab/modules/graphics/Makefile.in3
-rw-r--r--scilab/modules/gui/Makefile.in3
-rw-r--r--scilab/modules/hdf5/Makefile.in4
-rw-r--r--scilab/modules/helptools/Makefile.in3
-rw-r--r--scilab/modules/history_manager/Makefile.in3
-rw-r--r--scilab/modules/integer/Makefile.in3
-rw-r--r--scilab/modules/interpolation/Makefile.in3
-rw-r--r--scilab/modules/intersci/Makefile.in3
-rw-r--r--scilab/modules/io/Makefile.in3
-rw-r--r--scilab/modules/javasci/Makefile.in3
-rw-r--r--scilab/modules/jvm/Makefile.in3
-rw-r--r--scilab/modules/linear_algebra/Makefile.in3
-rw-r--r--scilab/modules/localization/Makefile.in3
-rw-r--r--scilab/modules/m2sci/Makefile.in3
-rw-r--r--scilab/modules/maple2scilab/Makefile.in3
-rw-r--r--scilab/modules/matio/Makefile.in3
-rw-r--r--scilab/modules/mexlib/Makefile.in3
-rw-r--r--scilab/modules/optimization/Makefile.in3
-rw-r--r--scilab/modules/output_stream/Makefile.in3
-rw-r--r--scilab/modules/overloading/Makefile.in3
-rw-r--r--scilab/modules/parameters/Makefile.in3
-rw-r--r--scilab/modules/polynomials/Makefile.in3
-rw-r--r--scilab/modules/pvm/Makefile.in3
-rw-r--r--scilab/modules/randlib/Makefile.in3
-rw-r--r--scilab/modules/renderer/Makefile.in3
-rw-r--r--scilab/modules/scicos/Makefile.in3
-rw-r--r--scilab/modules/scicos_blocks/Makefile.in3
-rw-r--r--scilab/modules/shell/Makefile.in3
-rw-r--r--scilab/modules/signal_processing/Makefile.in3
-rw-r--r--scilab/modules/simulated_annealing/Makefile.in3
-rw-r--r--scilab/modules/sound/Makefile.in3
-rw-r--r--scilab/modules/sparse/Makefile.in3
-rw-r--r--scilab/modules/special_functions/Makefile.in3
-rw-r--r--scilab/modules/spreadsheet/Makefile.in3
-rw-r--r--scilab/modules/statistics/Makefile.in3
-rw-r--r--scilab/modules/string/Makefile.in3
-rw-r--r--scilab/modules/symbolic/Makefile.in3
-rw-r--r--scilab/modules/tclsci/Makefile.in3
-rw-r--r--scilab/modules/texmacs/Makefile.in3
-rw-r--r--scilab/modules/time/Makefile.in3
-rw-r--r--scilab/modules/umfpack/Makefile.in3
-rw-r--r--scilab/modules/windows_tools/Makefile.in3
-rw-r--r--scilab/modules/xcos/Makefile.in3
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/graph/ScilabGraph.java8
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/Xcos.java97
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/BasicBlock.java4
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/SuperBlock.java3
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/EventInBlock.java2
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/EventOutBlock.java2
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/ExplicitInBlock.java2
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/ExplicitOutBlock.java2
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/ImplicitInBlock.java2
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/ImplicitOutBlock.java2
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/graph/XcosDiagram.java50
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/XcosPalette.java4
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/utils/XcosFileType.java2
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/utils/XcosInterpreterManagement.java15
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/utils/XcosMessages.java67
-rw-r--r--scilab/modules/xpad/Makefile.in3
98 files changed, 442 insertions, 200 deletions
diff --git a/scilab/CHANGES_5.2.X b/scilab/CHANGES_5.2.X
index fa3282d..48dfb1a 100644
--- a/scilab/CHANGES_5.2.X
+++ b/scilab/CHANGES_5.2.X
@@ -77,6 +77,13 @@ Atoms:
77* bug 6389 fixed - Atoms GUI : "Update" button just removed the selected module 77* bug 6389 fixed - Atoms GUI : "Update" button just removed the selected module
78 but didn't update it. 78 but didn't update it.
79 79
80Compilation:
81============
82
83* Under GNU/Linux, Mac OS X & Unix, a m4 macro called
84 AC_JAVA_CHECK_VERSION_PACKAGE has been added to check the version of Java
85 packages used
86
80Bug fixes: 87Bug fixes:
81========== 88==========
82 89
diff --git a/scilab/Makefile.in b/scilab/Makefile.in
index 3208553..e19916f 100644
--- a/scilab/Makefile.in
+++ b/scilab/Makefile.in
@@ -65,7 +65,7 @@ check_PROGRAMS = call_scilab_c_simple$(EXEEXT) call_scilab_c$(EXEEXT) \
65 call_scilab_readwritematrix$(EXEEXT) \ 65 call_scilab_readwritematrix$(EXEEXT) \
66 call_scilab_readwritestring$(EXEEXT) 66 call_scilab_readwritestring$(EXEEXT)
67subdir = . 67subdir = .
68DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \ 68DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
69 $(srcdir)/Makefile.in $(srcdir)/scilab-lib-doc.properties.in \ 69 $(srcdir)/Makefile.in $(srcdir)/scilab-lib-doc.properties.in \
70 $(srcdir)/scilab-lib.properties.in $(srcdir)/scilab.pc.in \ 70 $(srcdir)/scilab-lib.properties.in $(srcdir)/scilab.pc.in \
71 $(top_srcdir)/configure $(top_srcdir)/etc/classpath.xml.in \ 71 $(top_srcdir)/configure $(top_srcdir)/etc/classpath.xml.in \
@@ -80,7 +80,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
80am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 80am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
81 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 81 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
82 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 82 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
83 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ 83 $(top_srcdir)/m4/intel_compiler.m4 \
84 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
84 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \ 85 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
85 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \ 86 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
86 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 87 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
diff --git a/scilab/aclocal.m4 b/scilab/aclocal.m4
index 7195a04..cba181f 100644
--- a/scilab/aclocal.m4
+++ b/scilab/aclocal.m4
@@ -3116,6 +3116,7 @@ m4_include([m4/fortran.m4])
3116m4_include([m4/giws.m4]) 3116m4_include([m4/giws.m4])
3117m4_include([m4/hdf5.m4]) 3117m4_include([m4/hdf5.m4])
3118m4_include([m4/intel_compiler.m4]) 3118m4_include([m4/intel_compiler.m4])
3119m4_include([m4/java-thirdparty.m4])
3119m4_include([m4/java.m4]) 3120m4_include([m4/java.m4])
3120m4_include([m4/lib-ld.m4]) 3121m4_include([m4/lib-ld.m4])
3121m4_include([m4/libsmath.m4]) 3122m4_include([m4/libsmath.m4])
diff --git a/scilab/configure b/scilab/configure
index 4e4c07e..c395c0e 100755
--- a/scilab/configure
+++ b/scilab/configure
@@ -11222,6 +11222,43 @@ $as_echo "$as_me: WARNING: Could not find or use the Java package/jar jgraphx us
11222 JGRAPHX=$PACKAGE_JAR_FILE 11222 JGRAPHX=$PACKAGE_JAR_FILE
11223 11223
11224 11224
11225
11226 { $as_echo "$as_me:${as_lineno-$LINENO}: checking minimal version (1.2.0.0) of jgraphx" >&5
11227$as_echo_n "checking minimal version (1.2.0.0) of jgraphx... " >&6; }
11228 saved_ac_java_classpath=$ac_java_classpath
11229 export ac_java_classpath="$JGRAPHX:$ac_java_classpath"
11230
11231 cat << \EOF > conftest.java
11232// #line 11232 "configure"
11233import com.mxgraph.view.mxGraph;
11234
11235public class conftest {
11236 public static void main(String[] argv) {
11237 String minVersion="1.2.0.0";
11238 if (minVersion.compareTo(mxGraph.VERSION) > 0) {
11239 System.exit(-1);
11240 }
11241
11242 }
11243}
11244EOF
11245
11246 CLASSPATH=$ac_java_classpath
11247 export CLASSPATH
11248 cmd="$JAVAC ${JAVAC_FLAGS} conftest.java"
11249 if (echo $cmd >&5 ; eval $cmd >&5 2>&5) ; then
11250 echo "yes" >&5
11251 echo "yes"
11252 else
11253 echo "configure: failed program was:" >&5
11254 cat conftest.java >&5
11255 echo "configure: CLASSPATH was $CLASSPATH" >&5
11256 as_fn_error "Wrong version of jgraphx. Expected at least 1.2.0.0" "$LINENO" 5
11257 fi
11258
11259 ac_java_classpath=$saved_ac_java_classpath
11260
11261
11225 # Docking system 11262 # Docking system
11226 11263
11227 { $as_echo "$as_me:${as_lineno-$LINENO}: checking flexdock" >&5 11264 { $as_echo "$as_me:${as_lineno-$LINENO}: checking flexdock" >&5
@@ -11242,7 +11279,7 @@ $as_echo_n "checking flexdock... " >&6; }
11242 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11279 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11243 11280
11244 cat << \EOF > conftest.java 11281 cat << \EOF > conftest.java
11245// #line 11245 "configure" 11282// #line 11282 "configure"
11246import org.flexdock.docking.DockingManager; 11283import org.flexdock.docking.DockingManager;
11247 11284
11248public class conftest { 11285public class conftest {
@@ -11314,7 +11351,7 @@ $as_echo_n "checking looks... " >&6; }
11314 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11351 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11315 11352
11316 cat << \EOF > conftest.java 11353 cat << \EOF > conftest.java
11317// #line 11317 "configure" 11354// #line 11354 "configure"
11318import com.jgoodies.looks.common.RenderingUtils; 11355import com.jgoodies.looks.common.RenderingUtils;
11319 11356
11320public class conftest { 11357public class conftest {
@@ -11386,7 +11423,7 @@ $as_echo_n "checking jgoodies-looks... " >&6; }
11386 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11423 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11387 11424
11388 cat << \EOF > conftest.java 11425 cat << \EOF > conftest.java
11389// #line 11389 "configure" 11426// #line 11426 "configure"
11390import com.jgoodies.looks.common.RenderingUtils; 11427import com.jgoodies.looks.common.RenderingUtils;
11391 11428
11392public class conftest { 11429public class conftest {
@@ -11459,7 +11496,7 @@ $as_echo_n "checking skinlf... " >&6; }
11459 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11496 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11460 11497
11461 cat << \EOF > conftest.java 11498 cat << \EOF > conftest.java
11462// #line 11462 "configure" 11499// #line 11499 "configure"
11463import com.l2fprod.util.AccessUtils; 11500import com.l2fprod.util.AccessUtils;
11464 11501
11465public class conftest { 11502public class conftest {
@@ -11531,7 +11568,7 @@ $as_echo_n "checking jogl... " >&6; }
11531 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11568 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11532 11569
11533 cat << \EOF > conftest.java 11570 cat << \EOF > conftest.java
11534// #line 11534 "configure" 11571// #line 11571 "configure"
11535import javax.media.opengl.glu.GLUnurbs; 11572import javax.media.opengl.glu.GLUnurbs;
11536 11573
11537public class conftest { 11574public class conftest {
@@ -11703,7 +11740,7 @@ $as_echo_n "checking gluegen-rt... " >&6; }
11703 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11740 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11704 11741
11705 cat << \EOF > conftest.java 11742 cat << \EOF > conftest.java
11706// #line 11706 "configure" 11743// #line 11743 "configure"
11707import com.sun.gluegen.runtime.CPU; 11744import com.sun.gluegen.runtime.CPU;
11708 11745
11709public class conftest { 11746public class conftest {
@@ -11830,7 +11867,7 @@ $as_echo_n "checking jhall... " >&6; }
11830 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11867 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11831 11868
11832 cat << \EOF > conftest.java 11869 cat << \EOF > conftest.java
11833// #line 11833 "configure" 11870// #line 11870 "configure"
11834import javax.help.JHelp; 11871import javax.help.JHelp;
11835 11872
11836public class conftest { 11873public class conftest {
@@ -11902,7 +11939,7 @@ $as_echo_n "checking javahelp2... " >&6; }
11902 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11939 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11903 11940
11904 cat << \EOF > conftest.java 11941 cat << \EOF > conftest.java
11905// #line 11905 "configure" 11942// #line 11942 "configure"
11906import javax.help.JHelp; 11943import javax.help.JHelp;
11907 11944
11908public class conftest { 11945public class conftest {
@@ -11975,7 +12012,7 @@ $as_echo_n "checking jrosetta-API... " >&6; }
11975 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12012 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11976 12013
11977 cat << \EOF > conftest.java 12014 cat << \EOF > conftest.java
11978// #line 11978 "configure" 12015// #line 12015 "configure"
11979import com.artenum.rosetta.interfaces.core.ConsoleConfiguration; 12016import com.artenum.rosetta.interfaces.core.ConsoleConfiguration;
11980 12017
11981public class conftest { 12018public class conftest {
@@ -12047,7 +12084,7 @@ $as_echo_n "checking jrosetta-engine... " >&6; }
12047 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12084 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12048 12085
12049 cat << \EOF > conftest.java 12086 cat << \EOF > conftest.java
12050// #line 12050 "configure" 12087// #line 12087 "configure"
12051import com.artenum.rosetta.core.action.AbstractConsoleAction; 12088import com.artenum.rosetta.core.action.AbstractConsoleAction;
12052 12089
12053public class conftest { 12090public class conftest {
@@ -12120,7 +12157,7 @@ $as_echo_n "checking jhdf5... " >&6; }
12120 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12157 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12121 12158
12122 cat << \EOF > conftest.java 12159 cat << \EOF > conftest.java
12123// #line 12123 "configure" 12160// #line 12160 "configure"
12124import ncsa.hdf.hdf5lib.HDF5Constants; 12161import ncsa.hdf.hdf5lib.HDF5Constants;
12125 12162
12126public class conftest { 12163public class conftest {
@@ -12193,7 +12230,7 @@ $as_echo_n "checking commons-logging... " >&6; }
12193 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12230 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12194 12231
12195 cat << \EOF > conftest.java 12232 cat << \EOF > conftest.java
12196// #line 12196 "configure" 12233// #line 12233 "configure"
12197import org.apache.commons.logging.LogFactory; 12234import org.apache.commons.logging.LogFactory;
12198 12235
12199public class conftest { 12236public class conftest {
@@ -12265,7 +12302,7 @@ $as_echo_n "checking jlatexmath... " >&6; }
12265 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12302 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12266 12303
12267 cat << \EOF > conftest.java 12304 cat << \EOF > conftest.java
12268// #line 12268 "configure" 12305// #line 12305 "configure"
12269import org.scilab.forge.jlatexmath.TeXFormula; 12306import org.scilab.forge.jlatexmath.TeXFormula;
12270 12307
12271public class conftest { 12308public class conftest {
@@ -12343,7 +12380,7 @@ $as_echo_n "checking checkstyle... " >&6; }
12343 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12380 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12344 12381
12345 cat << \EOF > conftest.java 12382 cat << \EOF > conftest.java
12346// #line 12346 "configure" 12383// #line 12383 "configure"
12347import com.puppycrawl.tools.checkstyle.CheckStyleTask; 12384import com.puppycrawl.tools.checkstyle.CheckStyleTask;
12348 12385
12349public class conftest { 12386public class conftest {
@@ -12415,7 +12452,7 @@ $as_echo_n "checking commons-beanutils... " >&6; }
12415 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12452 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12416 12453
12417 cat << \EOF > conftest.java 12454 cat << \EOF > conftest.java
12418// #line 12418 "configure" 12455// #line 12455 "configure"
12419import org.apache.commons.beanutils.Converter; 12456import org.apache.commons.beanutils.Converter;
12420 12457
12421public class conftest { 12458public class conftest {
@@ -12487,7 +12524,7 @@ $as_echo_n "checking antlr... " >&6; }
12487 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12524 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12488 12525
12489 cat << \EOF > conftest.java 12526 cat << \EOF > conftest.java
12490// #line 12490 "configure" 12527// #line 12527 "configure"
12491import antlr.TokenStreamException; 12528import antlr.TokenStreamException;
12492 12529
12493public class conftest { 12530public class conftest {
@@ -20512,7 +20549,7 @@ CPPFLAGS="$CPPFLAGS -I$CHK_TCL_INCLUDE_PATH"
20512{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later" >&5 20549{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later" >&5
20513$as_echo_n "checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later... " >&6; } 20550$as_echo_n "checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later... " >&6; }
20514cat > conftest.$ac_ext <<EOF 20551cat > conftest.$ac_ext <<EOF
20515#line 20515 "configure" 20552#line 20552 "configure"
20516#include "confdefs.h" 20553#include "confdefs.h"
20517 20554
20518#include "$CHK_TCL_INCLUDE_PATH/$CHK_TCL_INC_NAME" 20555#include "$CHK_TCL_INCLUDE_PATH/$CHK_TCL_INC_NAME"
@@ -20824,7 +20861,7 @@ CPPFLAGS="$CPPFLAGS $TCL_INC_PATH -I$CHK_TK_INCLUDE_PATH $X_CFLAGS"
20824$as_echo_n "checking if tk is version $CHK_TK_MAJOR.$CHK_TK_MINOR or later... " >&6; } 20861$as_echo_n "checking if tk is version $CHK_TK_MAJOR.$CHK_TK_MINOR or later... " >&6; }
20825 20862
20826cat > conftest.$ac_ext <<EOF 20863cat > conftest.$ac_ext <<EOF
20827#line 20827 "configure" 20864#line 20864 "configure"
20828#include "confdefs.h" 20865#include "confdefs.h"
20829 20866
20830#include "$CHK_TK_INCLUDE_PATH/$CHK_TK_INC_NAME" 20867#include "$CHK_TK_INCLUDE_PATH/$CHK_TK_INC_NAME"
@@ -21405,7 +21442,7 @@ $as_echo_n "checking batik-all... " >&6; }
21405 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 21442 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
21406 21443
21407 cat << \EOF > conftest.java 21444 cat << \EOF > conftest.java
21408// #line 21408 "configure" 21445// #line 21445 "configure"
21409import org.apache.batik.parser.Parser; 21446import org.apache.batik.parser.Parser;
21410 21447
21411public class conftest { 21448public class conftest {
@@ -21477,7 +21514,7 @@ $as_echo_n "checking batik... " >&6; }
21477 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 21514 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
21478 21515
21479 cat << \EOF > conftest.java 21516 cat << \EOF > conftest.java
21480// #line 21480 "configure" 21517// #line 21517 "configure"
21481import org.apache.batik.parser.Parser; 21518import org.apache.batik.parser.Parser;
21482 21519
21483public class conftest { 21520public class conftest {
@@ -21551,7 +21588,7 @@ $as_echo_n "checking saxon... " >&6; }
21551 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 21588 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
21552 21589
21553 cat << \EOF > conftest.java 21590 cat << \EOF > conftest.java
21554// #line 21554 "configure" 21591// #line 21591 "configure"
21555import com.icl.saxon.Loader; 21592import com.icl.saxon.Loader;
21556 21593
21557public class conftest { 21594public class conftest {
@@ -21623,7 +21660,7 @@ $as_echo_n "checking fop... " >&6; }
21623 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 21660 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
21624 21661
21625 cat << \EOF > conftest.java 21662 cat << \EOF > conftest.java
21626// #line 21626 "configure" 21663// #line 21663 "configure"
21627import org.apache.fop.pdf.PDFInfo; 21664import org.apache.fop.pdf.PDFInfo;
21628 21665
21629public class conftest { 21666public class conftest {
@@ -21695,7 +21732,7 @@ $as_echo_n "checking jeuclid-core... " >&6; }
21695 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 21732 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
21696 21733
21697 cat << \EOF > conftest.java 21734 cat << \EOF > conftest.java
21698// #line 21698 "configure" 21735// #line 21735 "configure"
21699import net.sourceforge.jeuclid.LayoutContext; 21736import net.sourceforge.jeuclid.LayoutContext;
21700 21737
21701public class conftest { 21738public class conftest {
@@ -21767,7 +21804,7 @@ $as_echo_n "checking commons-io... " >&6; }
21767 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 21804 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
21768 21805
21769 cat << \EOF > conftest.java 21806 cat << \EOF > conftest.java
21770// #line 21770 "configure" 21807// #line 21807 "configure"
21771import org.apache.commons.io.output.CountingOutputStream; 21808import org.apache.commons.io.output.CountingOutputStream;
21772 21809
21773public class conftest { 21810public class conftest {
@@ -21839,7 +21876,7 @@ $as_echo_n "checking xmlgraphics-commons... " >&6; }
21839 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 21876 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
21840 21877
21841 cat << \EOF > conftest.java 21878 cat << \EOF > conftest.java
21842// #line 21842 "configure" 21879// #line 21879 "configure"
21843import org.apache.xmlgraphics.util.Service; 21880import org.apache.xmlgraphics.util.Service;
21844 21881
21845public class conftest { 21882public class conftest {
@@ -21911,7 +21948,7 @@ $as_echo_n "checking xml-apis-ext... " >&6; }
21911 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 21948 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
21912 21949
21913 cat << \EOF > conftest.java 21950 cat << \EOF > conftest.java
21914// #line 21914 "configure" 21951// #line 21951 "configure"
21915import org.w3c.dom.svg.SVGDocument; 21952import org.w3c.dom.svg.SVGDocument;
21916 21953
21917public class conftest { 21954public class conftest {
@@ -21984,7 +22021,7 @@ $as_echo_n "checking avalon-framework... " >&6; }
21984 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 22021 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
21985 22022
21986 cat << \EOF > conftest.java 22023 cat << \EOF > conftest.java
21987// #line 21987 "configure" 22024// #line 22024 "configure"
21988import org.apache.avalon.framework.configuration.ConfigurationException; 22025import org.apache.avalon.framework.configuration.ConfigurationException;
21989 22026
21990public class conftest { 22027public class conftest {
@@ -28227,7 +28264,7 @@ else
28227 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 28264 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
28228 lt_status=$lt_dlunknown 28265 lt_status=$lt_dlunknown
28229 cat > conftest.$ac_ext <<_LT_EOF 28266 cat > conftest.$ac_ext <<_LT_EOF
28230#line 28230 "configure" 28267#line 28267 "configure"
28231#include "confdefs.h" 28268#include "confdefs.h"
28232 28269
28233#if HAVE_DLFCN_H 28270#if HAVE_DLFCN_H
@@ -28333,7 +28370,7 @@ else
28333 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 28370 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
28334 lt_status=$lt_dlunknown 28371 lt_status=$lt_dlunknown
28335 cat > conftest.$ac_ext <<_LT_EOF 28372 cat > conftest.$ac_ext <<_LT_EOF
28336#line 28336 "configure" 28373#line 28373 "configure"
28337#include "confdefs.h" 28374#include "confdefs.h"
28338 28375
28339#if HAVE_DLFCN_H 28376#if HAVE_DLFCN_H
diff --git a/scilab/configure.ac b/scilab/configure.ac
index 1771990..7808e75 100644
--- a/scilab/configure.ac
+++ b/scilab/configure.ac
@@ -664,6 +664,8 @@ if test "$with_javasci" != no -o "$with_gui" != no -o "$enable_build_help" != no
664 JGRAPHX=$PACKAGE_JAR_FILE 664 JGRAPHX=$PACKAGE_JAR_FILE
665 AC_SUBST(JGRAPHX) 665 AC_SUBST(JGRAPHX)
666 666
667 AC_JAVA_CHECK_VERSION_PACKAGE([jgraphx],[import com.mxgraph.view.mxGraph;],$JGRAPHX,[1.2.0.0],[mxGraph.VERSION])
668
667 # Docking system 669 # Docking system
668 AC_JAVA_CHECK_PACKAGE([flexdock],[org.flexdock.docking.DockingManager],[Scilab Gui]) 670 AC_JAVA_CHECK_PACKAGE([flexdock],[org.flexdock.docking.DockingManager],[Scilab Gui])
669 FLEXDOCK=$PACKAGE_JAR_FILE 671 FLEXDOCK=$PACKAGE_JAR_FILE
diff --git a/scilab/contrib/Makefile.in b/scilab/contrib/Makefile.in
index 3fa411d..9e94ffa 100644
--- a/scilab/contrib/Makefile.in
+++ b/scilab/contrib/Makefile.in
@@ -46,7 +46,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
46am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 46am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
47 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 47 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
48 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 48 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
49 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ 49 $(top_srcdir)/m4/intel_compiler.m4 \
50 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
50 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \ 51 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
51 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \ 52 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
52 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 53 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
diff --git a/scilab/libs/MALLOC/Makefile.in b/scilab/libs/MALLOC/Makefile.in
index 9df9d24..6f02d95 100644
--- a/scilab/libs/MALLOC/Makefile.in
+++ b/scilab/libs/MALLOC/Makefile.in
@@ -64,7 +64,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
64am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 64am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
65 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 65 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
66 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 66 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
67 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ 67 $(top_srcdir)/m4/intel_compiler.m4 \
68 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
68 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \ 69 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
69 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \ 70 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
70 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 71 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
diff --git a/scilab/libs/Makefile.in b/scilab/libs/Makefile.in
index 8e9aef3..0ff74b8 100644
--- a/scilab/libs/Makefile.in
+++ b/scilab/libs/Makefile.in
@@ -44,7 +44,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
44am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 44am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
45 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 45 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
46 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 46 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
47 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ 47 $(top_srcdir)/m4/intel_compiler.m4 \
48 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
48 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \ 49 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
49 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \ 50 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
50 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 51 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
diff --git a/scilab/libs/doublylinkedlist/Makefile.in b/scilab/libs/doublylinkedlist/Makefile.in
index 2e2d30a..9e421ef 100644
--- a/scilab/libs/doublylinkedlist/Makefile.in
+++ b/scilab/libs/doublylinkedlist/Makefile.in
@@ -65,7 +65,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
65am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 65am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
66 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 66 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
67 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 67 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
68 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ 68 $(top_srcdir)/m4/intel_compiler.m4 \
69 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
69 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \ 70 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
70 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \ 71 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
71 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 72 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
diff --git a/scilab/libs/dynamiclibrary/Makefile.in b/scilab/libs/dynamiclibrary/Makefile.in
index c5b1a6e..93eea03 100644
--- a/scilab/libs/dynamiclibrary/Makefile.in
+++ b/scilab/libs/dynamiclibrary/Makefile.in
@@ -65,7 +65,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
65am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 65am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
66 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 66 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
67 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 67 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
68 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ 68 $(top_srcdir)/m4/intel_compiler.m4 \
69 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
69 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \ 70 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
70 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \ 71 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
71 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 72 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
diff --git a/scilab/libs/hashtable/Makefile.in b/scilab/libs/hashtable/Makefile.in
index 6ddd46d..951cb64 100644
--- a/scilab/libs/hashtable/Makefile.in
+++ b/scilab/libs/hashtable/Makefile.in
@@ -65,7 +65,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
65am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 65am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
66 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 66 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
67 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 67 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
68 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ 68 $(top_srcdir)/m4/intel_compiler.m4 \
69 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
69 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \ 70 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
70 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \ 71 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
71 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 72 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
diff --git a/scilab/libs/libst/Makefile.in b/scilab/libs/libst/Makefile.in
index d9fe238..c384dca 100644
--- a/scilab/libs/libst/Makefile.in
+++ b/scilab/libs/libst/Makefile.in
@@ -63,7 +63,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
63am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 63am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
64 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 64 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
65 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 65 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
66 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ 66 $(top_srcdir)/m4/intel_compiler.m4 \
67 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
67 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \ 68 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
68 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \ 69 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
69 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 70 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
diff --git a/scilab/m4/java-thirdparty.m4 b/scilab/m4/java-thirdparty.m4
new file mode 100644
index 0000000..a68d804
--- /dev/null
+++ b/scilab/m4/java-thirdparty.m4
@@ -0,0 +1,40 @@
1dnl
2dnl Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
3dnl Copyright (C) DIGITEO - 2010 - Sylvestre Ledru
4dnl
5dnl This file must be used under the terms of the CeCILL.
6dnl This source file is licensed as described in the file COPYING, which
7dnl you should have received as part of this distribution. The terms
8dnl are also available at
9dnl http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
10dnl
11
12#------------------------------------------------------------------------
13# AC_JAVA_CHECK_VERSION_PACKAGE(NAME, IMPORTS, JAR, MIN_VERSION, CURRENT_VERSION)
14#
15# Check if the minimal version of a software/package is available or not.
16# Note that since java does not provide an universal mechanism to detect
17# the version of a package, some work is left to the user.
18# I will update this work when OSGI is more supported.
19#
20# Arguments:
21# 1. The name of the package (only used in the display of feedbacks)
22# 2. Which imports are necessary in the check
23# 3. The name of the jar files used to build against
24# 4. What is the minimal version expected
25# 5. The Java code to get the version ... This can be a serie of java
26# instructions
27#
28#------------------------------------------------------------------------
29
30AC_DEFUN([AC_JAVA_CHECK_VERSION_PACKAGE], [
31 AC_MSG_CHECKING([minimal version ($4) of $1])
32 saved_ac_java_classpath=$ac_java_classpath
33 export ac_java_classpath="$3:$ac_java_classpath"
34 AC_JAVA_TRY_COMPILE($2, [String minVersion="$4";
35 if (minVersion.compareTo($5) > 0) {
36 System.exit(-1);
37 }
38 ], echo "yes" , AC_MSG_ERROR([Wrong version of $1. Expected at least $4]))
39 ac_java_classpath=$saved_ac_java_classpath
40])
diff --git a/scilab/modules/Makefile.in b/scilab/modules/Makefile.in
index 3ac90b9..31f0756 100644
--- a/scilab/modules/Makefile.in
+++ b/scilab/modules/Makefile.in
@@ -70,7 +70,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
70am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 70am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
71 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 71 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
72 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 72 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
73 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ 73 $(top_srcdir)/m4/intel_compiler.m4 \
74 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
74 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \ 75 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
75 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \ 76 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
76 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 77 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
diff --git a/scilab/modules/action_binding/Makefile.in b/scilab/modules/action_binding/Makefile.in
index 1d464a1..f493c98 100644
--- a/scilab/modules/action_binding/Makefile.in
+++ b/scilab/modules/action_binding/Makefile.in
@@ -69,7 +69,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
69am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 69am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
70 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 70 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
71 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 71 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
72 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ 72 $(top_srcdir)/m4/intel_compiler.m4 \
73 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
73 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \ 74 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
74 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \ 75 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
75 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 76 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
diff --git a/scilab/modules/api_scilab/Makefile.in b/scilab/modules/api_scilab/Makefile.in
index 54107cb..f6ef894 100644
--- a/scilab/modules/api_scilab/Makefile.in
+++ b/scilab/modules/api_scilab/Makefile.in
@@ -68,7 +68,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
68am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 68am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
69 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 69 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
70 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 70 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
71 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ 71 $(top_srcdir)/m4/intel_compiler.m4 \
72 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
72 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \ 73 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
73 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \ 74 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
74 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 75 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
diff --git a/scilab/modules/arnoldi/Makefile.in b/scilab/modules/arnoldi/Makefile.in
index f2b39ed..f793b69 100644
--- a/scilab/modules/arnoldi/Makefile.in
+++ b/scilab/modules/arnoldi/Makefile.in
@@ -64,7 +64,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
64am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 64am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
65 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 65 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
66 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 66 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
67 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ 67 $(top_srcdir)/m4/intel_compiler.m4 \
68 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
68 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \ 69 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
69 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \ 70 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
70 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 71 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
diff --git a/scilab/modules/atoms/Makefile.in b/scilab/modules/atoms/Makefile.in
index 0e821ce..6455fc1 100644
--- a/scilab/modules/atoms/Makefile.in
+++ b/scilab/modules/atoms/Makefile.in
@@ -67,7 +67,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
67am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 67am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
68 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 68 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
69 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 69 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
70 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ 70 $(top_srcdir)/m4/intel_compiler.m4 \
71 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
71 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \ 72 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
72 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \ 73 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
73 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 74 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
diff --git a/scilab/modules/boolean/Makefile.in b/scilab/modules/boolean/Makefile.in
index 10d27d0..f347d2a 100644
--- a/scilab/modules/boolean/Makefile.in
+++ b/scilab/modules/boolean/Makefile.in
@@ -64,7 +64,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
64am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 64am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
65 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 65 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
66 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 66 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
67 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ 67 $(top_srcdir)/m4/intel_compiler.m4 \
68 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
68 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \ 69 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
69 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \ 70 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
70 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 71 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
diff --git a/scilab/modules/cacsd/Makefile.in b/scilab/modules/cacsd/Makefile.in
index 40c1203..5528554 100644
--- a/scilab/modules/cacsd/Makefile.in
+++ b/scilab/modules/cacsd/Makefile.in
@@ -64,7 +64,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
64am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 64am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
65 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 65 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
66 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 66 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
67 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ 67 $(top_srcdir)/m4/intel_compiler.m4 \
68 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
68 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \ 69 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
69 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \ 70 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
70 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 71 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
diff --git a/scilab/modules/call_scilab/Makefile.in b/scilab/modules/call_scilab/Makefile.in
index fdc1267..f33c23b 100644
--- a/scilab/modules/call_scilab/Makefile.in
+++ b/scilab/modules/call_scilab/Makefile.in
@@ -66,7 +66,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
66am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 66am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
67 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 67 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
68 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 68 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
69 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ 69 $(top_srcdir)/m4/intel_compiler.m4 \
70 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
70 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \ 71 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
71 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \ 72 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
72 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 73 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
diff --git a/scilab/modules/compatibility_functions/Makefile.in b/scilab/modules/compatibility_functions/Makefile.in
index 8e737f6..bb2862a 100644
--- a/scilab/modules/compatibility_functions/Makefile.in
+++ b/scilab/modules/compatibility_functions/Makefile.in
@@ -64,7 +64,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
64am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 64am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
65 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 65 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
66 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 66 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
67 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ 67 $(top_srcdir)/m4/intel_compiler.m4 \
68 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
68 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \ 69 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
69 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \ 70 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
70 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 71 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
diff --git a/scilab/modules/completion/Makefile.in b/scilab/modules/completion/Makefile.in
index 8dd3a10..4db1e61 100644
--- a/scilab/modules/completion/Makefile.in
+++ b/scilab/modules/completion/Makefile.in
@@ -70,7 +70,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
70am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 70am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
71 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 71 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
72 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 72 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
73 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ 73 $(top_srcdir)/m4/intel_compiler.m4 \
74 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
74 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \ 75 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
75 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \ 76 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
76 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 77 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
diff --git a/scilab/modules/console/Makefile.in b/scilab/modules/console/Makefile.in
index 66e005f..2d203f4 100644
--- a/scilab/modules/console/Makefile.in
+++ b/scilab/modules/console/Makefile.in
@@ -76,7 +76,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
76am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 76am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
77 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 77 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
78 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 78 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
79 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ 79 $(top_srcdir)/m4/intel_compiler.m4 \
80 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
80 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \ 81 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
81 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \ 82 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
82 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 83 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
diff --git a/scilab/modules/core/Makefile.in b/scilab/modules/core/Makefile.in
index 53a7c37..f18d470 100644
--- a/scilab/modules/core/Makefile.in
+++ b/scilab/modules/core/Makefile.in
@@ -76,7 +76,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
76am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 76am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
77 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 77 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
78 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 78 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
79 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ 79 $(top_srcdir)/m4/intel_compiler.m4 \
80 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
80 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \ 81 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
81 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \ 82 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
82 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 83 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
diff --git a/scilab/modules/core/src/c/getmemory.c b/scilab/modules/core/src/c/getmemory.c
index a2bc6d0..5218726 100644
--- a/scilab/modules/core/src/c/getmemory.c
+++ b/scilab/modules/core/src/c/getmemory.c
@@ -18,6 +18,7 @@
18@sa http://netbsd.gw.com/cgi-bin/man-cgi?sysctl+3+NetBSD-4.0 18@sa http://netbsd.gw.com/cgi-bin/man-cgi?sysctl+3+NetBSD-4.0
19@sa http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/math/scilab/patches/patch-aj?annotate=1.9 19@sa http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/math/scilab/patches/patch-aj?annotate=1.9
20*/ 20*/
21#define _GNU_SOURCE
21#include "getmemory.h" 22#include "getmemory.h"
22 23
23#if defined(__NetBSD__) || defined(__DragonFly__) 24#if defined(__NetBSD__) || defined(__DragonFly__)
diff --git a/scilab/modules/data_structures/Makefile.in b/scilab/modules/data_structures/Makefile.in
index 8781385..db730ff 100644
--- a/scilab/modules/data_structures/Makefile.in
+++ b/scilab/modules/data_structures/Makefile.in
@@ -64,7 +64,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
64am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 64am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
65 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 65 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
66 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 66 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
67 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ 67 $(top_srcdir)/m4/intel_compiler.m4 \
68 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
68 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \ 69 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
69 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \ 70 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
70 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 71 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
diff --git a/scilab/modules/demo_tools/Makefile.in b/scilab/modules/demo_tools/Makefile.in
index 409dee2..9d93e6a 100644
--- a/scilab/modules/demo_tools/Makefile.in
+++ b/scilab/modules/demo_tools/Makefile.in
@@ -63,7 +63,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
63am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 63am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
64 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 64 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
65 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 65 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
66 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ 66 $(top_srcdir)/m4/intel_compiler.m4 \
67 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
67 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \ 68 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
68 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \ 69 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
69 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 70 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
diff --git a/scilab/modules/development_tools/Makefile.in b/scilab/modules/development_tools/Makefile.in
index c8b7f44..eb7a9b5 100644
--- a/scilab/modules/development_tools/Makefile.in
+++ b/scilab/modules/development_tools/Makefile.in
@@ -63,7 +63,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
63am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 63am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
64 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 64 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
65 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 65 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
66 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ 66 $(top_srcdir)/m4/intel_compiler.m4 \
67 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
67 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \ 68 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
68 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \ 69 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
69 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 70 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
diff --git a/scilab/modules/development_tools/src/fake/Makefile.in b/scilab/modules/development_tools/src/fake/Makefile.in
index 75663cb..a7ebd30 100644
--- a/scilab/modules/development_tools/src/fake/Makefile.in
+++ b/scilab/modules/development_tools/src/fake/Makefile.in
@@ -39,7 +39,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
39am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 39am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
40 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 40 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
41 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 41 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
42 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ 42 $(top_srcdir)/m4/intel_compiler.m4 \
43 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
43 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \ 44 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
44 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \ 45 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
45 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 46 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
diff --git a/scilab/modules/differential_equations/Makefile.in b/scilab/modules/differential_equations/Makefile.in
index 54b8602..7f30a03 100644
--- a/scilab/modules/differential_equations/Makefile.in
+++ b/scilab/modules/differential_equations/Makefile.in
@@ -64,7 +64,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
64am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 64am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
65 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 65 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
66 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 66 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
67 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ 67 $(top_srcdir)/m4/intel_compiler.m4 \
68 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
68 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \ 69 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
69 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \ 70 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
70 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 71 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
diff --git a/scilab/modules/double/Makefile.in b/scilab/modules/double/Makefile.in
index b02feb9..78375f6 100644
--- a/scilab/modules/double/Makefile.in
+++ b/scilab/modules/double/Makefile.in
@@ -64,7 +64,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
64am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 64am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
65 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 65 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
66 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 66 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
67 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ 67 $(top_srcdir)/m4/intel_compiler.m4 \
68 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
68 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \ 69 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
69 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \ 70 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
70 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 71 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
diff --git a/scilab/modules/dynamic_link/Makefile.in b/scilab/modules/dynamic_link/Makefile.in
index 0731ad9..2fa5936 100644
--- a/scilab/modules/dynamic_link/Makefile.in
+++ b/scilab/modules/dynamic_link/Makefile.in
@@ -65,7 +65,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
65am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 65am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
66 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 66 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
67 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 67 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
68 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ 68 $(top_srcdir)/m4/intel_compiler.m4 \
69 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
69 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \ 70 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
70 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \ 71 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
71 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 72 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
diff --git a/scilab/modules/elementary_functions/Makefile.in b/scilab/modules/elementary_functions/Makefile.in
index cd6f69d..0b8ebaa 100644
--- a/scilab/modules/elementary_functions/Makefile.in
+++ b/scilab/modules/elementary_functions/Makefile.in
@@ -64,7 +64,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
64am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 64am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
65 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 65 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
66 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 66 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
67 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ 67 $(top_srcdir)/m4/intel_compiler.m4 \
68 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
68 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \ 69 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
69 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \ 70 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
70 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 71 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
diff --git a/scilab/modules/fftw/Makefile.in b/scilab/modules/fftw/Makefile.in
index 3410add..ccc1aba 100644
--- a/scilab/modules/fftw/Makefile.in
+++ b/scilab/modules/fftw/Makefile.in
@@ -69,7 +69,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
69am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 69am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
70 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 70 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
71 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 71 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
72 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ 72 $(top_srcdir)/m4/intel_compiler.m4 \
73 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
73 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \ 74 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
74 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \ 75 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
75 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 76 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
diff --git a/scilab/modules/fileio/Makefile.in b/scilab/modules/fileio/Makefile.in
index bd13d83..d2c4abb 100644
--- a/scilab/modules/fileio/Makefile.in
+++ b/scilab/modules/fileio/Makefile.in
@@ -64,7 +64,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
64am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 64am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
65 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 65 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
66 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 66 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
67 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ 67 $(top_srcdir)/m4/intel_compiler.m4 \
68 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
68 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \ 69 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
69 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \ 70 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
70 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 71 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
diff --git a/scilab/modules/functions/Makefile.in b/scilab/modules/functions/Makefile.in
index 2951db5..16c74b3 100644
--- a/scilab/modules/functions/Makefile.in
+++ b/scilab/modules/functions/Makefile.in
@@ -64,7 +64,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
64am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 64am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
65 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 65 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
66 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 66 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
67 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ 67 $(top_srcdir)/m4/intel_compiler.m4 \
68 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
68 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \ 69 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
69 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \ 70 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
70 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 71 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
diff --git a/scilab/modules/genetic_algorithms/Makefile.in b/scilab/modules/genetic_algorithms/Makefile.in
index e658831..1072992 100644
--- a/scilab/modules/genetic_algorithms/Makefile.in
+++ b/scilab/modules/genetic_algorithms/Makefile.in
@@ -67,7 +67,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
67am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 67am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
68 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 68 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
69 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 69 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
70 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ 70 $(top_srcdir)/m4/intel_compiler.m4 \
71 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
71 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \ 72 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
72 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \ 73 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
73 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 74 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
diff --git a/scilab/modules/graphic_export/Makefile.in b/scilab/modules/graphic_export/Makefile.in
index 58a227b..a159114 100644
--- a/scilab/modules/graphic_export/Makefile.in
+++ b/scilab/modules/graphic_export/Makefile.in
@@ -72,7 +72,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
72am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 72am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
73 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 73 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
74 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 74 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
75 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ 75 $(top_srcdir)/m4/intel_compiler.m4 \
76 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
76 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \ 77 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
77 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \ 78 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
78 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 79 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
diff --git a/scilab/modules/graphics/Makefile.in b/scilab/modules/graphics/Makefile.in
index b367b97..33e31fb 100644
--- a/scilab/modules/graphics/Makefile.in
+++ b/scilab/modules/graphics/Makefile.in
@@ -72,7 +72,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
72am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 72am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
73 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 73 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
74 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 74 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
75 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ 75 $(top_srcdir)/m4/intel_compiler.m4 \
76 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
76 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \ 77 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
77 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \ 78 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
78 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 79 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
diff --git a/scilab/modules/gui/Makefile.in b/scilab/modules/gui/Makefile.in
index 4dd8075..febecbe 100644
--- a/scilab/modules/gui/Makefile.in
+++ b/scilab/modules/gui/Makefile.in
@@ -74,7 +74,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
74am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 74am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
75 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 75 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
76 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 76 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
77 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ 77 $(top_srcdir)/m4/intel_compiler.m4 \
78 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
78 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \ 79 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
79 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \ 80 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
80 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 81 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
diff --git a/scilab/modules/hdf5/Makefile.in b/scilab/modules/hdf5/Makefile.in
index 6a4a3c7..bd4071a 100644
--- a/scilab/modules/hdf5/Makefile.in
+++ b/scilab/modules/hdf5/Makefile.in
@@ -72,7 +72,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
72am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 72am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
73 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 73 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
74 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 74 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
75 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ 75 $(top_srcdir)/m4/intel_compiler.m4 \
76 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
76 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \ 77 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
77 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \ 78 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
78 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 79 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
@@ -323,6 +324,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
323PACKAGE_NAME = @PACKAGE_NAME@ 324PACKAGE_NAME = @PACKAGE_NAME@
324PACKAGE_STRING = @PACKAGE_STRING@ 325PACKAGE_STRING = @PACKAGE_STRING@
325PACKAGE_TARNAME = @PACKAGE_TARNAME@ 326PACKAGE_TARNAME = @PACKAGE_TARNAME@
327PACKAGE_URL = @PACKAGE_URL@
326PACKAGE_VERSION = @PACKAGE_VERSION@ 328PACKAGE_VERSION = @PACKAGE_VERSION@
327PATH_SEPARATOR = @PATH_SEPARATOR@ 329PATH_SEPARATOR = @PATH_SEPARATOR@
328PCRE_CFLAGS = @PCRE_CFLAGS@ 330PCRE_CFLAGS = @PCRE_CFLAGS@
diff --git a/scilab/modules/helptools/Makefile.in b/scilab/modules/helptools/Makefile.in
index a9781af..a7cc5b3 100644
--- a/scilab/modules/helptools/Makefile.in
+++ b/scilab/modules/helptools/Makefile.in
@@ -64,7 +64,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
64am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 64am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
65 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 65 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
66 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 66 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
67 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ 67 $(top_srcdir)/m4/intel_compiler.m4 \
68 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
68 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \ 69 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
69 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \ 70 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
70 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 71 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
diff --git a/scilab/modules/history_manager/Makefile.in b/scilab/modules/history_manager/Makefile.in
index 2ecef1e..6967183 100644
--- a/scilab/modules/history_manager/Makefile.in
+++ b/scilab/modules/history_manager/Makefile.in
@@ -69,7 +69,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
69am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 69am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
70 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 70 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
71 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 71 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
72 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ 72 $(top_srcdir)/m4/intel_compiler.m4 \
73 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
73 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \ 74 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
74 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \ 75 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
75 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 76 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
diff --git a/scilab/modules/integer/Makefile.in b/scilab/modules/integer/Makefile.in
index 202c2fd..2339d61 100644
--- a/scilab/modules/integer/Makefile.in
+++ b/scilab/modules/integer/Makefile.in
@@ -64,7 +64,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
64am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 64am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
65 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 65 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
66 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 66 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
67 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ 67 $(top_srcdir)/m4/intel_compiler.m4 \
68 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
68 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \ 69 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
69 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \ 70 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
70 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 71 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
diff --git a/scilab/modules/interpolation/Makefile.in b/scilab/modules/interpolation/Makefile.in
index fc0b21e..2f99e58 100644
--- a/scilab/modules/interpolation/Makefile.in
+++ b/scilab/modules/interpolation/Makefile.in
@@ -68,7 +68,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
68am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 68am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
69 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 69 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
70 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 70 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
71 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ 71 $(top_srcdir)/m4/intel_compiler.m4 \
72 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
72 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \ 73 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
73 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \ 74 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
74 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 75 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
diff --git a/scilab/modules/intersci/Makefile.in b/scilab/modules/intersci/Makefile.in
index 525f4f7..628d3d5 100644
--- a/scilab/modules/intersci/Makefile.in
+++ b/scilab/modules/intersci/Makefile.in
@@ -66,7 +66,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
66am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 66am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
67 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 67 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
68 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 68 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
69 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ 69 $(top_srcdir)/m4/intel_compiler.m4 \
70 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
70 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \ 71 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
71 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \ 72 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
72 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 73 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
diff --git a/scilab/modules/io/Makefile.in b/scilab/modules/io/Makefile.in
index 2a6690d..f61578d 100644
--- a/scilab/modules/io/Makefile.in
+++ b/scilab/modules/io/Makefile.in
@@ -64,7 +64,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
64am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 64am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
65 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 65 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
66 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 66 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
67 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ 67 $(top_srcdir)/m4/intel_compiler.m4 \
68 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
68 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \ 69 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
69 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \ 70 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
70 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 71 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
diff --git a/scilab/modules/javasci/Makefile.in b/scilab/modules/javasci/Makefile.in
index 3b4b1e9..ec1655a 100644
--- a/scilab/modules/javasci/Makefile.in
+++ b/scilab/modules/javasci/Makefile.in
@@ -71,7 +71,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
71am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 71am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
72 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 72 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
73 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 73 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
74 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ 74 $(top_srcdir)/m4/intel_compiler.m4 \
75 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
75 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \ 76 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
76 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \ 77 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
77 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 78 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
diff --git a/scilab/modules/jvm/Makefile.in b/scilab/modules/jvm/Makefile.in
index e73ecd8..a9f3b51 100644
--- a/scilab/modules/jvm/Makefile.in
+++ b/scilab/modules/jvm/Makefile.in
@@ -74,7 +74,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
74am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 74am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
75 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 75 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
76 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 76 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
77 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ 77 $(top_srcdir)/m4/intel_compiler.m4 \
78 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
78 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \ 79 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
79 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \ 80 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
80 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 81 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
diff --git a/scilab/modules/linear_algebra/Makefile.in b/scilab/modules/linear_algebra/Makefile.in
index a75fc9f..bf02621 100644
--- a/scilab/modules/linear_algebra/Makefile.in
+++ b/scilab/modules/linear_algebra/Makefile.in
@@ -64,7 +64,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
64am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 64am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
65 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 65 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
66 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 66 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
67 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ 67 $(top_srcdir)/m4/intel_compiler.m4 \
68 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
68 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \ 69 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
69 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \ 70 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
70 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 71 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
diff --git a/scilab/modules/localization/Makefile.in b/scilab/modules/localization/Makefile.in
index f32cf04..1e9da14 100644
--- a/scilab/modules/localization/Makefile.in
+++ b/scilab/modules/localization/Makefile.in
@@ -74,7 +74,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
74am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 74am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
75 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 75 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
76 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 76 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
77 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ 77 $(top_srcdir)/m4/intel_compiler.m4 \
78 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
78 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \ 79 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
79 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \ 80 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
80 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 81 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
diff --git a/scilab/modules/m2sci/Makefile.in b/scilab/modules/m2sci/Makefile.in
index 08948e9..5e62814 100644
--- a/scilab/modules/m2sci/Makefile.in
+++ b/scilab/modules/m2sci/Makefile.in
@@ -63,7 +63,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
63am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 63am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
64 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 64 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
65 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 65 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
66 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ 66 $(top_srcdir)/m4/intel_compiler.m4 \
67 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
67 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \ 68 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
68 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \ 69 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
69 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 70 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
diff --git a/scilab/modules/maple2scilab/Makefile.in b/scilab/modules/maple2scilab/Makefile.in
index 81aeb4c..c3147cd 100644
--- a/scilab/modules/maple2scilab/Makefile.in
+++ b/scilab/modules/maple2scilab/Makefile.in
@@ -63,7 +63,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
63am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 63am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
64 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 64 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
65 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 65 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
66 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ 66 $(top_srcdir)/m4/intel_compiler.m4 \
67 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
67 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \ 68 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
68 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \ 69 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
69 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 70 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
diff --git a/scilab/modules/matio/Makefile.in b/scilab/modules/matio/Makefile.in
index 00f95d9..00fc52d 100644
--- a/scilab/modules/matio/Makefile.in
+++ b/scilab/modules/matio/Makefile.in
@@ -65,7 +65,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
65am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 65am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
66 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 66 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
67 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 67 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
68 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ 68 $(top_srcdir)/m4/intel_compiler.m4 \
69 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
69 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \ 70 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
70 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \ 71 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
71 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 72 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
diff --git a/scilab/modules/mexlib/Makefile.in b/scilab/modules/mexlib/Makefile.in
index e71cbdc..7714359 100644
--- a/scilab/modules/mexlib/Makefile.in
+++ b/scilab/modules/mexlib/Makefile.in
@@ -65,7 +65,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
65am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 65am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
66 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 66 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
67 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 67 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
68 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ 68 $(top_srcdir)/m4/intel_compiler.m4 \
69 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
69 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \ 70 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
70 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \ 71 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
71 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 72 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
diff --git a/scilab/modules/optimization/Makefile.in b/scilab/modules/optimization/Makefile.in
index 9338d2b..a29093c 100644
--- a/scilab/modules/optimization/Makefile.in
+++ b/scilab/modules/optimization/Makefile.in
@@ -64,7 +64,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
64am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 64am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
65 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 65 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
66 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 66 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
67 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ 67 $(top_srcdir)/m4/intel_compiler.m4 \
68 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
68 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \ 69 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
69 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \ 70 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
70 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 71 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
diff --git a/scilab/modules/output_stream/Makefile.in b/scilab/modules/output_stream/Makefile.in
index 8508116..664732a 100644
--- a/scilab/modules/output_stream/Makefile.in
+++ b/scilab/modules/output_stream/Makefile.in
@@ -61,7 +61,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
61am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 61am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
62 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 62 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
63 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 63 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
64 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ 64 $(top_srcdir)/m4/intel_compiler.m4 \
65 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
65 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \ 66 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
66 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \ 67 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
67 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 68 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
diff --git a/scilab/modules/overloading/Makefile.in b/scilab/modules/overloading/Makefile.in
index a61aacd..186cddb 100644
--- a/scilab/modules/overloading/Makefile.in
+++ b/scilab/modules/overloading/Makefile.in
@@ -63,7 +63,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
63am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 63am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
64 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 64 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
65 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 65 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
66 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ 66 $(top_srcdir)/m4/intel_compiler.m4 \
67 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
67 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \ 68 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
68 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \ 69 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
69 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 70 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
diff --git a/scilab/modules/parameters/Makefile.in b/scilab/modules/parameters/Makefile.in
index be0d7c0..3115db2 100644
--- a/scilab/modules/parameters/Makefile.in
+++ b/scilab/modules/parameters/Makefile.in
@@ -67,7 +67,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
67am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 67am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
68 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 68 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
69 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 69 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
70 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ 70 $(top_srcdir)/m4/intel_compiler.m4 \
71 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
71 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \ 72 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
72 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \ 73 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
73 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 74 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
diff --git a/scilab/modules/polynomials/Makefile.in b/scilab/modules/polynomials/Makefile.in
index 449b45b..c4ff0a8 100644
--- a/scilab/modules/polynomials/Makefile.in
+++ b/scilab/modules/polynomials/Makefile.in
@@ -64,7 +64,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
64am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 64am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
65 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 65 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
66 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 66 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
67 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ 67 $(top_srcdir)/m4/intel_compiler.m4 \
68 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
68 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \ 69 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
69 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \ 70 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
70 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 71 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
diff --git a/scilab/modules/pvm/Makefile.in b/scilab/modules/pvm/Makefile.in
index 8c92ad6..4eb7dd7 100644
--- a/scilab/modules/pvm/Makefile.in
+++ b/scilab/modules/pvm/Makefile.in
@@ -81,7 +81,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
81am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 81am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
82 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 82 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
83 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 83 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
84 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ 84 $(top_srcdir)/m4/intel_compiler.m4 \
85 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
85 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \ 86 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
86 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \ 87 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
87 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 88 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
diff --git a/scilab/modules/randlib/Makefile.in b/scilab/modules/randlib/Makefile.in
index e1e5a45..d8fe77b 100644
--- a/scilab/modules/randlib/Makefile.in
+++ b/scilab/modules/randlib/Makefile.in
@@ -64,7 +64,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
64am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 64am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
65 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 65 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
66 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 66 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
67 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ 67 $(top_srcdir)/m4/intel_compiler.m4 \
68 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
68 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \ 69 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
69 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \ 70 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
70 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 71 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
diff --git a/scilab/modules/renderer/Makefile.in b/scilab/modules/renderer/Makefile.in
index c84fd8e..bd2cb56 100644
--- a/scilab/modules/renderer/Makefile.in
+++ b/scilab/modules/renderer/Makefile.in
@@ -72,7 +72,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
72am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 72am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
73 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 73 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
74 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 74 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
75 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ 75 $(top_srcdir)/m4/intel_compiler.m4 \
76 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
76 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \ 77 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
77 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \ 78 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
78 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 79 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
diff --git a/scilab/modules/scicos/Makefile.in b/scilab/modules/scicos/Makefile.in
index 43a2fbf..388b389 100644
--- a/scilab/modules/scicos/Makefile.in
+++ b/scilab/modules/scicos/Makefile.in
@@ -75,7 +75,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
75am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 75am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
76 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 76 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
77 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 77 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
78 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ 78 $(top_srcdir)/m4/intel_compiler.m4 \
79 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
79 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \ 80 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
80 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \ 81 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
81 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 82 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
diff --git a/scilab/modules/scicos_blocks/Makefile.in b/scilab/modules/scicos_blocks/Makefile.in
index 6536e14..fee352a 100644
--- a/scilab/modules/scicos_blocks/Makefile.in
+++ b/scilab/modules/scicos_blocks/Makefile.in
@@ -70,7 +70,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
70am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 70am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
71 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 71 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
72 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 72 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
73 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ 73 $(top_srcdir)/m4/intel_compiler.m4 \
74 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
74 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \ 75 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
75 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \ 76 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
76 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 77 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
diff --git a/scilab/modules/shell/Makefile.in b/scilab/modules/shell/Makefile.in
index b952ab8..7d3300d 100644
--- a/scilab/modules/shell/Makefile.in
+++ b/scilab/modules/shell/Makefile.in
@@ -68,7 +68,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
68am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 68am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
69 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 69 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
70 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 70 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
71 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ 71 $(top_srcdir)/m4/intel_compiler.m4 \
72 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
72 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \ 73 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
73 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \ 74 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
74 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 75 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
diff --git a/scilab/modules/signal_processing/Makefile.in b/scilab/modules/signal_processing/Makefile.in
index ec7afa6..74f762c 100644
--- a/scilab/modules/signal_processing/Makefile.in
+++ b/scilab/modules/signal_processing/Makefile.in
@@ -64,7 +64,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
64am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 64am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
65 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 65 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
66 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 66 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
67 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ 67 $(top_srcdir)/m4/intel_compiler.m4 \
68 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
68 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \ 69 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
69 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \ 70 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
70 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 71 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
diff --git a/scilab/modules/simulated_annealing/Makefile.in b/scilab/modules/simulated_annealing/Makefile.in
index ed85ebf..3911ac1 100644
--- a/scilab/modules/simulated_annealing/Makefile.in
+++ b/scilab/modules/simulated_annealing/Makefile.in
@@ -67,7 +67,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
67am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 67am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
68 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 68 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
69 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 69 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
70 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ 70 $(top_srcdir)/m4/intel_compiler.m4 \
71 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
71 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \ 72 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
72 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \ 73 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
73 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 74 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
diff --git a/scilab/modules/sound/Makefile.in b/scilab/modules/sound/Makefile.in
index b479a47..531ee33 100644
--- a/scilab/modules/sound/Makefile.in
+++ b/scilab/modules/sound/Makefile.in
@@ -64,7 +64,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
64am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 64am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
65 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 65 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
66 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 66 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
67 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ 67 $(top_srcdir)/m4/intel_compiler.m4 \
68 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
68 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \ 69 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
69 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \ 70 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
70 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 71 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
diff --git a/scilab/modules/sparse/Makefile.in b/scilab/modules/sparse/Makefile.in
index 1dac0f3..5a6e5b6 100644
--- a/scilab/modules/sparse/Makefile.in
+++ b/scilab/modules/sparse/Makefile.in
@@ -64,7 +64,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
64am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 64am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
65 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 65 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
66 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 66 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
67 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ 67 $(top_srcdir)/m4/intel_compiler.m4 \
68 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
68 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \ 69 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
69 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \ 70 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
70 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 71 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
diff --git a/scilab/modules/special_functions/Makefile.in b/scilab/modules/special_functions/Makefile.in
index 309ec1e..ed3c67b 100644
--- a/scilab/modules/special_functions/Makefile.in
+++ b/scilab/modules/special_functions/Makefile.in
@@ -64,7 +64,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
64am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 64am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
65 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 65 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
66 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 66 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
67 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ 67 $(top_srcdir)/m4/intel_compiler.m4 \
68 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
68 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \ 69 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
69 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \ 70 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
70 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 71 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
diff --git a/scilab/modules/spreadsheet/Makefile.in b/scilab/modules/spreadsheet/Makefile.in
index c64cef3..4bf7273 100644
--- a/scilab/modules/spreadsheet/Makefile.in
+++ b/scilab/modules/spreadsheet/Makefile.in
@@ -64,7 +64,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
64am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 64am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
65 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 65 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
66 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 66 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
67 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ 67 $(top_srcdir)/m4/intel_compiler.m4 \
68 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
68 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \ 69 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
69 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \ 70 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
70 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 71 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
diff --git a/scilab/modules/statistics/Makefile.in b/scilab/modules/statistics/Makefile.in
index 8ce5754..b86dc40 100644
--- a/scilab/modules/statistics/Makefile.in
+++ b/scilab/modules/statistics/Makefile.in
@@ -64,7 +64,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
64am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 64am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
65 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 65 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
66 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 66 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
67 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ 67 $(top_srcdir)/m4/intel_compiler.m4 \
68 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
68 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \ 69 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
69 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \ 70 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
70 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 71 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
diff --git a/scilab/modules/string/Makefile.in b/scilab/modules/string/Makefile.in
index 0f73346..58aa68b 100644
--- a/scilab/modules/string/Makefile.in
+++ b/scilab/modules/string/Makefile.in
@@ -64,7 +64,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
64am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 64am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
65 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 65 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
66 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 66 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
67 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ 67 $(top_srcdir)/m4/intel_compiler.m4 \
68 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
68 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \ 69 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
69 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \ 70 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
70 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 71 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
diff --git a/scilab/modules/symbolic/Makefile.in b/scilab/modules/symbolic/Makefile.in
index 1306397..80f0dab 100644
--- a/scilab/modules/symbolic/Makefile.in
+++ b/scilab/modules/symbolic/Makefile.in
@@ -68,7 +68,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
68am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 68am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
69 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 69 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
70 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 70 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
71 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ 71 $(top_srcdir)/m4/intel_compiler.m4 \
72 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
72 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \ 73 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
73 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \ 74 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
74 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 75 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
diff --git a/scilab/modules/tclsci/Makefile.in b/scilab/modules/tclsci/Makefile.in
index 24f1f7f..017951f 100644
--- a/scilab/modules/tclsci/Makefile.in
+++ b/scilab/modules/tclsci/Makefile.in
@@ -64,7 +64,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
64am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 64am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
65 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 65 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
66 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 66 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
67 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ 67 $(top_srcdir)/m4/intel_compiler.m4 \
68 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
68 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \ 69 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
69 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \ 70 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
70 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 71 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
diff --git a/scilab/modules/texmacs/Makefile.in b/scilab/modules/texmacs/Makefile.in
index bcdf8f9..eab7613 100644
--- a/scilab/modules/texmacs/Makefile.in
+++ b/scilab/modules/texmacs/Makefile.in
@@ -63,7 +63,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
63am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 63am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
64 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 64 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
65 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 65 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
66 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ 66 $(top_srcdir)/m4/intel_compiler.m4 \
67 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
67 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \ 68 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
68 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \ 69 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
69 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 70 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
diff --git a/scilab/modules/time/Makefile.in b/scilab/modules/time/Makefile.in
index ba97193..b8152a1 100644
--- a/scilab/modules/time/Makefile.in
+++ b/scilab/modules/time/Makefile.in
@@ -65,7 +65,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
65am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 65am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
66 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 66 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
67 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 67 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
68 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ 68 $(top_srcdir)/m4/intel_compiler.m4 \
69 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
69 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \ 70 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
70 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \ 71 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
71 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 72 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
diff --git a/scilab/modules/umfpack/Makefile.in b/scilab/modules/umfpack/Makefile.in
index 5e4a06d..7249f0a 100644
--- a/scilab/modules/umfpack/Makefile.in
+++ b/scilab/modules/umfpack/Makefile.in
@@ -70,7 +70,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
70am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 70am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
71 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 71 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
72 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 72 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
73 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ 73 $(top_srcdir)/m4/intel_compiler.m4 \
74 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
74 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \ 75 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
75 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \ 76 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
76 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 77 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
diff --git a/scilab/modules/windows_tools/Makefile.in b/scilab/modules/windows_tools/Makefile.in
index 76648fd..f17e549 100644
--- a/scilab/modules/windows_tools/Makefile.in
+++ b/scilab/modules/windows_tools/Makefile.in
@@ -64,7 +64,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
64am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 64am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
65 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 65 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
66 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 66 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
67 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ 67 $(top_srcdir)/m4/intel_compiler.m4 \
68 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
68 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \ 69 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
69 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \ 70 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
70 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 71 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
diff --git a/scilab/modules/xcos/Makefile.in b/scilab/modules/xcos/Makefile.in
index 33106ca..aadec74 100644
--- a/scilab/modules/xcos/Makefile.in
+++ b/scilab/modules/xcos/Makefile.in
@@ -71,7 +71,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
71am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 71am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
72 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 72 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
73 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 73 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
74 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ 74 $(top_srcdir)/m4/intel_compiler.m4 \
75 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
75 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \ 76 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
76 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \ 77 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
77 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 78 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/graph/ScilabGraph.java b/scilab/modules/xcos/src/java/org/scilab/modules/graph/ScilabGraph.java
index 5d8023d..167f8a8 100644
--- a/scilab/modules/xcos/src/java/org/scilab/modules/graph/ScilabGraph.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/graph/ScilabGraph.java
@@ -74,7 +74,7 @@ public class ScilabGraph extends mxGraph {
74 74
75 if (!redoInAction) { 75 if (!redoInAction) {
76 undoManager.undoableEditHappened((mxUndoableEdit) evt 76 undoManager.undoableEditHappened((mxUndoableEdit) evt
77 .getArgAt(0)); 77 .getProperty("edit"));
78 incrementUndoCounter(); 78 incrementUndoCounter();
79 } 79 }
80 } 80 }
@@ -85,8 +85,7 @@ public class ScilabGraph extends mxGraph {
85 */ 85 */
86 private mxIEventListener selectionHandler = new mxIEventListener() { 86 private mxIEventListener selectionHandler = new mxIEventListener() {
87 public void invoke(Object source, mxEventObject evt) { 87 public void invoke(Object source, mxEventObject evt) {
88 List<mxUndoableChange> changes = ((mxUndoableEdit) evt.getArgAt(0)) 88 List<mxUndoableChange> changes = ((mxUndoableEdit) evt.getProperty("edit")).getChanges();
89 .getChanges();
90 setSelectionCells(getSelectionCellsForChanges(changes)); 89 setSelectionCells(getSelectionCellsForChanges(changes));
91 } 90 }
92 }; 91 };
@@ -195,10 +194,13 @@ public class ScilabGraph extends mxGraph {
195 * Redo the last action com.mxgraph.util.mxUndoManager 194 * Redo the last action com.mxgraph.util.mxUndoManager
196 */ 195 */
197 public void redo() { 196 public void redo() {
197 if (!redoInAction) {
198
198 incrementUndoCounter(); 199 incrementUndoCounter();
199 redoInAction = true; 200 redoInAction = true;
200 undoManager.redo(); 201 undoManager.redo();
201 redoInAction = false; 202 redoInAction = false;
203 }
202 } 204 }
203 205
204 /** 206 /**
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/Xcos.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/Xcos.java
index b7968fc..9b543de 100644
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/Xcos.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/Xcos.java
@@ -1,6 +1,7 @@
1/* 1/*
2 * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab 2 * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
3 * Copyright (C) 2009 - DIGITEO - Bruno JOFRET 3 * Copyright (C) 2009 - DIGITEO - Bruno JOFRET
4 * Copyright (C) 2010 - DIGITEO - Clément DAVID
4 * 5 *
5 * This file must be used under the terms of the CeCILL. 6 * This file must be used under the terms of the CeCILL.
6 * This source file is licensed as described in the file COPYING, which 7 * This source file is licensed as described in the file COPYING, which
@@ -31,6 +32,9 @@ import org.scilab.modules.xcos.palette.actions.ViewPaletteBrowserAction;
31import org.scilab.modules.xcos.utils.ConfigXcosManager; 32import org.scilab.modules.xcos.utils.ConfigXcosManager;
32import org.scilab.modules.xcos.utils.XcosInterpreterManagement; 33import org.scilab.modules.xcos.utils.XcosInterpreterManagement;
33 34
35/**
36 * Xcos entry point class
37 */
34public final class Xcos { 38public final class Xcos {
35 39
36 /** 40 /**
@@ -41,9 +45,8 @@ public final class Xcos {
41 45
42 private static Map<String, SuperBlock> openedSuperBlock = new HashMap<String, SuperBlock>(); 46 private static Map<String, SuperBlock> openedSuperBlock = new HashMap<String, SuperBlock>();
43 47
44 /* Static class */ 48 /** This class is a static singleton, thus it must not be instantiated */
45 private Xcos() { 49 private Xcos() { }
46 }
47 50
48 /** Palette creation */ 51 /** Palette creation */
49 static { 52 static {
@@ -52,7 +55,8 @@ public final class Xcos {
52 } 55 }
53 56
54 /** 57 /**
55 * @param args 58 * Debug main function
59 * @param args command line args (Not used)
56 */ 60 */
57 public static void main(String[] args) { 61 public static void main(String[] args) {
58 SwingUtilities.invokeLater(new Runnable() { 62 SwingUtilities.invokeLater(new Runnable() {
@@ -62,6 +66,9 @@ public final class Xcos {
62 }); 66 });
63 } 67 }
64 68
69 /**
70 * Entry point without filename
71 */
65 public static void xcos() { 72 public static void xcos() {
66 SwingUtilities.invokeLater(new Runnable() { 73 SwingUtilities.invokeLater(new Runnable() {
67 public void run() { 74 public void run() {
@@ -72,12 +79,16 @@ public final class Xcos {
72 }); 79 });
73 } 80 }
74 81
82 /**
83 * Entry point with filename
84 * @param fileName The filename
85 */
75 public static void xcos(String fileName) { 86 public static void xcos(String fileName) {
76 final String filename = fileName; 87 final String filename = fileName;
77 SwingUtilities.invokeLater(new Runnable() { 88 SwingUtilities.invokeLater(new Runnable() {
78 public void run() { 89 public void run() {
79 ConfigXcosManager.saveToRecentOpenedFiles(filename); 90 ConfigXcosManager.saveToRecentOpenedFiles(filename);
80 if (XcosTab.focusOnExistingFile(filename) == false) { 91 if (!XcosTab.focusOnExistingFile(filename)) {
81 XcosDiagram diagram = createEmptyDiagram(); 92 XcosDiagram diagram = createEmptyDiagram();
82 diagram.openDiagramFromFile(filename); 93 diagram.openDiagramFromFile(filename);
83 } 94 }
@@ -85,12 +96,20 @@ public final class Xcos {
85 }); 96 });
86 } 97 }
87 98
99 /**
100 * Create a diagram model with a visible window
101 * @return The new empty model
102 */
88 public static XcosDiagram createEmptyDiagram() { 103 public static XcosDiagram createEmptyDiagram() {
89 XcosDiagram xcosDiagramm = createANotShownDiagram(); 104 XcosDiagram xcosDiagramm = createANotShownDiagram();
90 XcosTab.showTabFromDiagram(xcosDiagramm); 105 XcosTab.showTabFromDiagram(xcosDiagramm);
91 return xcosDiagramm; 106 return xcosDiagramm;
92 } 107 }
93 108
109 /**
110 * Create a diagram model
111 * @return The new empty model
112 */
94 public static XcosDiagram createANotShownDiagram() { 113 public static XcosDiagram createANotShownDiagram() {
95 XcosDiagram xcosDiagramm = new XcosDiagram(); 114 XcosDiagram xcosDiagramm = new XcosDiagram();
96 xcosDiagramm.installListeners(); 115 xcosDiagramm.installListeners();
@@ -98,12 +117,19 @@ public final class Xcos {
98 return xcosDiagramm; 117 return xcosDiagramm;
99 } 118 }
100 119
120 /**
121 * Create an xcos fake diagram
122 * @return The diagram model
123 */
101 public static XcosDiagram createHiddenDiagram() { 124 public static XcosDiagram createHiddenDiagram() {
102 XcosDiagram xcosDiagramm = new XcosDiagram(); 125 XcosDiagram xcosDiagramm = new XcosDiagram();
103 xcosDiagramm.installListeners(); 126 xcosDiagramm.installListeners();
104 return xcosDiagramm; 127 return xcosDiagramm;
105 } 128 }
106 129
130 /**
131 * Close the current xcos session
132 */
107 public static void closeSession() { 133 public static void closeSession() {
108 List<XcosDiagram> diagrams = XcosTab.getAllDiagrams(); 134 List<XcosDiagram> diagrams = XcosTab.getAllDiagrams();
109 135
@@ -113,19 +139,26 @@ public final class Xcos {
113 * 139 *
114 * Furthermore the closeDiagram operation modify the diagram list. 140 * Furthermore the closeDiagram operation modify the diagram list.
115 */ 141 */
116 int i = diagrams.size()-1; 142 int i = diagrams.size() - 1;
117 while (i >= 0) { 143 while (i >= 0) {
118 diagrams.get(i).closeDiagram(); 144 diagrams.get(i).closeDiagram();
119 i = diagrams.size()-1; 145 i = diagrams.size() - 1;
120 } 146 }
121 147
122 ViewPaletteBrowserAction.setPalettesVisible(false); 148 ViewPaletteBrowserAction.setPalettesVisible(false);
123 } 149 }
124 150
151 /**
152 * Get the session palette.
153 * @return The Tab palette
154 */
125 public static Tab getPalettes() { 155 public static Tab getPalettes() {
126 return XcosPaletteManager.getPalettes(); 156 return XcosPaletteManager.getPalettes();
127 } 157 }
128 158
159 /**
160 * @return All the opened (hidden or shown) diagrams
161 */
129 public static List<XcosDiagram> getDiagrams() { 162 public static List<XcosDiagram> getDiagrams() {
130 return XcosTab.getAllDiagrams(); 163 return XcosTab.getAllDiagrams();
131 } 164 }
@@ -134,16 +167,16 @@ public final class Xcos {
134 * Look in each diagram to find the block corresponding to the given uid and 167 * Look in each diagram to find the block corresponding to the given uid and
135 * display a warning message. 168 * display a warning message.
136 * 169 *
137 * @param UID 170 * @param uid
138 * - A String as UID. 171 * A String as UID.
139 * @param message 172 * @param message
140 * - The message to display. 173 * The message to display.
141 */ 174 */
142 public static void warnCellByUID(String UID, String message) { 175 public static void warnCellByUID(String uid, String message) {
143 // Try to find a block with given index (UID) 176 // Try to find a block with given index (UID)
144 List<XcosDiagram> allDiagrams = Xcos.getDiagrams(); 177 List<XcosDiagram> allDiagrams = Xcos.getDiagrams();
145 for (int i = 0; i < allDiagrams.size(); ++i) { 178 for (int i = 0; i < allDiagrams.size(); ++i) {
146 allDiagrams.get(i).warnCellByUID(UID, message); 179 allDiagrams.get(i).warnCellByUID(uid, message);
147 } 180 }
148 } 181 }
149 182
@@ -164,6 +197,10 @@ public final class Xcos {
164 197
165 /** 198 /**
166 * This function convert a Xcos diagram to Scilab variable 199 * This function convert a Xcos diagram to Scilab variable
200 * @param xcosFile The xcos diagram file
201 * @param h5File The target file
202 * @param forceOverwrite Does the file will be overwritten ?
203 * @return Not used (compatibility)
167 */ 204 */
168 public static int xcosDiagramToHDF5(String xcosFile, String h5File, 205 public static int xcosDiagramToHDF5(String xcosFile, String h5File,
169 boolean forceOverwrite) { 206 boolean forceOverwrite) {
@@ -172,7 +209,7 @@ public final class Xcos {
172 final boolean overwrite = forceOverwrite; 209 final boolean overwrite = forceOverwrite;
173 210
174 if (temp.exists()) { 211 if (temp.exists()) {
175 if (overwrite == false) { 212 if (!overwrite) {
176 return 1; 213 return 1;
177 } else { 214 } else {
178 temp.delete(); 215 temp.delete();
@@ -196,8 +233,16 @@ public final class Xcos {
196 return 0; 233 return 0;
197 } 234 }
198 235
236 /**
237 * Open a diagram by uid.
238 *
239 * @param uid
240 * UID diagram to open.
241 * @param showed
242 * True if you want the diagram to be shown, false otherwise.
243 */
199 public static void xcosDiagramOpen(String uid, boolean showed) { 244 public static void xcosDiagramOpen(String uid, boolean showed) {
200 final String UID = uid; 245 final String id = uid;
201 final boolean show = showed; 246 final boolean show = showed;
202 247
203 try { 248 try {
@@ -211,19 +256,19 @@ public final class Xcos {
211 continue; 256 continue;
212 } 257 }
213 258
214 block = diagram.getChildById(UID); 259 block = diagram.getChildById(id);
215 if (block != null) { 260 if (block != null) {
216 SuperBlock newSP = (SuperBlock) BlockFactory.createBlock("SUPER_f"); 261 SuperBlock newSP = (SuperBlock) BlockFactory.createBlock("SUPER_f");
217 newSP.setRealParameters(block.getRealParameters()); 262 newSP.setRealParameters(block.getRealParameters());
218 newSP.setParentDiagram(block.getParentDiagram()); 263 newSP.setParentDiagram(block.getParentDiagram());
219 if (show == true) { 264 if (show) {
220 if(newSP.createChildDiagram() == true) { 265 if (newSP.createChildDiagram()) {
221 XcosTab.createTabFromDiagram(newSP.getChild()); 266 XcosTab.createTabFromDiagram(newSP.getChild());
222 XcosTab.showTabFromDiagram(newSP.getChild()); 267 XcosTab.showTabFromDiagram(newSP.getChild());
223 newSP.getChild().setReadOnly(true); 268 newSP.getChild().setReadOnly(true);
224 } 269 }
225 } 270 }
226 openedSuperBlock.put(UID, newSP); 271 openedSuperBlock.put(id, newSP);
227 break; 272 break;
228 } 273 }
229 } 274 }
@@ -236,17 +281,21 @@ public final class Xcos {
236 } 281 }
237 } 282 }
238 283
284 /**
285 * Close a diagram by uid.
286 * @param uid The diagram id
287 */
239 public static void xcosDiagramClose(String uid) { 288 public static void xcosDiagramClose(String uid) {
240 final String UID = uid; 289 final String id = uid;
241 290
242 try { 291 try {
243 SwingUtilities.invokeAndWait(new Runnable() { 292 SwingUtilities.invokeAndWait(new Runnable() {
244 public void run() { 293 public void run() {
245 SuperBlock SP = openedSuperBlock.get(UID); 294 SuperBlock sp = openedSuperBlock.get(id);
246 if (SP != null) { 295 if (sp != null) {
247 openedSuperBlock.remove(UID); 296 openedSuperBlock.remove(id);
248 SP.closeBlockSettings(); 297 sp.closeBlockSettings();
249 SP = null; 298 sp = null;
250 } 299 }
251 } 300 }
252 }); 301 });
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/BasicBlock.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/BasicBlock.java
index 56a7cd6..f0dbf6b 100644
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/BasicBlock.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/BasicBlock.java
@@ -516,7 +516,7 @@ public class BasicBlock extends XcosUIDObject {
516 */ 516 */
517 if (getParentDiagram() instanceof SuperBlockDiagram) { 517 if (getParentDiagram() instanceof SuperBlockDiagram) {
518 SuperBlock parentBlock = ((SuperBlockDiagram) getParentDiagram()).getContainer(); 518 SuperBlock parentBlock = ((SuperBlockDiagram) getParentDiagram()).getContainer();
519 parentBlock.getParentDiagram().fireEvent(XcosEvent.SUPER_BLOCK_UPDATED,new mxEventObject(new Object[] { parentBlock })); 519 parentBlock.getParentDiagram().fireEvent(new mxEventObject(XcosEvent.SUPER_BLOCK_UPDATED, "block", parentBlock));
520 } 520 }
521 521
522 } 522 }
@@ -559,7 +559,7 @@ public class BasicBlock extends XcosUIDObject {
559 // Now read new Block 559 // Now read new Block
560 BasicBlock modifiedBlock = BlockReader.readBlockFromFile(tempInput.getAbsolutePath()); 560 BasicBlock modifiedBlock = BlockReader.readBlockFromFile(tempInput.getAbsolutePath());
561 updateBlockSettings(modifiedBlock); 561 updateBlockSettings(modifiedBlock);
562 getParentDiagram().fireEvent(XcosEvent.ADD_PORTS, new mxEventObject(new Object[] {currentBlock})); 562 getParentDiagram().fireEvent(new mxEventObject(XcosEvent.ADD_PORTS, "block", currentBlock));
563 setLocked(false); 563 setLocked(false);
564 } 564 }
565 }); 565 });
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/SuperBlock.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/SuperBlock.java
index ba87c43..0a677e0 100644
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/SuperBlock.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/SuperBlock.java
@@ -431,8 +431,7 @@ public final class SuperBlock extends BasicBlock {
431 updateExportedExplicitOutputPort(); 431 updateExportedExplicitOutputPort();
432 updateExportedImplicitOutputPort(); 432 updateExportedImplicitOutputPort();
433 updateExportedEventOutputPort(); 433 updateExportedEventOutputPort();
434 getParentDiagram().fireEvent(XcosEvent.SUPER_BLOCK_UPDATED, 434 getParentDiagram().fireEvent(new mxEventObject(XcosEvent.SUPER_BLOCK_UPDATED, "block", this));
435 new mxEventObject(new Object[] { this }));
436 } 435 }
437 436
438 private void updateExportedExplicitInputPort() { 437 private void updateExportedExplicitInputPort() {
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/EventInBlock.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/EventInBlock.java
index 1413fb6..5361279 100644
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/EventInBlock.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/EventInBlock.java
@@ -56,7 +56,7 @@ public final class EventInBlock extends ContextUpdate {
56 double newValue = ((ScilabDouble)getIntegerParameters()).getRealPart()[0][0]; 56 double newValue = ((ScilabDouble)getIntegerParameters()).getRealPart()[0][0];
57 57
58 if(oldValue != newValue){ 58 if(oldValue != newValue){
59 getParentDiagram().fireEvent(XcosEvent.IN_EVENT_VALUE_UPDATED, new mxEventObject(new Object[]{oldValue,newValue})); 59 getParentDiagram().fireEvent(new mxEventObject(XcosEvent.IN_EVENT_VALUE_UPDATED, "old", oldValue, "new", newValue));
60 } 60 }
61 } 61 }
62 62
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/EventOutBlock.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/EventOutBlock.java
index 679eec6..98d3300 100644
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/EventOutBlock.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/EventOutBlock.java
@@ -56,7 +56,7 @@ public final class EventOutBlock extends ContextUpdate {
56 double newValue = ((ScilabDouble)getIntegerParameters()).getRealPart()[0][0]; 56 double newValue = ((ScilabDouble)getIntegerParameters()).getRealPart()[0][0];
57 57
58 if(oldValue != newValue){ 58 if(oldValue != newValue){
59 getParentDiagram().fireEvent(XcosEvent.OUT_EVENT_VALUE_UPDATED, new mxEventObject(new Object[]{oldValue,newValue})); 59 getParentDiagram().fireEvent(new mxEventObject(XcosEvent.OUT_EVENT_VALUE_UPDATED, "old", oldValue, "new", newValue));
60 } 60 }
61 } 61 }
62 62
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/ExplicitInBlock.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/ExplicitInBlock.java
index 28f7190..1992806 100644
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/ExplicitInBlock.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/ExplicitInBlock.java
@@ -55,7 +55,7 @@ public final class ExplicitInBlock extends ContextUpdate {
55 double newValue = ((ScilabDouble)getIntegerParameters()).getRealPart()[0][0]; 55 double newValue = ((ScilabDouble)getIntegerParameters()).getRealPart()[0][0];
56 56
57 if(oldValue != newValue){ 57 if(oldValue != newValue){
58 getParentDiagram().fireEvent(XcosEvent.IN_EXPLICIT_VALUE_UPDATED, new mxEventObject(new Object[]{oldValue,newValue})); 58 getParentDiagram().fireEvent(new mxEventObject(XcosEvent.IN_EXPLICIT_VALUE_UPDATED, "old", oldValue, "new", newValue));
59 } 59 }
60 } 60 }
61 61
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/ExplicitOutBlock.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/ExplicitOutBlock.java
index 6d8525f..9ff6574 100644
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/ExplicitOutBlock.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/ExplicitOutBlock.java
@@ -56,7 +56,7 @@ public final class ExplicitOutBlock extends ContextUpdate {
56 double newValue = ((ScilabDouble)getIntegerParameters()).getRealPart()[0][0]; 56 double newValue = ((ScilabDouble)getIntegerParameters()).getRealPart()[0][0];
57 57
58 if(oldValue != newValue){ 58 if(oldValue != newValue){
59 getParentDiagram().fireEvent(XcosEvent.OUT_EXPLICIT_VALUE_UPDATED, new mxEventObject(new Object[]{oldValue,newValue})); 59 getParentDiagram().fireEvent(new mxEventObject(XcosEvent.OUT_EXPLICIT_VALUE_UPDATED, "old", oldValue, "new", newValue));
60 } 60 }
61 } 61 }
62 62
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/ImplicitInBlock.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/ImplicitInBlock.java
index 1b4bdbb..b31a07d 100644
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/ImplicitInBlock.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/ImplicitInBlock.java
@@ -56,7 +56,7 @@ public final class ImplicitInBlock extends ContextUpdate {
56 double newValue = ((ScilabDouble)getIntegerParameters()).getRealPart()[0][0]; 56 double newValue = ((ScilabDouble)getIntegerParameters()).getRealPart()[0][0];
57 57
58 if(oldValue != newValue){ 58 if(oldValue != newValue){
59 getParentDiagram().fireEvent(XcosEvent.IN_IMPLICIT_VALUE_UPDATED, new mxEventObject(new Object[]{oldValue,newValue})); 59 getParentDiagram().fireEvent(new mxEventObject(XcosEvent.IN_IMPLICIT_VALUE_UPDATED, "old", oldValue, "new", newValue));
60 } 60 }
61 } 61 }
62 62
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/ImplicitOutBlock.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/ImplicitOutBlock.java
index 59c3e29..ede1a5a 100644
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/ImplicitOutBlock.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/io/ImplicitOutBlock.java
@@ -56,7 +56,7 @@ public final class ImplicitOutBlock extends ContextUpdate {
56 double newValue = ((ScilabDouble)getIntegerParameters()).getRealPart()[0][0]; 56 double newValue = ((ScilabDouble)getIntegerParameters()).getRealPart()[0][0];
57 57
58 if(oldValue != newValue){ 58 if(oldValue != newValue){
59 getParentDiagram().fireEvent(XcosEvent.OUT_IMPLICIT_VALUE_UPDATED, new mxEventObject(new Object[]{oldValue,newValue})); 59 getParentDiagram().fireEvent(new mxEventObject(XcosEvent.OUT_IMPLICIT_VALUE_UPDATED, "old", oldValue, "new", newValue));
60 } 60 }
61 } 61 }
62 62
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/graph/XcosDiagram.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/graph/XcosDiagram.java
index 6249dfd..85e3088 100644
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/graph/XcosDiagram.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/graph/XcosDiagram.java
@@ -107,6 +107,7 @@ import com.mxgraph.model.mxGraphModel;
107import com.mxgraph.model.mxICell; 107import com.mxgraph.model.mxICell;
108import com.mxgraph.model.mxGraphModel.mxChildChange; 108import com.mxgraph.model.mxGraphModel.mxChildChange;
109import com.mxgraph.model.mxGraphModel.mxStyleChange; 109import com.mxgraph.model.mxGraphModel.mxStyleChange;
110import com.mxgraph.model.mxIGraphModel.mxAtomicGraphModelChange;
110import com.mxgraph.util.mxEvent; 111import com.mxgraph.util.mxEvent;
111import com.mxgraph.util.mxEventObject; 112import com.mxgraph.util.mxEventObject;
112import com.mxgraph.util.mxPoint; 113import com.mxgraph.util.mxPoint;
@@ -621,7 +622,7 @@ public class XcosDiagram extends ScilabGraph {
621 public void invoke(Object source, mxEventObject evt) { 622 public void invoke(Object source, mxEventObject evt) {
622 getModel().beginUpdate(); 623 getModel().beginUpdate();
623 refresh(); 624 refresh();
624 BasicBlock updatedBlock = (BasicBlock) evt.getArgAt(0); 625 BasicBlock updatedBlock = (BasicBlock) evt.getProperty("block");
625 BlockPositioning.updateBlockView(updatedBlock); 626 BlockPositioning.updateBlockView(updatedBlock);
626 getModel().endUpdate(); 627 getModel().endUpdate();
627 } 628 }
@@ -635,7 +636,7 @@ public class XcosDiagram extends ScilabGraph {
635 */ 636 */
636 private class ModelTracker implements mxIEventListener { 637 private class ModelTracker implements mxIEventListener {
637 public void invoke(Object source, mxEventObject evt) { 638 public void invoke(Object source, mxEventObject evt) {
638 List<mxUndoableChange> changes = (List<mxUndoableChange>) evt.getArgAt(0); 639 List<mxAtomicGraphModelChange> changes = (List<mxAtomicGraphModelChange>) (evt.getProperty("changes"));
639 List<Object> objects = new ArrayList<Object>(); 640 List<Object> objects = new ArrayList<Object>();
640 getModel().beginUpdate(); 641 getModel().beginUpdate();
641 for (int i = 0; i < changes.size(); ++i) { 642 for (int i = 0; i < changes.size(); ++i) {
@@ -656,7 +657,7 @@ public class XcosDiagram extends ScilabGraph {
656 firedCells[j] = objects.get(j); 657 firedCells[j] = objects.get(j);
657 } 658 }
658 //fireEvent(XcosEvent.FORCE_CELL_RESHAPE, new mxEventObject(new Object[] {firedCells})); 659 //fireEvent(XcosEvent.FORCE_CELL_RESHAPE, new mxEventObject(new Object[] {firedCells}));
659 fireEvent(XcosEvent.FORCE_CELL_VALUE_UPDATE, new mxEventObject(new Object[] {firedCells})); 660 fireEvent(new mxEventObject(XcosEvent.FORCE_CELL_VALUE_UPDATE, "cells", firedCells));
660 } 661 }
661 getModel().endUpdate(); 662 getModel().endUpdate();
662 } 663 }
@@ -667,7 +668,7 @@ public class XcosDiagram extends ScilabGraph {
667 */ 668 */
668 private class ForceCellValueUpdate implements mxIEventListener { 669 private class ForceCellValueUpdate implements mxIEventListener {
669 public void invoke(Object source, mxEventObject evt) { 670 public void invoke(Object source, mxEventObject evt) {
670 Object[] cells = (Object[]) evt.getArgs()[0]; 671 Object[] cells = (Object[]) evt.getProperty("cells");
671 672
672 getModel().beginUpdate(); 673 getModel().beginUpdate();
673 674
@@ -695,22 +696,41 @@ public class XcosDiagram extends ScilabGraph {
695 } 696 }
696 697
697 /** 698 /**
699<<<<<<< HEAD:scilab/modules/xcos/src/java/org/scilab/modules/xcos/graph/XcosDiagram.java
700=======
701 * ForceCellReshapeTracker
702 * Called when we want a Block to reshape for it's ports positions.
703 */
704 private class ForceCellReshapeTracker implements mxIEventListener {
705 public void invoke(Object source, mxEventObject evt) {
706 Object[] cells = (Object[]) evt.getProperty("cells");
707 getModel().beginUpdate();
708 for (int i = 0; i < cells.length; ++i) {
709 Object cell = cells[i];
710 if (cell instanceof BasicBlock) {
711 BlockPositioning.updateBlockView((BasicBlock) cell);
712 }
713 }
714 getModel().endUpdate();
715 }
716 }
717
718 /**
719>>>>>>> e48febf... API compatibility with jgraphx-1.2.0.5:scilab/modules/xcos/src/java/org/scilab/modules/xcos/graph/XcosDiagram.java
698 * SuperBlockUpdateTracker 720 * SuperBlockUpdateTracker
699 * Called when adding some port in a SuperBlock diagram 721 * Called when adding some port in a SuperBlock diagram
700 * to update current sub-diagram (i.e SuperBlock) representation. 722 * to update current sub-diagram (i.e SuperBlock) representation.
701 */ 723 */
702 private class SuperBlockUpdateTracker implements mxIEventListener { 724 private class SuperBlockUpdateTracker implements mxIEventListener {
703 public void invoke(Object source, mxEventObject evt) { 725 public void invoke(Object source, mxEventObject evt) {
704 assert evt.getArgs()[0] instanceof SuperBlock; 726 assert evt.getProperty("block") instanceof SuperBlock;
705 SuperBlock updatedBlock = (SuperBlock) evt.getArgs()[0]; 727 SuperBlock updatedBlock = (SuperBlock) evt.getProperty("block");
706 updatedBlock.setRealParameters(BlockWriter 728 updatedBlock.setRealParameters(BlockWriter
707 .convertDiagramToMList(updatedBlock.getChild())); 729 .convertDiagramToMList(updatedBlock.getChild()));
708 if (updatedBlock.getParentDiagram() instanceof SuperBlockDiagram) { 730 if (updatedBlock.getParentDiagram() instanceof SuperBlockDiagram) {
709 SuperBlock parentBlock = ((SuperBlockDiagram) updatedBlock 731 SuperBlock parentBlock = ((SuperBlockDiagram) updatedBlock
710 .getParentDiagram()).getContainer(); 732 .getParentDiagram()).getContainer();
711 parentBlock.getParentDiagram().fireEvent( 733 parentBlock.getParentDiagram().fireEvent(new mxEventObject(XcosEvent.SUPER_BLOCK_UPDATED, "block", parentBlock));
712 XcosEvent.SUPER_BLOCK_UPDATED,
713 new mxEventObject(new Object[] { parentBlock }));
714 } 734 }
715 BlockPositioning.updateBlockView(updatedBlock); 735 BlockPositioning.updateBlockView(updatedBlock);
716 refresh(); 736 refresh();
@@ -729,7 +749,7 @@ public class XcosDiagram extends ScilabGraph {
729 } 749 }
730 750
731 public void invoke(Object source, mxEventObject evt) { 751 public void invoke(Object source, mxEventObject evt) {
732 Object[] cells = (Object[]) evt.getArgs()[0]; 752 Object[] cells = (Object[]) evt.getProperty("cells");
733 753
734 diagram.getModel().beginUpdate(); 754 diagram.getModel().beginUpdate();
735 for (int i = 0; i < cells.length; ++i) { 755 for (int i = 0; i < cells.length; ++i) {
@@ -760,7 +780,7 @@ public class XcosDiagram extends ScilabGraph {
760 } 780 }
761 781
762 public void invoke(Object source, mxEventObject evt) { 782 public void invoke(Object source, mxEventObject evt) {
763 Object[] cells = (Object[]) evt.getArgs()[0]; 783 Object[] cells = (Object[]) evt.getProperty("cells");
764 for (int i = 0; i < cells.length; i++) { 784 for (int i = 0; i < cells.length; i++) {
765 if (cells[i] instanceof BasicLink) { 785 if (cells[i] instanceof BasicLink) {
766 BasicLink link = (BasicLink) cells[i]; 786 BasicLink link = (BasicLink) cells[i];
@@ -878,7 +898,7 @@ public class XcosDiagram extends ScilabGraph {
878 */ 898 */
879 private class CellResizedTracker implements mxIEventListener { 899 private class CellResizedTracker implements mxIEventListener {
880 public void invoke(Object source, mxEventObject evt) { 900 public void invoke(Object source, mxEventObject evt) {
881 Object[] cells = (Object[]) evt.getArgs()[0]; 901 Object[] cells = (Object[]) evt.getProperty("cells");
882 getModel().beginUpdate(); 902 getModel().beginUpdate();
883 for (int i = 0; i < cells.length; ++i) { 903 for (int i = 0; i < cells.length; ++i) {
884 if (cells[i] instanceof BasicBlock) { 904 if (cells[i] instanceof BasicBlock) {
@@ -894,7 +914,7 @@ public class XcosDiagram extends ScilabGraph {
894 */ 914 */
895 private class UndoUpdateTracker implements mxIEventListener { 915 private class UndoUpdateTracker implements mxIEventListener {
896 public void invoke(Object source, mxEventObject evt) { 916 public void invoke(Object source, mxEventObject evt) {
897 List<mxUndoableChange> changes = ((mxUndoableEdit) evt.getArgAt(0)).getChanges(); 917 List<mxUndoableChange> changes = ((mxUndoableEdit) evt.getProperty("edit")).getChanges();
898 Object[] changedCells = getSelectionCellsForChanges(changes); 918 Object[] changedCells = getSelectionCellsForChanges(changes);
899 getModel().beginUpdate(); 919 getModel().beginUpdate();
900 for (Object object : changedCells) { 920 for (Object object : changedCells) {
@@ -1706,7 +1726,7 @@ public class XcosDiagram extends ScilabGraph {
1706 //getParentTab().setName((String) properties.get("title")); 1726 //getParentTab().setName((String) properties.get("title"));
1707 1727
1708 // Clear all undo events in Undo Manager 1728 // Clear all undo events in Undo Manager
1709 getUndoManager().reset(); 1729 getUndoManager().clear();
1710 setModified(false); 1730 setModified(false);
1711 } 1731 }
1712 1732
@@ -2048,7 +2068,7 @@ public class XcosDiagram extends ScilabGraph {
2048 * This function will reset the UndoManager in a stable state. 2068 * This function will reset the UndoManager in a stable state.
2049 */ 2069 */
2050 public void resetUndoManager() { 2070 public void resetUndoManager() {
2051 getUndoManager().reset(); 2071 getUndoManager().clear();
2052 2072
2053 resetUndoCounter(); 2073 resetUndoCounter();
2054 2074
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/XcosPalette.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/XcosPalette.java
index 165e705..3438a96 100644
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/XcosPalette.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/XcosPalette.java
@@ -187,8 +187,8 @@ public class XcosPalette extends JScrollPane implements ComponentListener {
187 selectedEntry.setOpaque(true); 187 selectedEntry.setOpaque(true);
188 } 188 }
189 189
190 eventSource.fireEvent(mxEvent.SELECT, new mxEventObject(new Object[] { 190 eventSource.fireEvent(new mxEventObject(mxEvent.SELECT, "entry",
191 selectedEntry, t, last })); 191 selectedEntry, "transferable", t, "previous", last));
192 } 192 }
193 193
194 194
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/utils/XcosFileType.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/utils/XcosFileType.java
index 0b7a7fc..a4a3dc5 100644
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/utils/XcosFileType.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/utils/XcosFileType.java
@@ -203,7 +203,7 @@ public enum XcosFileType {
203 public static File loadScicosDiagram(File filename) { 203 public static File loadScicosDiagram(File filename) {
204 File tempOutput = null; 204 File tempOutput = null;
205 try { 205 try {
206 tempOutput = File.createTempFile("xcos", XcosFileType.HDF5.getDottedExtension()); 206 tempOutput = File.createTempFile(XcosFileType.XCOS.getExtension(), XcosFileType.HDF5.getDottedExtension());
207 String cmd = "scs_m = importScicosDiagram(\"" + filename.getAbsolutePath() + "\");"; 207 String cmd = "scs_m = importScicosDiagram(\"" + filename.getAbsolutePath() + "\");";
208 cmd += "export_to_hdf5(\"" + tempOutput.getAbsolutePath() + "\", \"scs_m\");"; 208 cmd += "export_to_hdf5(\"" + tempOutput.getAbsolutePath() + "\", \"scs_m\");";
209 try { 209 try {
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/utils/XcosInterpreterManagement.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/utils/XcosInterpreterManagement.java
index 14c6a8b..ec44383 100644
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/utils/XcosInterpreterManagement.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/utils/XcosInterpreterManagement.java
@@ -32,6 +32,9 @@ public final class XcosInterpreterManagement extends InterpreterManagement {
32 32
33 private static ExecutorService executor = Executors.newSingleThreadExecutor(); 33 private static ExecutorService executor = Executors.newSingleThreadExecutor();
34 private static Set<String> runningTasks = Collections.synchronizedSet(new HashSet<String>()); 34 private static Set<String> runningTasks = Collections.synchronizedSet(new HashSet<String>());
35
36 private static final String NOTIFY = ";xcosNotify(\"";
37 private static final String CLOSE = "\");";
35 38
36 /** This class is a static singleton, thus it must not be instantiated */ 39 /** This class is a static singleton, thus it must not be instantiated */
37 private XcosInterpreterManagement() { } 40 private XcosInterpreterManagement() { }
@@ -58,15 +61,15 @@ public final class XcosInterpreterManagement extends InterpreterManagement {
58 */ 61 */
59 public static void synchronousScilabExec(String command) throws InterpreterException { 62 public static void synchronousScilabExec(String command) throws InterpreterException {
60 final String uidDesc = Integer.toString(command.hashCode()); 63 final String uidDesc = Integer.toString(command.hashCode());
61 final String fullCommand = command + ";xcosNotify(\"" + uidDesc + "\");"; 64 final String fullCommand = command + NOTIFY + uidDesc + CLOSE;
62 65
63 if (runningTasks.contains(uidDesc)) { 66 if (runningTasks.contains(uidDesc)) {
64 throw new InterpreterException("Same command executed again"); 67 throw new InterpreterException(XcosMessages.SCILAB_SAMECOMMAND);
65 } 68 }
66 69
67 int ret = InterpreterManagement.requestScilabExec(fullCommand); 70 int ret = InterpreterManagement.requestScilabExec(fullCommand);
68 if (ret != 0) { 71 if (ret != 0) {
69 throw new InterpreterException("Unable to communicate with the interpreter"); 72 throw new InterpreterException(XcosMessages.SCILAB_UNABLE);
70 } 73 }
71 runningTasks.add(uidDesc); 74 runningTasks.add(uidDesc);
72 Signal.wait(uidDesc); 75 Signal.wait(uidDesc);
@@ -98,19 +101,19 @@ public final class XcosInterpreterManagement extends InterpreterManagement {
98 final ActionListener callback) throws InterpreterException { 101 final ActionListener callback) throws InterpreterException {
99 final int uid = command.hashCode(); 102 final int uid = command.hashCode();
100 final String uidDesc = Integer.toString(uid); 103 final String uidDesc = Integer.toString(uid);
101 final String fullCommand = command + ";xcosNotify(\"" + uidDesc + "\");"; 104 final String fullCommand = command + NOTIFY + uidDesc + CLOSE;
102 final ActionEvent event = new ActionEvent( 105 final ActionEvent event = new ActionEvent(
103 XcosInterpreterManagement.class, uid, command); 106 XcosInterpreterManagement.class, uid, command);
104 107
105 if (runningTasks.contains(uidDesc)) { 108 if (runningTasks.contains(uidDesc)) {
106 throw new InterpreterException("Same command executed again"); 109 throw new InterpreterException(XcosMessages.SCILAB_SAMECOMMAND);
107 } 110 }
108 111
109 executor.submit(new Callable<Void>() { 112 executor.submit(new Callable<Void>() {
110 public Void call() throws Exception { 113 public Void call() throws Exception {
111 int ret = InterpreterManagement.putCommandInScilabQueue(fullCommand); 114 int ret = InterpreterManagement.putCommandInScilabQueue(fullCommand);
112 if (ret != 0) { 115 if (ret != 0) {
113 throw new InterpreterException("Unable to communicate with the interpreter"); 116 throw new InterpreterException(XcosMessages.SCILAB_UNABLE);
114 } 117 }
115 runningTasks.add(uidDesc); 118 runningTasks.add(uidDesc);
116 Signal.wait(uidDesc); 119 Signal.wait(uidDesc);
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/utils/XcosMessages.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/utils/XcosMessages.java
index 06f13c9..0af2b54 100644
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/utils/XcosMessages.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/utils/XcosMessages.java
@@ -21,16 +21,8 @@ import org.scilab.modules.localization.Messages;
21 21
22/** 22/**
23 * All localized messages/menus labels used in Xcos 23 * All localized messages/menus labels used in Xcos
24 * @author Vincent COUVERT
25 *
26 */ 24 */
27public final class XcosMessages { 25public final class XcosMessages {
28 /**
29 * Constructor
30 */
31 private XcosMessages() {
32
33 }
34 26
35 public static final String XCOS = Messages.gettext("Xcos"); 27 public static final String XCOS = Messages.gettext("Xcos");
36 28
@@ -38,7 +30,7 @@ public final class XcosMessages {
38 30
39 public static final String UNTITLED = Messages.gettext("Untitled"); 31 public static final String UNTITLED = Messages.gettext("Untitled");
40 32
41 /** File menu */ 33 /* File menu */
42 public static final String FILE = Messages.gettext("File"); 34 public static final String FILE = Messages.gettext("File");
43 public static final String NEW = Messages.gettext("New"); 35 public static final String NEW = Messages.gettext("New");
44 public static final String NEW_DIAGRAM = Messages.gettext("New diagram") + DOTS; 36 public static final String NEW_DIAGRAM = Messages.gettext("New diagram") + DOTS;
@@ -53,15 +45,7 @@ public final class XcosMessages {
53 public static final String QUIT = Messages.gettext("Quit Xcos"); 45 public static final String QUIT = Messages.gettext("Quit Xcos");
54 public static final String RECENT_FILES = Messages.gettext("Recent Files"); 46 public static final String RECENT_FILES = Messages.gettext("Recent Files");
55 47
56 /** Palette menu in palette browser*/ 48 /* Edit Menu */
57 public static final String LOAD_AS_PAL = Messages.gettext("Load as palette") + DOTS;
58 public static final String USER_DEFINED = Messages.gettext("User-Defined");
59 public static final String REMOVE_USER_DEFINED = Messages.gettext("Remove");
60
61 public static final String DUMP = Messages.gettext("Dump");
62 public static final String VIEW_IN_SCICOS = Messages.gettext("View in Scicos");
63
64 /** Edit Menu */
65 public static final String EDIT = Messages.gettext("Edit"); 49 public static final String EDIT = Messages.gettext("Edit");
66 public static final String BLOCK_PARAMETERS = Messages.gettext("Block Parameters") + DOTS; 50 public static final String BLOCK_PARAMETERS = Messages.gettext("Block Parameters") + DOTS;
67 public static final String REGION_TO_SUPERBLOCK = Messages.gettext("Region to superblock"); 51 public static final String REGION_TO_SUPERBLOCK = Messages.gettext("Region to superblock");
@@ -71,7 +55,15 @@ public final class XcosMessages {
71 public static final String CUSTOMIZE = Messages.gettext("Customize") + DOTS; 55 public static final String CUSTOMIZE = Messages.gettext("Customize") + DOTS;
72 public static final String SAVE_BLOCK_GUI = Messages.gettext("Save block GUI"); 56 public static final String SAVE_BLOCK_GUI = Messages.gettext("Save block GUI");
73 57
74 /** View Menu */ 58 /* Palette menu in palette browser*/
59 public static final String LOAD_AS_PAL = Messages.gettext("Load as palette") + DOTS;
60 public static final String USER_DEFINED = Messages.gettext("User-Defined");
61 public static final String REMOVE_USER_DEFINED = REMOVE;
62
63 public static final String DUMP = Messages.gettext("Dump");
64 public static final String VIEW_IN_SCICOS = Messages.gettext("View in Scicos");
65
66 /* View Menu */
75 public static final String VIEW = Messages.gettext("View"); 67 public static final String VIEW = Messages.gettext("View");
76 public static final String FIT_DIAGRAM_TO_VIEW = Messages.gettext("Fit diagram to view"); 68 public static final String FIT_DIAGRAM_TO_VIEW = Messages.gettext("Fit diagram to view");
77 public static final String NORMAL_100 = Messages.gettext("Normal 100%"); 69 public static final String NORMAL_100 = Messages.gettext("Normal 100%");
@@ -82,7 +74,7 @@ public final class XcosMessages {
82 public static final String DETAILS = Messages.gettext("Details"); 74 public static final String DETAILS = Messages.gettext("Details");
83 public static final String SHOW_PARENT = Messages.gettext("Show parent diagram"); 75 public static final String SHOW_PARENT = Messages.gettext("Show parent diagram");
84 76
85 /** Simulation menu */ 77 /* Simulation menu */
86 public static final String SIMULATION = Messages.gettext("Simulation"); 78 public static final String SIMULATION = Messages.gettext("Simulation");
87 public static final String SETUP = Messages.gettext("Setup"); 79 public static final String SETUP = Messages.gettext("Setup");
88 public static final String COMPILE = Messages.gettext("Compile"); 80 public static final String COMPILE = Messages.gettext("Compile");
@@ -90,7 +82,7 @@ public final class XcosMessages {
90 public static final String STOP = Messages.gettext("Stop"); 82 public static final String STOP = Messages.gettext("Stop");
91 public static final String SET_CONTEXT = Messages.gettext("Set Context"); 83 public static final String SET_CONTEXT = Messages.gettext("Set Context");
92 84
93 /** Format menu */ 85 /* Format menu */
94 public static final String FORMAT = Messages.gettext("Format"); 86 public static final String FORMAT = Messages.gettext("Format");
95 public static final String RESIZE = Messages.gettext("Resize"); 87 public static final String RESIZE = Messages.gettext("Resize");
96 public static final String ROTATE = Messages.gettext("Rotate"); 88 public static final String ROTATE = Messages.gettext("Rotate");
@@ -100,18 +92,18 @@ public final class XcosMessages {
100 public static final String GRID = Messages.gettext("Grid"); 92 public static final String GRID = Messages.gettext("Grid");
101 public static final String DIAGRAM_BACKGROUND = Messages.gettext("Diagram background") + DOTS; 93 public static final String DIAGRAM_BACKGROUND = Messages.gettext("Diagram background") + DOTS;
102 94
103 /** Tools menu */ 95 /* Tools menu */
104 public static final String TOOLS = Messages.gettext("Tools"); 96 public static final String TOOLS = Messages.gettext("Tools");
105 public static final String CODE_GENERATION = Messages.gettext("Code generation"); 97 public static final String CODE_GENERATION = Messages.gettext("Code generation");
106 98
107 /** Help menu */ 99 /* Help menu */
108 public static final String HELP = Messages.gettext("?"); 100 public static final String HELP = Messages.gettext("?");
109 public static final String XCOS_DOCUMENTATION = Messages.gettext("Xcos Help"); 101 public static final String XCOS_DOCUMENTATION = Messages.gettext("Xcos Help");
110 public static final String BLOCK_DOCUMENTATION = Messages.gettext("Block Help"); 102 public static final String BLOCK_DOCUMENTATION = Messages.gettext("Block Help");
111 public static final String XCOS_DEMONSTRATIONS = Messages.gettext("Xcos Demos"); 103 public static final String XCOS_DEMONSTRATIONS = Messages.gettext("Xcos Demos");
112 public static final String ABOUT_XCOS = Messages.gettext("About Xcos") + DOTS; 104 public static final String ABOUT_XCOS = Messages.gettext("About Xcos") + DOTS;
113 105
114 /** PALETTES */ 106 /* PALETTES */
115 public static final String PALETTES = Messages.gettext("Palettes"); 107 public static final String PALETTES = Messages.gettext("Palettes");
116 public static final String SOURCES_PAL = Messages.gettext("Sources"); 108 public static final String SOURCES_PAL = Messages.gettext("Sources");
117 public static final String CONTINUOUS_PAL = Messages.gettext("Continuous time systems"); 109 public static final String CONTINUOUS_PAL = Messages.gettext("Continuous time systems");
@@ -207,7 +199,7 @@ public final class XcosMessages {
207 public static final String COPYRIGHT_INRIA = Messages.gettext("Copyright (c) 1989-2009 (INRIA)"); 199 public static final String COPYRIGHT_INRIA = Messages.gettext("Copyright (c) 1989-2009 (INRIA)");
208 public static final String SCICOS_BASED = Messages.gettext("Based on Scicos"); 200 public static final String SCICOS_BASED = Messages.gettext("Based on Scicos");
209 201
210 /** InfoBar messages */ 202 /* InfoBar messages */
211 public static final String EMPTY_INFO = ""; 203 public static final String EMPTY_INFO = "";
212 public static final String SAVING_DIAGRAM = Messages.gettext("Saving diagram" + DOTS); 204 public static final String SAVING_DIAGRAM = Messages.gettext("Saving diagram" + DOTS);
213 public static final String LOADING_DIAGRAM = Messages.gettext("Loading diagram" + DOTS); 205 public static final String LOADING_DIAGRAM = Messages.gettext("Loading diagram" + DOTS);
@@ -221,19 +213,19 @@ public final class XcosMessages {
221 public static final String DRAW_LINK = Messages.gettext("Click on diagram to add link point or on a compatible target to finish"); 213 public static final String DRAW_LINK = Messages.gettext("Click on diagram to add link point or on a compatible target to finish");
222 214
223 215
224 /** Debug level messages */ 216 /* Debug level messages */
225 public static final String DEBUGLEVEL_0 = Messages.gettext("No trace nor debug printing"); 217 public static final String DEBUGLEVEL_0 = Messages.gettext("No trace nor debug printing");
226 public static final String DEBUGLEVEL_1 = Messages.gettext("Light Simulation trace (Discrete and Continous part switches)"); 218 public static final String DEBUGLEVEL_1 = Messages.gettext("Light Simulation trace (Discrete and Continous part switches)");
227 public static final String DEBUGLEVEL_2 = Messages.gettext("Per block execution trace and Debug block calls"); 219 public static final String DEBUGLEVEL_2 = Messages.gettext("Per block execution trace and Debug block calls");
228 public static final String DEBUGLEVEL_3 = Messages.gettext("Debug block calls without trace"); 220 public static final String DEBUGLEVEL_3 = Messages.gettext("Debug block calls without trace");
229 221
230 /** File description */ 222 /* File description */
231 public static final String FILE_COSF = Messages.gettext("Scicos file"); 223 public static final String FILE_COSF = Messages.gettext("Scicos file");
232 public static final String FILE_COS = Messages.gettext("Scicos file"); 224 public static final String FILE_COS = FILE_COSF;
233 public static final String FILE_XCOS = Messages.gettext("Xcos file"); 225 public static final String FILE_XCOS = Messages.gettext("Xcos file");
234 public static final String FILE_HDF5 = Messages.gettext("Scilab file"); 226 public static final String FILE_HDF5 = Messages.gettext("Scilab file");
235 227
236 /** Superblock mask editor */ 228 /* Superblock mask editor */
237 public static final String MASK_TITLE = Messages.gettext("Masked SuperBlock editor"); 229 public static final String MASK_TITLE = Messages.gettext("Masked SuperBlock editor");
238 public static final String MASK_INSERT = Messages.gettext("Insert"); 230 public static final String MASK_INSERT = Messages.gettext("Insert");
239 public static final String MASK_DELETE = Messages.gettext("Delete"); 231 public static final String MASK_DELETE = Messages.gettext("Delete");
@@ -250,12 +242,23 @@ public final class XcosMessages {
250 public static final String MASK_VARVALUES = Messages.gettext("Values"); 242 public static final String MASK_VARVALUES = Messages.gettext("Values");
251 public static final String MASK_DEFAULTWINDOWNAME = Messages.gettext("Set block parameters"); 243 public static final String MASK_DEFAULTWINDOWNAME = Messages.gettext("Set block parameters");
252 244
245 /* Interpreter errors */
246 public static final String SCILAB_SAMECOMMAND = Messages.gettext("Same command executed again");
247 public static final String SCILAB_UNABLE = Messages.gettext("Unable to communicate with the interpreter");
248
249 /** This class is a static singleton, thus it must not be instantiated */
250 private XcosMessages() { }
251
253 /** 252 /**
254 * This function checks for the popup menu activation under MacOS with Java version 1.5 253 * This function checks for the popup menu activation under MacOS with Java version 1.5
255 * Related to Scilab bug #5190 254 * Related to Scilab bug #5190
255 * @param e Click event
256 * @return true if Java 1.5 and MacOS and mouse clic and ctrl activated 256 * @return true if Java 1.5 and MacOS and mouse clic and ctrl activated
257 */ 257 */
258 public static boolean isMacOsPopupTrigger(MouseEvent e) { 258 public static boolean isMacOsPopupTrigger(MouseEvent e) {
259 return (SwingUtilities.isLeftMouseButton(e) && e.isControlDown() && (System.getProperty("os.name").toLowerCase().indexOf("mac") != -1) && (System.getProperty("java.specification.version").equals("1.5"))); 259 return (SwingUtilities.isLeftMouseButton(e)
260 } 260 && e.isControlDown()
261 && (System.getProperty("os.name").toLowerCase().indexOf("mac") != -1) && (System
262 .getProperty("java.specification.version").equals("1.5")));
263 }
261} 264}
diff --git a/scilab/modules/xpad/Makefile.in b/scilab/modules/xpad/Makefile.in
index 8eeb1a8..2474d88 100644
--- a/scilab/modules/xpad/Makefile.in
+++ b/scilab/modules/xpad/Makefile.in
@@ -71,7 +71,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
71am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 71am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
72 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 72 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
73 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \ 73 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
74 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \ 74 $(top_srcdir)/m4/intel_compiler.m4 \
75 $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
75 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \ 76 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
76 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \ 77 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
77 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ 78 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \