Merge remote-tracking branch 'origin/master' into YaSp 28/14628/2
Vincent COUVERT [Fri, 6 Jun 2014 09:10:35 +0000 (11:10 +0200)]
Conflicts:
scilab/configure
scilab/configure.ac
scilab/libs/GetWindowsVersion/GetWindowsVersion.rc
scilab/modules/action_binding/src/c/action_binding.rc
scilab/modules/action_binding/src/noaction_binding/noaction_binding.rc
scilab/modules/api_scilab/src/c/api_scilab.rc
scilab/modules/arnoldi/src/c/arnoldi.rc
scilab/modules/boolean/src/c/boolean.rc
scilab/modules/boolean/src/fortran/boolean_f.rc
scilab/modules/cacsd/src/c/cacsd.rc
scilab/modules/cacsd/src/fortran/cacsd_f.rc
scilab/modules/cacsd/src/slicot/slicot_f/slicot_f.rc
scilab/modules/call_scilab/src/c/call_scilab.rc
scilab/modules/commons/src/c/commons.rc
scilab/modules/commons/src/fortran/commons_f.rc
scilab/modules/completion/src/c/completion.rc
scilab/modules/completion/src/nocompletion/nocompletion.rc
scilab/modules/console/src/c/console.rc
scilab/modules/console/src/noconsole/noconsole.rc
scilab/modules/core/includes/version.h.vc
scilab/modules/core/src/fortran/typ2cod.f
scilab/modules/data_structures/src/c/data_structures.rc
scilab/modules/data_structures/src/fortran/data_structures_f.rc
scilab/modules/differential_equations/src/c/differential_equations.rc
scilab/modules/differential_equations/src/fortran/differential_equations_f.rc
scilab/modules/double/src/c/double.rc
scilab/modules/double/src/fortran/double_f.rc
scilab/modules/dynamic_link/src/c/dynamic_link.rc
scilab/modules/dynamic_link/src/fortran/dynamic_link_f.rc
scilab/modules/elementary_functions/Makefile.am
scilab/modules/elementary_functions/Makefile.in
scilab/modules/elementary_functions/src/c/elementary_functions.rc
scilab/modules/elementary_functions/src/fortran/eispack/eispack_f.rc
scilab/modules/elementary_functions/src/fortran/elementary_functions_f.rc
scilab/modules/elementary_functions/src/fortran/linpack/linpack_f.rc
scilab/modules/elementary_functions/src/fortran/slatec/slatec_f.rc
scilab/modules/external_objects/Makefile.am
scilab/modules/external_objects/Makefile.in
scilab/modules/external_objects/external_objects.rc
scilab/modules/fftw/src/c/fftw.rc
scilab/modules/fftw/src/nofftw/nofftw.rc
scilab/modules/fileio/src/c/fileio.rc
scilab/modules/fileio/src/c/mopen.c
scilab/modules/functions/src/c/functions.rc
scilab/modules/functions/src/fortran/functions_f.rc
scilab/modules/graphic_export/graphic_export.rc
scilab/modules/graphic_export/src/nographic_export/nographic_export.rc
scilab/modules/graphics/Makefile.am
scilab/modules/graphics/Makefile.in
scilab/modules/graphics/graphic.rc
scilab/modules/graphics/src/nographics/nographics.rc
scilab/modules/gui/Makefile.am
scilab/modules/gui/Makefile.in
scilab/modules/gui/images/icons/aboutscilab.png
scilab/modules/gui/src/c/gui.rc
scilab/modules/gui/src/nogui/nogui.rc
scilab/modules/hdf5/Makefile.am
scilab/modules/hdf5/Makefile.in
scilab/modules/hdf5/src/c/hdf5.rc
scilab/modules/helptools/data/pages/homepage-en_US.html
scilab/modules/helptools/data/pages/homepage-fr_FR.html
scilab/modules/helptools/etc/SciDocConf.xml.vc
scilab/modules/helptools/src/c/helptools.rc
scilab/modules/history_browser/src/c/history_browser.rc
scilab/modules/history_browser/src/nohistory_browser/nohistory_browser.rc
scilab/modules/history_manager/src/c/history_manager.rc
scilab/modules/integer/src/c/integer.rc
scilab/modules/integer/src/fortran/integer_f.rc
scilab/modules/interpolation/src/c/interpolation.rc
scilab/modules/interpolation/src/fortran/interpolation_f.rc
scilab/modules/intersci/src/lib/intersci.rc
scilab/modules/io/src/c/io.rc
scilab/modules/io/src/fortran/io_f.rc
scilab/modules/javasci/Makefile.in
scilab/modules/javasci/javasci.rc
scilab/modules/jvm/src/c/libjvm.rc
scilab/modules/jvm/src/nojvm/nojvm.rc
scilab/modules/linear_algebra/src/c/linear_algebra.rc
scilab/modules/linear_algebra/src/fortran/linear_algebra_f.rc
scilab/modules/localization/src/localization.rc
scilab/modules/matio/Makefile.am
scilab/modules/matio/Makefile.in
scilab/modules/matio/src/c/matio.rc
scilab/modules/matio/src/nomatio/nomatio.rc
scilab/modules/mexlib/src/libmat/libmat.rc
scilab/modules/mexlib/src/libmex/libmex.rc
scilab/modules/mexlib/src/libmx/libmx.rc
scilab/modules/optimization/src/c/optimization.rc
scilab/modules/optimization/src/fortran/optimization_f.rc
scilab/modules/output_stream/src/c/output_stream.rc
scilab/modules/output_stream/src/fortran/output_stream_f.rc
scilab/modules/parallel/src/c/parallel.rc
scilab/modules/parameters/src/c/parameters.rc
scilab/modules/polynomials/src/c/polynomials.rc
scilab/modules/polynomials/src/fortran/polynomials_f.rc
scilab/modules/preferences/src/c/preferences.rc
scilab/modules/randlib/src/c/randlib.rc
scilab/modules/randlib/src/fortran/randlib_f.rc
scilab/modules/randlib/src/norandlib/norandlib.rc
scilab/modules/renderer/renderer.rc
scilab/modules/renderer/src/norenderer/norenderer.rc
scilab/modules/scicos/src/c/noscicos/noscicos.rc
scilab/modules/scicos/src/c/scicos.rc
scilab/modules/scicos/src/fortran/scicos_f.rc
scilab/modules/scicos/src/scicos_sundials/scicos_sundials.rc
scilab/modules/scicos_blocks/src/c/scicos_blocks.rc
scilab/modules/scicos_blocks/src/fortran/scicos_blocks_f.rc
scilab/modules/scinotes/src/c/scinotes.rc
scilab/modules/signal_processing/src/c/signal_processing.rc
scilab/modules/signal_processing/src/fortran/signal_processing_f.rc
scilab/modules/sound/src/c/sound.rc
scilab/modules/sound/src/nosound/nosound.rc
scilab/modules/sparse/src/c/sparse.rc
scilab/modules/sparse/src/fortran/sparse_f.rc
scilab/modules/special_functions/src/c/special_functions.rc
scilab/modules/special_functions/src/fortran/special_functions_f.rc
scilab/modules/spreadsheet/src/c/spreadsheet.rc
scilab/modules/spreadsheet/src/nospreadsheet/nospreadsheet.rc
scilab/modules/statistics/src/c/statistics.rc
scilab/modules/statistics/src/dcdflib/dcd_f/dcd_f.rc
scilab/modules/string/sci_gateway/c/sci_convstr.c
scilab/modules/string/src/c/string.rc
scilab/modules/string/src/fortran/string_f.rc
scilab/modules/symbolic/src/c/symbolic.rc
scilab/modules/symbolic/src/fortran/symbolic_f.rc
scilab/modules/tclsci/src/c/tclsci.rc
scilab/modules/time/src/c/time.rc
scilab/modules/ui_data/src/c/ui_data.rc
scilab/modules/ui_data/src/noui_data/noui_data.rc
scilab/modules/umfpack/src/c/umfpack.rc
scilab/modules/umfpack/src/noumfpack/noumfpack.rc
scilab/modules/windows_tools/src/c/CScilex/CScilex.rc
scilab/modules/windows_tools/src/c/WScilex/WScilex.rc
scilab/modules/windows_tools/src/c/scilab_windows/scilab_windows.rc
scilab/modules/windows_tools/src/c/windows_tools.rc
scilab/modules/windows_tools/src/nowindows_tools/nowindows_tools.rc
scilab/modules/xcos/src/c/xcos.rc
scilab/modules/xml/src/c/xml.rc

Change-Id: I3e5b874eac8ac4035d5545094f39847a84bf1f2a

38 files changed:
1  2 
scilab/Makefile.am
scilab/configure
scilab/configure.ac
scilab/modules/api_scilab/src/cpp/api_string.cpp
scilab/modules/completion/Makefile.am
scilab/modules/completion/Makefile.in
scilab/modules/console/src/c/clc.c
scilab/modules/console/src/c/cmdLine/getKey.c
scilab/modules/core/help/ja_JP/mode.xml
scilab/modules/dynamic_link/macros/windows/dlwGenerateMakefile.sci
scilab/modules/elementary_functions/Makefile.am
scilab/modules/elementary_functions/Makefile.in
scilab/modules/external_objects/Makefile.am
scilab/modules/external_objects/Makefile.in
scilab/modules/external_objects_java/Makefile.am
scilab/modules/external_objects_java/Makefile.in
scilab/modules/fileio/src/cpp/mopen.cpp
scilab/modules/graphics/Makefile.am
scilab/modules/graphics/Makefile.in
scilab/modules/graphics/macros/%h_p.sci
scilab/modules/graphics/sci_gateway/c/sci_xrect.c
scilab/modules/graphics/src/c/getHandleProperty/get_type_property.c
scilab/modules/gui/Makefile.am
scilab/modules/gui/Makefile.in
scilab/modules/gui/sci_gateway/cpp/sci_saveGui.cpp
scilab/modules/hdf5/Makefile.am
scilab/modules/hdf5/Makefile.in
scilab/modules/history_manager/sci_gateway/c/sci_historysize.c
scilab/modules/javasci/Makefile.in
scilab/modules/preferences/Makefile.am
scilab/modules/preferences/Makefile.in
scilab/modules/renderer/Makefile.am
scilab/modules/renderer/Makefile.in
scilab/modules/scicos/Makefile.in
scilab/modules/special_functions/Makefile.am
scilab/modules/special_functions/Makefile.in
scilab/modules/xcos/Makefile.am
scilab/modules/xcos/Makefile.in

@@@ -87,10 -55,13 +87,8 @@@ $(AM_CPPFLAGS
  # (causing issues on some platform)
  COMMON_LIBS = $(LTLIBINTL)
  
 -scilab_bin_SOURCES    = modules/startup/src/c/mainscic.cpp
 -
 -# Match scilab -nwni (ie command line without graphics)
 -scilab_cli_bin_SOURCES        = modules/startup/src/c/mainscic.cpp
 -scilab_cli_bin_CPPFLAGS = -DWITHOUT_GUI $(scilab_bin_CPPFLAGS)
 -
 +scilab_bin_SOURCES = modules/startup/src/cpp/scilab.cpp
  
- scilab_bin_LDADD              = $(COMMON_LIBS)
  # the scilab-bin object file itself uses symbols from at least libscilab-cli.la,
  # libsciconsole-minimal.la and libscijvm-disable.la, so we have to link with these
  # libraries explicitly unless we link with -Wl,--copy-dt-needed-entries
              fi
  
  
+     # The class java.util.stream.DoubleStream is new to 1.8
+     cat << \EOF > conftest.java
 -// #line 11482 "configure"
++// #line 11882 "configure"
+ import java.util.regex.Pattern;
+ import java.util.stream.DoubleStream;
+ public class conftest {
+     public static void main(String[] argv) {
+     }
+     private static int compare(String v1, String v2) {
+         String s1 = normalisedVersion(v1);
+         String s2 = normalisedVersion(v2);
+         return s1.compareTo(s2);
+     }
+     private static String normalisedVersion(String version) {
+         return normalisedVersion(version, ".", 4);
+     }
+     private static String normalisedVersion(String version, String sep, int maxWidth) {
+         String[] split = Pattern.compile(sep, Pattern.LITERAL).split(version);
+         StringBuilder sb = new StringBuilder();
+         for (String s : split) {
+             sb.append(String.format("%" + maxWidth + 's', s));
+         }
+         return sb.toString();
+     }
+ }
+ EOF
+     CLASSPATH=$ac_java_classpath
+     export CLASSPATH
+     cmd="$JAVAC ${JAVAC_FLAGS} conftest.java"
+     if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5) ; then
+        if test ""no"" = "no"; then
+            echo "yes" >&5
+               ac_java_jvm_version=1.8
+        else
+               cmd="$JAVA conftest"
+               if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5); then
+                echo "yes" >&5
+                   ac_java_jvm_version=1.8
+             else
+                 echo "configure: failed program was:" >&5
+                 cat conftest.java >&5
+                 if test -s conftest.java.output; then
+                    STDOUT=`cat conftest.java.output`
+                 fi
+                 echo "configure: CLASSPATH was $CLASSPATH" >&5
+                             fi
+         fi
+         if test -f conftest.java.output; then
+            rm conftest.java.output
+         fi
+     else
+         echo "configure: failed program was:" >&5
+         cat conftest.java >&5
+         echo "configure: CLASSPATH was $CLASSPATH" >&5
+             fi
      if test "x$ac_java_jvm_version" = "x" ; then
          as_fn_error $? "Could not detect Java version, 1.4 or newer is required" "$LINENO" 5
      fi
@@@ -13192,7 -12857,7 +13257,7 @@@ $as_echo_n "checking jgraphx... " >&6; 
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 13195 "configure"
 -// #line 12860 "configure"
++// #line 13260 "configure"
  import java.util.regex.Pattern;
  
  import com.mxgraph.model.mxCell;
@@@ -13299,7 -12964,7 +13364,7 @@@ $as_echo_n "checking minimal version (2
     if test "x" == "x"; then
  
      cat << \EOF > conftest.java
- // #line 13302 "configure"
 -// #line 12967 "configure"
++// #line 13367 "configure"
  import java.util.regex.Pattern;
  
  import com.mxgraph.view.mxGraph;
     else
  
      cat << \EOF > conftest.java
- // #line 13374 "configure"
 -// #line 13039 "configure"
++// #line 13439 "configure"
  import java.util.regex.Pattern;
  
  import com.mxgraph.view.mxGraph;
@@@ -13465,7 -13130,7 +13530,7 @@@ $as_echo_n "checking scirenderer... " >
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 13468 "configure"
 -// #line 13133 "configure"
++// #line 13533 "configure"
  import java.util.regex.Pattern;
  
  import org.scilab.forge.scirenderer.PackageInfo;
@@@ -13572,7 -13237,7 +13637,7 @@@ $as_echo_n "checking minimal version (1
     if test "x" == "x"; then
  
      cat << \EOF > conftest.java
- // #line 13575 "configure"
 -// #line 13240 "configure"
++// #line 13640 "configure"
  import java.util.regex.Pattern;
  
  import org.scilab.forge.scirenderer.PackageInfo;
     else
  
      cat << \EOF > conftest.java
- // #line 13647 "configure"
 -// #line 13312 "configure"
++// #line 13712 "configure"
  import java.util.regex.Pattern;
  
  import org.scilab.forge.scirenderer.PackageInfo;
@@@ -13743,7 -13408,7 +13808,7 @@@ $as_echo_n "checking flexdock... " >&6
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 13746 "configure"
 -// #line 13411 "configure"
++// #line 13811 "configure"
  import java.util.regex.Pattern;
  
  import org.flexdock.docking.DockingManager;
@@@ -13850,7 -13515,7 +13915,7 @@@ $as_echo_n "checking minimal version (1
     if test "x" == "x"; then
  
      cat << \EOF > conftest.java
- // #line 13853 "configure"
 -// #line 13518 "configure"
++// #line 13918 "configure"
  import java.util.regex.Pattern;
  
  import org.flexdock.util.Utilities;
     else
  
      cat << \EOF > conftest.java
- // #line 13925 "configure"
 -// #line 13590 "configure"
++// #line 13990 "configure"
  import java.util.regex.Pattern;
  
  import org.flexdock.util.Utilities;
@@@ -14013,7 -13678,7 +14078,7 @@@ $as_echo_n "checking looks... " >&6; 
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14016 "configure"
 -// #line 13681 "configure"
++// #line 14081 "configure"
  import java.util.regex.Pattern;
  
  import com.jgoodies.looks.common.MenuItemRenderer;
@@@ -14130,7 -13795,7 +14195,7 @@@ $as_echo_n "checking jgoodies-looks... 
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14133 "configure"
 -// #line 13798 "configure"
++// #line 14198 "configure"
  import java.util.regex.Pattern;
  
  import com.jgoodies.looks.common.MenuItemRenderer;
@@@ -14248,7 -13913,7 +14313,7 @@@ $as_echo_n "checking skinlf... " >&6; 
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14251 "configure"
 -// #line 13916 "configure"
++// #line 14316 "configure"
  import java.util.regex.Pattern;
  
  import com.l2fprod.util.AccessUtils;
@@@ -14365,7 -14030,7 +14430,7 @@@ $as_echo_n "checking jogl2... " >&6; 
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14368 "configure"
 -// #line 14033 "configure"
++// #line 14433 "configure"
  import java.util.regex.Pattern;
  
  import javax.media.opengl.glu.GLUnurbs;
@@@ -14588,7 -14253,7 +14653,7 @@@ $as_echo_n "checking gluegen2-rt... " >
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14591 "configure"
 -// #line 14256 "configure"
++// #line 14656 "configure"
  import java.util.regex.Pattern;
  
  import jogamp.common.os.MachineDescriptionRuntime;
@@@ -14762,7 -14427,7 +14827,7 @@@ $as_echo_n "checking jhall... " >&6; 
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14765 "configure"
 -// #line 14430 "configure"
++// #line 14830 "configure"
  import java.util.regex.Pattern;
  
  import javax.help.JHelp;
@@@ -14879,7 -14542,7 +14942,7 @@@ $as_echo_n "checking javahelp2... " >&6
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14882 "configure"
 -// #line 14545 "configure"
++// #line 14945 "configure"
  import java.util.regex.Pattern;
  
  import javax.help.JHelp;
@@@ -14997,7 -14660,7 +15060,7 @@@ $as_echo_n "checking jrosetta-API... " 
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 15000 "configure"
 -// #line 14663 "configure"
++// #line 15063 "configure"
  import java.util.regex.Pattern;
  
  import com.artenum.rosetta.interfaces.core.ConsoleConfiguration;
@@@ -15112,7 -14774,7 +15174,7 @@@ $as_echo_n "checking jrosetta-api... " 
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 15115 "configure"
 -// #line 14777 "configure"
++// #line 15177 "configure"
  import java.util.regex.Pattern;
  
  import com.artenum.rosetta.interfaces.core.ConsoleConfiguration;
@@@ -15230,7 -14892,7 +15292,7 @@@ $as_echo_n "checking jrosetta-engine..
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 15233 "configure"
 -// #line 14895 "configure"
++// #line 15295 "configure"
  import java.util.regex.Pattern;
  
  import com.artenum.rosetta.core.action.AbstractConsoleAction;
@@@ -15336,7 -14998,7 +15398,7 @@@ $as_echo_n "checking minimal version (1
     if test "x" == "x"; then
  
      cat << \EOF > conftest.java
- // #line 15339 "configure"
 -// #line 15001 "configure"
++// #line 15401 "configure"
  import java.util.regex.Pattern;
  
  import com.artenum.rosetta.util.ConfigurationBuilder;
     else
  
      cat << \EOF > conftest.java
- // #line 15411 "configure"
 -// #line 15073 "configure"
++// #line 15473 "configure"
  import java.util.regex.Pattern;
  
  import com.artenum.rosetta.util.ConfigurationBuilder;
@@@ -15501,7 -15163,7 +15563,7 @@@ $as_echo_n "checking jeuclid-core... " 
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 15504 "configure"
 -// #line 15166 "configure"
++// #line 15566 "configure"
  import java.util.regex.Pattern;
  
  import net.sourceforge.jeuclid.LayoutContext;
@@@ -15620,7 -15282,7 +15682,7 @@@ $as_echo_n "checking fop... " >&6; 
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 15623 "configure"
 -// #line 15285 "configure"
++// #line 15685 "configure"
  import java.util.regex.Pattern;
  
  import org.apache.fop.pdf.PDFInfo;
@@@ -15744,7 -15406,7 +15806,7 @@@ $as_echo_n "checking freehep-graphics2d
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 15747 "configure"
 -// #line 15409 "configure"
++// #line 15809 "configure"
  import java.util.regex.Pattern;
  
  import org.freehep.graphics2d.VectorGraphics;
@@@ -15861,7 -15523,7 +15923,7 @@@ $as_echo_n "checking freehep-graphicsio
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 15864 "configure"
 -// #line 15526 "configure"
++// #line 15926 "configure"
  import java.util.regex.Pattern;
  
  import org.freehep.graphicsio.emf.EMFGraphics2D;
@@@ -15978,7 -15640,7 +16040,7 @@@ $as_echo_n "checking freehep-graphicsio
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 15981 "configure"
 -// #line 15643 "configure"
++// #line 16043 "configure"
  import java.util.regex.Pattern;
  
  import org.freehep.graphicsio.VectorGraphicsIO;
@@@ -16095,7 -15757,7 +16157,7 @@@ $as_echo_n "checking freehep-io... " >&
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 16098 "configure"
 -// #line 15760 "configure"
++// #line 16160 "configure"
  import java.util.regex.Pattern;
  
  import org.freehep.util.io.XMLSequence;
@@@ -16212,7 -15874,7 +16274,7 @@@ $as_echo_n "checking freehep-util... " 
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 16215 "configure"
 -// #line 15877 "configure"
++// #line 16277 "configure"
  import java.util.regex.Pattern;
  
  import org.freehep.util.StringUtilities;
@@@ -16330,7 -15992,7 +16392,7 @@@ $as_echo_n "checking batik-all... " >&6
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 16333 "configure"
 -// #line 15995 "configure"
++// #line 16395 "configure"
  import java.util.regex.Pattern;
  
  import org.apache.batik.parser.Parser;
@@@ -16447,7 -16109,7 +16509,7 @@@ $as_echo_n "checking batik... " >&6; 
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 16450 "configure"
 -// #line 16112 "configure"
++// #line 16512 "configure"
  import java.util.regex.Pattern;
  
  import org.apache.batik.parser.Parser;
@@@ -16554,7 -16216,7 +16616,7 @@@ $as_echo_n "checking minimal version (1
     if test "x" == "x"; then
  
      cat << \EOF > conftest.java
- // #line 16557 "configure"
 -// #line 16219 "configure"
++// #line 16619 "configure"
  import java.util.regex.Pattern;
  
  import org.apache.batik.Version;
     else
  
      cat << \EOF > conftest.java
- // #line 16629 "configure"
 -// #line 16291 "configure"
++// #line 16691 "configure"
  import java.util.regex.Pattern;
  
  import org.apache.batik.Version;
@@@ -16717,7 -16379,7 +16779,7 @@@ $as_echo_n "checking commons-io... " >&
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 16720 "configure"
 -// #line 16382 "configure"
++// #line 16782 "configure"
  import java.util.regex.Pattern;
  
  import org.apache.commons.io.output.CountingOutputStream;
@@@ -16834,7 -16496,7 +16896,7 @@@ $as_echo_n "checking xmlgraphics-common
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 16837 "configure"
 -// #line 16499 "configure"
++// #line 16899 "configure"
  import java.util.regex.Pattern;
  
  import org.apache.xmlgraphics.util.Service;
@@@ -16951,7 -16613,7 +17013,7 @@@ $as_echo_n "checking avalon-framework..
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 16954 "configure"
 -// #line 16616 "configure"
++// #line 17016 "configure"
  import java.util.regex.Pattern;
  
  import org.apache.avalon.framework.configuration.ConfigurationException;
@@@ -17068,7 -16730,7 +17130,7 @@@ $as_echo_n "checking xml-apis-ext... " 
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 17071 "configure"
 -// #line 16733 "configure"
++// #line 17133 "configure"
  import java.util.regex.Pattern;
  
  import org.w3c.dom.svg.SVGDocument;
@@@ -17185,7 -16847,7 +17247,7 @@@ $as_echo_n "checking xml-commons-apis-e
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 17188 "configure"
 -// #line 16850 "configure"
++// #line 17250 "configure"
  import java.util.regex.Pattern;
  
  import org.w3c.dom.svg.SVGDocument;
@@@ -17306,7 -16968,7 +17368,7 @@@ $as_echo_n "checking commons-logging..
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 17309 "configure"
 -// #line 16971 "configure"
++// #line 17371 "configure"
  import java.util.regex.Pattern;
  
  import org.apache.commons.logging.LogFactory;
@@@ -17423,7 -17085,7 +17485,7 @@@ $as_echo_n "checking jlatexmath... " >&
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 17426 "configure"
 -// #line 17088 "configure"
++// #line 17488 "configure"
  import java.util.regex.Pattern;
  
  import org.scilab.forge.jlatexmath.TeXFormula;
@@@ -17530,7 -17192,7 +17592,7 @@@ $as_echo_n "checking minimal version (1
     if test "x" == "x"; then
  
      cat << \EOF > conftest.java
- // #line 17533 "configure"
 -// #line 17195 "configure"
++// #line 17595 "configure"
  import java.util.regex.Pattern;
  
  import org.scilab.forge.jlatexmath.TeXFormula;
     else
  
      cat << \EOF > conftest.java
- // #line 17605 "configure"
 -// #line 17267 "configure"
++// #line 17667 "configure"
  import java.util.regex.Pattern;
  
  import org.scilab.forge.jlatexmath.TeXFormula;
@@@ -17693,7 -17355,7 +17755,7 @@@ $as_echo_n "checking jlatexmath-fop... 
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 17696 "configure"
 -// #line 17358 "configure"
++// #line 17758 "configure"
  import java.util.regex.Pattern;
  
  import org.scilab.forge.jlatexmath.fop.JLaTeXMathObj;
@@@ -17816,7 -17478,7 +17878,7 @@@ $as_echo_n "checking checkstyle... " >&
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 17819 "configure"
 -// #line 17481 "configure"
++// #line 17881 "configure"
  import java.util.regex.Pattern;
  
  import com.puppycrawl.tools.checkstyle.CheckStyleTask;
@@@ -17933,7 -17595,7 +17995,7 @@@ $as_echo_n "checking commons-beanutils.
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 17936 "configure"
 -// #line 17598 "configure"
++// #line 17998 "configure"
  import java.util.regex.Pattern;
  
  import org.apache.commons.beanutils.Converter;
@@@ -18050,7 -17712,7 +18112,7 @@@ $as_echo_n "checking antlr... " >&6; 
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 18053 "configure"
 -// #line 17715 "configure"
++// #line 18115 "configure"
  import java.util.regex.Pattern;
  
  import antlr.TokenStreamException;
@@@ -18167,7 -17829,7 +18229,7 @@@ $as_echo_n "checking junit4... " >&6; 
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 18170 "configure"
 -// #line 17832 "configure"
++// #line 18232 "configure"
  import java.util.regex.Pattern;
  
  import org.junit.Assert;
@@@ -18263,6 -17925,124 +18325,124 @@@ $as_echo "$as_me: WARNING: Could not fi
        fi
      fi
  
+         if test -z "$PACKAGE_JAR_FILE"; then
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking junit" >&5
+ $as_echo_n "checking junit... " >&6; }
+     PACKAGE_JAR_FILE=
+     found_jar=no
+     saved_ac_java_classpath=$ac_java_classpath
+     DEFAULT_JAR_DIR="/usr/share/java /usr/lib/java /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(find /usr/share/java/ -maxdepth 1 -type d 2>/dev/null) $(find /usr/lib64/ -maxdepth 1 -type d 2>/dev/null) $(find  /usr/lib/ -maxdepth 1 -type d 2>/dev/null)  $(find /usr/share/*/lib -maxdepth 1 -type d 2>/dev/null)"
+     for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR; do
+       for jar in "$jardir/junit.jar" "$jardir/libjunit.jar" "$jardir/libjunit-java.jar" "$jardir/junit*.jar"; do
+ # TODO check the behaviour when spaces
+         jars_resolved=`ls $jar 2>/dev/null`
+         for jar_resolved in $jars_resolved; do # If several jars matches
+           if test -e "$jar_resolved"; then
+             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+     cat << \EOF > conftest.java
 -// #line 17946 "configure"
++// #line 18346 "configure"
+ import java.util.regex.Pattern;
+ import org.junit.Assert;
+ public class conftest {
+     public static void main(String[] argv) {
+     }
+     private static int compare(String v1, String v2) {
+         String s1 = normalisedVersion(v1);
+         String s2 = normalisedVersion(v2);
+         return s1.compareTo(s2);
+     }
+     private static String normalisedVersion(String version) {
+         return normalisedVersion(version, ".", 4);
+     }
+     private static String normalisedVersion(String version, String sep, int maxWidth) {
+         String[] split = Pattern.compile(sep, Pattern.LITERAL).split(version);
+         StringBuilder sb = new StringBuilder();
+         for (String s : split) {
+             sb.append(String.format("%" + maxWidth + 's', s));
+         }
+         return sb.toString();
+     }
+ }
+ EOF
+     CLASSPATH=$ac_java_classpath
+     export CLASSPATH
+     cmd="$JAVAC ${JAVAC_FLAGS} conftest.java"
+     if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5) ; then
+        if test ""no"" = "no"; then
+            echo "yes" >&5
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
+ $as_echo "$jar_resolved" >&6; }
+               found_jar=yes
+               PACKAGE_JAR_FILE=$jar_resolved
+               break 3
+        else
+               cmd="$JAVA conftest"
+               if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5); then
+                echo "yes" >&5
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
+ $as_echo "$jar_resolved" >&6; }
+               found_jar=yes
+               PACKAGE_JAR_FILE=$jar_resolved
+               break 3
+             else
+                 echo "configure: failed program was:" >&5
+                 cat conftest.java >&5
+                 if test -s conftest.java.output; then
+                    STDOUT=`cat conftest.java.output`
+                 fi
+                 echo "configure: CLASSPATH was $CLASSPATH" >&5
+             ac_java_classpath=$saved_ac_java_classpath
+                             fi
+         fi
+         if test -f conftest.java.output; then
+            rm conftest.java.output
+         fi
+     else
+         echo "configure: failed program was:" >&5
+         cat conftest.java >&5
+         echo "configure: CLASSPATH was $CLASSPATH" >&5
+             ac_java_classpath=$saved_ac_java_classpath
+             fi
+           fi
+         done
+       done
+     done
+     if test "$found_jar" = "no"; then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+       if test ""yes"" = "yes"; then
+          { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar junit used by Junit4 -
+ Unit tests (looking for package org.junit.Assert)" >&5
+ $as_echo "$as_me: WARNING: Could not find or use the Java package/jar junit used by Junit4 -
+ Unit tests (looking for package org.junit.Assert)" >&2;}
+       else
+           as_fn_error $? "Could not find or use the Java package/jar junit used by Junit4 -
+ Unit tests (looking for package org.junit.Assert)" "$LINENO" 5
+       fi
+     fi
+         fi
          JUNIT4=$PACKAGE_JAR_FILE
  
  
@@@ -18284,7 -18064,7 +18464,7 @@@ $as_echo_n "checking cobertura... " >&6
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 18287 "configure"
 -// #line 18067 "configure"
++// #line 18467 "configure"
  import java.util.regex.Pattern;
  
  import net.sourceforge.cobertura.merge.Main;
@@@ -18401,7 -18181,7 +18581,7 @@@ $as_echo_n "checking asm3... " >&6; 
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 18404 "configure"
 -// #line 18184 "configure"
++// #line 18584 "configure"
  import java.util.regex.Pattern;
  
  import org.objectweb.asm.Type;
@@@ -18517,7 -18295,7 +18695,7 @@@ $as_echo_n "checking asm... " >&6; 
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 18520 "configure"
 -// #line 18298 "configure"
++// #line 18698 "configure"
  import java.util.regex.Pattern;
  
  import org.objectweb.asm.Type;
@@@ -18633,7 -18412,7 +18812,7 @@@ $as_echo_n "checking ecj... " >&6; 
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 18636 "configure"
 -// #line 18415 "configure"
++// #line 18815 "configure"
  import java.util.regex.Pattern;
  
  import org.eclipse.jdt.core.compiler.batch.BatchCompiler;
  
  
  #################
 +## EIGEN
 +#################
 +
 +
 +ac_ext=cpp
 +ac_cpp='$CXXCPP $CPPFLAGS'
 +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
 +$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
 +if test -z "$CXXCPP"; then
 +  if ${ac_cv_prog_CXXCPP+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +      # Double quotes because CXXCPP needs to be expanded
 +    for CXXCPP in "$CXX -E" "/lib/cpp"
 +    do
 +      ac_preproc_ok=false
 +for ac_cxx_preproc_warn_flag in '' yes
 +do
 +  # Use a header file that comes with gcc, so configuring glibc
 +  # with a fresh cross-compiler works.
 +  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 +  # <limits.h> exists even on freestanding compilers.
 +  # On the NeXT, cc -E runs the code through the compiler's parser,
 +  # not just through cpp. "Syntax error" is here to catch this case.
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +#ifdef __STDC__
 +# include <limits.h>
 +#else
 +# include <assert.h>
 +#endif
 +                   Syntax error
 +_ACEOF
 +if ac_fn_cxx_try_cpp "$LINENO"; then :
 +
 +else
 +  # Broken: fails on valid input.
 +continue
 +fi
 +rm -f conftest.err conftest.i conftest.$ac_ext
 +
 +  # OK, works on sane cases.  Now check whether nonexistent headers
 +  # can be detected and how.
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +#include <ac_nonexistent.h>
 +_ACEOF
 +if ac_fn_cxx_try_cpp "$LINENO"; then :
 +  # Broken: success on invalid input.
 +continue
 +else
 +  # Passes both tests.
 +ac_preproc_ok=:
 +break
 +fi
 +rm -f conftest.err conftest.i conftest.$ac_ext
 +
 +done
 +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 +rm -f conftest.i conftest.err conftest.$ac_ext
 +if $ac_preproc_ok; then :
 +  break
 +fi
 +
 +    done
 +    ac_cv_prog_CXXCPP=$CXXCPP
 +
 +fi
 +  CXXCPP=$ac_cv_prog_CXXCPP
 +else
 +  ac_cv_prog_CXXCPP=$CXXCPP
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
 +$as_echo "$CXXCPP" >&6; }
 +ac_preproc_ok=false
 +for ac_cxx_preproc_warn_flag in '' yes
 +do
 +  # Use a header file that comes with gcc, so configuring glibc
 +  # with a fresh cross-compiler works.
 +  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 +  # <limits.h> exists even on freestanding compilers.
 +  # On the NeXT, cc -E runs the code through the compiler's parser,
 +  # not just through cpp. "Syntax error" is here to catch this case.
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +#ifdef __STDC__
 +# include <limits.h>
 +#else
 +# include <assert.h>
 +#endif
 +                   Syntax error
 +_ACEOF
 +if ac_fn_cxx_try_cpp "$LINENO"; then :
 +
 +else
 +  # Broken: fails on valid input.
 +continue
 +fi
 +rm -f conftest.err conftest.i conftest.$ac_ext
 +
 +  # OK, works on sane cases.  Now check whether nonexistent headers
 +  # can be detected and how.
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +#include <ac_nonexistent.h>
 +_ACEOF
 +if ac_fn_cxx_try_cpp "$LINENO"; then :
 +  # Broken: success on invalid input.
 +continue
 +else
 +  # Passes both tests.
 +ac_preproc_ok=:
 +break
 +fi
 +rm -f conftest.err conftest.i conftest.$ac_ext
 +
 +done
 +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 +rm -f conftest.i conftest.err conftest.$ac_ext
 +if $ac_preproc_ok; then :
 +
 +else
 +  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 +as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
 +See \`config.log' for more details" "$LINENO" 5; }
 +fi
 +
 +ac_ext=cpp
 +ac_cpp='$CXXCPP $CPPFLAGS'
 +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 +
 +
 +
 +ac_ext=cpp
 +ac_cpp='$CXXCPP $CPPFLAGS'
 +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 +
 +
 +
 +# Check whether --with-eigen_include was given.
 +if test "${with_eigen_include+set}" = set; then :
 +  withval=$with_eigen_include; with_eigen_include=$withval
 +else
 +  with_eigen_include='yes'
 +
 +fi
 +
 +
 +
 +save_CPPFLAGS="$CPPFLAGS"
 +
 +if test "x$with_eigen_include" != "xyes"; then
 +      CPPFLAGS="-I$with_eigen_include"
 +      ac_fn_cxx_check_header_mongrel "$LINENO" "Eigen/Sparse" "ac_cv_header_Eigen_Sparse" "$ac_includes_default"
 +if test "x$ac_cv_header_Eigen_Sparse" = xyes; then :
 +  EIGEN_CPPFLAGS="$CPPFLAGS"
 +else
 +  as_fn_error $? "Cannot find headers (Eigen/Sparse) of the library EIGEN in $with_eigen_include. Please install the dev package (Debian : libeigen3-dev)" "$LINENO" 5
 +
 +fi
 +
 +
 +    PATH_TO_EIGEN=$with_eigen_include
 +else
 +      ac_fn_cxx_check_header_mongrel "$LINENO" "Eigen/Sparse" "ac_cv_header_Eigen_Sparse" "$ac_includes_default"
 +if test "x$ac_cv_header_Eigen_Sparse" = xyes; then :
 +  EIGEN_CPPFLAGS=""
 +else
 +         $as_unset ac_cv_header_Eigen_Sparse
 +                CPPFLAGS="-I/usr/include/eigen3/"
 +                ac_fn_cxx_check_header_mongrel "$LINENO" "Eigen/Sparse" "ac_cv_header_Eigen_Sparse" "$ac_includes_default"
 +if test "x$ac_cv_header_Eigen_Sparse" = xyes; then :
 +  EIGEN_CPPFLAGS=$CPPFLAGS
 +else
 +  as_fn_error $? "Cannot find headers (Eigen/Sparse) of the library eigen. Please install the dev package (Debian : libeigen3-dev)" "$LINENO" 5
 +
 +fi
 +
 +
 +
 +fi
 +
 +
 +    PATH_TO_EIGEN="/usr/include/eigen3/"
 +fi
 +CPPFLAGS="$save_CPPFLAGS"
 +
 +CHK_EIGEN_WORLD=3
 +CHK_EIGEN_MAJOR=1
 +CHK_EIGEN_MINOR=0
 +
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if Eigen is version $CHK_EIGEN_WORLD.$CHK_EIGEN_MAJOR.$CHK_EIGEN_MINOR or later" >&5
 +$as_echo_n "checking if Eigen is version $CHK_EIGEN_WORLD.$CHK_EIGEN_MAJOR.$CHK_EIGEN_MINOR or later... " >&6; }
 +cat > conftest.$ac_ext <<EOF
- #line 22871 "configure"
++#line 23051 "configure"
 +#include "confdefs.h"
 +
 +#include "$PATH_TO_EIGEN/Eigen/Sparse"
 +#if EIGEN_VERSION_AT_LEAST(3,1,0)
 +EIGEN_VERSION_OK
 +#endif
 +
 +EOF
 +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 +  grep "EIGEN_VERSION_OK" >/dev/null 2>&1; then
 +  rm -rf conftest*
 +  \
 +EIGEN_VERSION_OK=1
 +else
 +  rm -rf conftest*
 +  \
 +EIGEN_VERSION_OK=0
 +fi
 +rm -f conftest*
 +
 +if test $EIGEN_VERSION_OK = 0; then
 +   as_fn_error $? "Version $CHK_EIGEN_WORLD.$CHK_EIGEN_MAJOR.$CHK_EIGEN_MINOR of Eigen expected (at least)" "$LINENO" 5
 +else
 +   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 +$as_echo "yes" >&6; }
 +fi
 +
 +
 +
 +$as_echo "#define WITH_EIGEN /**/" >>confdefs.h
 +
 +ac_ext=c
 +ac_cpp='$CPP $CPPFLAGS'
 +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 +ac_compiler_gnu=$ac_cv_c_compiler_gnu
 +
 +
 +
 +
 +#################
  ## MPI
  #################
  
@@@ -27418,7 -26955,7 +27598,7 @@@ CPPFLAGS="$CPPFLAGS -I$CHK_TCL_INCLUDE_
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later" >&5
  $as_echo_n "checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later... " >&6; }
  cat > conftest.$ac_ext <<EOF
- #line 27421 "configure"
 -#line 26958 "configure"
++#line 27601 "configure"
  #include "confdefs.h"
  
  #include "$CHK_TCL_INCLUDE_PATH/$CHK_TCL_INC_NAME"
@@@ -27729,7 -27266,7 +27909,7 @@@ CPPFLAGS="$CPPFLAGS $TCL_INC_PATH -I$CH
  $as_echo_n "checking if tk is version $CHK_TK_MAJOR.$CHK_TK_MINOR or later... " >&6; }
  
  cat > conftest.$ac_ext <<EOF
- #line 27732 "configure"
 -#line 27269 "configure"
++#line 27912 "configure"
  #include "confdefs.h"
  
  #include "$CHK_TK_INCLUDE_PATH/$CHK_TK_INC_NAME"
@@@ -28313,7 -27850,7 +28493,7 @@@ $as_echo_n "checking saxon9he... " >&6
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 28316 "configure"
 -// #line 27853 "configure"
++// #line 28496 "configure"
  import java.util.regex.Pattern;
  
  import net.sf.saxon.Version;
@@@ -28428,7 -27965,7 +28608,7 @@@ $as_echo_n "checking saxon... " >&6; 
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 28431 "configure"
 -// #line 27968 "configure"
++// #line 28611 "configure"
  import java.util.regex.Pattern;
  
  import net.sf.saxon.Version;
@@@ -28544,7 -28081,7 +28724,7 @@@ $as_echo_n "checking saxon... " >&6; 
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 28547 "configure"
 -// #line 28084 "configure"
++// #line 28727 "configure"
  import java.util.regex.Pattern;
  
  import com.icl.saxon.Loader;
Simple merge
@@@ -728,10 -889,8 +733,9 @@@ int createSingleString(void* _pvCtx, in
  int allocSingleString(void* _pvCtx, int _iVar, int _iLen, const char** _pstStrings)
  {
      SciErr sciErr = sciErrInit();
 +#if 0
      int iNewPos     = Top - Rhs + _iVar;
      int iAddr       = *Lstk(iNewPos);
-     int iTotalLen   = 0;
      int* piAddr     = NULL;
      int* piOffset   = NULL;
      char* pstString = NULL;
Simple merge
Simple merge
@@@ -11,8 -12,9 +12,9 @@@
   */
  /*--------------------------------------------------------------------------*/
  #include <stdlib.h>
+ #include <stdio.h>
  #include "clc.h"
 -#include "scilabmode.h"
 +#include "sci_mode.h"
  #include "ClearConsole.h"
  #include "ClearConsolePart.h"
  #ifdef _MSC_VER
@@@ -353,23 -377,12 +353,23 @@@ libdummy_elementary_functions_la_CPPFLA
      $(AM_CPPFLAGS)
  
  # Includes need for the compilation
 -libscielementary_functions_la_CPPFLAGS = -I$(srcdir)/includes/ \
 +libscielementary_functions_la_CPPFLAGS = \
 +    -I$(srcdir)/includes/ \
-       -I$(srcdir)/src/cpp/ \
        -I$(srcdir)/src/c/ \
++      -I$(srcdir)/src/cpp/ \
 +      -I$(top_srcdir)/modules/dynamic_link/includes \
        -I$(top_srcdir)/modules/api_scilab/includes/ \
 -      -I$(top_srcdir)/modules/core/src/c/ \
 +      -I$(top_srcdir)/modules/console/includes/ \
        -I$(top_srcdir)/modules/localization/includes/ \
        -I$(top_srcdir)/modules/output_stream/includes/ \
 +      -I$(top_srcdir)/modules/operations/includes/ \
 +      -I$(top_srcdir)/modules/types/includes/ \
 +      -I$(top_srcdir)/modules/ast/includes/ \
 +      -I$(top_srcdir)/modules/symbol/includes/ \
 +      -I$(top_srcdir)/modules/system_env/includes/ \
 +      -I$(top_srcdir)/modules/threads/includes/ \
 +      -I$(top_srcdir)/modules/string/includes/ \
 +      $(EIGEN_CPPFLAGS) \
        $(AM_CPPFLAGS)
  
  if MAINTAINER_MODE
@@@ -1138,23 -1236,12 +1138,23 @@@ libdummy_elementary_functions_la_CPPFLA
  
  
  # Includes need for the compilation
 -libscielementary_functions_la_CPPFLAGS = -I$(srcdir)/includes/ \
 +libscielementary_functions_la_CPPFLAGS = \
 +    -I$(srcdir)/includes/ \
-       -I$(srcdir)/src/cpp/ \
        -I$(srcdir)/src/c/ \
++      -I$(srcdir)/src/cpp/ \
 +      -I$(top_srcdir)/modules/dynamic_link/includes \
        -I$(top_srcdir)/modules/api_scilab/includes/ \
 -      -I$(top_srcdir)/modules/core/src/c/ \
 +      -I$(top_srcdir)/modules/console/includes/ \
        -I$(top_srcdir)/modules/localization/includes/ \
        -I$(top_srcdir)/modules/output_stream/includes/ \
 +      -I$(top_srcdir)/modules/operations/includes/ \
 +      -I$(top_srcdir)/modules/types/includes/ \
 +      -I$(top_srcdir)/modules/ast/includes/ \
 +      -I$(top_srcdir)/modules/symbol/includes/ \
 +      -I$(top_srcdir)/modules/system_env/includes/ \
 +      -I$(top_srcdir)/modules/threads/includes/ \
 +      -I$(top_srcdir)/modules/string/includes/ \
 +      $(EIGEN_CPPFLAGS) \
        $(AM_CPPFLAGS)
  
  @MAINTAINER_MODE_TRUE@pkglib_LTLIBRARIES = libscielementary_functions.la
@@@ -127,9 -126,7 +126,8 @@@ libsciexternal_objects_la_CPPFLAGS = -I
      -I$(top_srcdir)/modules/output_stream/includes \
      -I$(top_srcdir)/modules/string/includes \
      -I$(top_srcdir)/modules/fileio/includes \
 -    -I$(top_srcdir)/modules/core/src/c
 +    -I$(top_srcdir)/modules/core/src/c \
-       -I$(top_srcdir)/modules/operations/includes \
-     $(EXTERNAL_OBJECTS_FLAGS)
++      -I$(top_srcdir)/modules/operations/includes
  
  
  pkglib_LTLIBRARIES = libsciexternal_objects.la 
@@@ -825,9 -817,7 +824,8 @@@ libsciexternal_objects_la_CPPFLAGS = -I
      -I$(top_srcdir)/modules/output_stream/includes \
      -I$(top_srcdir)/modules/string/includes \
      -I$(top_srcdir)/modules/fileio/includes \
 -    -I$(top_srcdir)/modules/core/src/c
 +    -I$(top_srcdir)/modules/core/src/c \
-       -I$(top_srcdir)/modules/operations/includes \
-     $(EXTERNAL_OBJECTS_FLAGS)
++      -I$(top_srcdir)/modules/operations/includes
  
  pkglib_LTLIBRARIES = libsciexternal_objects.la 
  noinst_LTLIBRARIES = libsciexternal_objects-algo.la 
index f528475,0000000..6c07bbe
mode 100644,000000..100644
--- /dev/null
@@@ -1,88 -1,0 +1,99 @@@
 +/*
 + * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
 + * Copyright (C) 2007 - INRIA
 + * Copyright (C) 2009 - DIGITEO - Allan CORNET
 + *
 + * This file must be used under the terms of the CeCILL.
 + * This source file is licensed as described in the file COPYING, which
 + * you should have received as part of this distribution.  The terms
 + * are also available at
 + * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
 + *
 + */
 +/*--------------------------------------------------------------------------*/
 +#include <stdio.h>
 +#include <string.h>
 +#include "file.hxx"
 +#include "filemanager.hxx"
 +
 +extern "C"
 +{
 +#include "MALLOC.h"
 +#include "mopen.h"
 +#include "sciprint.h"
 +#include "charEncoding.h"
 +#include "warningmode.h"
 +#include "isdir.h"
 +#include "localization.h"
 +#include "os_wfopen.h"
 +}
 +/*--------------------------------------------------------------------------*/
 +int mopen(wchar_t* _pstFilename, wchar_t* _pstMode, int _iSwap, int* _piID)
 +{
++    int lenChar = 0, testRep = 1;
++
 +    if (getWarningMode() && FileManager::isOpened(_pstFilename))
 +    {
 +        char* pst = wide_string_to_UTF8(_pstFilename);
 +        sciprint(_("Warning: file '%s' already opened in Scilab.\n"), pst);
 +        FREE(pst);
 +    }
 +    /* bug 4846 */
 +    if (_pstFilename == NULL)
 +    {
 +        return MOPEN_INVALID_FILENAME;
 +    }
 +
 +    if (wcslen(_pstFilename) == 0)
 +    {
 +        return MOPEN_INVALID_FILENAME;
 +    }
 +
 +    if (_pstMode == NULL)
 +    {
 +        return MOPEN_INVALID_STATUS;
 +    }
 +
-     if (wcslen(_pstMode) == 0)
++    lenChar = wcslen(_pstMode);
++    if (( lenChar == 0 ) || ( lenChar > 3 ))
 +    {
 +        return MOPEN_INVALID_STATUS;
 +    }
 +
 +    if ((_pstMode[0] != L'a') && (_pstMode[0] != L'r') && (_pstMode[0] != L'w'))
 +    {
 +        return MOPEN_INVALID_STATUS;
 +    }
 +
++    for ( testRep = 1; testRep < lenChar ; testRep++ )
++    {
++        if (( _pstMode[testRep] != '+' ) && ( _pstMode[testRep] != 'b' ) && ( _pstMode[testRep] != 't' ))
++        {
++            return MOPEN_INVALID_STATUS;
++        }
++    }
++
 +    if (isdirW(_pstFilename))
 +    {
 +        return MOPEN_CAN_NOT_OPEN_FILE;
 +    }
 +
 +    FILE* pF = os_wfopen(_pstFilename, _pstMode);
 +    if (pF == NULL)
 +    {
 +        return MOPEN_CAN_NOT_OPEN_FILE;
 +    }
 +
 +    //Create File object and fill it
 +    types::File* pFile = new types::File();
 +    pFile->setFileDesc(pF);
 +    pFile->setFilename(_pstFilename);
 +    pFile->setFileType(2); //hard coded value for file opened by C/C++ fopen functions
 +    pFile->setFileMode(_pstMode);
 +    pFile->setFileSwap(_iSwap);
 +
 +    *_piID = FileManager::addFile(pFile);
 +    return MOPEN_NO_ERROR;
 +}
 +/*--------------------------------------------------------------------------*/
 +
@@@ -462,48 -461,26 +462,47 @@@ sci_gateway/c/sci_color.c 
  sci_gateway/c/sci_name2rgb.c \
  sci_gateway/c/sci_addcolor.c
  
 +GATEWAY_CXX_SOURCES = \
 +sci_gateway/cpp/graphics_gw.cpp \
 +sci_gateway/cpp/sci_get.cpp \
 +sci_gateway/cpp/sci_xget.cpp \
 +sci_gateway/cpp/sci_xset.cpp \
 +sci_gateway/cpp/sci_winsid.cpp
 +
 +
  libscigraphics_la_CPPFLAGS = \
 -      -I$(srcdir)/includes/ \
 -      -I$(srcdir)/src/c/ \
 -      -I$(srcdir)/src/c/getHandleProperty/ \
 -      -I$(top_srcdir)/modules/action_binding/includes/ \
 -      -I$(top_srcdir)/modules/api_scilab/includes/ \
 -      -I$(top_srcdir)/modules/elementary_functions/includes/ \
 -      -I$(top_srcdir)/modules/fileio/includes/ \
 -      -I$(top_srcdir)/modules/graphic_export/includes/ \
 -      -I$(top_srcdir)/modules/graphic_objects/includes/ \
 -      -I$(top_srcdir)/modules/gui/includes/ \
 -      -I$(top_srcdir)/modules/jvm/includes/ \
 -      -I$(top_srcdir)/modules/localization/includes/ \
 -      -I$(top_srcdir)/modules/output_stream/includes/ \
 -      -I$(top_srcdir)/modules/renderer/includes/ \
 -      -I$(top_srcdir)/modules/string/includes/ \
 -      $(AM_CPPFLAGS)
 +-I$(srcdir)/includes/ \
 +-I$(srcdir)/src/c/ \
- -I$(srcdir)/src/c/getHandleProperty/ \
 +-I$(srcdir)/src/cpp/ \
- -I$(top_srcdir)/libs/hashtable/ \
++-I$(srcdir)/src/c/getHandleProperty/ \
 +-I$(top_srcdir)/modules/action_binding/includes/ \
 +-I$(top_srcdir)/modules/api_scilab/includes/ \
 +-I$(top_srcdir)/modules/elementary_functions/includes/ \
 +-I$(top_srcdir)/modules/fileio/includes/ \
 +-I$(top_srcdir)/modules/graphic_export/includes/ \
 +-I$(top_srcdir)/modules/graphic_objects/includes/ \
 +-I$(top_srcdir)/modules/gui/includes/ \
 +-I$(top_srcdir)/modules/jvm/includes/ \
 +-I$(top_srcdir)/modules/localization/includes/ \
 +-I$(top_srcdir)/modules/output_stream/includes/ \
 +-I$(top_srcdir)/modules/renderer/includes/ \
 +-I$(top_srcdir)/modules/string/includes/ \
 +-I$(top_srcdir)/modules/system_env/includes/ \
 +-I$(top_srcdir)/modules/operations/includes/ \
 +-I$(top_srcdir)/modules/types/includes/ \
 +-I$(top_srcdir)/modules/ast/includes/ \
 +-I$(top_srcdir)/modules/symbol/includes/ \
 +-I$(top_srcdir)/modules/localization/includes/ \
 +-I$(top_srcdir)/modules/threads/includes/ \
 +-I$(top_srcdir)/modules/console/includes/ \
 +-I$(top_srcdir)/modules/dynamic_link/includes \
 +$(EIGEN_CPPFLAGS) \
 +$(TCL_INC_PATH) \
 +$(TK_INC_PATH) \
 +$(AM_CPPFLAGS)
  
  libscigraphics_algo_la_SOURCES = $(GRAPHICS_C_SOURCES) $(GRAPHICS_CXX_SOURCES)
 -libscigraphics_la_SOURCES = $(GATEWAY_C_SOURCES)
 +libscigraphics_la_SOURCES = $(GATEWAY_C_SOURCES) $(GATEWAY_CXX_SOURCES)
  libscigraphics_algo_la_CPPFLAGS = $(libscigraphics_la_CPPFLAGS)
  
  # For the code check (splint)
@@@ -1446,47 -1416,26 +1446,46 @@@ sci_gateway/c/sci_color.c 
  sci_gateway/c/sci_name2rgb.c \
  sci_gateway/c/sci_addcolor.c
  
 +GATEWAY_CXX_SOURCES = \
 +sci_gateway/cpp/graphics_gw.cpp \
 +sci_gateway/cpp/sci_get.cpp \
 +sci_gateway/cpp/sci_xget.cpp \
 +sci_gateway/cpp/sci_xset.cpp \
 +sci_gateway/cpp/sci_winsid.cpp
 +
  libscigraphics_la_CPPFLAGS = \
 -      -I$(srcdir)/includes/ \
 -      -I$(srcdir)/src/c/ \
 -      -I$(srcdir)/src/c/getHandleProperty/ \
 -      -I$(top_srcdir)/modules/action_binding/includes/ \
 -      -I$(top_srcdir)/modules/api_scilab/includes/ \
 -      -I$(top_srcdir)/modules/elementary_functions/includes/ \
 -      -I$(top_srcdir)/modules/fileio/includes/ \
 -      -I$(top_srcdir)/modules/graphic_export/includes/ \
 -      -I$(top_srcdir)/modules/graphic_objects/includes/ \
 -      -I$(top_srcdir)/modules/gui/includes/ \
 -      -I$(top_srcdir)/modules/jvm/includes/ \
 -      -I$(top_srcdir)/modules/localization/includes/ \
 -      -I$(top_srcdir)/modules/output_stream/includes/ \
 -      -I$(top_srcdir)/modules/renderer/includes/ \
 -      -I$(top_srcdir)/modules/string/includes/ \
 -      $(AM_CPPFLAGS)
 +-I$(srcdir)/includes/ \
 +-I$(srcdir)/src/c/ \
- -I$(srcdir)/src/c/getHandleProperty/ \
 +-I$(srcdir)/src/cpp/ \
- -I$(top_srcdir)/libs/hashtable/ \
++-I$(srcdir)/src/c/getHandleProperty/ \
 +-I$(top_srcdir)/modules/action_binding/includes/ \
 +-I$(top_srcdir)/modules/api_scilab/includes/ \
 +-I$(top_srcdir)/modules/elementary_functions/includes/ \
 +-I$(top_srcdir)/modules/fileio/includes/ \
 +-I$(top_srcdir)/modules/graphic_export/includes/ \
 +-I$(top_srcdir)/modules/graphic_objects/includes/ \
 +-I$(top_srcdir)/modules/gui/includes/ \
 +-I$(top_srcdir)/modules/jvm/includes/ \
 +-I$(top_srcdir)/modules/localization/includes/ \
 +-I$(top_srcdir)/modules/output_stream/includes/ \
 +-I$(top_srcdir)/modules/renderer/includes/ \
 +-I$(top_srcdir)/modules/string/includes/ \
 +-I$(top_srcdir)/modules/system_env/includes/ \
 +-I$(top_srcdir)/modules/operations/includes/ \
 +-I$(top_srcdir)/modules/types/includes/ \
 +-I$(top_srcdir)/modules/ast/includes/ \
 +-I$(top_srcdir)/modules/symbol/includes/ \
 +-I$(top_srcdir)/modules/localization/includes/ \
 +-I$(top_srcdir)/modules/threads/includes/ \
 +-I$(top_srcdir)/modules/console/includes/ \
 +-I$(top_srcdir)/modules/dynamic_link/includes \
 +$(EIGEN_CPPFLAGS) \
 +$(TCL_INC_PATH) \
 +$(TK_INC_PATH) \
 +$(AM_CPPFLAGS)
  
  libscigraphics_algo_la_SOURCES = $(GRAPHICS_C_SOURCES) $(GRAPHICS_CXX_SOURCES)
 -libscigraphics_la_SOURCES = $(GATEWAY_C_SOURCES)
 +libscigraphics_la_SOURCES = $(GATEWAY_C_SOURCES) $(GATEWAY_CXX_SOURCES)
  libscigraphics_algo_la_CPPFLAGS = $(libscigraphics_la_CPPFLAGS)
  
  # For the code check (splint)
Simple merge
Simple merge
@@@ -86,26 -86,19 +86,25 @@@ FORCE_HDF_1.8_API =  -DH5Dopen_vers=2 -
   -DH5Gcreate_vers=2 -DH5Gopen_vers=2 -DH5Tget_array_dims_vers=2 \
   -DH5Acreate_vers=2 -DNO_DEPRECATED_SYMBOLS
  
 -libscihdf5_la_CPPFLAGS = -I$(srcdir)/includes/ \
 -                              -I$(srcdir)/src/c/ \
 -                              -I$(srcdir)/src/cpp/ \
 -                              -I$(top_srcdir)/modules/output_stream/includes/ \
 -                              -I$(top_srcdir)/modules/api_scilab/includes/ \
 -                -I$(top_srcdir)/modules/jvm/includes/ \
 -                -I$(top_srcdir)/modules/commons/src/jni/ \
 -                              -I$(top_srcdir)/modules/localization/includes/ \
 -                              -I$(top_srcdir)/modules/fileio/includes/ \
 -                              $(JAVA_JNI_INCLUDE) \
 -                              $(HDF5_CFLAGS) \
 -                              $(AM_CPPFLAGS) \
 -                              $(FORCE_HDF_1.8_API)
 +libscihdf5_la_CPPFLAGS = \
 +      -I$(srcdir)/includes/ \
 +      -I$(srcdir)/src/c/ \
 +      -I$(srcdir)/src/cpp/ \
-       -I$(srcdir)/src/jni/ \
 +      -I$(top_srcdir)/modules/output_stream/includes/ \
 +      -I$(top_srcdir)/modules/api_scilab/includes/ \
 +      -I$(top_srcdir)/modules/jvm/includes/ \
 +      -I$(top_srcdir)/modules/commons/src/jni/ \
 +      -I$(top_srcdir)/modules/localization/includes/ \
 +      -I$(top_srcdir)/modules/fileio/includes/ \
 +      -I$(top_srcdir)/modules/string/includes/ \
 +      -I$(top_srcdir)/modules/system_env/includes/ \
 +      -I$(top_srcdir)/modules/operations/includes/ \
 +      -I$(top_srcdir)/modules/types/includes/ \
 +      -I$(top_srcdir)/modules/ast/includes/ \
 +      $(JAVA_JNI_INCLUDE) \
 +      $(HDF5_CFLAGS) \
 +      $(AM_CPPFLAGS) \
 +      $(FORCE_HDF_1.8_API)
  
  
  
@@@ -674,26 -667,19 +674,25 @@@ FORCE_HDF_1.8_API = -DH5Dopen_vers=2 -D
   -DH5Gcreate_vers=2 -DH5Gopen_vers=2 -DH5Tget_array_dims_vers=2 \
   -DH5Acreate_vers=2 -DNO_DEPRECATED_SYMBOLS
  
 -libscihdf5_la_CPPFLAGS = -I$(srcdir)/includes/ \
 -                              -I$(srcdir)/src/c/ \
 -                              -I$(srcdir)/src/cpp/ \
 -                              -I$(top_srcdir)/modules/output_stream/includes/ \
 -                              -I$(top_srcdir)/modules/api_scilab/includes/ \
 -                -I$(top_srcdir)/modules/jvm/includes/ \
 -                -I$(top_srcdir)/modules/commons/src/jni/ \
 -                              -I$(top_srcdir)/modules/localization/includes/ \
 -                              -I$(top_srcdir)/modules/fileio/includes/ \
 -                              $(JAVA_JNI_INCLUDE) \
 -                              $(HDF5_CFLAGS) \
 -                              $(AM_CPPFLAGS) \
 -                              $(FORCE_HDF_1.8_API)
 +libscihdf5_la_CPPFLAGS = \
 +      -I$(srcdir)/includes/ \
 +      -I$(srcdir)/src/c/ \
 +      -I$(srcdir)/src/cpp/ \
-       -I$(srcdir)/src/jni/ \
 +      -I$(top_srcdir)/modules/output_stream/includes/ \
 +      -I$(top_srcdir)/modules/api_scilab/includes/ \
 +      -I$(top_srcdir)/modules/jvm/includes/ \
 +      -I$(top_srcdir)/modules/commons/src/jni/ \
 +      -I$(top_srcdir)/modules/localization/includes/ \
 +      -I$(top_srcdir)/modules/fileio/includes/ \
 +      -I$(top_srcdir)/modules/string/includes/ \
 +      -I$(top_srcdir)/modules/system_env/includes/ \
 +      -I$(top_srcdir)/modules/operations/includes/ \
 +      -I$(top_srcdir)/modules/types/includes/ \
 +      -I$(top_srcdir)/modules/ast/includes/ \
 +      $(JAVA_JNI_INCLUDE) \
 +      $(HDF5_CFLAGS) \
 +      $(AM_CPPFLAGS) \
 +      $(FORCE_HDF_1.8_API)
  
  
  #### hdf5 : gateway declaration ####
@@@ -985,10 -976,10 +985,10 @@@ maintainer-clean-generic
        @echo "This command is intended for maintainers to use"
        @echo "it deletes files that may require special tools to rebuild."
        -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
- @JAVASCI_FALSE@distclean-local:
- @JAVASCI_FALSE@install-data-local:
 -@JAVASCI_FALSE@install-html-local:
 -@JAVASCI_FALSE@install-data-local:
  @JAVASCI_FALSE@clean-local:
++@JAVASCI_FALSE@install-data-local:
 +@JAVASCI_FALSE@install-html-local:
+ @JAVASCI_FALSE@distclean-local:
  clean: clean-am
  
  clean-am: clean-generic clean-libtool clean-local \
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge