Merge remote branch 'origin/master' into YaSp 13/3513/2
Bruno JOFRET [Fri, 11 Mar 2011 14:15:57 +0000 (15:15 +0100)]
Conflicts:
scilab/Makefile.in
scilab/Scilab.sln
scilab/bin/scilab
scilab/configure
scilab/configure.ac
scilab/contrib/Makefile.in
scilab/etc/modules.xml.in
scilab/libs/LibScilab/LibScilab.vcproj
scilab/modules/Makefile.am
scilab/modules/api_scilab/src/cpp/api_common.cpp
scilab/modules/boolean/Makefile.in
scilab/modules/call_scilab/src/c/call_scilab.c
scilab/modules/commons/Makefile.am
scilab/modules/commons/Makefile.in
scilab/modules/core/Makefile.am
scilab/modules/core/Makefile.in
scilab/modules/core/includes/gw_core.h
scilab/modules/core/sci_gateway/c/sci_exit.c
scilab/modules/core/src/c/SCIHOME.c
scilab/modules/core/src/c/banier.c
scilab/modules/core/src/c/core.vcproj
scilab/modules/core/src/c/getmodules.c
scilab/modules/double/Makefile.in
scilab/modules/elementary_functions/Makefile.in
scilab/modules/elementary_functions/macros/dec2oct.sci
scilab/modules/elementary_functions/sci_gateway/c/gw_elementary_functions.c
scilab/modules/elementary_functions/sci_gateway/c/sci_maxi.c
scilab/modules/elementary_functions/sci_gateway/elementary_functions_gateway.xml
scilab/modules/fileio/Makefile.in
scilab/modules/fileio/macros/mkdir.sci
scilab/modules/fileio/sci_gateway/c/sci_copyfile.c
scilab/modules/fileio/sci_gateway/c/sci_fileparts.c
scilab/modules/fileio/sci_gateway/c/sci_isdir.c
scilab/modules/fileio/sci_gateway/c/sci_mclose.c
scilab/modules/fileio/sci_gateway/c/sci_mget.c
scilab/modules/fileio/sci_gateway/c/sci_mput.c
scilab/modules/fileio/sci_gateway/c/sci_mputl.c
scilab/modules/fileio/sci_gateway/c/sci_pathconvert.c
scilab/modules/fileio/src/c/copyfile_others.c
scilab/modules/fileio/src/c/fprintfMat.c
scilab/modules/fileio/src/c/fscanfMat.c
scilab/modules/fileio/src/c/mgetl.c
scilab/modules/functions/Makefile.in
scilab/modules/graph/src/java/org/scilab/modules/graph/io/ScilabIntegerCodec.java
scilab/modules/gui/Makefile.am
scilab/modules/gui/Makefile.in
scilab/modules/gui/sci_gateway/c/sci_ClipBoard.c
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/window/SwingScilabWindow.java
scilab/modules/hdf5/sci_gateway/cpp/sci_export_to_hdf5.cpp
scilab/modules/hdf5/sci_gateway/cpp/sci_import_from_hdf5.cpp
scilab/modules/integer/Makefile.in
scilab/modules/io/Makefile.in
scilab/modules/io/sci_gateway/c/sci_file.c
scilab/modules/javasci/src/c/javasci_Scilab.c
scilab/modules/localization/src/c/setgetlanguage.c
scilab/modules/matio/src/c/CreateHyperMatrixVariable.c
scilab/modules/matio/src/c/GetMlistVariable.c
scilab/modules/matio/src/c/GetStructVariable.c
scilab/modules/output_stream/output_stream.iss
scilab/modules/output_stream/sci_gateway/c/sci_mprintf.c
scilab/modules/output_stream/sci_gateway/c/sci_msprintf.c
scilab/modules/output_stream/src/c/api_scilab_Import.def
scilab/modules/output_stream/src/c/errmsg.c
scilab/modules/pvm/Makefile.in
scilab/modules/scicos/Makefile.in
scilab/modules/scicos_blocks/Makefile.am
scilab/modules/scicos_blocks/Makefile.in
scilab/modules/scinotes/Makefile.am
scilab/modules/scinotes/Makefile.in
scilab/modules/shell/Makefile.in
scilab/modules/special_functions/sci_gateway/c/sci_oldbesseli.c
scilab/modules/special_functions/sci_gateway/c/sci_oldbesselj.c
scilab/modules/special_functions/sci_gateway/c/sci_oldbesselk.c
scilab/modules/special_functions/sci_gateway/c/sci_oldbessely.c
scilab/modules/string/Makefile.in
scilab/modules/string/sci_gateway/c/sci_grep.c
scilab/modules/string/src/c/pcre_private.h
scilab/modules/string/src/c/stringsstrrchr.c
scilab/modules/time/Makefile.in
scilab/modules/time/sci_gateway/c/sci_calendar.c
scilab/modules/time/time.iss
scilab/modules/types/Makefile.am
scilab/modules/types/Makefile.in
scilab/modules/types/readme.txt
scilab/modules/ui_data/Makefile.am
scilab/modules/ui_data/Makefile.in
scilab/modules/windows_tools/sci_gateway/c/sci_win64.c

Change-Id: I3cee06ffb6dc0d72174b7d7c0595bc37d483056e

306 files changed:
1  2 
scilab/.gitignore
scilab/Makefile.am
scilab/Makefile.in
scilab/Scilab.sln
scilab/Scilab_f2c.sln
scilab/Visual-Studio-settings/rename-vc-files/rename-vc-files.vcproj
scilab/bin/scilab
scilab/configure
scilab/configure.ac
scilab/contrib/Makefile.in
scilab/etc/Info.plist
scilab/libs/MALLOC/Makefile.in
scilab/libs/Makefile.in
scilab/libs/doublylinkedlist/Makefile.in
scilab/libs/dynamiclibrary/Makefile.in
scilab/libs/hashtable/Makefile.in
scilab/libs/libst/Makefile.in
scilab/modules/Makefile.am
scilab/modules/Makefile.in
scilab/modules/abstractSyntaxTree/Makefile.in
scilab/modules/action_binding/Makefile.am
scilab/modules/action_binding/Makefile.in
scilab/modules/action_binding/action_binding.iss
scilab/modules/api_scilab/Makefile.am
scilab/modules/api_scilab/Makefile.in
scilab/modules/api_scilab/includes/api_error.h
scilab/modules/api_scilab/includes/api_list.h
scilab/modules/api_scilab/src/cpp/api_common.cpp
scilab/modules/api_scilab/src/cpp/api_list.cpp
scilab/modules/api_scilab/src/cpp/api_string.cpp
scilab/modules/arnoldi/Makefile.am
scilab/modules/arnoldi/Makefile.in
scilab/modules/arnoldi/arnoldi.iss
scilab/modules/arnoldi/sci_gateway/c/sci_znaupd.c
scilab/modules/arnoldi/sci_gateway/c/sci_zneupd.c
scilab/modules/atoms/Makefile.in
scilab/modules/atoms/atoms.iss
scilab/modules/boolean/Makefile.am
scilab/modules/boolean/Makefile.in
scilab/modules/boolean/boolean.iss
scilab/modules/cacsd/Makefile.am
scilab/modules/cacsd/Makefile.in
scilab/modules/cacsd/cacsd.iss
scilab/modules/call_scilab/Makefile.am
scilab/modules/call_scilab/Makefile.in
scilab/modules/call_scilab/call_scilab.iss
scilab/modules/call_scilab/src/c/call_scilab.c
scilab/modules/commons/Makefile.am
scilab/modules/commons/Makefile.in
scilab/modules/compatibility_functions/Makefile.in
scilab/modules/compatibility_functions/compatibility_functions.iss
scilab/modules/completion/Makefile.am
scilab/modules/completion/Makefile.in
scilab/modules/completion/completion.iss
scilab/modules/completion/src/c/completeLine.c
scilab/modules/completion/src/c/getfieldsdictionary.c
scilab/modules/console/Makefile.am
scilab/modules/console/Makefile.in
scilab/modules/console/console.iss
scilab/modules/core/Makefile.am
scilab/modules/core/Makefile.in
scilab/modules/core/core.iss
scilab/modules/core/includes/gw_core.h
scilab/modules/core/includes/machine.h.in
scilab/modules/core/includes/version.h
scilab/modules/core/includes/version.h.in
scilab/modules/core/includes/version.h.vc
scilab/modules/core/sci_gateway/c/sci_newfun.c
scilab/modules/core/src/c/core.vcproj
scilab/modules/core/src/c/getmodules.c
scilab/modules/core/src/c/stack2.c
scilab/modules/core/src/c/stack3.c
scilab/modules/data_structures/Makefile.am
scilab/modules/data_structures/Makefile.in
scilab/modules/data_structures/data_structures.iss
scilab/modules/demo_tools/Makefile.in
scilab/modules/demo_tools/demo_tools.iss
scilab/modules/development_tools/Makefile.in
scilab/modules/development_tools/development_tools.iss
scilab/modules/development_tools/macros/buildmacros.sce
scilab/modules/development_tools/src/fake/Makefile.in
scilab/modules/differential_equations/Makefile.am
scilab/modules/differential_equations/Makefile.in
scilab/modules/differential_equations/differential_equations.iss
scilab/modules/double/Makefile.am
scilab/modules/double/Makefile.in
scilab/modules/double/double.iss
scilab/modules/dynamic_link/Makefile.am
scilab/modules/dynamic_link/Makefile.in
scilab/modules/dynamic_link/dynamic_link.iss
scilab/modules/elementary_functions/Makefile.am
scilab/modules/elementary_functions/Makefile.in
scilab/modules/elementary_functions/elementary_functions.iss
scilab/modules/elementary_functions/sci_gateway/c/gw_elementary_functions.c
scilab/modules/elementary_functions/sci_gateway/c/sci_maxi.c
scilab/modules/elementary_functions/sci_gateway/elementary_functions_gateway.xml
scilab/modules/fftw/Makefile.am
scilab/modules/fftw/Makefile.in
scilab/modules/fftw/fftw.iss
scilab/modules/fileio/Makefile.am
scilab/modules/fileio/Makefile.in
scilab/modules/fileio/fileio.iss
scilab/modules/fileio/macros/mkdir.sci
scilab/modules/fileio/sci_gateway/c/sci_copyfile.c
scilab/modules/fileio/sci_gateway/c/sci_merror.c
scilab/modules/fileio/src/c/copyfile_others.c
scilab/modules/fileio/src/c/fprintfMat.c
scilab/modules/fileio/src/c/fscanfMat.c
scilab/modules/functions/Makefile.am
scilab/modules/functions/Makefile.in
scilab/modules/functions/functions.iss
scilab/modules/functions/sci_gateway/c/sci_exec.c
scilab/modules/functions_manager/Makefile.in
scilab/modules/genetic_algorithms/Makefile.in
scilab/modules/genetic_algorithms/genetic_algorithms.iss
scilab/modules/graph/Makefile.in
scilab/modules/graph/src/java/org/scilab/modules/graph/io/ScilabIntegerCodec.java
scilab/modules/graphic_export/Makefile.am
scilab/modules/graphic_export/Makefile.in
scilab/modules/graphic_export/graphic_export.iss
scilab/modules/graphics/Makefile.am
scilab/modules/graphics/Makefile.in
scilab/modules/graphics/graphics.iss
scilab/modules/graphics/src/c/SetProperty.c
scilab/modules/gui/Makefile.am
scilab/modules/gui/Makefile.in
scilab/modules/gui/etc/main_menubar.xml
scilab/modules/gui/gui.iss
scilab/modules/hdf5/Makefile.am
scilab/modules/hdf5/Makefile.in
scilab/modules/hdf5/hdf5.iss
scilab/modules/hdf5/sci_gateway/cpp/sci_export_to_hdf5.cpp
scilab/modules/hdf5/sci_gateway/cpp/sci_import_from_hdf5.cpp
scilab/modules/helptools/Makefile.am
scilab/modules/helptools/Makefile.in
scilab/modules/helptools/etc/SciDocConf.xml
scilab/modules/helptools/helptools.iss
scilab/modules/helptools/sci_gateway/cpp/sci_buildDocv2.cpp
scilab/modules/history_browser/Makefile.am
scilab/modules/history_browser/Makefile.in
scilab/modules/history_browser/history_browser.iss
scilab/modules/history_browser/src/cpp/CommandHistory_Wrap.cpp
scilab/modules/history_manager/Makefile.am
scilab/modules/history_manager/Makefile.in
scilab/modules/history_manager/history_manager.iss
scilab/modules/integer/Makefile.am
scilab/modules/integer/Makefile.in
scilab/modules/integer/integer.iss
scilab/modules/interpolation/Makefile.am
scilab/modules/interpolation/Makefile.in
scilab/modules/interpolation/interpolation.iss
scilab/modules/intersci/Makefile.am
scilab/modules/intersci/Makefile.in
scilab/modules/intersci/intersci.iss
scilab/modules/io/Makefile.am
scilab/modules/io/Makefile.in
scilab/modules/io/io.iss
scilab/modules/javasci/Makefile.am
scilab/modules/javasci/Makefile.in
scilab/modules/javasci/javasci.iss
scilab/modules/javasci/src/c/javasci2_helper.c
scilab/modules/javasci/src/c/javasci_Scilab.c
scilab/modules/jvm/Makefile.am
scilab/modules/jvm/Makefile.in
scilab/modules/jvm/jvm.iss
scilab/modules/linear_algebra/Makefile.am
scilab/modules/linear_algebra/Makefile.in
scilab/modules/linear_algebra/help/en_US/lsq.xml
scilab/modules/linear_algebra/help/en_US/schur.xml
scilab/modules/linear_algebra/linear_algebra.iss
scilab/modules/localization/Makefile.am
scilab/modules/localization/Makefile.in
scilab/modules/localization/localization.iss
scilab/modules/localization/src/c/setgetlanguage.c
scilab/modules/m2sci/Makefile.in
scilab/modules/m2sci/m2sci.iss
scilab/modules/maple2scilab/Makefile.in
scilab/modules/maple2scilab/maple2scilab.iss
scilab/modules/matio/Makefile.am
scilab/modules/matio/Makefile.in
scilab/modules/matio/matio.iss
scilab/modules/matio/src/c/CreateHyperMatrixVariable.c
scilab/modules/matio/src/c/GetMlistVariable.c
scilab/modules/matio/src/c/GetStructVariable.c
scilab/modules/mexlib/Makefile.am
scilab/modules/mexlib/Makefile.in
scilab/modules/mexlib/mexlib.iss
scilab/modules/modules_manager/Makefile.in
scilab/modules/modules_manager/modules_manager.iss
scilab/modules/operations/Makefile.in
scilab/modules/optimization/Makefile.am
scilab/modules/optimization/Makefile.in
scilab/modules/optimization/optimization.iss
scilab/modules/output_stream/Makefile.am
scilab/modules/output_stream/Makefile.in
scilab/modules/overloading/Makefile.in
scilab/modules/overloading/overloading.iss
scilab/modules/parallel/Makefile.am
scilab/modules/parallel/Makefile.in
scilab/modules/parallel/parallel.iss
scilab/modules/parameters/Makefile.am
scilab/modules/parameters/Makefile.in
scilab/modules/parameters/parameters.iss
scilab/modules/parameters/src/c/parameters.c
scilab/modules/parse/Makefile.in
scilab/modules/polynomials/Makefile.am
scilab/modules/polynomials/Makefile.in
scilab/modules/polynomials/polynomials.iss
scilab/modules/pvm/Makefile.am
scilab/modules/pvm/Makefile.in
scilab/modules/pvm/pvm.iss
scilab/modules/randlib/Makefile.am
scilab/modules/randlib/Makefile.in
scilab/modules/randlib/randlib.iss
scilab/modules/renderer/Makefile.am
scilab/modules/renderer/Makefile.in
scilab/modules/renderer/renderer.iss
scilab/modules/scicos/Makefile.am
scilab/modules/scicos/Makefile.in
scilab/modules/scicos/locales/ca_ES.po
scilab/modules/scicos/locales/de_DE.po
scilab/modules/scicos/locales/pt_BR.po
scilab/modules/scicos/locales/uk_UA.po
scilab/modules/scicos/locales/zh_CN.po
scilab/modules/scicos/locales/zh_TW.po
scilab/modules/scicos/macros/scicos_auto/scicos.sci
scilab/modules/scicos/scicos.iss
scilab/modules/scicos/src/c/ezxml.c
scilab/modules/scicos/src/c/scicos.vcproj
scilab/modules/scicos_blocks/Makefile.am
scilab/modules/scicos_blocks/Makefile.in
scilab/modules/scicos_blocks/scicos_blocks.iss
scilab/modules/scinotes/Makefile.am
scilab/modules/scinotes/Makefile.in
scilab/modules/scinotes/sci_gateway/cpp/sci_scinotes.cpp
scilab/modules/scinotes/scinotes.iss
scilab/modules/shell/Makefile.am
scilab/modules/shell/Makefile.in
scilab/modules/shell/shell.iss
scilab/modules/shell/src/c/others/zzledt.c
scilab/modules/signal_processing/Makefile.am
scilab/modules/signal_processing/Makefile.in
scilab/modules/signal_processing/signal_processing.iss
scilab/modules/signal_processing/src/c/signal_processing.vcproj
scilab/modules/simulated_annealing/Makefile.in
scilab/modules/simulated_annealing/simulated_annealing.iss
scilab/modules/sound/Makefile.am
scilab/modules/sound/Makefile.in
scilab/modules/sound/sound.iss
scilab/modules/sparse/Makefile.am
scilab/modules/sparse/Makefile.in
scilab/modules/sparse/sparse.iss
scilab/modules/special_functions/Makefile.am
scilab/modules/special_functions/Makefile.in
scilab/modules/special_functions/special_functions.iss
scilab/modules/special_functions/src/c/special_functions.vcproj
scilab/modules/spreadsheet/Makefile.am
scilab/modules/spreadsheet/Makefile.in
scilab/modules/spreadsheet/spreadsheet.iss
scilab/modules/statistics/Makefile.am
scilab/modules/statistics/Makefile.in
scilab/modules/statistics/statistics.iss
scilab/modules/string/Makefile.am
scilab/modules/string/Makefile.in
scilab/modules/string/includes/gw_string.h
scilab/modules/string/sci_gateway/c/gw_string.c
scilab/modules/string/sci_gateway/c/sci_strchr.c
scilab/modules/string/src/c/pcre_private.h
scilab/modules/string/src/c/string.vcproj
scilab/modules/string/src/c/stringsstrrchr.c
scilab/modules/string/src/c/strsubst.c
scilab/modules/string/string.iss
scilab/modules/symbol/Makefile.in
scilab/modules/symbolic/Makefile.am
scilab/modules/symbolic/Makefile.in
scilab/modules/symbolic/symbolic.iss
scilab/modules/system_env/Makefile.in
scilab/modules/tclsci/Makefile.am
scilab/modules/tclsci/Makefile.in
scilab/modules/tclsci/tclsci.iss
scilab/modules/texmacs/Makefile.in
scilab/modules/texmacs/texmacs.iss
scilab/modules/time/Makefile.am
scilab/modules/time/Makefile.in
scilab/modules/time/sci_gateway/c/sci_calendar.c
scilab/modules/types/Makefile.am
scilab/modules/types/Makefile.in
scilab/modules/types/types.iss
scilab/modules/ui_data/Makefile.am
scilab/modules/ui_data/Makefile.in
scilab/modules/umfpack/Makefile.am
scilab/modules/umfpack/Makefile.in
scilab/modules/umfpack/umfpack.iss
scilab/modules/windows_tools/Makefile.am
scilab/modules/windows_tools/Makefile.in
scilab/modules/windows_tools/sci_gateway/c/sci_win64.c
scilab/modules/windows_tools/src/c/FindFileAssociation.c
scilab/modules/windows_tools/src/c/scilab_windows/console.c
scilab/modules/windows_tools/src/c/scilab_windows/console_main.c
scilab/modules/windows_tools/src/c/scilab_windows/windows_main.c
scilab/modules/windows_tools/windows_tools.iss
scilab/modules/xcos/Makefile.am
scilab/modules/xcos/Makefile.in
scilab/modules/xcos/sci_gateway/cpp/sci_Xcos.cpp
scilab/modules/xcos/xcos.iss
scilab/tools/innosetup/code.iss

Simple merge
Simple merge
@@@ -62,13 -62,13 +62,14 @@@ host_triplet = @host
  bin_PROGRAMS = scilab-bin$(EXEEXT) scilab-cli-bin$(EXEEXT) \
        $(am__EXEEXT_1)
  @IS_MACOSX_TRUE@am__append_1 = -framework Cocoa
 +@IS_MACOSX_TRUE@am__append_2 = $(top_srcdir)/modules/core/src/c/initMacOSXEnv.c
  
  #-static
 -@ENABLE_STATIC_TRUE@am__append_2 = scilab-static-bin
 +@ENABLE_STATIC_TRUE@am__append_3 = scilab-static-bin
  
  #  The user wants to compile the localization files
 -@GENERATE_LOCALIZATION_FILES_TRUE@am__append_3 = localization
 -@COMPILATION_TESTS_TRUE@am__append_4 = check-java
 +@GENERATE_LOCALIZATION_FILES_TRUE@am__append_4 = localization
++@COMPILATION_TESTS_TRUE@am__append_5 = check-java
  DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
        $(srcdir)/Makefile.in $(srcdir)/scilab-lib-doc.properties.in \
        $(srcdir)/scilab-lib.properties.in $(srcdir)/scilab.pc.in \
@@@ -437,11 -420,9 +443,12 @@@ JROSETTA_API = @JROSETTA_API
  JROSETTA_ENGINE = @JROSETTA_ENGINE@
  JUNIT = @JUNIT@
  LAPACK_LIBS = @LAPACK_LIBS@
+ LCOV = @LCOV@
  LD = @LD@
  LDFLAGS = @LDFLAGS@
 +LEX = @LEX@
 +LEXLIB = @LEXLIB@
 +LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBICONV = @LIBICONV@
  LIBINTL = @LIBINTL@
  LIBM = @LIBM@
@@@ -657,7 -617,7 +668,7 @@@ scilab_cli_bin_CPPFLAGS = -DWITHOUT_GU
  @ENABLE_STATIC_TRUE@scilab_static_bin_LDADD = $(top_builddir)/modules/libscilab.la
  @ENABLE_STATIC_TRUE@scilab_static_bin_SOURCES = $(scilab_bin_SOURCES)
  LANG_DOMAIN = scilab
- TARGETS_ALL = macros $(am__append_4)
 -TARGETS_ALL = macros $(am__append_3) $(am__append_4)
++TARGETS_ALL = macros $(am__append_4) $(am__append_5)
  rootdir = $(pkgdatadir)/etc/
  root_DATA = $(top_srcdir)/etc/scilab.start \
  $(top_srcdir)/etc/scilab.quit \
@@@ -1895,9 -1794,20 +1941,20 @@@ clean-localization
  clean-generated:
        rm -rf $(top_builddir)/modules/scicos_blocks/build/ 2> /dev/null
  
 -distclean-generated: 
 +distclean-generated:
        rm -f $(top_builddir)/modules/core/includes/stack.h 2> /dev/null
  
+ # For each module, build and call Java unitary tests
+ # If fails, stops the call
+ check-java:
+       @echo "-- Launch all TestNG (Java) unitary tests"; \
+       MASK="$(top_srcdir)/modules/*/tests/java/"; \
+       MODULES=`ls -d $$MASK`; \
+       for M in $$MODULES; do \
+               BASE=`echo $$M|sed -e "s|tests/java/$$||g"`; \
+               $(ANT) -buildfile $$BASE/build.xml test || exit $$?; \
+       done
  # The user wants to compile the localization files
  # Please note that ALL_LINGUAS is defined in configure.ac
  @GENERATE_LOCALIZATION_FILES_TRUE@localization:
@@@ -1121,7 -1077,7 +1121,8 @@@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C
                {8CCDD3C2-B025-4A12-A986-1AA28D7C0C33} = {8CCDD3C2-B025-4A12-A986-1AA28D7C0C33}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
                {8A654CC5-22C1-4972-A8CF-1B89F78B5383} = {8A654CC5-22C1-4972-A8CF-1B89F78B5383}
 +              {7CA60AEF-9AFA-4D06-AF28-613C0AA27640} = {7CA60AEF-9AFA-4D06-AF28-613C0AA27640}
+               {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
        EndProjectSection
  EndProject
  Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "output_stream_f", "modules\output_stream\src\fortran\output_stream_f.vfproj", "{E60B43CC-73EA-457E-8DEE-31D0B2BDFA4B}"
Simple merge
                                >
                        </File>
                        <File
--                              RelativePath="..\..\etc\jvm_options.xml.vc"
--                              >
--                      </File>
--                      <File
                                RelativePath="..\..\modules\core\includes\machine.h.vc"
                                >
                        </File>
@@@ -550,57 -648,46 +647,59 @@@ do_scilex(
  
  do_help()
  {
-       echo "Usage:"
-       echo     "scilab <arguments>"
-       echo     " "
-       echo     "      Possible arguments are:"
-       echo     "      -display Display: for use under Xwindow systems to set a specific X server display."
-       echo     "      -d Display      : equivalent to -display Display."
-       echo     "      -e Instruction  : execute the scilab instruction given in Instruction argument."
-       echo     "                        -e and -f arguments are mutually exclusive."
-       echo     "      -f File         : execute the scilab script given in File argument."
-       echo     "                        -e and -f arguments are mutually exclusive."
-       echo     "      -l Lang         : set the current language. Lang can be equal to fr or en."
-       echo     "      -mem N          : set the initial stacksize, for use with -ns argument."
-       echo     "      -nb             : do not display the Scilab banner at starting time."
-       echo     "      -ns             : do not execute scilab.start startup file. This argument will disable many features in Scilab (Only use if you know what you are doing)."
-       echo     "      -nouserstartup  : do not execute the user startup files SCIHOME/.scilab or SCIHOME/scilab.ini."
-       echo     "      -nw             : start Scilab without dedicated Scilab Window."
-       echo     "      -nwni           : start Scilab without the GUI, graphic and help features (batch mode). This argument disables the need of Java."
-       echo     "      -nogui          : See -nwni"
-       echo     "      -args           : accept all extra arguments and make them available through sciargs"
-       echo     "      -version        : print product version and exit."
-       echo     "      -h/--help       : display help about this command."
-       echo     "      --texmacs       : reserved for TeXMacs."
-       echo     " "
-       echo     "Developer arguments:"
-       echo     "      -debug          : Start Scilab under gdb (Unix/linux only)."
-       echo     "                        define the variable SCILAB_GDB_OPT to add custom arguments to gdb."
-       echo     "      -debug-kdbg     : Start Scilab under kdbg (Unix/linux only)."
-       echo     "      -profiling      : Start Scilab under valgrind (Unix/linux only)."
-       echo     "                        define the variable SCILAB_VALGRIND_OPT to add custom arguments to"
-       echo     "                        valgrind (and override the existing valgrind arguments)."
-       echo     "      -profiling-visu : Start Scilab under callgrind (Unix/linux only)."
-       echo     "                        define the variable SCILAB_VALGRIND_OPT to add custom arguments to"
-       echo     "                        callgrind (and override the existing callgrind arguments)."
-       echo     "      -electric-fence : Start Scilab with the Electric Fence (Unix/linux only)."
+     echo "Usage:"
+     echo     "scilab <arguments>"
+     echo     " "
+     echo     "      Possible arguments are:"
+     echo     "      -display Display: for use under Xwindow systems to set a specific X server display."
+     echo     "      -d Display      : equivalent to -display Display."
+     echo     "      -e Instruction  : execute the scilab instruction given in Instruction argument."
+     echo     "                        -e and -f arguments are mutually exclusive."
+     echo     "      -f File         : execute the scilab script given in File argument."
+     echo     "                        -e and -f arguments are mutually exclusive."
+     echo     "      -l Lang         : set the current language. Lang can be equal to fr or en."
+     echo     "      -mem N          : set the initial stacksize, for use with -ns argument."
+     echo     "      -nb             : do not display the Scilab banner at starting time."
+     echo     "      -ns             : do not execute scilab.start startup file. This argument will disable many features in Scilab (Only use if you know what you are doing)."
+     echo     "      -nouserstartup  : do not execute the user startup files SCIHOME/.scilab or SCIHOME/scilab.ini."
+     echo     "      -nw             : start Scilab without dedicated Scilab Window."
+     echo     "      -nwni           : start Scilab without the GUI, graphic and help features (batch mode). This argument disables the need of Java."
+     echo     "      -nogui          : See -nwni"
+     echo     "      -args           : accept all extra arguments and make them available through sciargs"
+     echo     "      -version        : print product version and exit."
+     echo     "      -h/--help       : display help about this command."
+     echo     "      --texmacs       : reserved for TeXMacs."
+     echo     " "
+ if test $IS_SCILAB_BINARY -eq 0; then
+     echo     "Developer arguments:"
+     echo     "      -debug          : Start Scilab under gdb (Unix/linux only)."
+     echo     "                        define the variable SCILAB_GDB_OPT to add custom arguments to gdb."
+     echo     "      -debug-kdbg     : Start Scilab under kdbg (Unix/linux only)."
+     echo     "      -profiling      : Start Scilab under valgrind (Unix/linux only)."
+     echo     "                        define the variable SCILAB_VALGRIND_OPT to add custom arguments to"
+     echo     "                        valgrind (and override the existing valgrind arguments)."
+     echo     "      -profiling-visu : Start Scilab under callgrind (Unix/linux only)."
+     echo     "                        define the variable SCILAB_VALGRIND_OPT to add custom arguments to"
+     echo     "                        callgrind (and override the existing callgrind arguments)."
+     echo     "      -electric-fence : Start Scilab with the Electric Fence (Unix/linux only)."
      echo     " "
 +    echo     "Developer Trace arguments:"
 +    echo     "      --parse-trace    : Display bison state machine evolution."
 +    echo     "      --AST-trace      : Display ASCII-art AST to be human readable."
 +    echo     "      --pretty-print   : Display pretty-printed code, standard Scilab syntax."
 +    echo     " "
 +    echo     "Developer Timer arguments:"
 +    echo     "      --AST-timed      : Time each AST node."
 +    echo     "      --timed          : Time global execution."
 +    echo     " "
 +    echo     "Developer Debug arguments:"
 +    echo     "      --no-exec        : Only do Lexing/parsing do not execute instructions."
 +    echo     "      --context-dump   : Display context status."
 +      echo     " "
-       echo     "      All these arguments can be retrieved by the Scilab function sciargs."
-       echo     " "
-       exit
+ fi
+     echo     "      All these arguments can be retrieved by the Scilab function sciargs."
+     echo     " "
+     exit
  }
  
  do_compile()
@@@ -680,61 -767,58 +779,61 @@@ esa
  # really calling Scilab with arguments
  
  if test "$rest" = "yes"; then
-   debug=
-   debug_kdbg=
-   profiling=
-   profiling_visu=
-   electric_fence=
-   prevarg=
-   for sciarg in "$@"
-   do
+     debug=
+     debug_kdbg=
+     profiling=
+     profiling_visu=
+     electric_fence=
+     prevarg=
+     for sciarg in "$@"
+     do
  
      # If the previous argument needs an argument, skip current one.
-     if test -n "$prevarg"; then
-       prevarg=
-       continue
-     fi
+         if test -n "$prevarg"; then
+             prevarg=
+             continue
+         fi
  
-     case $sciarg in
-       -nogui|-version|-ns|-nb|-nw|-nouserstartup|--texmacs|-nwni)
-           ;;
-       --parse-trace|--pretty-print|--help|--AST-trace|--no-exec|--context-dump|--timed|--AST-timed|--orig)
+         case $sciarg in
+             -nogui|-version|-ns|-nb|-nw|-nouserstartup|--texmacs|-nwni)
+                 ;;
++            --parse-trace|--pretty-print|--help|--AST-trace|--no-exec|--context-dump|--timed|--AST-timed)
 +          #This are Scilab6 dedicated options.
-           ;;
-       -psn_*)
-           # Under Mac OS X, .app is adding the arg -psn_0_xxxx
-           # (psn = ProcessSerialNumber). It is not used (but could be in the future)
-           ;;
-       -display|-f|-l|-e|-d|-mem)
-             prevarg=1
-             ;;
-         -args) # Accept extra arguments
-                 extraarg=1
-                 ;;
-       -debug)
-           DEBUG="-debug"
-           ;;
-       -debug-kdbg)
-           DEBUG_KDBG="-debug-kdbg"
-           ;;
-       -profiling)
-           PROFILING="-profiling"
-           ;;
-       -profiling-visu)
-           PROFILING_VISU="-profiling-visu"
-           ;;
-       -electric-fence)
-           ELECTRIC_FENCE="-electric-fence"
-           ;;
-       -h|--help)
-           do_help
-           ;;
-               *)
-                       foundUnknownArg=1
-                 # Do nothing. Gives unknown args to Scilab binaries if -a is provided
-                 ;;
-     esac
-   done
++                  ;;
+             -psn_*)
+         # Under Mac OS X, .app is adding the arg -psn_0_xxxx
+         # (psn = ProcessSerialNumber). It is not used (but could be in the future)
+                 ;;
+             -display|-f|-l|-e|-d|-mem)
+                 prevarg=1
+                 ;;
+             -args) # Accept extra arguments
+                 extraarg=1
+                 ;;
+             -debug)
+                 DEBUG="-debug"
+                 ;;
+             -debug-kdbg)
+                 DEBUG_KDBG="-debug-kdbg"
+                 ;;
+             -profiling)
+                 PROFILING="-profiling"
+                 ;;
+             -profiling-visu)
+                 PROFILING_VISU="-profiling-visu"
+                 ;;
+             -electric-fence)
+                 ELECTRIC_FENCE="-electric-fence"
+                 ;;
+             -h|--help)
+                 do_help
+                 ;;
+             *)
+                 foundUnknownArg=1
+           # Do nothing. Gives unknown args to Scilab binaries if -a is provided
+                 ;;
+         esac
+     done
  
  
  # If the argument -a is not provided (extraarg) and we found unknown args
@@@ -999,8 -998,8 +1007,10 @@@ FFLAG
  CXX
  CXXFLAGS
  CCC
 +YACC
 +YFLAGS
+ PCRE_CFLAGS
+ PCRE_LIBS
  XMKMF
  MATIO_CFLAGS
  MATIO_LIBS
@@@ -1746,11 -1744,8 +1756,13 @@@ Some influential environment variables
    FFLAGS      Fortran 77 compiler flags
    CXX         C++ compiler command
    CXXFLAGS    C++ compiler flags
 +  YACC        The `Yet Another C Compiler' implementation to use. Defaults to
 +              the first program found out of: `bison -y', `byacc', `yacc'.
 +  YFLAGS      The list of arguments that will be passed by default to $YACC.
 +              This script will default YFLAGS to the empty string to avoid a
 +              default value of `-d' given by some make applications.
+   PCRE_CFLAGS C compiler flags for PCRE, overriding pkg-config
+   PCRE_LIBS   linker flags for PCRE, overriding pkg-config
    XMKMF       Path to xmkmf, Makefile generator for X Window System
    MATIO_CFLAGS
                C compiler flags for MATIO, overriding pkg-config
@@@ -2988,7 -2983,18 +3000,18 @@@ SCI_BUILDDIR="`pwd`
  SCI_SRCDIR="$srcdir"
  SCI_SRCDIR_FULL="`cd $SCI_SRCDIR && pwd`"
  
- SCILAB_LIBRARY_VERSION=6:0:0
 -SCILAB_VERSION_MAJOR=5
 -SCILAB_VERSION_MINOR=4
++SCILAB_VERSION_MAJOR=6
++SCILAB_VERSION_MINOR=0
+ SCILAB_VERSION_MAINTENANCE=0
+ SCILAB_LIBRARY_VERSION=$SCILAB_VERSION_MAJOR:$SCILAB_VERSION_MINOR:$SCILAB_VERSION_MAINTENANCE
+ SCILAB_BINARY_VERSION=$SCILAB_VERSION_MAJOR.$SCILAB_VERSION_MINOR.$SCILAB_VERSION_MAINTENANCE
  
  
  #shared library versioning
@@@ -10210,7 -10283,7 +10575,7 @@@ $as_echo "$ac_java_classpath" >&6; 
  $as_echo_n "checking to see if the java compiler works... " >&6; }
  
      cat << \EOF > conftest.java
- // #line 10213 "configure"
 -// #line 10286 "configure"
++// #line 10578 "configure"
  
  
  public class conftest {
@@@ -10276,7 -10349,7 +10641,7 @@@ $as_echo_n "checking type of jvm... " >
      if test "x$ac_java_jvm_name" = "x" ; then
  
      cat << \EOF > conftest.java
- // #line 10279 "configure"
 -// #line 10352 "configure"
++// #line 10644 "configure"
  import gnu.java.io.EncodingManager;
  
  public class conftest {
@@@ -10340,7 -10413,7 +10705,7 @@@ $as_echo_n "checking java API version..
  
  
      cat << \EOF > conftest.java
- // #line 10343 "configure"
 -// #line 10416 "configure"
++// #line 10708 "configure"
  import java.nio.charset.Charset;
  
  public class conftest {
  
  
      cat << \EOF > conftest.java
- // #line 10388 "configure"
 -// #line 10461 "configure"
++// #line 10753 "configure"
  import java.lang.StringBuilder;
  
  public class conftest {
@@@ -11754,7 -11829,7 +12121,7 @@@ $as_echo_n "checking jgraphx... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 11757 "configure"
 -// #line 11832 "configure"
++// #line 12124 "configure"
  import com.mxgraph.model.mxCell;
  
  public class conftest {
@@@ -11848,7 -11923,7 +12215,7 @@@ $as_echo_n "checking minimal version (1
     if test "x=" == "x"; then
  
      cat << \EOF > conftest.java
- // #line 11851 "configure"
 -// #line 11926 "configure"
++// #line 12218 "configure"
  import com.mxgraph.view.mxGraph;
  
  public class conftest {
     else
  
      cat << \EOF > conftest.java
- // #line 11902 "configure"
 -// #line 11977 "configure"
++// #line 12269 "configure"
  import com.mxgraph.view.mxGraph;
  
  public class conftest {
@@@ -11972,8 -12051,8 +12343,8 @@@ $as_echo_n "checking jhdf5... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 11975 "configure"
- import org.flexdock.docking.DockingManager;
 -// #line 12054 "configure"
++// #line 12346 "configure"
+ import ncsa.hdf.hdf5lib.HDF5Constants;
  
  public class conftest {
      public static void main(String[] argv) {
@@@ -12066,8 -12200,8 +12492,8 @@@ $as_echo_n "checking minimal version (1
     if test "x" == "x"; then
  
      cat << \EOF > conftest.java
- // #line 12069 "configure"
- import org.flexdock.util.Utilities;
 -// #line 12203 "configure"
++// #line 12495 "configure"
+ import ncsa.hdf.hdf5lib.H5;
  
  public class conftest {
      public static void main(String[] argv) {
     else
  
      cat << \EOF > conftest.java
- // #line 12120 "configure"
- import org.flexdock.util.Utilities;
 -// #line 12258 "configure"
++// #line 12550 "configure"
+ import ncsa.hdf.hdf5lib.H5;
  
  public class conftest {
      public static void main(String[] argv) {
@@@ -12190,8 -12339,8 +12631,8 @@@ $as_echo_n "checking flexdock... " >&6
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 12193 "configure"
- import com.jgoodies.looks.common.RenderingUtils;
 -// #line 12342 "configure"
++// #line 12634 "configure"
+ import org.flexdock.docking.DockingManager;
  
  public class conftest {
      public static void main(String[] argv) {
@@@ -12273,13 -12422,124 +12714,124 @@@ $as_echo "$as_me: WARNING: Could not fi
          fi
      fi
  
-                               LOOKS=$PACKAGE_JAR_FILE
+                 FLEXDOCK=$PACKAGE_JAR_FILE
  
-                               # Named differently under ArchLinux
-                               if test -z "$LOOKS"; then
  
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking jgoodies-looks" >&5
- $as_echo_n "checking jgoodies-looks... " >&6; }
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking minimal version (0.5.2) of flexdock" >&5
+ $as_echo_n "checking minimal version (0.5.2) of flexdock... " >&6; }
+    saved_ac_java_classpath=$ac_java_classpath
+    export ac_java_classpath="$FLEXDOCK:$ac_java_classpath"
+    if test "x" == "x"; then
+     cat << \EOF > conftest.java
 -// #line 12436 "configure"
++// #line 12728 "configure"
+ import org.flexdock.util.Utilities;
+ public class conftest {
+     public static void main(String[] argv) {
+         String minVersion="0.5.2";
+                             System.out.println(Utilities.VERSION);
+                                   if (minVersion.compareTo(Utilities.VERSION) > 0) {
+                                    System.exit(-1);
+                                 }
+     }
+ }
+ 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 ""yes"" = "no"; then
+            echo "yes" >&5
+                  echo "yes"
+          else
+                  cmd="$JAVA conftest"
+                  if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5); then
+                  echo "yes" >&5
+                          echo "yes"
+                       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
+                         as_fn_error $? "Wrong version of flexdock. Expected at least 0.5.2. Found $STDOUT" "$LINENO" 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
+           as_fn_error $? "Wrong version of flexdock. Expected at least 0.5.2. Found $STDOUT" "$LINENO" 5
+             fi
+    else
+     cat << \EOF > conftest.java
 -// #line 12487 "configure"
++// #line 12779 "configure"
+ import org.flexdock.util.Utilities;
+ public class conftest {
+     public static void main(String[] argv) {
+         String minVersion="0.5.2";
+                             System.out.println(Utilities.VERSION);
+                                   if (minVersion.compareTo(Utilities.VERSION) != 0) {
+                                    System.exit(-1);
+                                 }
+     }
+ }
+ 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 ""yes"" = "no"; then
+            echo "yes" >&5
+                  echo "yes"
+          else
+                  cmd="$JAVA conftest"
+                  if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5); then
+                  echo "yes" >&5
+                          echo "yes"
+                       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
+                         as_fn_error $? "Wrong version of flexdock. Expected exact version 0.5.2. Found $STDOUT" "$LINENO" 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
+           as_fn_error $? "Wrong version of flexdock. Expected exact version 0.5.2. Found $STDOUT" "$LINENO" 5
+             fi
+     fi
+    ac_java_classpath=$saved_ac_java_classpath
+                 # Swing look&feel implementations
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking looks" >&5
+ $as_echo_n "checking looks... " >&6; }
        PACKAGE_JAR_FILE=
        found_jar=no
        saved_ac_java_classpath=$ac_java_classpath
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 12300 "configure"
- import com.jgoodies.looks.common.RenderingUtils;
 -// #line 12560 "configure"
++// #line 12852 "configure"
+ import com.jgoodies.looks.common.MenuItemRenderer;
  
  public class conftest {
      public static void main(String[] argv) {
@@@ -12405,8 -12664,116 +12956,116 @@@ $as_echo_n "checking jgoodies-looks... 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 12408 "configure"
- import com.l2fprod.util.AccessUtils;
 -// #line 12667 "configure"
++// #line 12959 "configure"
+ import com.jgoodies.looks.common.MenuItemRenderer;
+ public class conftest {
+     public static void main(String[] argv) {
+     }
+ }
+ 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
+          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
+                       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
+         # If ls returns several results and the first one is OK, stop the search
+       if test "$found_jar" = "yes"; then
+         break
+       fi
+       done
+         # If found, no need to search in other directory
+       if test "$found_jar" = "yes"; then
+         break
+       fi
+     done
+     if test "$found_jar" = "no"; then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+         if test "" = "yes"; then
+               { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar jgoodies-looks used by Scilab Gui - Look and feel (looking for package com.jgoodies.looks.common.MenuItemRenderer)" >&5
+ $as_echo "$as_me: WARNING: Could not find or use the Java package/jar jgoodies-looks used by Scilab Gui - Look and feel (looking for package com.jgoodies.looks.common.MenuItemRenderer)" >&2;}
+         else
+                 as_fn_error $? "Could not find or use the Java package/jar jgoodies-looks used by Scilab Gui - Look and feel (looking for package com.jgoodies.looks.common.MenuItemRenderer)" "$LINENO" 5
+         fi
+     fi
+                     LOOKS=$PACKAGE_JAR_FILE
+                 fi
+                 #  Skin Look and Feel
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking skinlf" >&5
+ $as_echo_n "checking skinlf... " >&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 $(ls -d /usr/share/java/*/ 2>/dev/null) $(ls -d /usr/lib64/*/ 2>/dev/null) $(ls -d /usr/lib/*/ 2>/dev/null)  $(ls -d /usr/share/*/lib/ 2>/dev/null)"
+     for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
+       for jar in "$jardir/skinlf.jar" "$jardir/libskinlf.jar" "$jardir/libskinlf-java.jar" "$jardir/skinlf*.jar"; do
+ #     jar=`echo $jar|sed -e 's/ /\\ /'`
+ #     echo "protected $jar"
+ #     jar_resolved=`ls $jar 2>/dev/null`
+ #     echo "looking for $jar_resolved"
+ # 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 12775 "configure"
++// #line 13067 "configure"
+ import com.l2fprod.util.AccessUtils;
  
  public class conftest {
      public static void main(String[] argv) {
@@@ -12512,7 -12879,7 +13171,7 @@@ $as_echo_n "checking jogl... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 12515 "configure"
 -// #line 12882 "configure"
++// #line 13174 "configure"
  import javax.media.opengl.glu.GLUnurbs;
  
  public class conftest {
@@@ -12724,7 -13091,7 +13383,7 @@@ $as_echo_n "checking gluegen-rt... " >&
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 12727 "configure"
 -// #line 13094 "configure"
++// #line 13386 "configure"
  import com.sun.gluegen.runtime.CPU;
  
  public class conftest {
@@@ -12885,7 -13252,7 +13544,7 @@@ $as_echo_n "checking jhall... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 12888 "configure"
 -// #line 13255 "configure"
++// #line 13547 "configure"
  import javax.help.JHelp;
  
  public class conftest {
@@@ -12992,7 -13359,7 +13651,7 @@@ $as_echo_n "checking javahelp2... " >&6
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 12995 "configure"
 -// #line 13362 "configure"
++// #line 13654 "configure"
  import javax.help.JHelp;
  
  public class conftest {
@@@ -13100,7 -13467,7 +13759,7 @@@ $as_echo_n "checking jrosetta-API... " 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 13103 "configure"
 -// #line 13470 "configure"
++// #line 13762 "configure"
  import com.artenum.rosetta.interfaces.core.ConsoleConfiguration;
  
  public class conftest {
@@@ -13207,7 -13574,7 +13866,7 @@@ $as_echo_n "checking jrosetta-engine..
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 13210 "configure"
 -// #line 13577 "configure"
++// #line 13869 "configure"
  import com.artenum.rosetta.core.action.AbstractConsoleAction;
  
  public class conftest {
@@@ -13316,7 -13683,7 +13975,7 @@@ $as_echo_n "checking jeuclid-core... " 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 13319 "configure"
 -// #line 13686 "configure"
++// #line 13978 "configure"
  import net.sourceforge.jeuclid.LayoutContext;
  
  public class conftest {
@@@ -13425,7 -13792,7 +14084,7 @@@ $as_echo_n "checking fop... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 13428 "configure"
 -// #line 13795 "configure"
++// #line 14087 "configure"
  import org.apache.fop.pdf.PDFInfo;
  
  public class conftest {
@@@ -13532,7 -13899,7 +14191,7 @@@ $as_echo_n "checking batik-all... " >&6
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 13535 "configure"
 -// #line 13902 "configure"
++// #line 14194 "configure"
  import org.apache.batik.parser.Parser;
  
  public class conftest {
@@@ -13639,7 -14006,7 +14298,7 @@@ $as_echo_n "checking batik... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 13642 "configure"
 -// #line 14009 "configure"
++// #line 14301 "configure"
  import org.apache.batik.parser.Parser;
  
  public class conftest {
@@@ -13733,7 -14100,7 +14392,7 @@@ $as_echo_n "checking minimal version (1
     if test "x" == "x"; then
  
      cat << \EOF > conftest.java
- // #line 13736 "configure"
 -// #line 14103 "configure"
++// #line 14395 "configure"
  import org.apache.batik.Version;
  
  public class conftest {
     else
  
      cat << \EOF > conftest.java
- // #line 13787 "configure"
 -// #line 14154 "configure"
++// #line 14446 "configure"
  import org.apache.batik.Version;
  
  public class conftest {
@@@ -13857,7 -14224,7 +14516,7 @@@ $as_echo_n "checking commons-io... " >&
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 13860 "configure"
 -// #line 14227 "configure"
++// #line 14519 "configure"
  import org.apache.commons.io.output.CountingOutputStream;
  
  public class conftest {
@@@ -13964,7 -14331,7 +14623,7 @@@ $as_echo_n "checking xmlgraphics-common
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 13967 "configure"
 -// #line 14334 "configure"
++// #line 14626 "configure"
  import org.apache.xmlgraphics.util.Service;
  
  public class conftest {
@@@ -14071,7 -14438,7 +14730,7 @@@ $as_echo_n "checking avalon-framework..
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14074 "configure"
 -// #line 14441 "configure"
++// #line 14733 "configure"
  import org.apache.avalon.framework.configuration.ConfigurationException;
  
  public class conftest {
@@@ -14178,7 -14545,7 +14837,7 @@@ $as_echo_n "checking xml-apis-ext... " 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14181 "configure"
 -// #line 14548 "configure"
++// #line 14840 "configure"
  import org.w3c.dom.svg.SVGDocument;
  
  public class conftest {
@@@ -14285,7 -14652,7 +14944,7 @@@ $as_echo_n "checking xml-commons-apis-e
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14288 "configure"
 -// #line 14655 "configure"
++// #line 14947 "configure"
  import org.w3c.dom.svg.SVGDocument;
  
  public class conftest {
@@@ -14396,7 -14763,7 +15055,7 @@@ $as_echo_n "checking commons-logging..
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14399 "configure"
 -// #line 14766 "configure"
++// #line 15058 "configure"
  import org.apache.commons.logging.LogFactory;
  
  public class conftest {
@@@ -14503,7 -14870,7 +15162,7 @@@ $as_echo_n "checking jlatexmath... " >&
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14506 "configure"
 -// #line 14873 "configure"
++// #line 15165 "configure"
  import org.scilab.forge.jlatexmath.TeXFormula;
  
  public class conftest {
@@@ -14597,7 -14964,7 +15256,7 @@@ $as_echo_n "checking minimal version (0
     if test "x" == "x"; then
  
      cat << \EOF > conftest.java
- // #line 14600 "configure"
 -// #line 14967 "configure"
++// #line 15259 "configure"
  import org.scilab.forge.jlatexmath.TeXFormula;
  
  public class conftest {
     else
  
      cat << \EOF > conftest.java
- // #line 14651 "configure"
 -// #line 15018 "configure"
++// #line 15310 "configure"
  import org.scilab.forge.jlatexmath.TeXFormula;
  
  public class conftest {
@@@ -14727,7 -15094,7 +15386,7 @@@ $as_echo_n "checking checkstyle... " >&
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14730 "configure"
 -// #line 15097 "configure"
++// #line 15389 "configure"
  import com.puppycrawl.tools.checkstyle.CheckStyleTask;
  
  public class conftest {
@@@ -14834,7 -15201,7 +15493,7 @@@ $as_echo_n "checking commons-beanutils.
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14837 "configure"
 -// #line 15204 "configure"
++// #line 15496 "configure"
  import org.apache.commons.beanutils.Converter;
  
  public class conftest {
@@@ -14941,7 -15308,7 +15600,7 @@@ $as_echo_n "checking antlr... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14944 "configure"
 -// #line 15311 "configure"
++// #line 15603 "configure"
  import antlr.TokenStreamException;
  
  public class conftest {
@@@ -15048,7 -15415,7 +15707,7 @@@ $as_echo_n "checking testng... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 15051 "configure"
 -// #line 15418 "configure"
++// #line 15710 "configure"
  import org.testng.TestNG;
  
  public class conftest {
@@@ -15155,7 -15522,7 +15814,7 @@@ $as_echo_n "checking qdox... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 15158 "configure"
 -// #line 15525 "configure"
++// #line 15817 "configure"
  import com.thoughtworks.qdox.tools.QDoxTester;
  
  public class conftest {
@@@ -15262,7 -15629,7 +15921,7 @@@ $as_echo_n "checking bsh... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 15265 "configure"
 -// #line 15632 "configure"
++// #line 15924 "configure"
  import bsh.Console;
  
  public class conftest {
@@@ -15369,7 -15736,7 +16028,7 @@@ $as_echo_n "checking junit... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 15372 "configure"
 -// #line 15739 "configure"
++// #line 16031 "configure"
  import junit.framework.Assert;
  
  public class conftest {
@@@ -24163,7 -23758,7 +24050,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 24166 "configure"
 -#line 23761 "configure"
++#line 24053 "configure"
  #include "confdefs.h"
  
  #include "$CHK_TCL_INCLUDE_PATH/$CHK_TCL_INC_NAME"
@@@ -24473,7 -24068,7 +24360,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 24476 "configure"
 -#line 24071 "configure"
++#line 24363 "configure"
  #include "confdefs.h"
  
  #include "$CHK_TK_INCLUDE_PATH/$CHK_TK_INC_NAME"
@@@ -25054,7 -24649,7 +24941,7 @@@ $as_echo_n "checking saxon... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 25057 "configure"
 -// #line 24652 "configure"
++// #line 24944 "configure"
  import com.icl.saxon.Loader;
  
  public class conftest {
@@@ -25161,7 -24756,7 +25048,7 @@@ $as_echo_n "checking jlatexmath-fop... 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 25164 "configure"
 -// #line 24759 "configure"
++// #line 25051 "configure"
  import org.scilab.forge.jlatexmath.fop.JLaTeXMathObj;
  
  public class conftest {
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<_LT_EOF
- #line 31465 "configure"
 -#line 31066 "configure"
++#line 31358 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<_LT_EOF
- #line 31571 "configure"
 -#line 31172 "configure"
++#line 31464 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
  #
  if test "$enable_stop_on_warning" = yes; then
     CFLAGS="$CFLAGS -Werror -O0"
-    CPPFLAGS="$CPPFLAGS -Werror -O0"
+    CXXFLAGS="$CXXFLAGS -Werror -O0"
  fi
  
- ac_config_files="$ac_config_files libs/MALLOC/Makefile libs/dynamiclibrary/Makefile libs/doublylinkedlist/Makefile libs/hashtable/Makefile libs/libst/Makefile contrib/Makefile modules/abstractSyntaxTree/Makefile modules/parse/Makefile modules/symbol/Makefile modules/functions_manager/Makefile modules/system_env/Makefile modules/helptools/Makefile modules/helptools/macros/xmlfiletohtml.sci modules/data_structures/Makefile modules/differential_equations/Makefile modules/optimization/Makefile modules/elementary_functions/Makefile modules/special_functions/Makefile modules/io/Makefile modules/shell/Makefile modules/completion/Makefile modules/history_manager/Makefile modules/jvm/Makefile modules/commons/Makefile modules/sound/Makefile modules/statistics/Makefile modules/mexlib/Makefile modules/sparse/Makefile modules/linear_algebra/Makefile modules/polynomials/Makefile modules/symbolic/Makefile modules/signal_processing/Makefile modules/arnoldi/Makefile modules/interpolation/Makefile modules/intersci/Makefile modules/localization/Makefile modules/cacsd/Makefile modules/boolean/Makefile modules/integer/Makefile modules/double/Makefile modules/fileio/Makefile modules/spreadsheet/Makefile modules/string/Makefile modules/time/Makefile modules/graphics/Makefile modules/graphic_export/Makefile modules/renderer/Makefile modules/action_binding/Makefile modules/gui/Makefile modules/pvm/Makefile modules/randlib/Makefile modules/tclsci/Makefile modules/windows_tools/Makefile modules/core/Makefile modules/api_scilab/Makefile modules/call_scilab/Makefile modules/types/Makefile modules/hdf5/Makefile modules/fftw/Makefile modules/umfpack/Makefile modules/scicos/Makefile modules/scicos_blocks/Makefile modules/functions/Makefile modules/dynamic_link/Makefile modules/overloading/Makefile modules/javasci/Makefile modules/maple2scilab/Makefile modules/m2sci/Makefile modules/compatibility_functions/Makefile modules/texmacs/Makefile modules/development_tools/Makefile modules/output_stream/Makefile modules/console/Makefile modules/demo_tools/Makefile modules/genetic_algorithms/Makefile modules/simulated_annealing/Makefile modules/parameters/Makefile modules/matio/Makefile modules/operations/Makefile modules/atoms/Makefile modules/xcos/Makefile modules/scinotes/Makefile modules/ui_data/Makefile modules/graph/Makefile modules/parallel/Makefile modules/modules_manager/Makefile modules/history_browser/Makefile modules/Makefile libs/Makefile Makefile scilab.pc etc/modules.xml etc/classpath.xml etc/jvm_options.xml scilab-lib.properties scilab-lib-doc.properties"
 -ac_config_files="$ac_config_files libs/MALLOC/Makefile libs/dynamiclibrary/Makefile libs/doublylinkedlist/Makefile libs/hashtable/Makefile libs/libst/Makefile contrib/Makefile modules/helptools/Makefile modules/helptools/macros/xmlfiletohtml.sci modules/data_structures/Makefile modules/differential_equations/Makefile modules/optimization/Makefile modules/elementary_functions/Makefile modules/special_functions/Makefile modules/io/Makefile modules/shell/Makefile modules/completion/Makefile modules/history_manager/Makefile modules/jvm/Makefile modules/commons/Makefile modules/sound/Makefile modules/statistics/Makefile modules/mexlib/Makefile modules/sparse/Makefile modules/linear_algebra/Makefile modules/polynomials/Makefile modules/symbolic/Makefile modules/signal_processing/Makefile modules/arnoldi/Makefile modules/interpolation/Makefile modules/intersci/Makefile modules/localization/Makefile modules/cacsd/Makefile modules/boolean/Makefile modules/integer/Makefile modules/double/Makefile modules/fileio/Makefile modules/spreadsheet/Makefile modules/string/Makefile modules/time/Makefile modules/graphics/Makefile modules/graphic_export/Makefile modules/renderer/Makefile modules/action_binding/Makefile modules/gui/Makefile modules/pvm/Makefile modules/randlib/Makefile modules/tclsci/Makefile modules/windows_tools/Makefile modules/core/Makefile modules/api_scilab/Makefile modules/call_scilab/Makefile modules/types/Makefile modules/hdf5/Makefile modules/fftw/Makefile modules/umfpack/Makefile modules/scicos/Makefile modules/scicos_blocks/Makefile modules/functions/Makefile modules/dynamic_link/Makefile modules/overloading/Makefile modules/javasci/Makefile modules/maple2scilab/Makefile modules/m2sci/Makefile modules/compatibility_functions/Makefile modules/texmacs/Makefile modules/development_tools/Makefile modules/output_stream/Makefile modules/console/Makefile modules/demo_tools/Makefile modules/genetic_algorithms/Makefile modules/simulated_annealing/Makefile modules/parameters/Makefile modules/matio/Makefile modules/atoms/Makefile modules/xcos/Makefile modules/scinotes/Makefile modules/ui_data/Makefile modules/graph/Makefile modules/parallel/Makefile modules/modules_manager/Makefile modules/history_browser/Makefile modules/Makefile libs/Makefile Makefile scilab.pc etc/modules.xml etc/classpath.xml etc/Info.plist scilab.properties scilab-lib.properties scilab-lib-doc.properties modules/helptools/etc/SciDocConf.xml modules/core/includes/version.h"
++ac_config_files="$ac_config_files libs/MALLOC/Makefile libs/dynamiclibrary/Makefile libs/doublylinkedlist/Makefile libs/hashtable/Makefile libs/libst/Makefile contrib/Makefile modules/abstractSyntaxTree/Makefile modules/parse/Makefile modules/symbol/Makefile modules/functions_manager/Makefile modules/system_env/Makefile modules/helptools/Makefile modules/helptools/macros/xmlfiletohtml.sci modules/data_structures/Makefile modules/differential_equations/Makefile modules/optimization/Makefile modules/elementary_functions/Makefile modules/special_functions/Makefile modules/io/Makefile modules/shell/Makefile modules/completion/Makefile modules/history_manager/Makefile modules/jvm/Makefile modules/commons/Makefile modules/sound/Makefile modules/statistics/Makefile modules/mexlib/Makefile modules/sparse/Makefile modules/linear_algebra/Makefile modules/polynomials/Makefile modules/symbolic/Makefile modules/signal_processing/Makefile modules/arnoldi/Makefile modules/interpolation/Makefile modules/intersci/Makefile modules/localization/Makefile modules/cacsd/Makefile modules/boolean/Makefile modules/integer/Makefile modules/double/Makefile modules/fileio/Makefile modules/spreadsheet/Makefile modules/string/Makefile modules/time/Makefile modules/graphics/Makefile modules/graphic_export/Makefile modules/renderer/Makefile modules/action_binding/Makefile modules/gui/Makefile modules/pvm/Makefile modules/randlib/Makefile modules/tclsci/Makefile modules/windows_tools/Makefile modules/core/Makefile modules/api_scilab/Makefile modules/call_scilab/Makefile modules/types/Makefile modules/hdf5/Makefile modules/fftw/Makefile modules/umfpack/Makefile modules/scicos/Makefile modules/scicos_blocks/Makefile modules/functions/Makefile modules/dynamic_link/Makefile modules/overloading/Makefile modules/javasci/Makefile modules/maple2scilab/Makefile modules/m2sci/Makefile modules/compatibility_functions/Makefile modules/texmacs/Makefile modules/development_tools/Makefile modules/output_stream/Makefile modules/console/Makefile modules/demo_tools/Makefile modules/genetic_algorithms/Makefile modules/simulated_annealing/Makefile modules/parameters/Makefile modules/matio/Makefile modules/operations/Makefile modules/atoms/Makefile modules/xcos/Makefile modules/scinotes/Makefile modules/ui_data/Makefile modules/graph/Makefile modules/parallel/Makefile modules/modules_manager/Makefile modules/history_browser/Makefile modules/Makefile libs/Makefile Makefile scilab.pc etc/modules.xml etc/classpath.xml etc/Info.plist scilab.properties scilab-lib.properties scilab-lib-doc.properties modules/helptools/etc/SciDocConf.xml modules/core/includes/version.h"
  
  
  # Detection of the module for the future version of Scilab 6
@@@ -23,9 -23,20 +23,20 @@@ SCI_BUILDDIR="`pwd`
  SCI_SRCDIR="$srcdir"
  SCI_SRCDIR_FULL="`cd $SCI_SRCDIR && pwd`"
  
- SCILAB_LIBRARY_VERSION=6:0:0
 -SCILAB_VERSION_MAJOR=5
 -SCILAB_VERSION_MINOR=4
++SCILAB_VERSION_MAJOR=6
++SCILAB_VERSION_MINOR=0
+ SCILAB_VERSION_MAINTENANCE=0
+ AC_SUBST(SCILAB_VERSION_MAJOR)
+ AC_SUBST(SCILAB_VERSION_MINOR)
+ AC_SUBST(SCILAB_VERSION_MAINTENANCE)
+ SCILAB_LIBRARY_VERSION=$SCILAB_VERSION_MAJOR:$SCILAB_VERSION_MINOR:$SCILAB_VERSION_MAINTENANCE
  AC_SUBST(SCILAB_LIBRARY_VERSION)
  
+ SCILAB_BINARY_VERSION=$SCILAB_VERSION_MAJOR.$SCILAB_VERSION_MINOR.$SCILAB_VERSION_MAINTENANCE
+ AC_SUBST(SCILAB_BINARY_VERSION)
  #shared library versioning
  #GENERIC_LIBRARY_VERSION=1:2:0
  #                       | | |
@@@ -478,13 -495,17 +498,17 @@@ case "$CXX" i
            case "$host" in
            *-linux-gnu )
            # Only doing that under Linux
-                   CPPFLAGS="$CPPFLAGS -fdiagnostics-show-option -Werror=format-security"
+                   CXXFLAGS="$CXXFLAGS -fdiagnostics-show-option -Werror=format-security"
            ;;
-         esac
+       esac
     else
-         CPPFLAGS="$CPPFLAGS -DNDEBUG"
+       CXXFLAGS="$CXXFLAGS -DNDEBUG"
     fi
-    CPPFLAGS="$CPPFLAGS -fno-stack-protector" # bug 3131
+    CXXFLAGS="$CXXFLAGS -fno-stack-protector" # bug 3131
+    ;;
 -   clang-* | clang) 
++   clang-* | clang)
+            # clang expect an explict declaration
+            LDFLAGS="$LDFLAGS -lstdc++"
     ;;
  esac
  
  AM_CONDITIONAL(IS_64_BITS_CPU, test $IS_64_BITS_CPU = true)
  AM_CONDITIONAL(USE_DYNAMIC_STACK, test $IS_64_BITS_CPU = true -o "$MACOSX" = "1")
  
+ ################
+ ## SSE
 -## By default, for x86 CPU, enable the SSE. 
 -## Note that it is already the case with 64 bits CPU 
++## By default, for x86 CPU, enable the SSE.
++## Note that it is already the case with 64 bits CPU
+ ## (these extensions are enabled by default by gcc)
+ ################
+ case "$host" in
+      i*86-linux-gnu|i*86-*-linux-gnu)
+         CFLAGS="$CFLAGS -msse"
+         FFLAGS="$FFLAGS -msse"
+         CPPFLAGS="$CPPFLAGS -msse"
+      ;;
+ esac
  #######################
  ## test for underscores (name mangling issues between C and fortran)
  #######################
@@@ -157,11 -158,9 +158,12 @@@ JROSETTA_API = @JROSETTA_API
  JROSETTA_ENGINE = @JROSETTA_ENGINE@
  JUNIT = @JUNIT@
  LAPACK_LIBS = @LAPACK_LIBS@
+ LCOV = @LCOV@
  LD = @LD@
  LDFLAGS = @LDFLAGS@
 +LEX = @LEX@
 +LEXLIB = @LEXLIB@
 +LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBICONV = @LIBICONV@
  LIBINTL = @LIBINTL@
  LIBM = @LIBM@
@@@ -317,54 -318,62 +323,63 @@@ target_alias = @target_alias
  top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
 +yacc_present = @yacc_present@
- SKELETON_FILES = toolbox_skeleton/builder.sce \
- toolbox_skeleton/changelog.txt \
- toolbox_skeleton/demos/c_sum.dem.sce \
- toolbox_skeleton/demos/fortran_sum.dem.sce \
- toolbox_skeleton/demos/scilab_sum.dem.sce \
- toolbox_skeleton/demos/cpp_find.dem.sce \
- toolbox_skeleton/demos/toolbox_skeleton.dem.gateway.sce \
+ SKELETON_FILES = toolbox_skeleton/src/fortran/builder_fortran.sce \
+ toolbox_skeleton/src/fortran/fsum.f \
+ toolbox_skeleton/src/c/csum.c \
+ toolbox_skeleton/src/c/builder_c.sce \
+ toolbox_skeleton/src/c/multiplybypi.c \
+ toolbox_skeleton/src/c/csub.c \
+ toolbox_skeleton/src/c/multiplybypi.h \
+ toolbox_skeleton/src/c/csub.h \
+ toolbox_skeleton/src/c/csum.h \
+ toolbox_skeleton/src/cleaner_src.sce \
+ toolbox_skeleton/src/builder_src.sce \
  toolbox_skeleton/etc/toolbox_skeleton.quit \
  toolbox_skeleton/etc/toolbox_skeleton.start \
+ toolbox_skeleton/license.txt \
+ toolbox_skeleton/DESCRIPTION \
+ toolbox_skeleton/changelog.txt \
+ toolbox_skeleton/DESCRIPTION-FUNCTIONS \
  toolbox_skeleton/help/builder_help.sce \
- toolbox_skeleton/help/en_US/build_help.sce \
- toolbox_skeleton/help/en_US/c_sub.xml \
- toolbox_skeleton/help/en_US/c_sum.xml \
- toolbox_skeleton/help/en_US/fortran_sum.xml \
- toolbox_skeleton/help/en_US/scilab_sum.xml \
- toolbox_skeleton/help/en_US/cpp_find.xml \
- toolbox_skeleton/help/fr_FR/build_help.sce \
+ toolbox_skeleton/help/fr_FR/scilab_sum.xml \
  toolbox_skeleton/help/fr_FR/c_sub.xml \
- toolbox_skeleton/help/fr_FR/c_sum.xml \
  toolbox_skeleton/help/fr_FR/fortran_sum.xml \
- toolbox_skeleton/help/fr_FR/scilab_sum.xml \
- toolbox_skeleton/license.txt \
- toolbox_skeleton/macros/buildmacros.sce \
- toolbox_skeleton/macros/scilab_sum.sci \
+ toolbox_skeleton/help/fr_FR/c_sum.xml \
+ toolbox_skeleton/help/fr_FR/build_help.sce \
+ toolbox_skeleton/help/en_US/scilab_sum.xml \
+ toolbox_skeleton/help/en_US/c_sub.xml \
+ toolbox_skeleton/help/en_US/fortran_sum.xml \
+ toolbox_skeleton/help/en_US/c_sum.xml \
+ toolbox_skeleton/help/en_US/build_help.sce \
+ toolbox_skeleton/help/en_US/c_multiplybypi.xml \
+ toolbox_skeleton/demos/c_sum.dem.sce \
+ toolbox_skeleton/demos/toolbox_skeleton.dem.gateway.sce \
+ toolbox_skeleton/demos/cpp_find.dem.sce \
+ toolbox_skeleton/demos/scilab_sum.dem.sce \
+ toolbox_skeleton/demos/fortran_sum.dem.sce \
  toolbox_skeleton/readme.txt \
- toolbox_skeleton/sci_gateway/builder_gateway.sce \
- toolbox_skeleton/sci_gateway/c/builder_gateway_c.sce \
- toolbox_skeleton/sci_gateway/c/sci_csub.c \
- toolbox_skeleton/sci_gateway/c/sci_csum.c \
+ toolbox_skeleton/tests/unit_tests/c_sum.tst \
+ toolbox_skeleton/tests/unit_tests/fortran_sum.tst \
+ toolbox_skeleton/tests/unit_tests/scilab_sum.dia.ref \
+ toolbox_skeleton/tests/unit_tests/fortran_sum.dia.ref \
+ toolbox_skeleton/tests/unit_tests/c_sum.dia.ref \
+ toolbox_skeleton/tests/unit_tests/scilab_sum.tst \
  toolbox_skeleton/sci_gateway/fortran/builder_gateway_fortran.sce \
  toolbox_skeleton/sci_gateway/fortran/sci_fsum.c \
+ toolbox_skeleton/sci_gateway/c/sci_csub.c \
+ toolbox_skeleton/sci_gateway/c/sci_multiplybypi.c \
+ toolbox_skeleton/sci_gateway/c/sci_csum.c \
+ toolbox_skeleton/sci_gateway/c/builder_gateway_c.sce \
  toolbox_skeleton/sci_gateway/cpp/builder_gateway_cpp.sce \
  toolbox_skeleton/sci_gateway/cpp/sci_cpp_find.cxx \
- toolbox_skeleton/src/builder_src.sce \
- toolbox_skeleton/src/c/builder_c.sce \
- toolbox_skeleton/src/c/csub.c \
- toolbox_skeleton/src/c/csum.c \
- toolbox_skeleton/src/c/csub.h \
- toolbox_skeleton/src/c/csum.h \
- toolbox_skeleton/src/fortran/builder_fortran.sce \
- toolbox_skeleton/src/fortran/fsum.f \
- toolbox_skeleton/tests/unit_tests/c_sum.tst \
- toolbox_skeleton/tests/unit_tests/fortran_sum.tst \
- toolbox_skeleton/tests/unit_tests/scilab_sum.tst \
- toolbox_skeleton/toolbox_skeleton.iss \
+ toolbox_skeleton/sci_gateway/builder_gateway.sce \
+ toolbox_skeleton/builder.sce \
+ toolbox_skeleton/macros/scilab_sum.sci \
+ toolbox_skeleton/macros/buildmacros.sce \
+ toolbox_skeleton/macros/cleanmacros.sce \
  toolbox_skeleton/toolbox_skeleton_redist.iss \
- loader.sce
+ toolbox_skeleton/toolbox_skeleton.iss
  
  all: all-am
  
@@@ -10,7 -10,7 +10,7 @@@
        <key>CFBundleExecutable</key>
        <string>bin/scilab</string>
        <key>CFBundleGetInfoString</key>
-       <string>Scilab 5.1.0, © 1998-2009 DIGITEO</string>
 -      <string>Scilab 5.4.0, © 1998-2011 DIGITEO</string>
++      <string>Scilab 6.0.0, © 1998-2011 DIGITEO</string>
        <key>CFBundleIconFile</key>
        <string>puffin</string>
        <key>CFBundleIdentifier</key>
@@@ -226,11 -224,9 +224,12 @@@ JROSETTA_API = @JROSETTA_API
  JROSETTA_ENGINE = @JROSETTA_ENGINE@
  JUNIT = @JUNIT@
  LAPACK_LIBS = @LAPACK_LIBS@
+ LCOV = @LCOV@
  LD = @LD@
  LDFLAGS = @LDFLAGS@
 +LEX = @LEX@
 +LEXLIB = @LEXLIB@
 +LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBICONV = @LIBICONV@
  LIBINTL = @LIBINTL@
  LIBM = @LIBM@
@@@ -195,11 -196,9 +196,12 @@@ JROSETTA_API = @JROSETTA_API
  JROSETTA_ENGINE = @JROSETTA_ENGINE@
  JUNIT = @JUNIT@
  LAPACK_LIBS = @LAPACK_LIBS@
+ LCOV = @LCOV@
  LD = @LD@
  LDFLAGS = @LDFLAGS@
 +LEX = @LEX@
 +LEXLIB = @LEXLIB@
 +LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBICONV = @LIBICONV@
  LIBINTL = @LIBINTL@
  LIBM = @LIBM@
@@@ -228,11 -226,9 +226,12 @@@ JROSETTA_API = @JROSETTA_API
  JROSETTA_ENGINE = @JROSETTA_ENGINE@
  JUNIT = @JUNIT@
  LAPACK_LIBS = @LAPACK_LIBS@
+ LCOV = @LCOV@
  LD = @LD@
  LDFLAGS = @LDFLAGS@
 +LEX = @LEX@
 +LEXLIB = @LEXLIB@
 +LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBICONV = @LIBICONV@
  LIBINTL = @LIBINTL@
  LIBM = @LIBM@
@@@ -228,11 -226,9 +226,12 @@@ JROSETTA_API = @JROSETTA_API
  JROSETTA_ENGINE = @JROSETTA_ENGINE@
  JUNIT = @JUNIT@
  LAPACK_LIBS = @LAPACK_LIBS@
+ LCOV = @LCOV@
  LD = @LD@
  LDFLAGS = @LDFLAGS@
 +LEX = @LEX@
 +LEXLIB = @LEXLIB@
 +LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBICONV = @LIBICONV@
  LIBINTL = @LIBINTL@
  LIBM = @LIBM@
@@@ -226,11 -224,9 +224,12 @@@ JROSETTA_API = @JROSETTA_API
  JROSETTA_ENGINE = @JROSETTA_ENGINE@
  JUNIT = @JUNIT@
  LAPACK_LIBS = @LAPACK_LIBS@
+ LCOV = @LCOV@
  LD = @LD@
  LDFLAGS = @LDFLAGS@
 +LEX = @LEX@
 +LEXLIB = @LEXLIB@
 +LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBICONV = @LIBICONV@
  LIBINTL = @LIBINTL@
  LIBM = @LIBM@
@@@ -222,11 -220,9 +220,12 @@@ JROSETTA_API = @JROSETTA_API
  JROSETTA_ENGINE = @JROSETTA_ENGINE@
  JUNIT = @JUNIT@
  LAPACK_LIBS = @LAPACK_LIBS@
+ LCOV = @LCOV@
  LD = @LD@
  LDFLAGS = @LDFLAGS@
 +LEX = @LEX@
 +LEXLIB = @LEXLIB@
 +LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBICONV = @LIBICONV@
  LIBINTL = @LIBINTL@
  LIBM = @LIBM@
@@@ -382,10 -380,9 +385,10 @@@ target_alias = @target_alias
  top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
 +yacc_present = @yacc_present@
  LIBST_C_SOURCES = libst.c  misc.c
  pkglib_LTLIBRARIES = libscilibst.la
- libscilibst_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION)
+ libscilibst_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION)
  libscilibst_la_SOURCES = $(LIBST_C_SOURCES)
  
  # For the code check (splint)
@@@ -197,17 -190,10 +197,18 @@@ ENGINE_LIBS =   $(top_builddir)/modules/f
        $(top_builddir)/modules/history_manager/libscihistory_manager.la \
        $(top_builddir)/modules/output_stream/libscioutput_stream.la \
        $(top_builddir)/modules/string/libscistring.la \
 -      $(top_builddir)/modules/functions/libscifunctions.la \
 +      $(top_builddir)/modules/fftw/libscifftw.la \
        $(top_builddir)/modules/hdf5/libscihdf5.la \
 +      $(top_builddir)/modules/abstractSyntaxTree/libsciabstractSyntaxTree.la \
 +      $(top_builddir)/modules/symbol/libscisymbol.la \
 +      $(top_builddir)/modules/parse/libsciparse.la \
 +      $(top_builddir)/modules/types/libscitypes.la \
 +      $(top_builddir)/modules/system_env/libscisystem_env.la \
 +      $(top_builddir)/modules/functions_manager/libscifunctions_manager.la \
 +      $(top_builddir)/modules/functions/libscifunctions.la \
 +      $(top_builddir)/modules/parallel/libsciparallel.la \
-       $(top_builddir)/modules/pvm/libscipvm.la
+       $(top_builddir)/modules/pvm/libscipvm.la \
+       $(top_builddir)/modules/fftw/libscifftw.la
  
  
  # These libraries are loaded dynamically from Scilab.
@@@ -286,11 -286,9 +287,12 @@@ JROSETTA_API = @JROSETTA_API
  JROSETTA_ENGINE = @JROSETTA_ENGINE@
  JUNIT = @JUNIT@
  LAPACK_LIBS = @LAPACK_LIBS@
+ LCOV = @LCOV@
  LD = @LD@
  LDFLAGS = @LDFLAGS@
 +LEX = @LEX@
 +LEXLIB = @LEXLIB@
 +LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBICONV = @LIBICONV@
  LIBINTL = @LIBINTL@
  LIBM = @LIBM@
@@@ -533,17 -531,10 +539,18 @@@ ENGINE_LIBS = $(top_builddir)/modules/f
        $(top_builddir)/modules/history_manager/libscihistory_manager.la \
        $(top_builddir)/modules/output_stream/libscioutput_stream.la \
        $(top_builddir)/modules/string/libscistring.la \
 -      $(top_builddir)/modules/functions/libscifunctions.la \
 +      $(top_builddir)/modules/fftw/libscifftw.la \
        $(top_builddir)/modules/hdf5/libscihdf5.la \
 +      $(top_builddir)/modules/abstractSyntaxTree/libsciabstractSyntaxTree.la \
 +      $(top_builddir)/modules/symbol/libscisymbol.la \
 +      $(top_builddir)/modules/parse/libsciparse.la \
 +      $(top_builddir)/modules/types/libscitypes.la \
 +      $(top_builddir)/modules/system_env/libscisystem_env.la \
 +      $(top_builddir)/modules/functions_manager/libscifunctions_manager.la \
 +      $(top_builddir)/modules/functions/libscifunctions.la \
 +      $(top_builddir)/modules/parallel/libsciparallel.la \
-       $(top_builddir)/modules/pvm/libscipvm.la
+       $(top_builddir)/modules/pvm/libscipvm.la \
+       $(top_builddir)/modules/fftw/libscifftw.la
  
  
  # These libraries are loaded dynamically from Scilab.
index ef71e35,0000000..2e8081b
mode 100644,000000..100644
--- /dev/null
@@@ -1,988 -1,0 +1,994 @@@
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
 +# @configure_input@
 +
 +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
 +# This Makefile.in is free software; the Free Software Foundation
 +# gives unlimited permission to copy and/or distribute it,
 +# with or without modifications, as long as this notice is preserved.
 +
 +# This program is distributed in the hope that it will be useful,
 +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
 +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 +# PARTICULAR PURPOSE.
 +
 +@SET_MAKE@
 +
 +
 +VPATH = @srcdir@
 +pkgdatadir = $(datadir)/@PACKAGE@
 +pkgincludedir = $(includedir)/@PACKAGE@
 +pkglibdir = $(libdir)/@PACKAGE@
 +pkglibexecdir = $(libexecdir)/@PACKAGE@
 +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 +install_sh_DATA = $(install_sh) -c -m 644
 +install_sh_PROGRAM = $(install_sh) -c
 +install_sh_SCRIPT = $(install_sh) -c
 +INSTALL_HEADER = $(INSTALL_DATA)
 +transform = $(program_transform_name)
 +NORMAL_INSTALL = :
 +PRE_INSTALL = :
 +POST_INSTALL = :
 +NORMAL_UNINSTALL = :
 +PRE_UNINSTALL = :
 +POST_UNINSTALL = :
 +build_triplet = @build@
 +host_triplet = @host@
 +check_PROGRAMS = testConstExp$(EXEEXT) testVarExp$(EXEEXT) \
 +      testControlExp$(EXEEXT)
 +TESTS = testConstExp$(EXEEXT) testVarExp$(EXEEXT) \
 +      testControlExp$(EXEEXT)
 +subdir = modules/abstractSyntaxTree
 +DIST_COMMON = $(libsciabstractSyntaxTree_la_include_HEADERS) \
 +      $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 +am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
 +      $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
 +      $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
 +      $(top_srcdir)/m4/intel_compiler.m4 \
 +      $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
-       $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
-       $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
-       $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-       $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-       $(top_srcdir)/m4/macosx.m4 $(top_srcdir)/m4/ocaml.m4 \
-       $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
-       $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
-       $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
-       $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
-       $(top_srcdir)/configure.ac
++      $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
++      $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
++      $(top_srcdir)/m4/libxml2.m4 $(top_srcdir)/m4/ltoptions.m4 \
++      $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
++      $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
++      $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
++      $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
++      $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
++      $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
++      $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
 +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 +      $(ACLOCAL_M4)
 +mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
 +CONFIG_HEADER = $(top_builddir)/modules/core/includes/machine.h
 +CONFIG_CLEAN_FILES =
 +CONFIG_CLEAN_VPATH_FILES =
 +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 +am__vpath_adj = case $$p in \
 +    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
 +    *) f=$$p;; \
 +  esac;
 +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
 +am__install_max = 40
 +am__nobase_strip_setup = \
 +  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
 +am__nobase_strip = \
 +  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
 +am__nobase_list = $(am__nobase_strip_setup); \
 +  for p in $$list; do echo "$$p $$p"; done | \
 +  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
 +  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
 +    if (++n[$$2] == $(am__install_max)) \
 +      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
 +    END { for (dir in files) print dir, files[dir] }'
 +am__base_list = \
 +  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
 +  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 +am__installdirs = "$(DESTDIR)$(pkglibdir)" \
 +      "$(DESTDIR)$(libsciabstractSyntaxTree_la_includedir)"
 +LTLIBRARIES = $(pkglib_LTLIBRARIES)
 +libsciabstractSyntaxTree_la_LIBADD =
 +am_libsciabstractSyntaxTree_la_OBJECTS =  \
 +      libsciabstractSyntaxTree_la-libAst.lo \
 +      libsciabstractSyntaxTree_la-visitor_common.lo \
 +      libsciabstractSyntaxTree_la-printvisitor.lo \
 +      libsciabstractSyntaxTree_la-debugvisitor.lo \
 +      libsciabstractSyntaxTree_la-mutevisitor.lo \
 +      libsciabstractSyntaxTree_la-shortcutvisitor.lo \
 +      libsciabstractSyntaxTree_la-scilabexception.lo
 +libsciabstractSyntaxTree_la_OBJECTS =  \
 +      $(am_libsciabstractSyntaxTree_la_OBJECTS)
 +libsciabstractSyntaxTree_la_LINK = $(LIBTOOL) --tag=CXX \
 +      $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
 +      $(libsciabstractSyntaxTree_la_CXXFLAGS) $(CXXFLAGS) \
 +      $(AM_LDFLAGS) $(LDFLAGS) -o $@
 +am_testConstExp_OBJECTS = testConstExp-testConstExp.$(OBJEXT)
 +testConstExp_OBJECTS = $(am_testConstExp_OBJECTS)
 +testConstExp_DEPENDENCIES = $(check_LDADD)
 +testConstExp_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
 +      $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(testConstExp_CXXFLAGS) \
 +      $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 +am_testControlExp_OBJECTS = testControlExp-testControlExp.$(OBJEXT)
 +testControlExp_OBJECTS = $(am_testControlExp_OBJECTS)
 +testControlExp_DEPENDENCIES = $(check_LDADD)
 +testControlExp_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
 +      $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
 +      $(testControlExp_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
 +      $(LDFLAGS) -o $@
 +am_testVarExp_OBJECTS = testVarExp-testVarExp.$(OBJEXT)
 +testVarExp_OBJECTS = $(am_testVarExp_OBJECTS)
 +testVarExp_DEPENDENCIES = $(check_LDADD)
 +testVarExp_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
 +      $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(testVarExp_CXXFLAGS) \
 +      $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/modules/core/includes
 +depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 +am__depfiles_maybe = depfiles
 +am__mv = mv -f
 +CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 +      $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 +LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 +      --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 +      $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 +CXXLD = $(CXX)
 +CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 +      --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
 +      $(LDFLAGS) -o $@
 +SOURCES = $(libsciabstractSyntaxTree_la_SOURCES) \
 +      $(testConstExp_SOURCES) $(testControlExp_SOURCES) \
 +      $(testVarExp_SOURCES)
 +DIST_SOURCES = $(libsciabstractSyntaxTree_la_SOURCES) \
 +      $(testConstExp_SOURCES) $(testControlExp_SOURCES) \
 +      $(testVarExp_SOURCES)
 +HEADERS = $(libsciabstractSyntaxTree_la_include_HEADERS)
 +ETAGS = etags
 +CTAGS = ctags
 +am__tty_colors = \
 +red=; grn=; lgn=; blu=; std=
 +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 +ACLOCAL = @ACLOCAL@
 +ALL_LINGUAS = @ALL_LINGUAS@
 +AMTAR = @AMTAR@
 +ANT = @ANT@
 +ANTLR = @ANTLR@
 +AR = @AR@
 +AUTOCONF = @AUTOCONF@
 +AUTOHEADER = @AUTOHEADER@
 +AUTOMAKE = @AUTOMAKE@
 +AVALON_FRAMEWORK = @AVALON_FRAMEWORK@
 +AWK = @AWK@
 +BATIK = @BATIK@
 +BLAS_LIBS = @BLAS_LIBS@
 +BSH = @BSH@
 +CC = @CC@
 +CCDEPMODE = @CCDEPMODE@
 +CFLAGS = @CFLAGS@
 +CHECKSTYLE = @CHECKSTYLE@
 +COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
 +COMMONS_IO = @COMMONS_IO@
 +COMMONS_LOGGING = @COMMONS_LOGGING@
 +CPP = @CPP@
 +CPPFLAGS = @CPPFLAGS@
 +CXX = @CXX@
 +CXXCPP = @CXXCPP@
 +CXXDEPMODE = @CXXDEPMODE@
 +CXXFLAGS = @CXXFLAGS@
 +CYGPATH_W = @CYGPATH_W@
 +DEFS = @DEFS@
 +DEMOTOOLS_ENABLE = @DEMOTOOLS_ENABLE@
 +DEPDIR = @DEPDIR@
 +DOCBOOK_ROOT = @DOCBOOK_ROOT@
 +DSYMUTIL = @DSYMUTIL@
 +DUMPBIN = @DUMPBIN@
 +ECHO_C = @ECHO_C@
 +ECHO_N = @ECHO_N@
 +ECHO_T = @ECHO_T@
 +EGREP = @EGREP@
 +EXEEXT = @EXEEXT@
 +F77 = @F77@
 +FFLAGS = @FFLAGS@
 +FFTW3_LIB = @FFTW3_LIB@
 +FFTW_ENABLE = @FFTW_ENABLE@
 +FGREP = @FGREP@
 +FLEXDOCK = @FLEXDOCK@
 +FLIBS = @FLIBS@
 +FOP = @FOP@
++GENHTML = @GENHTML@
 +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 +GIWS_BIN = @GIWS_BIN@
 +GLUEGEN_RT = @GLUEGEN_RT@
 +GMSGFMT = @GMSGFMT@
 +GMSGFMT_015 = @GMSGFMT_015@
 +GRAPHICS_ENABLE = @GRAPHICS_ENABLE@
 +GREP = @GREP@
 +GUI_ENABLE = @GUI_ENABLE@
 +HDF5_CFLAGS = @HDF5_CFLAGS@
 +HDF5_ENABLE = @HDF5_ENABLE@
 +HDF5_LIBS = @HDF5_LIBS@
 +HELP_ENABLE = @HELP_ENABLE@
 +INSTALL = @INSTALL@
 +INSTALL_DATA = @INSTALL_DATA@
 +INSTALL_PROGRAM = @INSTALL_PROGRAM@
 +INSTALL_SCRIPT = @INSTALL_SCRIPT@
 +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 +INTLLIBS = @INTLLIBS@
 +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 +JAR = @JAR@
 +JAVA = @JAVA@
 +JAVAC = @JAVAC@
++JAVAC_DEBUG = @JAVAC_DEBUG@
 +JAVADOC = @JAVADOC@
 +JAVAH = @JAVAH@
 +JAVASCI_ENABLE = @JAVASCI_ENABLE@
- JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
 +JAVA_ENABLE = @JAVA_ENABLE@
 +JAVA_G = @JAVA_G@
 +JAVA_HOME = @JAVA_HOME@
 +JAVA_JNI_INCLUDE = @JAVA_JNI_INCLUDE@
 +JAVA_JNI_LIBS = @JAVA_JNI_LIBS@
 +JDB = @JDB@
 +JEUCLID_CORE = @JEUCLID_CORE@
 +JGRAPHX = @JGRAPHX@
 +JHALL = @JHALL@
 +JHDF5 = @JHDF5@
 +JLATEXMATH = @JLATEXMATH@
 +JLATEXMATH_FOP = @JLATEXMATH_FOP@
 +JOGL = @JOGL@
 +JROSETTA_API = @JROSETTA_API@
 +JROSETTA_ENGINE = @JROSETTA_ENGINE@
 +JUNIT = @JUNIT@
 +LAPACK_LIBS = @LAPACK_LIBS@
++LCOV = @LCOV@
 +LD = @LD@
 +LDFLAGS = @LDFLAGS@
 +LEX = @LEX@
 +LEXLIB = @LEXLIB@
 +LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
 +LIBICONV = @LIBICONV@
 +LIBINTL = @LIBINTL@
 +LIBM = @LIBM@
 +LIBOBJS = @LIBOBJS@
 +LIBS = @LIBS@
 +LIBTOOL = @LIBTOOL@
 +LIPO = @LIPO@
 +LN_S = @LN_S@
 +LOOKS = @LOOKS@
 +LTLIBICONV = @LTLIBICONV@
 +LTLIBINTL = @LTLIBINTL@
 +LTLIBOBJS = @LTLIBOBJS@
 +MAINT = @MAINT@
 +MAKEINFO = @MAKEINFO@
 +MATIO_CFLAGS = @MATIO_CFLAGS@
 +MATIO_ENABLE = @MATIO_ENABLE@
 +MATIO_LIBS = @MATIO_LIBS@
 +MKDIR_P = @MKDIR_P@
 +MSGCAT = @MSGCAT@
 +MSGFMT = @MSGFMT@
 +MSGFMT_015 = @MSGFMT_015@
 +MSGMERGE = @MSGMERGE@
 +NM = @NM@
 +NMEDIT = @NMEDIT@
 +OBJDUMP = @OBJDUMP@
 +OBJEXT = @OBJEXT@
 +OCAMLC = @OCAMLC@
 +OCAMLDEP = @OCAMLDEP@
 +OCAMLLEX = @OCAMLLEX@
 +OCAMLOPT = @OCAMLOPT@
 +OCAMLYACC = @OCAMLYACC@
 +OPENMP_CFLAGS = @OPENMP_CFLAGS@
 +OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
 +OPENMP_ENABLE = @OPENMP_ENABLE@
 +OPENMP_LIBS = @OPENMP_LIBS@
 +OTOOL = @OTOOL@
 +OTOOL64 = @OTOOL64@
 +PACKAGE = @PACKAGE@
 +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 +PACKAGE_NAME = @PACKAGE_NAME@
 +PACKAGE_STRING = @PACKAGE_STRING@
 +PACKAGE_TARNAME = @PACKAGE_TARNAME@
 +PACKAGE_URL = @PACKAGE_URL@
 +PACKAGE_VERSION = @PACKAGE_VERSION@
 +PATH_SEPARATOR = @PATH_SEPARATOR@
 +PCRE_CFLAGS = @PCRE_CFLAGS@
 +PCRE_CONFIG = @PCRE_CONFIG@
 +PCRE_LIBS = @PCRE_LIBS@
 +PCRE_VERSION = @PCRE_VERSION@
 +PKG_CONFIG = @PKG_CONFIG@
 +POSUB = @POSUB@
 +POW_LIB = @POW_LIB@
 +PVMGETARCH = @PVMGETARCH@
 +PVM_ARCH = @PVM_ARCH@
 +PVM_ENABLE = @PVM_ENABLE@
 +PVM_INCLUDE = @PVM_INCLUDE@
 +PVM_LIB = @PVM_LIB@
 +PYTHON = @PYTHON@
 +QDOX = @QDOX@
 +RANLIB = @RANLIB@
 +RELOCATABLE = @RELOCATABLE@
 +RT_LIB = @RT_LIB@
 +SAXON = @SAXON@
- SCICOS_ENABLE = @SCICOS_ENABLE@
++SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@
 +SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@
++SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@
++SCILAB_VERSION_MAJOR = @SCILAB_VERSION_MAJOR@
++SCILAB_VERSION_MINOR = @SCILAB_VERSION_MINOR@
 +SED = @SED@
 +SET_MAKE = @SET_MAKE@
 +SET_RELOCATABLE = @SET_RELOCATABLE@
 +SHELL = @SHELL@
 +SKINLF = @SKINLF@
 +SPLINT = @SPLINT@
 +STRIP = @STRIP@
 +SWIG_BIN = @SWIG_BIN@
 +SWIG_JAVA = @SWIG_JAVA@
 +SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@
 +TCLTK_LIBS = @TCLTK_LIBS@
 +TCL_INC_PATH = @TCL_INC_PATH@
 +TESTNG = @TESTNG@
 +TK_INC_PATH = @TK_INC_PATH@
 +UMFPACK_ENABLE = @UMFPACK_ENABLE@
 +UMFPACK_LIB = @UMFPACK_LIB@
 +USE_NLS = @USE_NLS@
 +VERSION = @VERSION@
 +WITH_OCAML = @WITH_OCAML@
 +WITH_TKSCI = @WITH_TKSCI@
++XCOS_ENABLE = @XCOS_ENABLE@
 +XGETTEXT = @XGETTEXT@
 +XGETTEXT_015 = @XGETTEXT_015@
 +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 +XMKMF = @XMKMF@
 +XMLGRAPHICS_COMMONS = @XMLGRAPHICS_COMMONS@
 +XML_APIS_EXT = @XML_APIS_EXT@
 +XML_CONFIG = @XML_CONFIG@
 +XML_FLAGS = @XML_FLAGS@
 +XML_LIBS = @XML_LIBS@
 +XML_VERSION = @XML_VERSION@
 +X_CFLAGS = @X_CFLAGS@
 +X_EXTRA_LIBS = @X_EXTRA_LIBS@
 +X_LIBS = @X_LIBS@
 +X_PRE_LIBS = @X_PRE_LIBS@
 +YACC = @YACC@
 +YFLAGS = @YFLAGS@
 +abs_builddir = @abs_builddir@
 +abs_srcdir = @abs_srcdir@
 +abs_top_builddir = @abs_top_builddir@
 +abs_top_srcdir = @abs_top_srcdir@
 +ac_ct_CC = @ac_ct_CC@
 +ac_ct_CXX = @ac_ct_CXX@
 +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 +ac_ct_F77 = @ac_ct_F77@
 +am__include = @am__include@
 +am__leading_dot = @am__leading_dot@
 +am__quote = @am__quote@
 +am__tar = @am__tar@
 +am__untar = @am__untar@
 +bindir = @bindir@
 +build = @build@
 +build_alias = @build_alias@
 +build_cpu = @build_cpu@
 +build_os = @build_os@
 +build_vendor = @build_vendor@
 +builddir = @builddir@
 +cxx_present = @cxx_present@
 +datadir = @datadir@
 +datarootdir = @datarootdir@
 +docdir = @docdir@
 +dvidir = @dvidir@
 +exec_prefix = @exec_prefix@
 +host = @host@
 +host_alias = @host_alias@
 +host_cpu = @host_cpu@
 +host_os = @host_os@
 +host_vendor = @host_vendor@
 +htmldir = @htmldir@
 +includedir = @includedir@
 +infodir = @infodir@
 +install_sh = @install_sh@
 +libdir = @libdir@
 +libexecdir = @libexecdir@
 +localedir = @localedir@
 +localstatedir = @localstatedir@
 +mandir = @mandir@
 +mkdir_p = @mkdir_p@
 +oldincludedir = @oldincludedir@
 +pdfdir = @pdfdir@
 +prefix = @prefix@
 +program_transform_name = @program_transform_name@
 +psdir = @psdir@
 +sbindir = @sbindir@
 +sharedstatedir = @sharedstatedir@
 +srcdir = @srcdir@
 +sysconfdir = @sysconfdir@
 +target_alias = @target_alias@
 +top_build_prefix = @top_build_prefix@
 +top_builddir = @top_builddir@
 +top_srcdir = @top_srcdir@
 +yacc_present = @yacc_present@
 +pkglib_LTLIBRARIES = libsciabstractSyntaxTree.la
 +libsciabstractSyntaxTree_la_SOURCES = \
 +                              src/cpp/libAst.cpp \
 +                              src/cpp/visitor_common.cpp \
 +                              src/cpp/printvisitor.cpp \
 +                              src/cpp/debugvisitor.cpp \
 +                              src/cpp/mutevisitor.cpp \
 +                              src/cpp/shortcutvisitor.cpp \
 +                              src/cpp/scilabexception.cpp
 +
 +libsciabstractSyntaxTree_la_CXXFLAGS = \
 +                      -I $(top_srcdir)/modules/symbol/includes \
 +                      -I $(top_srcdir)/modules/types/includes \
 +                      -I $(top_srcdir)/modules/functions_manager/includes \
 +                      -I $(top_srcdir)/modules/elementary_functions/includes \
 +                      -I $(top_srcdir)/modules/operations/includes \
 +                      -I $(top_srcdir)/modules/output_stream/includes \
 +                      -I includes \
 +                      -I src/cpp \
 +                      -I $(top_srcdir)/modules/system_env/includes
 +
 +libsciabstractSyntaxTree_la_includedir = $(pkgincludedir)/abstractSyntaxTree
 +libsciabstractSyntaxTree_la_include_HEADERS = 
 +
 +####################
 +####################
 +check_INCLUDES = -I$(top_srcdir)/modules/symbol/includes \
 +                      -Iincludes/ \
 +                      -Isrc/cpp
 +
 +check_LDADD = $(top_builddir)/modules/symbol/libsciSymbol.la \
 +                      $(top_builddir)/modules/abstractSyntaxTree/libsciabstractSyntaxTree.la \
 +                      $(top_builddir)/modules/types/libsciTypes.la
 +
 +testConstExp_SOURCES = src/cpp/testConstExp.cpp
 +testConstExp_CXXFLAGS = $(check_INCLUDES)
 +testConstExp_LDADD = $(check_LDADD)
 +testVarExp_SOURCES = src/cpp/testVarExp.cpp
 +testVarExp_CXXFLAGS = $(check_INCLUDES)
 +testVarExp_LDADD = $(check_LDADD)
 +testControlExp_SOURCES = src/cpp/testControlExp.cpp
 +testControlExp_CXXFLAGS = $(check_INCLUDES)
 +testControlExp_LDADD = $(check_LDADD)
 +all: all-am
 +
 +.SUFFIXES:
 +.SUFFIXES: .cpp .lo .o .obj
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 +      @for dep in $?; do \
 +        case '$(am__configure_deps)' in \
 +          *$$dep*) \
 +            ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
 +              && { if test -f $@; then exit 0; else break; fi; }; \
 +            exit 1;; \
 +        esac; \
 +      done; \
 +      echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign modules/abstractSyntaxTree/Makefile'; \
 +      $(am__cd) $(top_srcdir) && \
 +        $(AUTOMAKE) --foreign modules/abstractSyntaxTree/Makefile
 +.PRECIOUS: Makefile
 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 +      @case '$?' in \
 +        *config.status*) \
 +          cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 +        *) \
 +          echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
 +          cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 +      esac;
 +
 +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 +      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 +      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 +      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(am__aclocal_m4_deps):
 +install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
 +      @$(NORMAL_INSTALL)
 +      test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)"
 +      @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
 +      list2=; for p in $$list; do \
 +        if test -f $$p; then \
 +          list2="$$list2 $$p"; \
 +        else :; fi; \
 +      done; \
 +      test -z "$$list2" || { \
 +        echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \
 +        $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \
 +      }
 +
 +uninstall-pkglibLTLIBRARIES:
 +      @$(NORMAL_UNINSTALL)
 +      @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
 +      for p in $$list; do \
 +        $(am__strip_dir) \
 +        echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \
 +        $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \
 +      done
 +
 +clean-pkglibLTLIBRARIES:
 +      -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
 +      @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
 +        dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
 +        test "$$dir" != "$$p" || dir=.; \
 +        echo "rm -f \"$${dir}/so_locations\""; \
 +        rm -f "$${dir}/so_locations"; \
 +      done
 +libsciabstractSyntaxTree.la: $(libsciabstractSyntaxTree_la_OBJECTS) $(libsciabstractSyntaxTree_la_DEPENDENCIES) 
 +      $(libsciabstractSyntaxTree_la_LINK) -rpath $(pkglibdir) $(libsciabstractSyntaxTree_la_OBJECTS) $(libsciabstractSyntaxTree_la_LIBADD) $(LIBS)
 +
 +clean-checkPROGRAMS:
 +      @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
 +      echo " rm -f" $$list; \
 +      rm -f $$list || exit $$?; \
 +      test -n "$(EXEEXT)" || exit 0; \
 +      list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 +      echo " rm -f" $$list; \
 +      rm -f $$list
 +testConstExp$(EXEEXT): $(testConstExp_OBJECTS) $(testConstExp_DEPENDENCIES) 
 +      @rm -f testConstExp$(EXEEXT)
 +      $(testConstExp_LINK) $(testConstExp_OBJECTS) $(testConstExp_LDADD) $(LIBS)
 +testControlExp$(EXEEXT): $(testControlExp_OBJECTS) $(testControlExp_DEPENDENCIES) 
 +      @rm -f testControlExp$(EXEEXT)
 +      $(testControlExp_LINK) $(testControlExp_OBJECTS) $(testControlExp_LDADD) $(LIBS)
 +testVarExp$(EXEEXT): $(testVarExp_OBJECTS) $(testVarExp_DEPENDENCIES) 
 +      @rm -f testVarExp$(EXEEXT)
 +      $(testVarExp_LINK) $(testVarExp_OBJECTS) $(testVarExp_LDADD) $(LIBS)
 +
 +mostlyclean-compile:
 +      -rm -f *.$(OBJEXT)
 +
 +distclean-compile:
 +      -rm -f *.tab.c
 +
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciabstractSyntaxTree_la-debugvisitor.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciabstractSyntaxTree_la-libAst.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciabstractSyntaxTree_la-mutevisitor.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciabstractSyntaxTree_la-printvisitor.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciabstractSyntaxTree_la-scilabexception.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciabstractSyntaxTree_la-shortcutvisitor.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciabstractSyntaxTree_la-visitor_common.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testConstExp-testConstExp.Po@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testControlExp-testControlExp.Po@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testVarExp-testVarExp.Po@am__quote@
 +
 +.cpp.o:
 +@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(CXXCOMPILE) -c -o $@ $<
 +
 +.cpp.obj:
 +@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 +
 +.cpp.lo:
 +@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LTCXXCOMPILE) -c -o $@ $<
 +
 +libsciabstractSyntaxTree_la-libAst.lo: src/cpp/libAst.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciabstractSyntaxTree_la_CXXFLAGS) $(CXXFLAGS) -MT libsciabstractSyntaxTree_la-libAst.lo -MD -MP -MF $(DEPDIR)/libsciabstractSyntaxTree_la-libAst.Tpo -c -o libsciabstractSyntaxTree_la-libAst.lo `test -f 'src/cpp/libAst.cpp' || echo '$(srcdir)/'`src/cpp/libAst.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libsciabstractSyntaxTree_la-libAst.Tpo $(DEPDIR)/libsciabstractSyntaxTree_la-libAst.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/libAst.cpp' object='libsciabstractSyntaxTree_la-libAst.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciabstractSyntaxTree_la_CXXFLAGS) $(CXXFLAGS) -c -o libsciabstractSyntaxTree_la-libAst.lo `test -f 'src/cpp/libAst.cpp' || echo '$(srcdir)/'`src/cpp/libAst.cpp
 +
 +libsciabstractSyntaxTree_la-visitor_common.lo: src/cpp/visitor_common.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciabstractSyntaxTree_la_CXXFLAGS) $(CXXFLAGS) -MT libsciabstractSyntaxTree_la-visitor_common.lo -MD -MP -MF $(DEPDIR)/libsciabstractSyntaxTree_la-visitor_common.Tpo -c -o libsciabstractSyntaxTree_la-visitor_common.lo `test -f 'src/cpp/visitor_common.cpp' || echo '$(srcdir)/'`src/cpp/visitor_common.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libsciabstractSyntaxTree_la-visitor_common.Tpo $(DEPDIR)/libsciabstractSyntaxTree_la-visitor_common.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/visitor_common.cpp' object='libsciabstractSyntaxTree_la-visitor_common.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciabstractSyntaxTree_la_CXXFLAGS) $(CXXFLAGS) -c -o libsciabstractSyntaxTree_la-visitor_common.lo `test -f 'src/cpp/visitor_common.cpp' || echo '$(srcdir)/'`src/cpp/visitor_common.cpp
 +
 +libsciabstractSyntaxTree_la-printvisitor.lo: src/cpp/printvisitor.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciabstractSyntaxTree_la_CXXFLAGS) $(CXXFLAGS) -MT libsciabstractSyntaxTree_la-printvisitor.lo -MD -MP -MF $(DEPDIR)/libsciabstractSyntaxTree_la-printvisitor.Tpo -c -o libsciabstractSyntaxTree_la-printvisitor.lo `test -f 'src/cpp/printvisitor.cpp' || echo '$(srcdir)/'`src/cpp/printvisitor.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libsciabstractSyntaxTree_la-printvisitor.Tpo $(DEPDIR)/libsciabstractSyntaxTree_la-printvisitor.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/printvisitor.cpp' object='libsciabstractSyntaxTree_la-printvisitor.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciabstractSyntaxTree_la_CXXFLAGS) $(CXXFLAGS) -c -o libsciabstractSyntaxTree_la-printvisitor.lo `test -f 'src/cpp/printvisitor.cpp' || echo '$(srcdir)/'`src/cpp/printvisitor.cpp
 +
 +libsciabstractSyntaxTree_la-debugvisitor.lo: src/cpp/debugvisitor.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciabstractSyntaxTree_la_CXXFLAGS) $(CXXFLAGS) -MT libsciabstractSyntaxTree_la-debugvisitor.lo -MD -MP -MF $(DEPDIR)/libsciabstractSyntaxTree_la-debugvisitor.Tpo -c -o libsciabstractSyntaxTree_la-debugvisitor.lo `test -f 'src/cpp/debugvisitor.cpp' || echo '$(srcdir)/'`src/cpp/debugvisitor.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libsciabstractSyntaxTree_la-debugvisitor.Tpo $(DEPDIR)/libsciabstractSyntaxTree_la-debugvisitor.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/debugvisitor.cpp' object='libsciabstractSyntaxTree_la-debugvisitor.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciabstractSyntaxTree_la_CXXFLAGS) $(CXXFLAGS) -c -o libsciabstractSyntaxTree_la-debugvisitor.lo `test -f 'src/cpp/debugvisitor.cpp' || echo '$(srcdir)/'`src/cpp/debugvisitor.cpp
 +
 +libsciabstractSyntaxTree_la-mutevisitor.lo: src/cpp/mutevisitor.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciabstractSyntaxTree_la_CXXFLAGS) $(CXXFLAGS) -MT libsciabstractSyntaxTree_la-mutevisitor.lo -MD -MP -MF $(DEPDIR)/libsciabstractSyntaxTree_la-mutevisitor.Tpo -c -o libsciabstractSyntaxTree_la-mutevisitor.lo `test -f 'src/cpp/mutevisitor.cpp' || echo '$(srcdir)/'`src/cpp/mutevisitor.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libsciabstractSyntaxTree_la-mutevisitor.Tpo $(DEPDIR)/libsciabstractSyntaxTree_la-mutevisitor.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/mutevisitor.cpp' object='libsciabstractSyntaxTree_la-mutevisitor.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciabstractSyntaxTree_la_CXXFLAGS) $(CXXFLAGS) -c -o libsciabstractSyntaxTree_la-mutevisitor.lo `test -f 'src/cpp/mutevisitor.cpp' || echo '$(srcdir)/'`src/cpp/mutevisitor.cpp
 +
 +libsciabstractSyntaxTree_la-shortcutvisitor.lo: src/cpp/shortcutvisitor.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciabstractSyntaxTree_la_CXXFLAGS) $(CXXFLAGS) -MT libsciabstractSyntaxTree_la-shortcutvisitor.lo -MD -MP -MF $(DEPDIR)/libsciabstractSyntaxTree_la-shortcutvisitor.Tpo -c -o libsciabstractSyntaxTree_la-shortcutvisitor.lo `test -f 'src/cpp/shortcutvisitor.cpp' || echo '$(srcdir)/'`src/cpp/shortcutvisitor.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libsciabstractSyntaxTree_la-shortcutvisitor.Tpo $(DEPDIR)/libsciabstractSyntaxTree_la-shortcutvisitor.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/shortcutvisitor.cpp' object='libsciabstractSyntaxTree_la-shortcutvisitor.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciabstractSyntaxTree_la_CXXFLAGS) $(CXXFLAGS) -c -o libsciabstractSyntaxTree_la-shortcutvisitor.lo `test -f 'src/cpp/shortcutvisitor.cpp' || echo '$(srcdir)/'`src/cpp/shortcutvisitor.cpp
 +
 +libsciabstractSyntaxTree_la-scilabexception.lo: src/cpp/scilabexception.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciabstractSyntaxTree_la_CXXFLAGS) $(CXXFLAGS) -MT libsciabstractSyntaxTree_la-scilabexception.lo -MD -MP -MF $(DEPDIR)/libsciabstractSyntaxTree_la-scilabexception.Tpo -c -o libsciabstractSyntaxTree_la-scilabexception.lo `test -f 'src/cpp/scilabexception.cpp' || echo '$(srcdir)/'`src/cpp/scilabexception.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libsciabstractSyntaxTree_la-scilabexception.Tpo $(DEPDIR)/libsciabstractSyntaxTree_la-scilabexception.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/scilabexception.cpp' object='libsciabstractSyntaxTree_la-scilabexception.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciabstractSyntaxTree_la_CXXFLAGS) $(CXXFLAGS) -c -o libsciabstractSyntaxTree_la-scilabexception.lo `test -f 'src/cpp/scilabexception.cpp' || echo '$(srcdir)/'`src/cpp/scilabexception.cpp
 +
 +testConstExp-testConstExp.o: src/cpp/testConstExp.cpp
 +@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testConstExp_CXXFLAGS) $(CXXFLAGS) -MT testConstExp-testConstExp.o -MD -MP -MF $(DEPDIR)/testConstExp-testConstExp.Tpo -c -o testConstExp-testConstExp.o `test -f 'src/cpp/testConstExp.cpp' || echo '$(srcdir)/'`src/cpp/testConstExp.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/testConstExp-testConstExp.Tpo $(DEPDIR)/testConstExp-testConstExp.Po
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/testConstExp.cpp' object='testConstExp-testConstExp.o' libtool=no @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testConstExp_CXXFLAGS) $(CXXFLAGS) -c -o testConstExp-testConstExp.o `test -f 'src/cpp/testConstExp.cpp' || echo '$(srcdir)/'`src/cpp/testConstExp.cpp
 +
 +testConstExp-testConstExp.obj: src/cpp/testConstExp.cpp
 +@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testConstExp_CXXFLAGS) $(CXXFLAGS) -MT testConstExp-testConstExp.obj -MD -MP -MF $(DEPDIR)/testConstExp-testConstExp.Tpo -c -o testConstExp-testConstExp.obj `if test -f 'src/cpp/testConstExp.cpp'; then $(CYGPATH_W) 'src/cpp/testConstExp.cpp'; else $(CYGPATH_W) '$(srcdir)/src/cpp/testConstExp.cpp'; fi`
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/testConstExp-testConstExp.Tpo $(DEPDIR)/testConstExp-testConstExp.Po
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/testConstExp.cpp' object='testConstExp-testConstExp.obj' libtool=no @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testConstExp_CXXFLAGS) $(CXXFLAGS) -c -o testConstExp-testConstExp.obj `if test -f 'src/cpp/testConstExp.cpp'; then $(CYGPATH_W) 'src/cpp/testConstExp.cpp'; else $(CYGPATH_W) '$(srcdir)/src/cpp/testConstExp.cpp'; fi`
 +
 +testControlExp-testControlExp.o: src/cpp/testControlExp.cpp
 +@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testControlExp_CXXFLAGS) $(CXXFLAGS) -MT testControlExp-testControlExp.o -MD -MP -MF $(DEPDIR)/testControlExp-testControlExp.Tpo -c -o testControlExp-testControlExp.o `test -f 'src/cpp/testControlExp.cpp' || echo '$(srcdir)/'`src/cpp/testControlExp.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/testControlExp-testControlExp.Tpo $(DEPDIR)/testControlExp-testControlExp.Po
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/testControlExp.cpp' object='testControlExp-testControlExp.o' libtool=no @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testControlExp_CXXFLAGS) $(CXXFLAGS) -c -o testControlExp-testControlExp.o `test -f 'src/cpp/testControlExp.cpp' || echo '$(srcdir)/'`src/cpp/testControlExp.cpp
 +
 +testControlExp-testControlExp.obj: src/cpp/testControlExp.cpp
 +@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testControlExp_CXXFLAGS) $(CXXFLAGS) -MT testControlExp-testControlExp.obj -MD -MP -MF $(DEPDIR)/testControlExp-testControlExp.Tpo -c -o testControlExp-testControlExp.obj `if test -f 'src/cpp/testControlExp.cpp'; then $(CYGPATH_W) 'src/cpp/testControlExp.cpp'; else $(CYGPATH_W) '$(srcdir)/src/cpp/testControlExp.cpp'; fi`
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/testControlExp-testControlExp.Tpo $(DEPDIR)/testControlExp-testControlExp.Po
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/testControlExp.cpp' object='testControlExp-testControlExp.obj' libtool=no @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testControlExp_CXXFLAGS) $(CXXFLAGS) -c -o testControlExp-testControlExp.obj `if test -f 'src/cpp/testControlExp.cpp'; then $(CYGPATH_W) 'src/cpp/testControlExp.cpp'; else $(CYGPATH_W) '$(srcdir)/src/cpp/testControlExp.cpp'; fi`
 +
 +testVarExp-testVarExp.o: src/cpp/testVarExp.cpp
 +@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testVarExp_CXXFLAGS) $(CXXFLAGS) -MT testVarExp-testVarExp.o -MD -MP -MF $(DEPDIR)/testVarExp-testVarExp.Tpo -c -o testVarExp-testVarExp.o `test -f 'src/cpp/testVarExp.cpp' || echo '$(srcdir)/'`src/cpp/testVarExp.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/testVarExp-testVarExp.Tpo $(DEPDIR)/testVarExp-testVarExp.Po
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/testVarExp.cpp' object='testVarExp-testVarExp.o' libtool=no @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testVarExp_CXXFLAGS) $(CXXFLAGS) -c -o testVarExp-testVarExp.o `test -f 'src/cpp/testVarExp.cpp' || echo '$(srcdir)/'`src/cpp/testVarExp.cpp
 +
 +testVarExp-testVarExp.obj: src/cpp/testVarExp.cpp
 +@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testVarExp_CXXFLAGS) $(CXXFLAGS) -MT testVarExp-testVarExp.obj -MD -MP -MF $(DEPDIR)/testVarExp-testVarExp.Tpo -c -o testVarExp-testVarExp.obj `if test -f 'src/cpp/testVarExp.cpp'; then $(CYGPATH_W) 'src/cpp/testVarExp.cpp'; else $(CYGPATH_W) '$(srcdir)/src/cpp/testVarExp.cpp'; fi`
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/testVarExp-testVarExp.Tpo $(DEPDIR)/testVarExp-testVarExp.Po
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/testVarExp.cpp' object='testVarExp-testVarExp.obj' libtool=no @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testVarExp_CXXFLAGS) $(CXXFLAGS) -c -o testVarExp-testVarExp.obj `if test -f 'src/cpp/testVarExp.cpp'; then $(CYGPATH_W) 'src/cpp/testVarExp.cpp'; else $(CYGPATH_W) '$(srcdir)/src/cpp/testVarExp.cpp'; fi`
 +
 +mostlyclean-libtool:
 +      -rm -f *.lo
 +
 +clean-libtool:
 +      -rm -rf .libs _libs
 +install-libsciabstractSyntaxTree_la_includeHEADERS: $(libsciabstractSyntaxTree_la_include_HEADERS)
 +      @$(NORMAL_INSTALL)
 +      test -z "$(libsciabstractSyntaxTree_la_includedir)" || $(MKDIR_P) "$(DESTDIR)$(libsciabstractSyntaxTree_la_includedir)"
 +      @list='$(libsciabstractSyntaxTree_la_include_HEADERS)'; test -n "$(libsciabstractSyntaxTree_la_includedir)" || list=; \
 +      for p in $$list; do \
 +        if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 +        echo "$$d$$p"; \
 +      done | $(am__base_list) | \
 +      while read files; do \
 +        echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libsciabstractSyntaxTree_la_includedir)'"; \
 +        $(INSTALL_HEADER) $$files "$(DESTDIR)$(libsciabstractSyntaxTree_la_includedir)" || exit $$?; \
 +      done
 +
 +uninstall-libsciabstractSyntaxTree_la_includeHEADERS:
 +      @$(NORMAL_UNINSTALL)
 +      @list='$(libsciabstractSyntaxTree_la_include_HEADERS)'; test -n "$(libsciabstractSyntaxTree_la_includedir)" || list=; \
 +      files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 +      test -n "$$files" || exit 0; \
 +      echo " ( cd '$(DESTDIR)$(libsciabstractSyntaxTree_la_includedir)' && rm -f" $$files ")"; \
 +      cd "$(DESTDIR)$(libsciabstractSyntaxTree_la_includedir)" && rm -f $$files
 +
 +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 +      list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 +      unique=`for i in $$list; do \
 +          if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 +        done | \
 +        $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 +            END { if (nonempty) { for (i in files) print i; }; }'`; \
 +      mkid -fID $$unique
 +tags: TAGS
 +
 +TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 +              $(TAGS_FILES) $(LISP)
 +      set x; \
 +      here=`pwd`; \
 +      list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 +      unique=`for i in $$list; do \
 +          if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 +        done | \
 +        $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 +            END { if (nonempty) { for (i in files) print i; }; }'`; \
 +      shift; \
 +      if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 +        test -n "$$unique" || unique=$$empty_fix; \
 +        if test $$# -gt 0; then \
 +          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 +            "$$@" $$unique; \
 +        else \
 +          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 +            $$unique; \
 +        fi; \
 +      fi
 +ctags: CTAGS
 +CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 +              $(TAGS_FILES) $(LISP)
 +      list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 +      unique=`for i in $$list; do \
 +          if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 +        done | \
 +        $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 +            END { if (nonempty) { for (i in files) print i; }; }'`; \
 +      test -z "$(CTAGS_ARGS)$$unique" \
 +        || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 +           $$unique
 +
 +GTAGS:
 +      here=`$(am__cd) $(top_builddir) && pwd` \
 +        && $(am__cd) $(top_srcdir) \
 +        && gtags -i $(GTAGS_ARGS) "$$here"
 +
 +distclean-tags:
 +      -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 +
 +check-TESTS: $(TESTS)
 +      @failed=0; all=0; xfail=0; xpass=0; skip=0; \
 +      srcdir=$(srcdir); export srcdir; \
 +      list=' $(TESTS) '; \
 +      $(am__tty_colors); \
 +      if test -n "$$list"; then \
 +        for tst in $$list; do \
 +          if test -f ./$$tst; then dir=./; \
 +          elif test -f $$tst; then dir=; \
 +          else dir="$(srcdir)/"; fi; \
 +          if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
 +            all=`expr $$all + 1`; \
 +            case " $(XFAIL_TESTS) " in \
 +            *[\ \     ]$$tst[\ \      ]*) \
 +              xpass=`expr $$xpass + 1`; \
 +              failed=`expr $$failed + 1`; \
 +              col=$$red; res=XPASS; \
 +            ;; \
 +            *) \
 +              col=$$grn; res=PASS; \
 +            ;; \
 +            esac; \
 +          elif test $$? -ne 77; then \
 +            all=`expr $$all + 1`; \
 +            case " $(XFAIL_TESTS) " in \
 +            *[\ \     ]$$tst[\ \      ]*) \
 +              xfail=`expr $$xfail + 1`; \
 +              col=$$lgn; res=XFAIL; \
 +            ;; \
 +            *) \
 +              failed=`expr $$failed + 1`; \
 +              col=$$red; res=FAIL; \
 +            ;; \
 +            esac; \
 +          else \
 +            skip=`expr $$skip + 1`; \
 +            col=$$blu; res=SKIP; \
 +          fi; \
 +          echo "$${col}$$res$${std}: $$tst"; \
 +        done; \
 +        if test "$$all" -eq 1; then \
 +          tests="test"; \
 +          All=""; \
 +        else \
 +          tests="tests"; \
 +          All="All "; \
 +        fi; \
 +        if test "$$failed" -eq 0; then \
 +          if test "$$xfail" -eq 0; then \
 +            banner="$$All$$all $$tests passed"; \
 +          else \
 +            if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
 +            banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
 +          fi; \
 +        else \
 +          if test "$$xpass" -eq 0; then \
 +            banner="$$failed of $$all $$tests failed"; \
 +          else \
 +            if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
 +            banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
 +          fi; \
 +        fi; \
 +        dashes="$$banner"; \
 +        skipped=""; \
 +        if test "$$skip" -ne 0; then \
 +          if test "$$skip" -eq 1; then \
 +            skipped="($$skip test was not run)"; \
 +          else \
 +            skipped="($$skip tests were not run)"; \
 +          fi; \
 +          test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
 +            dashes="$$skipped"; \
 +        fi; \
 +        report=""; \
 +        if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
 +          report="Please report to $(PACKAGE_BUGREPORT)"; \
 +          test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
 +            dashes="$$report"; \
 +        fi; \
 +        dashes=`echo "$$dashes" | sed s/./=/g`; \
 +        if test "$$failed" -eq 0; then \
 +          echo "$$grn$$dashes"; \
 +        else \
 +          echo "$$red$$dashes"; \
 +        fi; \
 +        echo "$$banner"; \
 +        test -z "$$skipped" || echo "$$skipped"; \
 +        test -z "$$report" || echo "$$report"; \
 +        echo "$$dashes$$std"; \
 +        test "$$failed" -eq 0; \
 +      else :; fi
 +
 +distdir: $(DISTFILES)
 +      @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 +      topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 +      list='$(DISTFILES)'; \
 +        dist_files=`for file in $$list; do echo $$file; done | \
 +        sed -e "s|^$$srcdirstrip/||;t" \
 +            -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
 +      case $$dist_files in \
 +        */*) $(MKDIR_P) `echo "$$dist_files" | \
 +                         sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
 +                         sort -u` ;; \
 +      esac; \
 +      for file in $$dist_files; do \
 +        if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 +        if test -d $$d/$$file; then \
 +          dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 +          if test -d "$(distdir)/$$file"; then \
 +            find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 +          fi; \
 +          if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 +            cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
 +            find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 +          fi; \
 +          cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 +        else \
 +          test -f "$(distdir)/$$file" \
 +          || cp -p $$d/$$file "$(distdir)/$$file" \
 +          || exit 1; \
 +        fi; \
 +      done
 +check-am: all-am
 +      $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
 +      $(MAKE) $(AM_MAKEFLAGS) check-TESTS
 +check: check-am
 +all-am: Makefile $(LTLIBRARIES) $(HEADERS)
 +installdirs:
 +      for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(libsciabstractSyntaxTree_la_includedir)"; do \
 +        test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 +      done
 +install: install-am
 +install-exec: install-exec-am
 +install-data: install-data-am
 +uninstall: uninstall-am
 +
 +install-am: all-am
 +      @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 +
 +installcheck: installcheck-am
 +install-strip:
 +      $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 +        install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 +        `test -z '$(STRIP)' || \
 +          echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 +mostlyclean-generic:
 +
 +clean-generic:
 +
 +distclean-generic:
 +      -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 +      -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 +
 +maintainer-clean-generic:
 +      @echo "This command is intended for maintainers to use"
 +      @echo "it deletes files that may require special tools to rebuild."
 +clean: clean-am
 +
 +clean-am: clean-checkPROGRAMS clean-generic clean-libtool \
 +      clean-pkglibLTLIBRARIES mostlyclean-am
 +
 +distclean: distclean-am
 +      -rm -rf ./$(DEPDIR)
 +      -rm -f Makefile
 +distclean-am: clean-am distclean-compile distclean-generic \
 +      distclean-tags
 +
 +dvi: dvi-am
 +
 +dvi-am:
 +
 +html: html-am
 +
 +html-am:
 +
 +info: info-am
 +
 +info-am:
 +
 +install-data-am: install-libsciabstractSyntaxTree_la_includeHEADERS
 +
 +install-dvi: install-dvi-am
 +
 +install-dvi-am:
 +
 +install-exec-am: install-pkglibLTLIBRARIES
 +
 +install-html: install-html-am
 +
 +install-html-am:
 +
 +install-info: install-info-am
 +
 +install-info-am:
 +
 +install-man:
 +
 +install-pdf: install-pdf-am
 +
 +install-pdf-am:
 +
 +install-ps: install-ps-am
 +
 +install-ps-am:
 +
 +installcheck-am:
 +
 +maintainer-clean: maintainer-clean-am
 +      -rm -rf ./$(DEPDIR)
 +      -rm -f Makefile
 +maintainer-clean-am: distclean-am maintainer-clean-generic
 +
 +mostlyclean: mostlyclean-am
 +
 +mostlyclean-am: mostlyclean-compile mostlyclean-generic \
 +      mostlyclean-libtool
 +
 +pdf: pdf-am
 +
 +pdf-am:
 +
 +ps: ps-am
 +
 +ps-am:
 +
 +uninstall-am: uninstall-libsciabstractSyntaxTree_la_includeHEADERS \
 +      uninstall-pkglibLTLIBRARIES
 +
 +.MAKE: check-am install-am install-strip
 +
 +.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
 +      clean-checkPROGRAMS clean-generic clean-libtool \
 +      clean-pkglibLTLIBRARIES ctags distclean distclean-compile \
 +      distclean-generic distclean-libtool distclean-tags distdir dvi \
 +      dvi-am html html-am info info-am install install-am \
 +      install-data install-data-am install-dvi install-dvi-am \
 +      install-exec install-exec-am install-html install-html-am \
 +      install-info install-info-am \
 +      install-libsciabstractSyntaxTree_la_includeHEADERS install-man \
 +      install-pdf install-pdf-am install-pkglibLTLIBRARIES \
 +      install-ps install-ps-am install-strip installcheck \
 +      installcheck-am installdirs maintainer-clean \
 +      maintainer-clean-generic mostlyclean mostlyclean-compile \
 +      mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 +      tags uninstall uninstall-am \
 +      uninstall-libsciabstractSyntaxTree_la_includeHEADERS \
 +      uninstall-pkglibLTLIBRARIES
 +
 +
 +# Tell versions [3.59,3.63) of GNU make to not export all variables.
 +# Otherwise a system limit (for SysV at least) may be exceeded.
 +.NOEXPORT:
@@@ -277,11 -272,9 +275,12 @@@ JROSETTA_API = @JROSETTA_API
  JROSETTA_ENGINE = @JROSETTA_ENGINE@
  JUNIT = @JUNIT@
  LAPACK_LIBS = @LAPACK_LIBS@
+ LCOV = @LCOV@
  LD = @LD@
  LDFLAGS = @LDFLAGS@
 +LEX = @LEX@
 +LEXLIB = @LEXLIB@
 +LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBICONV = @LIBICONV@
  LIBINTL = @LIBINTL@
  LIBM = @LIBM@
Simple merge
@@@ -243,11 -240,9 +241,12 @@@ JROSETTA_API = @JROSETTA_API
  JROSETTA_ENGINE = @JROSETTA_ENGINE@
  JUNIT = @JUNIT@
  LAPACK_LIBS = @LAPACK_LIBS@
+ LCOV = @LCOV@
  LD = @LD@
  LDFLAGS = @LDFLAGS@
 +LEX = @LEX@
 +LEXLIB = @LEXLIB@
 +LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBICONV = @LIBICONV@
  LIBINTL = @LIBINTL@
  LIBM = @LIBM@
@@@ -155,36 -143,45 +155,37 @@@ int getNewVarAddressFromPosition(void* 
  SciErr getVarAddressFromName(void* _pvCtx, const char* _pstName, int** _piAddress)
  {
      SciErr sciErr; sciErr.iErr = 0; sciErr.iMsgCount = 0;
 -    int iVarID[nsiz];
 -    int* piAddr = NULL;
 +    //int iVarID[nsiz];
 +    //int* piAddr                = NULL;
  
 -    //get variable id from name
 -    C2F(str2name)(_pstName, iVarID, (int)strlen(_pstName));
 +    ////get variable id from name
 +    //C2F(str2name)(_pstName, iVarID, (int)strlen(_pstName));
  
 -    //define scope of search
 -    Fin = -1;
 -    Err = 0;
 -    //search variable
 -    C2F(stackg)(iVarID);
 +    ////define scope of search
 +    //Fin = -1;
 +    //Err = 0;
 +    ////search variable
 +    //C2F(stackg)(iVarID);
  
 -    //No idea :(
 -    if ( *Infstk(Fin) == 2)
 -    {
 -        Fin = *istk(iadr(*Lstk(Fin )) + 1 + 1);
 -    }
 +    ////No idea :(
 +    //if ( *Infstk(Fin) == 2)
 +    //    Fin = *istk(iadr(*Lstk(Fin )) + 1 + 1);
  
 -    if (Err > 0 || Fin == 0)
 -    {
 -        addErrorMessage(&sciErr, API_ERROR_INVALID_NAME, _("%s: Unable to get address of variable \"%s\""), "getVarAddressFromName", _pstName);
 -        return sciErr;
 -    }
 +    //if (Err > 0 || Fin == 0)
 +    //{
 +    //    addErrorMessage(&sciErr, API_ERROR_INVALID_NAME, _("%s: Unable to get address of variable \"%s\""), "getVarAddressFromName", _pstName);
 +    //    return sciErr;
 +    //}
  
  
 -    //get variable address
 -    getNewVarAddressFromPosition(_pvCtx, Fin, &piAddr);
 -    if(piAddr[0] < 0)
 -    {//get address from reference
 -        int iStackRef       = *Lstk(Fin);
 -        int iStackAddr      = iadr(iStackRef);
 -        int iNewStackRef    = iStackAddr + 1;
 -        int iNewStackPtr    = *istk(iNewStackRef);
 -        int iNewStackAddr   = iadr(iNewStackPtr);
 -        piAddr              = istk(iNewStackAddr);
 -    }
 -    *_piAddress = piAddr;
 +    ////get variable address
 +    //getNewVarAddressFromPosition(_pvCtx, Fin, &piAddr);
 +
 +    //*_piAddress = piAddr;
++
      return sciErr;
  }
 +
  /*--------------------------------------------------------------------------*/
  SciErr getVarType(void* _pvCtx, int* _piAddress, int* _piType)
  {
@@@ -512,6 -515,127 +519,127 @@@ SciErr allocCommonItemInList(void* _pvC
        return sciErr;
  }
  
+ /******************************
+  * Void and defined functions *
+  ******************************/
+ SciErr createVoidInNamedList(void* _pvCtx, const char* _pstName, int* _piParent, int _iItemPos)
+ {
+     SciErr sciErr; sciErr.iErr = 0; sciErr.iMsgCount = 0;
 -    int iVarID[nsiz];
 -    int iNbItem         = 0;
 -    int iSaveRhs        = Rhs;
 -    int iSaveTop        = Top;
 -    int* piEnd          = NULL;
 -    int* piChildAddr    = NULL;
 -      int* piOffset       = NULL;
 -
 -    C2F(str2name)(_pstName, iVarID, (unsigned long)strlen(_pstName));
 -    Top = Top + Nbvars + 1;
 -
 -      //Does item can be added in the list
 -      sciErr = getListItemNumber(_pvCtx, _piParent, &iNbItem);
 -      if(sciErr.iErr)
 -      {
 -        addErrorMessage(&sciErr, API_ERROR_CREATE_VOID_IN_LIST, _("%s: Unable to get address of item #%d in argument #%d"), "createVoidInNamedList", _iItemPos + 1, getRhsFromAddress(_pvCtx, _piParent));
 -              return sciErr;
 -      }
 -
 -      if(iNbItem < _iItemPos)
 -      {
 -              addErrorMessage(&sciErr, API_ERROR_ITEM_LIST_NUMBER, _("%s: Unable to create list item #%d in Scilab memory"), "createVoidInNamedList", _iItemPos + 1);
 -              return sciErr;
 -      }
 -
 -      sciErr = allocCommonItemInList(_pvCtx, _piParent, _iItemPos, &piChildAddr);
 -      if(sciErr.iErr)
 -      {
 -              addErrorMessage(&sciErr, API_ERROR_ALLOC_DOUBLE_IN_LIST, _("%s: Unable to get address of item #%d in argument #%d"), "createVoidInNamedList", _iItemPos + 1, getRhsFromAddress(_pvCtx, _piParent));
 -              return sciErr;
 -      }
 -
 -    //set type, rows, cols complex at 0
 -    piChildAddr[0]            = 0;
 -    piChildAddr[1]            = 0;
 -    piChildAddr[2]            = 0;
 -    piChildAddr[3]            = 0;
 -
 -      piOffset            = _piParent + 2;
 -      piOffset[_iItemPos] = piOffset[_iItemPos - 1] + 2;
 -
 -    piEnd = piChildAddr + 4;
 -    closeList(Top, piEnd);
 -
 -    if(_iItemPos == _piParent[1])
 -    {
 -        updateNamedListOffset(_pvCtx, Top, _piParent, _iItemPos, piEnd);
 -        createNamedVariable(iVarID);
 -    }
 -
 -    Top = iSaveTop;
 -    Rhs = iSaveRhs;
++    // int iVarID[nsiz];
++    // int iNbItem         = 0;
++    // int iSaveRhs        = Rhs;
++    // int iSaveTop        = Top;
++    // int* piEnd          = NULL;
++    // int* piChildAddr    = NULL;
++      // int* piOffset       = NULL;
++
++    // C2F(str2name)(_pstName, iVarID, (unsigned long)strlen(_pstName));
++    // Top = Top + Nbvars + 1;
++
++      // //Does item can be added in the list
++      // sciErr = getListItemNumber(_pvCtx, _piParent, &iNbItem);
++      // if(sciErr.iErr)
++      // {
++    //     addErrorMessage(&sciErr, API_ERROR_CREATE_VOID_IN_LIST, _("%s: Unable to get address of item #%d in argument #%d"), "createVoidInNamedList", _iItemPos + 1, getRhsFromAddress(_pvCtx, _piParent));
++      //      return sciErr;
++      // }
++
++      // if(iNbItem < _iItemPos)
++      // {
++      //      addErrorMessage(&sciErr, API_ERROR_ITEM_LIST_NUMBER, _("%s: Unable to create list item #%d in Scilab memory"), "createVoidInNamedList", _iItemPos + 1);
++      //      return sciErr;
++      // }
++
++      // sciErr = allocCommonItemInList(_pvCtx, _piParent, _iItemPos, &piChildAddr);
++      // if(sciErr.iErr)
++      // {
++      //      addErrorMessage(&sciErr, API_ERROR_ALLOC_DOUBLE_IN_LIST, _("%s: Unable to get address of item #%d in argument #%d"), "createVoidInNamedList", _iItemPos + 1, getRhsFromAddress(_pvCtx, _piParent));
++      //      return sciErr;
++      // }
++
++    // //set type, rows, cols complex at 0
++    // piChildAddr[0]         = 0;
++    // piChildAddr[1]         = 0;
++    // piChildAddr[2]         = 0;
++    // piChildAddr[3]         = 0;
++
++      // piOffset            = _piParent + 2;
++      // piOffset[_iItemPos] = piOffset[_iItemPos - 1] + 2;
++
++    // piEnd = piChildAddr + 4;
++    // closeList(Top, piEnd);
++
++    // if(_iItemPos == _piParent[1])
++    // {
++    //     updateNamedListOffset(_pvCtx, Top, _piParent, _iItemPos, piEnd);
++    //     createNamedVariable(iVarID);
++    // }
++
++    // Top = iSaveTop;
++    // Rhs = iSaveRhs;
+     return sciErr;
+ }
+ SciErr createUndefinedInNamedList(void* _pvCtx, const char* _pstName, int* _piParent, int _iItemPos)
+ {
+     SciErr sciErr; sciErr.iErr = 0; sciErr.iMsgCount = 0;
 -    int iVarID[nsiz];
 -    int iNbItem         = 0;
 -    int iSaveRhs        = Rhs;
 -    int iSaveTop        = Top;
 -    int* piEnd          = NULL;
 -    int* piChildAddr    = NULL;
 -      int* piOffset       = NULL;
 -
 -    C2F(str2name)(_pstName, iVarID, (unsigned long)strlen(_pstName));
 -    Top = Top + Nbvars + 1;
 -
 -      //Does item can be added in the list
 -      sciErr = getListItemNumber(_pvCtx, _piParent, &iNbItem);
 -      if(sciErr.iErr)
 -      {
 -        addErrorMessage(&sciErr, API_ERROR_CREATE_VOID_IN_LIST, _("%s: Unable to get address of item #%d in argument #%d"), "createVoidInNamedList", _iItemPos + 1, getRhsFromAddress(_pvCtx, _piParent));
 -              return sciErr;
 -      }
 -
 -      if(iNbItem < _iItemPos)
 -      {
 -              addErrorMessage(&sciErr, API_ERROR_ITEM_LIST_NUMBER, _("%s: Unable to create list item #%d in Scilab memory"), "createVoidInNamedList", _iItemPos + 1);
 -              return sciErr;
 -      }
 -
 -      sciErr = allocCommonItemInList(_pvCtx, _piParent, _iItemPos, &piChildAddr);
 -      if(sciErr.iErr)
 -      {
 -              addErrorMessage(&sciErr, API_ERROR_ALLOC_DOUBLE_IN_LIST, _("%s: Unable to get address of item #%d in argument #%d"), "createVoidInNamedList", _iItemPos + 1, getRhsFromAddress(_pvCtx, _piParent));
 -              return sciErr;
 -      }
 -
 -    //set type, rows, cols complex at 0
 -    piChildAddr[0]            = 0;
 -    piChildAddr[1]            = 0;
 -    piChildAddr[2]            = 0;
 -    piChildAddr[3]            = 0;
 -
 -      piOffset            = _piParent + 2;
 -      piOffset[_iItemPos] = piOffset[_iItemPos - 1];
 -
 -    piEnd = piChildAddr + 4;
 -    closeList(Top, piEnd);
 -
 -    if(_iItemPos == _piParent[1])
 -    {
 -        updateNamedListOffset(_pvCtx, Top, _piParent, _iItemPos, piEnd);
 -        createNamedVariable(iVarID);
 -    }
 -
 -    Top = iSaveTop;
 -    Rhs = iSaveRhs;
++    // int iVarID[nsiz];
++    // int iNbItem         = 0;
++    // int iSaveRhs        = Rhs;
++    // int iSaveTop        = Top;
++    // int* piEnd          = NULL;
++    // int* piChildAddr    = NULL;
++      // int* piOffset       = NULL;
++
++    // C2F(str2name)(_pstName, iVarID, (unsigned long)strlen(_pstName));
++    // Top = Top + Nbvars + 1;
++
++      // //Does item can be added in the list
++      // sciErr = getListItemNumber(_pvCtx, _piParent, &iNbItem);
++      // if(sciErr.iErr)
++      // {
++    //     addErrorMessage(&sciErr, API_ERROR_CREATE_VOID_IN_LIST, _("%s: Unable to get address of item #%d in argument #%d"), "createVoidInNamedList", _iItemPos + 1, getRhsFromAddress(_pvCtx, _piParent));
++      //      return sciErr;
++      // }
++
++      // if(iNbItem < _iItemPos)
++      // {
++      //      addErrorMessage(&sciErr, API_ERROR_ITEM_LIST_NUMBER, _("%s: Unable to create list item #%d in Scilab memory"), "createVoidInNamedList", _iItemPos + 1);
++      //      return sciErr;
++      // }
++
++      // sciErr = allocCommonItemInList(_pvCtx, _piParent, _iItemPos, &piChildAddr);
++      // if(sciErr.iErr)
++      // {
++      //      addErrorMessage(&sciErr, API_ERROR_ALLOC_DOUBLE_IN_LIST, _("%s: Unable to get address of item #%d in argument #%d"), "createVoidInNamedList", _iItemPos + 1, getRhsFromAddress(_pvCtx, _piParent));
++      //      return sciErr;
++      // }
++
++    // //set type, rows, cols complex at 0
++    // piChildAddr[0]         = 0;
++    // piChildAddr[1]         = 0;
++    // piChildAddr[2]         = 0;
++    // piChildAddr[3]         = 0;
++
++      // piOffset            = _piParent + 2;
++      // piOffset[_iItemPos] = piOffset[_iItemPos - 1];
++
++    // piEnd = piChildAddr + 4;
++    // closeList(Top, piEnd);
++
++    // if(_iItemPos == _piParent[1])
++    // {
++    //     updateNamedListOffset(_pvCtx, Top, _piParent, _iItemPos, piEnd);
++    //     createNamedVariable(iVarID);
++    // }
++
++    // Top = iSaveTop;
++    // Rhs = iSaveRhs;
+     return sciErr;
+ }
  /*********************
   * Double functions *
   *********************/
Simple merge
@@@ -264,11 -262,9 +262,12 @@@ JROSETTA_API = @JROSETTA_API
  JROSETTA_ENGINE = @JROSETTA_ENGINE@
  JUNIT = @JUNIT@
  LAPACK_LIBS = @LAPACK_LIBS@
+ LCOV = @LCOV@
  LD = @LD@
  LDFLAGS = @LDFLAGS@
 +LEX = @LEX@
 +LEXLIB = @LEXLIB@
 +LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBICONV = @LIBICONV@
  LIBINTL = @LIBINTL@
  LIBM = @LIBM@
Simple merge
@@@ -207,11 -205,9 +205,12 @@@ JROSETTA_API = @JROSETTA_API
  JROSETTA_ENGINE = @JROSETTA_ENGINE@
  JUNIT = @JUNIT@
  LAPACK_LIBS = @LAPACK_LIBS@
+ LCOV = @LCOV@
  LD = @LD@
  LDFLAGS = @LDFLAGS@
 +LEX = @LEX@
 +LEXLIB = @LEXLIB@
 +LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBICONV = @LIBICONV@
  LIBINTL = @LIBINTL@
  LIBM = @LIBM@
Simple merge
@@@ -47,9 -27,9 +47,9 @@@ libsciboolean_la_CPPFLAGS = 
  
  pkglib_LTLIBRARIES = libsciboolean.la
  
- libsciboolean_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION)
+ libsciboolean_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION)
  
 -libsciboolean_la_SOURCES = $(BOOLEAN_C_SOURCES) $(BOOLEAN_FORTRAN_SOURCES) $(GATEWAY_C_SOURCES) $(GATEWAY_FORTRAN_SOURCES)
 +libsciboolean_la_SOURCES = $(BOOLEAN_C_SOURCES) $(BOOLEAN_FORTRAN_SOURCES) $(GATEWAY_C_SOURCES) $(GATEWAY_FORTRAN_SOURCES) $(BOOLEAN_CPP_SOURCES)
  
  # For the code check (splint)
  CHECK_SRC= $(BOOLEAN_C_SOURCES) $(GATEWAY_C_SOURCES)
@@@ -254,11 -242,9 +252,12 @@@ JROSETTA_API = @JROSETTA_API
  JROSETTA_ENGINE = @JROSETTA_ENGINE@
  JUNIT = @JUNIT@
  LAPACK_LIBS = @LAPACK_LIBS@
+ LCOV = @LCOV@
  LD = @LD@
  LDFLAGS = @LDFLAGS@
 +LEX = @LEX@
 +LEXLIB = @LEXLIB@
 +LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBICONV = @LIBICONV@
  LIBINTL = @LIBINTL@
  LIBM = @LIBM@
@@@ -436,24 -420,12 +439,24 @@@ sci_gateway/fortran/sci_find.
  
  libsciboolean_la_CFLAGS = -I$(srcdir)/includes/ \
                                -I$(srcdir)/src/c/ \
 +                              -I$(top_srcdir)/modules/output_stream/includes \
                                -I$(top_srcdir)/modules/api_scilab/includes \
 -                              -I$(top_srcdir)/modules/output_stream/includes
 +                              -I$(top_srcdir)/modules/operations/includes
 +
 +libsciboolean_la_CPPFLAGS = \
 +      -I$(srcdir)/includes/ \
 +      -I$(top_srcdir)/modules/functions_manager/includes \
 +        -I$(top_srcdir)/modules/types/includes \
 +        -I$(top_srcdir)/modules/symbol/includes \
 +        -I$(top_srcdir)/modules/abstractSyntaxTree/includes \
 +        -I$(top_srcdir)/modules/elementary_functions/includes \
 +        -I$(top_srcdir)/modules/core/includes \
 +        -I$(top_srcdir)/modules/operations/includes \
 +        -I$(top_srcdir)/modules/api_scilab/includes
  
  pkglib_LTLIBRARIES = libsciboolean.la
- libsciboolean_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION)
+ libsciboolean_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION)
 -libsciboolean_la_SOURCES = $(BOOLEAN_C_SOURCES) $(BOOLEAN_FORTRAN_SOURCES) $(GATEWAY_C_SOURCES) $(GATEWAY_FORTRAN_SOURCES)
 +libsciboolean_la_SOURCES = $(BOOLEAN_C_SOURCES) $(BOOLEAN_FORTRAN_SOURCES) $(GATEWAY_C_SOURCES) $(GATEWAY_FORTRAN_SOURCES) $(BOOLEAN_CPP_SOURCES)
  
  # For the code check (splint)
  CHECK_SRC = $(BOOLEAN_C_SOURCES) $(GATEWAY_C_SOURCES)
  ;
  Source: bin\{#BOOLEAN}.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
  Source: bin\{#BOOLEAN}_f.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 +Source: bin\{#BOOLEAN}_gw.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
  ;
  Source: modules\{#BOOLEAN}\VERSION.xml; DestDir: {app}\modules\{#BOOLEAN}; Components: {#COMPN_SCILAB}
- Source: modules\{#BOOLEAN}\readme.txt; DestDir: {app}\modules\{#BOOLEAN}; Components: {#COMPN_SCILAB}
  Source: modules\{#BOOLEAN}\license.txt; DestDir: {app}\modules\{#BOOLEAN}; Components: {#COMPN_SCILAB}
- Source: modules\{#BOOLEAN}\changelog.txt; DestDir: {app}\modules\{#BOOLEAN}; Components: {#COMPN_SCILAB}
  ;
  Source: modules\{#BOOLEAN}\sci_gateway\{#BOOLEAN}_gateway.xml; DestDir: {app}\modules\{#BOOLEAN}\sci_gateway; Components: {#COMPN_SCILAB}
  ;
Simple merge
@@@ -338,11 -336,9 +336,12 @@@ JROSETTA_API = @JROSETTA_API
  JROSETTA_ENGINE = @JROSETTA_ENGINE@
  JUNIT = @JUNIT@
  LAPACK_LIBS = @LAPACK_LIBS@
+ LCOV = @LCOV@
  LD = @LD@
  LDFLAGS = @LDFLAGS@
 +LEX = @LEX@
 +LEXLIB = @LEXLIB@
 +LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBICONV = @LIBICONV@
  LIBINTL = @LIBINTL@
  LIBM = @LIBM@
@@@ -696,13 -693,11 +699,13 @@@ sci_gateway/fortran/sci_f_rankqr.
  
  libscicacsd_la_FFLAGS = -I$(srcdir)/includes/
  libscicacsd_la_CFLAGS = -I$(srcdir)/includes/ \
 +                      -I$(top_srcdir)/modules/output_stream/includes/ \
 +                      -I$(top_srcdir)/modules/elementary_functions/includes/ \
                        -I$(top_srcdir)/modules/api_scilab/includes \
 -                      -I$(top_srcdir)/modules/output_stream/includes/
 +                      -I$(top_srcdir)/modules/operations/includes/
  
  pkglib_LTLIBRARIES = libscicacsd.la
- libscicacsd_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION)  $(ATLAS_LIBS)
+ libscicacsd_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION)  $(ATLAS_LIBS)
  libscicacsd_la_SOURCES = $(CACSD_FORTRAN_SOURCES) $(SLICOT_FORTRAN_SOURCES) $(GATEWAY_FORTRAN_SOURCES) $(GATEWAY_C_SOURCES)
  
  # For the code check (splint)
Simple merge
@@@ -239,11 -237,9 +237,12 @@@ JROSETTA_API = @JROSETTA_API
  JROSETTA_ENGINE = @JROSETTA_ENGINE@
  JUNIT = @JUNIT@
  LAPACK_LIBS = @LAPACK_LIBS@
+ LCOV = @LCOV@
  LD = @LD@
  LDFLAGS = @LDFLAGS@
 +LEX = @LEX@
 +LEXLIB = @LEXLIB@
 +LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBICONV = @LIBICONV@
  LIBINTL = @LIBINTL@
  LIBM = @LIBM@
@@@ -15,8 -15,9 +15,9 @@@
  #include <stdlib.h>
  #include "BOOL.h"
  #include "call_scilab.h"
+ #include "lasterror.h" /* clearLastError */
  #include "MALLOC.h"
 -#include "scilabmode.h"
 +#include "sci_mode.h"
  #include "fromc.h"
  #include "LaunchScilabSignal.h"
  #include "localization.h"
@@@ -157,11 -164,15 +158,15 @@@ int Call_ScilabOpen(char* SCIpath, BOO
      }
  
      /* creates TMPDIR */
 -    C2F(settmpdir)();
 +    defineTMPDIR();
  
      /* Scilab Initialization */
-     C2F(inisci)(&iflag,&StacksizeUsed,&ierr);
-     if ( ierr > 0 ) return ierr;
+     C2F(inisci)(&iflag, &StacksizeUsed, &ierr);
+     if ( ierr > 0 ) {
+         if (ScilabStartupUsed) {FREE(ScilabStartupUsed); ScilabStartupUsed = NULL;}
+         return ierr;
+     }
  
      lengthStringToScilab = (int)(strlen(FORMAT_SCRIPT_STARTUP) + strlen(ScilabStartupUsed + 1));
      InitStringToScilab = (char*)MALLOC(lengthStringToScilab*sizeof(char));
@@@ -188,6 -199,10 +193,12 @@@ BOOL TerminateScilab(char *ScilabQuit
          {
              TerminateCorePart2();
          }
+         /* Make sure that the error management is reset. See bug #8830 */
 -        clearLastError();
++        // /!\ Must call ConfigVariable::clearLastError()
++        //clearLastError();
++
          ReleaseLaunchScilabSignal();
          setCallScilabEngineState(CALL_SCILAB_ENGINE_STOP);
  
@@@ -48,22 -48,22 +48,22 @@@ GATEWAY_CPP_SOURCES 
  libscicommons_la_CFLAGS= $(JAVA_JNI_INCLUDE)
  
  
 -libscicommons_la_CPPFLAGS = 
 +libscicommons_la_CPPFLAGS =
  
 -# Without the commons module 
 -libscicommons_disable_la_CFLAGS = 
 +# Without the commons module
 +libscicommons_disable_la_CFLAGS =
  
 -COMMONS_DISABLE_C_SOURCES = 
 +COMMONS_DISABLE_C_SOURCES =
- libscicommons_disable_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION) $(LD_FLAGS)
+ libscicommons_disable_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION) $(LD_FLAGS)
  libscicommons_disable_la_SOURCES = $(COMMONS_DISABLE_C_SOURCES)
  
  pkglib_LTLIBRARIES = libscicommons-disable.la
  
  if GUI
 -pkglib_LTLIBRARIES += libscicommons.la 
 +pkglib_LTLIBRARIES += libscicommons.la
  endif
  
- libscicommons_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION) $(LD_FLAGS)  $(X_LIBS) $(X_EXTRA_LIBS)
+ libscicommons_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION) $(LD_FLAGS)  $(X_LIBS) $(X_EXTRA_LIBS)
  
  libscicommons_la_SOURCES = $(COMMONS_C_SOURCES) $(COMMONS_FORTRAN_SOURCES) $(COMMONS_JNI_SOURCES) $(GATEWAY_C_SOURCES) $(GATEWAY_CPP_SOURCES) $(COMMONS_CPP_SOURCES)
  
@@@ -65,10 -65,7 +65,7 @@@ host_triplet = @host
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
        $(top_srcdir)/Makefile.incl.am
  @NEED_JAVA_TRUE@am__append_1 = java
- # With --enable-compilation-tests, launch java unitary tests
- @COMPILATION_TESTS_TRUE@am__append_2 = test
- @GUI_TRUE@am__append_3 = libscicommons.la
 -@GUI_TRUE@am__append_2 = libscicommons.la 
++@GUI_TRUE@am__append_2 = libscicommons.la
  subdir = modules/commons
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
@@@ -259,11 -257,9 +257,12 @@@ JROSETTA_API = @JROSETTA_API
  JROSETTA_ENGINE = @JROSETTA_ENGINE@
  JUNIT = @JUNIT@
  LAPACK_LIBS = @LAPACK_LIBS@
+ LCOV = @LCOV@
  LD = @LD@
  LDFLAGS = @LDFLAGS@
 +LEX = @LEX@
 +LEXLIB = @LEXLIB@
 +LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBICONV = @LIBICONV@
  LIBINTL = @LIBINTL@
  LIBM = @LIBM@
@@@ -508,13 -505,13 +511,13 @@@ GATEWAY_CPP_SOURCES 
  libscicommons_la_CFLAGS = $(JAVA_JNI_INCLUDE)
  libscicommons_la_CPPFLAGS = 
  
 -# Without the commons module 
 +# Without the commons module
  libscicommons_disable_la_CFLAGS = 
  COMMONS_DISABLE_C_SOURCES = 
- libscicommons_disable_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION) $(LD_FLAGS)
+ libscicommons_disable_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION) $(LD_FLAGS)
  libscicommons_disable_la_SOURCES = $(COMMONS_DISABLE_C_SOURCES)
- pkglib_LTLIBRARIES = libscicommons-disable.la $(am__append_3)
- libscicommons_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION) $(LD_FLAGS)  $(X_LIBS) $(X_EXTRA_LIBS)
+ pkglib_LTLIBRARIES = libscicommons-disable.la $(am__append_2)
+ libscicommons_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION) $(LD_FLAGS)  $(X_LIBS) $(X_EXTRA_LIBS)
  libscicommons_la_SOURCES = $(COMMONS_C_SOURCES) $(COMMONS_FORTRAN_SOURCES) $(COMMONS_JNI_SOURCES) $(GATEWAY_C_SOURCES) $(GATEWAY_CPP_SOURCES) $(COMMONS_CPP_SOURCES)
  
  # For the code check (splint)
@@@ -204,11 -202,9 +202,12 @@@ JROSETTA_API = @JROSETTA_API
  JROSETTA_ENGINE = @JROSETTA_ENGINE@
  JUNIT = @JUNIT@
  LAPACK_LIBS = @LAPACK_LIBS@
+ LCOV = @LCOV@
  LD = @LD@
  LDFLAGS = @LDFLAGS@
 +LEX = @LEX@
 +LEXLIB = @LEXLIB@
 +LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBICONV = @LIBICONV@
  LIBINTL = @LIBINTL@
  LIBM = @LIBM@
Simple merge
@@@ -266,11 -264,9 +264,12 @@@ JROSETTA_API = @JROSETTA_API
  JROSETTA_ENGINE = @JROSETTA_ENGINE@
  JUNIT = @JUNIT@
  LAPACK_LIBS = @LAPACK_LIBS@
+ LCOV = @LCOV@
  LD = @LD@
  LDFLAGS = @LDFLAGS@
 +LEX = @LEX@
 +LEXLIB = @LEXLIB@
 +LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBICONV = @LIBICONV@
  LIBINTL = @LIBINTL@
  LIBM = @LIBM@
@@@ -92,10 -81,10 +92,10 @@@ libsciconsole_la_CFLAGS=   $(JAVA_JNI_I
  pkglib_LTLIBRARIES = libsciconsole-disable.la
  
  if GUI
 -pkglib_LTLIBRARIES += libsciconsole.la 
 +pkglib_LTLIBRARIES += libsciconsole.la
  endif
  
- libsciconsole_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION)
+ libsciconsole_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION)
  
  # All the sources needed by libsciconsole.la
  libsciconsole_la_SOURCES = $(CONSOLE_C_JNI_SOURCES) $(CONSOLE_C_SOURCES) $(CONSOLE_CPP_JNI_SOURCES) $(CONSOLE_CPP_SOURCES)
@@@ -278,11 -276,9 +276,12 @@@ JROSETTA_API = @JROSETTA_API
  JROSETTA_ENGINE = @JROSETTA_ENGINE@
  JUNIT = @JUNIT@
  LAPACK_LIBS = @LAPACK_LIBS@
+ LCOV = @LCOV@
  LD = @LD@
  LDFLAGS = @LDFLAGS@
 +LEX = @LEX@
 +LEXLIB = @LEXLIB@
 +LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBICONV = @LIBICONV@
  LIBINTL = @LIBINTL@
  LIBM = @LIBM@
Simple merge
@@@ -229,10 -245,14 +229,9 @@@ sci_gateway/c/sci_debug.c 
  sci_gateway/c/gw_core.c \
  sci_gateway/c/gw_user.c \
  sci_gateway/c/gw_user2.c \
- sci_gateway/c/sci_islittleendian.c \
 -sci_gateway/c/sci_error.c \
 -sci_gateway/c/sci_sciargs.c \
 -sci_gateway/c/sci_with_module.c \
 -sci_gateway/c/sci_getscilabmode.c \
  sci_gateway/c/sci_getvariablesonstack.c \
  sci_gateway/c/sci_readgateway.c \
 -sci_gateway/c/sci_comp.c \
 -sci_gateway/c/sci_exit.c
 +sci_gateway/c/sci_comp.c
  
  GATEWAY_FORTRAN_SOURCES =  sci_gateway/fortran/sci_global.f \
  sci_gateway/fortran/sci_mtlb_mode.f \
@@@ -190,31 -192,36 +187,31 @@@ am__libscicore_la_SOURCES_DIST = src/c/
        src/fortran/putid.f src/fortran/itosci.f \
        src/fortran/stackr2d.f src/fortran/stacki2d.f \
        src/fortran/stackc2i.f src/fortran/isinstring.f \
 -      src/fortran/relocstack.f sci_gateway/c/sci_stacksize.c \
 -      sci_gateway/c/sci_resume.c sci_gateway/c/sci_mtlb_mode.c \
 -      sci_gateway/c/sci_banner.c sci_gateway/c/sci_where.c \
 -      sci_gateway/c/sci_errcatch.c sci_gateway/c/sci_getos.c \
 +      src/fortran/relocstack.f src/cpp/core_gw.cpp \
 +      src/cpp/hashtable_core.cpp src/cpp/namstr.cpp \
 +      src/cpp/search_functions.cpp src/cpp/storeCommand.cpp \
 +      src/cpp/banner.cpp src/cpp/overload.cpp \
 +      src/cpp/with_module.cpp src/cpp/runner.cpp \
 +      sci_gateway/c/sci_stacksize.c sci_gateway/c/sci_mtlb_mode.c \
 +      sci_gateway/c/sci_where.c sci_gateway/c/sci_errcatch.c \
        sci_gateway/c/sci_format.c sci_gateway/c/sci_getmemory.c \
        sci_gateway/c/sci_havewindow.c sci_gateway/c/sci_delbpt.c \
 -      sci_gateway/c/sci_macr2lst.c sci_gateway/c/sci_isdef.c \
 -      sci_gateway/c/sci_isglobal.c sci_gateway/c/sci_who.c \
 -      sci_gateway/c/sci_errclear.c sci_gateway/c/sci_global.c \
 -      sci_gateway/c/sci_funcprot.c sci_gateway/c/sci_newfun.c \
 -      sci_gateway/c/sci_warning.c sci_gateway/c/sci_dispbpt.c \
 +      sci_gateway/c/sci_macr2lst.c sci_gateway/c/sci_who.c \
 +      sci_gateway/c/sci_errclear.c sci_gateway/c/sci_funcprot.c \
 +      sci_gateway/c/sci_newfun.c sci_gateway/c/sci_dispbpt.c \
        sci_gateway/c/sci_intppty.c sci_gateway/c/sci_ieee.c \
 -      sci_gateway/c/sci_gstacksize.c sci_gateway/c/sci_lasterror.c \
 -      sci_gateway/c/sci_funptr.c sci_gateway/c/sci_return.c \
 -      sci_gateway/c/sci_exists.c sci_gateway/c/sci_getmd5.c \
 -      sci_gateway/c/sci_clear.c sci_gateway/c/sci_clearfun.c \
 -      sci_gateway/c/sci_setbpt.c sci_gateway/c/sci_getmodules.c \
 -      sci_gateway/c/sci_what.c sci_gateway/c/sci_predef.c \
 -      sci_gateway/c/sci_clearglobal.c sci_gateway/c/sci_arg.c \
 -      sci_gateway/c/sci_type.c sci_gateway/c/sci_typename.c \
 -      sci_gateway/c/sci_mode.c sci_gateway/c/sci_macr2tree.c \
 -      sci_gateway/c/sci_iserror.c sci_gateway/c/sci_getversion.c \
 +      sci_gateway/c/sci_gstacksize.c sci_gateway/c/sci_funptr.c \
 +      sci_gateway/c/sci_return.c sci_gateway/c/sci_clearfun.c \
 +      sci_gateway/c/sci_setbpt.c sci_gateway/c/sci_what.c \
 +      sci_gateway/c/sci_predef.c sci_gateway/c/sci_type.c \
 +      sci_gateway/c/sci_typename.c sci_gateway/c/sci_mode.c \
 +      sci_gateway/c/sci_macr2tree.c sci_gateway/c/sci_iserror.c \
        sci_gateway/c/sci_getdebuginfo.c sci_gateway/c/sci_debug.c \
        sci_gateway/c/gw_core.c sci_gateway/c/gw_user.c \
-       sci_gateway/c/gw_user2.c sci_gateway/c/sci_islittleendian.c \
 -      sci_gateway/c/gw_user2.c sci_gateway/c/sci_error.c \
 -      sci_gateway/c/sci_sciargs.c sci_gateway/c/sci_with_module.c \
 -      sci_gateway/c/sci_getscilabmode.c \
++      sci_gateway/c/gw_user2.c \
        sci_gateway/c/sci_getvariablesonstack.c \
        sci_gateway/c/sci_readgateway.c sci_gateway/c/sci_comp.c \
 -      sci_gateway/c/sci_exit.c sci_gateway/fortran/sci_global.f \
 +      sci_gateway/fortran/sci_global.f \
        sci_gateway/fortran/sci_mtlb_mode.f \
        sci_gateway/fortran/sci_resume.f \
        sci_gateway/fortran/sci_dispbpt.f \
@@@ -303,51 -306,45 +300,50 @@@ am__objects_4 = clunit.lo getlin.lo all
        lst2vars.lo basnms.lo matc.lo ptrback.lo getch.lo ftob.lo \
        seteol.lo basin.lo clause.lo compcl.lo termf.lo expsum.lo \
        copyvar.lo putid.lo itosci.lo stackr2d.lo stacki2d.lo \
 -      stackc2i.lo isinstring.lo $(am__objects_4)
 +      stackc2i.lo isinstring.lo $(am__objects_3)
 +am__objects_5 = libscicore_la-core_gw.lo \
 +      libscicore_la-hashtable_core.lo libscicore_la-namstr.lo \
 +      libscicore_la-search_functions.lo \
 +      libscicore_la-storeCommand.lo libscicore_la-banner.lo \
 +      libscicore_la-overload.lo libscicore_la-with_module.lo \
 +      libscicore_la-runner.lo
  am__objects_6 = libscicore_la-sci_stacksize.lo \
 -      libscicore_la-sci_resume.lo libscicore_la-sci_mtlb_mode.lo \
 -      libscicore_la-sci_banner.lo libscicore_la-sci_where.lo \
 -      libscicore_la-sci_errcatch.lo libscicore_la-sci_getos.lo \
 -      libscicore_la-sci_format.lo libscicore_la-sci_getmemory.lo \
 -      libscicore_la-sci_havewindow.lo libscicore_la-sci_delbpt.lo \
 -      libscicore_la-sci_macr2lst.lo libscicore_la-sci_isdef.lo \
 -      libscicore_la-sci_isglobal.lo libscicore_la-sci_who.lo \
 -      libscicore_la-sci_errclear.lo libscicore_la-sci_global.lo \
 +      libscicore_la-sci_mtlb_mode.lo libscicore_la-sci_where.lo \
 +      libscicore_la-sci_errcatch.lo libscicore_la-sci_format.lo \
 +      libscicore_la-sci_getmemory.lo libscicore_la-sci_havewindow.lo \
 +      libscicore_la-sci_delbpt.lo libscicore_la-sci_macr2lst.lo \
 +      libscicore_la-sci_who.lo libscicore_la-sci_errclear.lo \
        libscicore_la-sci_funcprot.lo libscicore_la-sci_newfun.lo \
 -      libscicore_la-sci_warning.lo libscicore_la-sci_dispbpt.lo \
 -      libscicore_la-sci_intppty.lo libscicore_la-sci_ieee.lo \
 -      libscicore_la-sci_gstacksize.lo libscicore_la-sci_lasterror.lo \
 +      libscicore_la-sci_dispbpt.lo libscicore_la-sci_intppty.lo \
 +      libscicore_la-sci_ieee.lo libscicore_la-sci_gstacksize.lo \
        libscicore_la-sci_funptr.lo libscicore_la-sci_return.lo \
 -      libscicore_la-sci_exists.lo libscicore_la-sci_getmd5.lo \
 -      libscicore_la-sci_clear.lo libscicore_la-sci_clearfun.lo \
 -      libscicore_la-sci_setbpt.lo libscicore_la-sci_getmodules.lo \
 +      libscicore_la-sci_clearfun.lo libscicore_la-sci_setbpt.lo \
        libscicore_la-sci_what.lo libscicore_la-sci_predef.lo \
 -      libscicore_la-sci_clearglobal.lo libscicore_la-sci_arg.lo \
        libscicore_la-sci_type.lo libscicore_la-sci_typename.lo \
        libscicore_la-sci_mode.lo libscicore_la-sci_macr2tree.lo \
 -      libscicore_la-sci_iserror.lo libscicore_la-sci_getversion.lo \
 -      libscicore_la-sci_getdebuginfo.lo libscicore_la-sci_debug.lo \
 -      libscicore_la-gw_core.lo libscicore_la-gw_user.lo \
 -      libscicore_la-gw_user2.lo libscicore_la-sci_error.lo \
 -      libscicore_la-sci_sciargs.lo libscicore_la-sci_with_module.lo \
 -      libscicore_la-sci_getscilabmode.lo \
 +      libscicore_la-sci_iserror.lo libscicore_la-sci_getdebuginfo.lo \
 +      libscicore_la-sci_debug.lo libscicore_la-gw_core.lo \
 +      libscicore_la-gw_user.lo libscicore_la-gw_user2.lo \
-       libscicore_la-sci_islittleendian.lo \
        libscicore_la-sci_getvariablesonstack.lo \
 -      libscicore_la-sci_readgateway.lo libscicore_la-sci_comp.lo \
 -      libscicore_la-sci_exit.lo
 +      libscicore_la-sci_readgateway.lo libscicore_la-sci_comp.lo
  am__objects_7 = sci_global.lo sci_mtlb_mode.lo sci_resume.lo \
        sci_dispbpt.lo sci_useascommand.lo sci_intppty.lo sci_ieee.lo \
 -      sci_macrovar.lo sci_exists.lo sci_errcatch.lo sci_clear.lo \
 -      sci_argn.lo sci_setbpt.lo sci_clearglobal.lo sci_delbpt.lo \
 -      where.lo sci_iserror.lo sci_debug.lo sci_comp.lo \
 -      sci_isglobal.lo
 -am_libscicore_la_OBJECTS = $(am__objects_2) $(am__objects_3) \
 -      $(am__objects_5) $(am__objects_6) $(am__objects_7)
 +      sci_macrovar.lo sci_errcatch.lo sci_setbpt.lo sci_delbpt.lo \
 +      where.lo sci_iserror.lo sci_debug.lo sci_comp.lo
 +am__objects_8 = libscicore_la-sci_getmodules.lo \
 +      libscicore_la-sci_clear.lo libscicore_la-sci_banner.lo \
 +      libscicore_la-sci_quit.lo libscicore_la-sci_exit.lo \
 +      libscicore_la-sci_argn.lo libscicore_la-sci_clearglobal.lo \
 +      libscicore_la-sci_global.lo libscicore_la-sci_isglobal.lo \
 +      libscicore_la-sci_getscilabmode.lo libscicore_la-sci_getos.lo \
 +      libscicore_la-sci_exists.lo libscicore_la-sci_with_module.lo \
 +      libscicore_la-sci_lasterror.lo libscicore_la-sci_getversion.lo \
 +      libscicore_la-sci_warning.lo libscicore_la-sci_getmd5.lo \
 +      libscicore_la-sci_error.lo libscicore_la-sci_pause.lo \
 +      libscicore_la-sci_resume.lo libscicore_la-sci_abort.lo
 +am_libscicore_la_OBJECTS = $(am__objects_2) $(am__objects_4) \
 +      $(am__objects_5) $(am__objects_6) $(am__objects_7) \
 +      $(am__objects_8)
  libscicore_la_OBJECTS = $(am_libscicore_la_OBJECTS)
  libscicore_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
@@@ -479,11 -477,9 +476,12 @@@ JROSETTA_API = @JROSETTA_API
  JROSETTA_ENGINE = @JROSETTA_ENGINE@
  JUNIT = @JUNIT@
  LAPACK_LIBS = @LAPACK_LIBS@
+ LCOV = @LCOV@
  LD = @LD@
  LDFLAGS = @LDFLAGS@
 +LEX = @LEX@
 +LEXLIB = @LEXLIB@
 +LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBICONV = @LIBICONV@
  LIBINTL = @LIBINTL@
  LIBM = @LIBM@
@@@ -750,10 -758,14 +752,9 @@@ sci_gateway/c/sci_debug.c 
  sci_gateway/c/gw_core.c \
  sci_gateway/c/gw_user.c \
  sci_gateway/c/gw_user2.c \
- sci_gateway/c/sci_islittleendian.c \
 -sci_gateway/c/sci_error.c \
 -sci_gateway/c/sci_sciargs.c \
 -sci_gateway/c/sci_with_module.c \
 -sci_gateway/c/sci_getscilabmode.c \
  sci_gateway/c/sci_getvariablesonstack.c \
  sci_gateway/c/sci_readgateway.c \
 -sci_gateway/c/sci_comp.c \
 -sci_gateway/c/sci_exit.c
 +sci_gateway/c/sci_comp.c
  
  GATEWAY_FORTRAN_SOURCES = sci_gateway/fortran/sci_global.f \
  sci_gateway/fortran/sci_mtlb_mode.f \
@@@ -811,30 -805,16 +812,30 @@@ libscicore_la_CFLAGS = -I$(srcdir)/incl
        -I$(top_srcdir)/modules/elementary_functions/includes \
        -I$(top_srcdir)/modules/string/includes \
        -I$(top_srcdir)/modules/fileio/includes \
 -      -I$(top_srcdir)/modules/shell/includes $(XML_FLAGS) \
 +      -I$(top_srcdir)/modules/shell/includes \
 +      -I$(top_srcdir)/modules/operations/includes $(XML_FLAGS) \
        $(am__append_3)
 -libscicore_la_CPPFLAGS = -I$(srcdir)/includes/ \
 -      -I$(srcdir)/src/c/ \
 -      -I$(srcdir)/src/cpp/ \
 -      -I$(top_srcdir)/modules/dynamic_link/includes \
 -      -I$(top_srcdir)/libs/MALLOC/includes/
 +libscicore_la_CPPFLAGS = \
 +                      -I$(srcdir)/includes/ \
 +                      -I$(srcdir)/src/c/ \
 +                      -I$(srcdir)/src/cpp/ \
 +                      -I$(top_srcdir)/modules/api_scilab/includes \
 +                      -I$(top_srcdir)/modules/symbol/includes/ \
 +                      -I$(top_srcdir)/modules/operations/includes/ \
 +                      -I$(top_srcdir)/modules/functions_manager/includes/ \
 +                      -I$(top_srcdir)/modules/elementary_functions/includes/ \
 +                      -I$(top_srcdir)/modules/abstractSyntaxTree/includes/ \
 +                      -I$(top_srcdir)/modules/parse/includes \
 +                      -I$(top_srcdir)/modules/types/includes/ \
 +                      -I$(top_srcdir)/modules/output_stream/includes/ \
 +                      -I$(top_srcdir)/modules/dynamic_link/includes \
 +                      -I$(top_srcdir)/modules/system_env/includes \
 +                      -I$(top_srcdir)/modules/string/includes/ \
 +                      -I$(top_srcdir)/libs/MALLOC/includes/ \
 +              -I$(top_srcdir)/modules/fileio/includes
  
  pkglib_LTLIBRARIES = libscicore.la
- libscicore_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION) $(XML_LIBS)
+ libscicore_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION) $(XML_LIBS)
  
  # For the code check (splint)
  CHECK_SRC = $(CORE_C_SOURCES) $(GATEWAY_C_SOURCES)
@@@ -1125,9 -1105,9 +1126,8 @@@ distclean-compile
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_la-sci_havewindow.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_la-sci_ieee.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_la-sci_intppty.Plo@am__quote@
 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_la-sci_isdef.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_la-sci_iserror.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_la-sci_isglobal.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_la-sci_islittleendian.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_la-sci_lasterror.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_la-sci_macr2lst.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_la-sci_macr2tree.Plo@am__quote@
@@@ -1927,13 -2071,34 +1927,6 @@@ libscicore_la-gw_user2.lo: sci_gateway/
  @AMDEP_TRUE@@am__fastdepCC_FALSE@     DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@ $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscicore_la_CPPFLAGS) $(CPPFLAGS) $(libscicore_la_CFLAGS) $(CFLAGS) -c -o libscicore_la-gw_user2.lo `test -f 'sci_gateway/c/gw_user2.c' || echo '$(srcdir)/'`sci_gateway/c/gw_user2.c
  
- libscicore_la-sci_islittleendian.lo: sci_gateway/c/sci_islittleendian.c
- @am__fastdepCC_TRUE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscicore_la_CPPFLAGS) $(CPPFLAGS) $(libscicore_la_CFLAGS) $(CFLAGS) -MT libscicore_la-sci_islittleendian.lo -MD -MP -MF $(DEPDIR)/libscicore_la-sci_islittleendian.Tpo -c -o libscicore_la-sci_islittleendian.lo `test -f 'sci_gateway/c/sci_islittleendian.c' || echo '$(srcdir)/'`sci_gateway/c/sci_islittleendian.c
- @am__fastdepCC_TRUE@  $(am__mv) $(DEPDIR)/libscicore_la-sci_islittleendian.Tpo $(DEPDIR)/libscicore_la-sci_islittleendian.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@     source='sci_gateway/c/sci_islittleendian.c' object='libscicore_la-sci_islittleendian.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@     DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscicore_la_CPPFLAGS) $(CPPFLAGS) $(libscicore_la_CFLAGS) $(CFLAGS) -c -o libscicore_la-sci_islittleendian.lo `test -f 'sci_gateway/c/sci_islittleendian.c' || echo '$(srcdir)/'`sci_gateway/c/sci_islittleendian.c
 -libscicore_la-sci_error.lo: sci_gateway/c/sci_error.c
 -@am__fastdepCC_TRUE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscicore_la_CPPFLAGS) $(CPPFLAGS) $(libscicore_la_CFLAGS) $(CFLAGS) -MT libscicore_la-sci_error.lo -MD -MP -MF $(DEPDIR)/libscicore_la-sci_error.Tpo -c -o libscicore_la-sci_error.lo `test -f 'sci_gateway/c/sci_error.c' || echo '$(srcdir)/'`sci_gateway/c/sci_error.c
 -@am__fastdepCC_TRUE@  $(am__mv) $(DEPDIR)/libscicore_la-sci_error.Tpo $(DEPDIR)/libscicore_la-sci_error.Plo
 -@AMDEP_TRUE@@am__fastdepCC_FALSE@     source='sci_gateway/c/sci_error.c' object='libscicore_la-sci_error.lo' libtool=yes @AMDEPBACKSLASH@
 -@AMDEP_TRUE@@am__fastdepCC_FALSE@     DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 -@am__fastdepCC_FALSE@ $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscicore_la_CPPFLAGS) $(CPPFLAGS) $(libscicore_la_CFLAGS) $(CFLAGS) -c -o libscicore_la-sci_error.lo `test -f 'sci_gateway/c/sci_error.c' || echo '$(srcdir)/'`sci_gateway/c/sci_error.c
 -
 -libscicore_la-sci_sciargs.lo: sci_gateway/c/sci_sciargs.c
 -@am__fastdepCC_TRUE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscicore_la_CPPFLAGS) $(CPPFLAGS) $(libscicore_la_CFLAGS) $(CFLAGS) -MT libscicore_la-sci_sciargs.lo -MD -MP -MF $(DEPDIR)/libscicore_la-sci_sciargs.Tpo -c -o libscicore_la-sci_sciargs.lo `test -f 'sci_gateway/c/sci_sciargs.c' || echo '$(srcdir)/'`sci_gateway/c/sci_sciargs.c
 -@am__fastdepCC_TRUE@  $(am__mv) $(DEPDIR)/libscicore_la-sci_sciargs.Tpo $(DEPDIR)/libscicore_la-sci_sciargs.Plo
 -@AMDEP_TRUE@@am__fastdepCC_FALSE@     source='sci_gateway/c/sci_sciargs.c' object='libscicore_la-sci_sciargs.lo' libtool=yes @AMDEPBACKSLASH@
 -@AMDEP_TRUE@@am__fastdepCC_FALSE@     DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 -@am__fastdepCC_FALSE@ $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscicore_la_CPPFLAGS) $(CPPFLAGS) $(libscicore_la_CFLAGS) $(CFLAGS) -c -o libscicore_la-sci_sciargs.lo `test -f 'sci_gateway/c/sci_sciargs.c' || echo '$(srcdir)/'`sci_gateway/c/sci_sciargs.c
 -
 -libscicore_la-sci_with_module.lo: sci_gateway/c/sci_with_module.c
 -@am__fastdepCC_TRUE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscicore_la_CPPFLAGS) $(CPPFLAGS) $(libscicore_la_CFLAGS) $(CFLAGS) -MT libscicore_la-sci_with_module.lo -MD -MP -MF $(DEPDIR)/libscicore_la-sci_with_module.Tpo -c -o libscicore_la-sci_with_module.lo `test -f 'sci_gateway/c/sci_with_module.c' || echo '$(srcdir)/'`sci_gateway/c/sci_with_module.c
 -@am__fastdepCC_TRUE@  $(am__mv) $(DEPDIR)/libscicore_la-sci_with_module.Tpo $(DEPDIR)/libscicore_la-sci_with_module.Plo
 -@AMDEP_TRUE@@am__fastdepCC_FALSE@     source='sci_gateway/c/sci_with_module.c' object='libscicore_la-sci_with_module.lo' libtool=yes @AMDEPBACKSLASH@
 -@AMDEP_TRUE@@am__fastdepCC_FALSE@     DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 -@am__fastdepCC_FALSE@ $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscicore_la_CPPFLAGS) $(CPPFLAGS) $(libscicore_la_CFLAGS) $(CFLAGS) -c -o libscicore_la-sci_with_module.lo `test -f 'sci_gateway/c/sci_with_module.c' || echo '$(srcdir)/'`sci_gateway/c/sci_with_module.c
 -
 -libscicore_la-sci_getscilabmode.lo: sci_gateway/c/sci_getscilabmode.c
 -@am__fastdepCC_TRUE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscicore_la_CPPFLAGS) $(CPPFLAGS) $(libscicore_la_CFLAGS) $(CFLAGS) -MT libscicore_la-sci_getscilabmode.lo -MD -MP -MF $(DEPDIR)/libscicore_la-sci_getscilabmode.Tpo -c -o libscicore_la-sci_getscilabmode.lo `test -f 'sci_gateway/c/sci_getscilabmode.c' || echo '$(srcdir)/'`sci_gateway/c/sci_getscilabmode.c
 -@am__fastdepCC_TRUE@  $(am__mv) $(DEPDIR)/libscicore_la-sci_getscilabmode.Tpo $(DEPDIR)/libscicore_la-sci_getscilabmode.Plo
 -@AMDEP_TRUE@@am__fastdepCC_FALSE@     source='sci_gateway/c/sci_getscilabmode.c' object='libscicore_la-sci_getscilabmode.lo' libtool=yes @AMDEPBACKSLASH@
 -@AMDEP_TRUE@@am__fastdepCC_FALSE@     DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 -@am__fastdepCC_FALSE@ $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscicore_la_CPPFLAGS) $(CPPFLAGS) $(libscicore_la_CFLAGS) $(CFLAGS) -c -o libscicore_la-sci_getscilabmode.lo `test -f 'sci_gateway/c/sci_getscilabmode.c' || echo '$(srcdir)/'`sci_gateway/c/sci_getscilabmode.c
 -
  libscicore_la-sci_getvariablesonstack.lo: sci_gateway/c/sci_getvariablesonstack.c
  @am__fastdepCC_TRUE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscicore_la_CPPFLAGS) $(CPPFLAGS) $(libscicore_la_CFLAGS) $(CFLAGS) -MT libscicore_la-sci_getvariablesonstack.lo -MD -MP -MF $(DEPDIR)/libscicore_la-sci_getvariablesonstack.Tpo -c -o libscicore_la-sci_getvariablesonstack.lo `test -f 'sci_gateway/c/sci_getvariablesonstack.c' || echo '$(srcdir)/'`sci_gateway/c/sci_getvariablesonstack.c
  @am__fastdepCC_TRUE@  $(am__mv) $(DEPDIR)/libscicore_la-sci_getvariablesonstack.Tpo $(DEPDIR)/libscicore_la-sci_getvariablesonstack.Plo
  #define CORE "core"
  ;
  Source: modules\{#CORE}\jar\org.scilab.modules.{#CORE}.jar;DestDir: {app}\modules\{#CORE}\jar; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 +Source: bin\{#CORE}_gw.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 +;not generated (hardcoded)
  ;
  Source: modules\{#CORE}\VERSION.xml; DestDir: {app}\modules\{#CORE}; Components: {#COMPN_SCILAB}
- Source: modules\{#CORE}\readme.txt; DestDir: {app}\modules\{#CORE}; Components: {#COMPN_SCILAB}
  Source: modules\{#CORE}\license.txt; DestDir: {app}\modules\{#CORE}; Components: {#COMPN_SCILAB}
- Source: modules\{#CORE}\changelog.txt; DestDir: {app}\modules\{#CORE}; Components: {#COMPN_SCILAB}
  ;
  Source: modules\{#CORE}\sci_gateway\{#CORE}_gateway.xml; DestDir: {app}\modules\{#CORE}\sci_gateway; Components: {#COMPN_SCILAB}
  ;
@@@ -51,20 -63,17 +51,22 @@@ int C2F(sci_getos)(char *fname,unsigne
  int C2F(sci_fromjava)(char *fname,unsigned long fname_len);
  int C2F(sci_getmemory)(char *fname,unsigned long fname_len);
  int C2F(sci_fromc)(char *fname,unsigned long fname_len);
 -int C2F(sci_getmd5)(char *fname,unsigned long fname_len);
 +//int C2F(sci_getmd5)(char *fname,unsigned long fname_len); -> C++
- int C2F(sci_islittleendian)(char *fname,unsigned long fname_len);
+ int C2F(sci_getmodules)(char *fname,unsigned long fname_len);
+ int C2F(sci_with_module)(char *fname,unsigned long fname_len);
+ int C2F(sci_getscilabmode)(char *fname,unsigned long fname_len);
  int C2F(sci_librarieslist)(char *fname,unsigned long fname_len);
  int C2F(sci_getvariablesonstack)(char *fname,unsigned long fname_len);
 -int C2F(sci_getdebuginfo)(char *fname,unsigned long fname_len);
  int C2F(sci_readgateway)(char *fname,unsigned long fname_len);
 -int C2F(sci_exit)(char *fname,unsigned long fname_len);
  int C2F(sci_comp)(char *fname,unsigned long fname_len);
 +
 +int C2F(sci_typename)(char *fname,int* _piKey);
 +int C2F(sci_funcprot)(char *fname,int* _piKey);
 +int C2F(sci_newfun)(char *fname, int* _piKey);
 +
 +//Yasp
 +int sci_type(char *fname, int* _piKey);
 +int sci_getdebuginfo(char *fname, int* _piKey);
  /*--------------------------------------------------------------------------*/
  #endif /*  __GW_CORE__ */
  /*--------------------------------------------------------------------------*/
@@@ -26,7 -25,7 +26,7 @@@ void disp_scilab_version(void)
  /* for compatibility */
  /* Deprecated */
  #define SCI_VERSION SCI_VERSION_STRING
- #define DEFAULT_SCI_VERSION_MESSAGE L"scilab-YaSp-GIT (INRIA,ENPC)"
 -#define DEFAULT_SCI_VERSION_MESSAGE "scilab-branch-master"
++#define DEFAULT_SCI_VERSION_MESSAGE L"scilab-branch-YaSp"
  
  
  #endif
index 0000000,61214f8..8b0a7f5
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,33 +1,34 @@@
+ /*
+  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+  * Copyright (C) INRIA
+  *
+  * 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
+  *
+  */
+ #ifndef SCI_VERSION_H
+ #define SCI_VERSION_H
+ #define SCI_VERSION_MAJOR @SCILAB_VERSION_MAJOR@
+ #define SCI_VERSION_MINOR @SCILAB_VERSION_MINOR@
+ #define SCI_VERSION_MAINTENANCE @SCILAB_VERSION_MAINTENANCE@
 -#define SCI_VERSION_STRING "scilab-branch-master"
++#define SCI_VERSION_STRING "scilab-branch-YaSp"
++#define SCI_VERSION_WIDE_STRING L"scilab-branch-YaSp"
+ /* SCI_VERSION_REVISION --> hash key commit */
+ #define SCI_VERSION_REVISION 0
+ #define SCI_VERSION_TIMESTAMP 0
+ void disp_scilab_version(void);
+ /* for compatibility */
+ /* Deprecated */
+ #define SCI_VERSION SCI_VERSION_STRING
 -#define DEFAULT_SCI_VERSION_MESSAGE "scilab-branch-master"
++#define DEFAULT_SCI_VERSION_MESSAGE L"scilab-branch-YaSp"
+ #endif
+ /*--------------------------------------------------------------------------*/
index 0000000,03b1e2f..9a95179
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,33 +1,34 @@@
+ /*
+  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+  * Copyright (C) INRIA
+  *
+  * 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
+  *
+  */
+ #ifndef SCI_VERSION_H
+ #define SCI_VERSION_H
 -#define SCI_VERSION_MAJOR 5
 -#define SCI_VERSION_MINOR 4
++#define SCI_VERSION_MAJOR 6
++#define SCI_VERSION_MINOR 0
+ #define SCI_VERSION_MAINTENANCE 0
 -#define SCI_VERSION_STRING "scilab-branch-master"
++#define SCI_VERSION_STRING "scilab-branch-YaSp"
++#define SCI_VERSION_WIDE_STRING L"scilab-branch-YaSp"
+ /* SCI_VERSION_REVISION --> hash key commit */
+ #define SCI_VERSION_REVISION 0
+ #define SCI_VERSION_TIMESTAMP 0
+ void disp_scilab_version(void);
+ /* for compatibility */
+ /* Deprecated */
+ #define SCI_VERSION SCI_VERSION_STRING
 -#define DEFAULT_SCI_VERSION_MESSAGE "scilab-branch-master
++#define DEFAULT_SCI_VERSION_MESSAGE L"scilab-branch-YaSp"
+ #endif
+ /*--------------------------------------------------------------------------*/
Simple merge
@@@ -1,11 -1,11 +1,11 @@@
  /*
   * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
   * Copyright (C) 2006 - INRIA - 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    
++ * are also available at
   * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
   *
   */
  #include "GetXmlFileEncoding.h"
  #include "scilabDefaults.h"
  #include "FileExist.h"
 -#ifdef _MSC_VER
 -#include "strdup_windows.h"
 -#endif
 +#include "os_strdup.h"
  #include "getshortpathname.h"
--/*--------------------------------------------------------------------------*/ 
++/*--------------------------------------------------------------------------*/
  static struct MODULESLIST *ScilabModules=NULL;
--/*--------------------------------------------------------------------------*/ 
++/*--------------------------------------------------------------------------*/
  static BOOL ReadModulesFile(void);
  static BOOL AppendModules(char *filename);
  static BOOL VerifyModule(char *ModuleName);
--/*--------------------------------------------------------------------------*/ 
++/*--------------------------------------------------------------------------*/
  struct MODULESLIST *getmodules(void)
  {
-       if (ScilabModules==NULL)
-       {
-               ScilabModules=(struct MODULESLIST *)MALLOC(sizeof(struct MODULESLIST));
-               ReadModulesFile();
-       }
-       return ScilabModules;
+     if (ScilabModules==NULL)
+     {
+         ScilabModules=(struct MODULESLIST *)MALLOC(sizeof(struct MODULESLIST));
+         ReadModulesFile();
+     }
+     return ScilabModules;
  }
--/*--------------------------------------------------------------------------*/ 
++/*--------------------------------------------------------------------------*/
  BOOL DisposeModulesInfo(void)
  {
-       BOOL bOK=FALSE;
-       if (ScilabModules)
-       {
-               int i=0;
-               for (i=0;i<ScilabModules->numberofModules;i++)
-               {
-                       if (ScilabModules->ModuleList[i])
-                       {
-                               FREE(ScilabModules->ModuleList[i]);
-                               ScilabModules->ModuleList[i]=NULL;
-                       }
-               }
-               if (ScilabModules->ModuleList)
-               {
-                       FREE(ScilabModules->ModuleList);
-                       ScilabModules->ModuleList=NULL;
-               }
-               ScilabModules->numberofModules=0;
-               FREE(ScilabModules);
-               ScilabModules=NULL;
-       }
-       return bOK;
+     BOOL bOK=FALSE;
+     if (ScilabModules)
+     {
+         int i=0;
+         for (i=0;i<ScilabModules->numberofModules;i++)
+         {
+             if (ScilabModules->ModuleList[i])
+             {
+                 FREE(ScilabModules->ModuleList[i]);
+                 ScilabModules->ModuleList[i]=NULL;
+             }
+         }
+         if (ScilabModules->ModuleList)
+         {
+             FREE(ScilabModules->ModuleList);
+             ScilabModules->ModuleList=NULL;
+         }
+         ScilabModules->numberofModules=0;
+         FREE(ScilabModules);
+         ScilabModules=NULL;
+     }
+     return bOK;
  }
--/*--------------------------------------------------------------------------*/ 
++/*--------------------------------------------------------------------------*/
  static BOOL ReadModulesFile(void)
  {
-       BOOL bOK=FALSE;
-       char *ModulesFilename=NULL;
-       char *SciPath=NULL;
-       SciPath=getSCI();
-       if (SciPath==NULL)
-       {
-               sciprint(_("The SCI environment variable is not set.\n"));
-               return FALSE;
-       }
-       ModulesFilename=(char*)MALLOC((strlen(SciPath)+strlen("/")+strlen(basenamemodulesfile)+1)*sizeof(char));
-       sprintf(ModulesFilename,"%s/%s",SciPath,basenamemodulesfile);
-       FREE(SciPath);
-       SciPath=NULL;
-       
-       if (FileExist(ModulesFilename))
-       {
-               AppendModules(ModulesFilename);
-               FREE(ModulesFilename);
-               ModulesFilename=NULL;
-       }
-       else
-       {
-               sciprint(_("Cannot load the module declaration file: %s.\n"),ModulesFilename);
-               FREE(ModulesFilename);
-               ModulesFilename=NULL;
-               return FALSE;
-       }
-       return bOK;
+     BOOL bOK=FALSE;
+     char *ModulesFilename=NULL;
+     char *SciPath=NULL;
 -    SciPath=getSCIpath();
++    SciPath=getSCI();
+     if (SciPath==NULL)
+     {
+         sciprint(_("The SCI environment variable is not set.\n"));
+         return FALSE;
+     }
+     ModulesFilename=(char*)MALLOC((strlen(SciPath)+strlen("/")+strlen(basenamemodulesfile)+1)*sizeof(char));
+     sprintf(ModulesFilename,"%s/%s",SciPath,basenamemodulesfile);
+     FREE(SciPath);
+     SciPath=NULL;
 -    
++
+     if (FileExist(ModulesFilename))
+     {
+         AppendModules(ModulesFilename);
+         FREE(ModulesFilename);
+         ModulesFilename=NULL;
+     }
+     else
+     {
+         sciprint(_("Cannot load the module declaration file: %s.\n"),ModulesFilename);
+         FREE(ModulesFilename);
+         ModulesFilename=NULL;
+         return FALSE;
+     }
+     return bOK;
  }
--/*--------------------------------------------------------------------------*/ 
++/*--------------------------------------------------------------------------*/
  static BOOL VerifyModule(char *ModuleName)
  {
-       BOOL bOK=FALSE;
-       char *SciPath=NULL;
-       char *FullPathModuleName=NULL;
-       
-       SciPath=getSCI();
-       if (SciPath==NULL)
-       {
-               sciprint(_("The SCI environment variable is not set.\n"));
-               return FALSE;
-       }
-       FullPathModuleName=(char*)MALLOC((strlen(SciPath)+strlen("%s/modules/%s/etc/%s.start")+(strlen(ModuleName)*2)+1)*sizeof(char));
-       sprintf(FullPathModuleName,"%s/modules/%s/etc/%s.start",SciPath,ModuleName,ModuleName);
-       FREE(SciPath);
-       SciPath=NULL;
-       /* ajouter d'autres tests d'existences */
-       if (FileExist(FullPathModuleName))
-       {
-               bOK=TRUE;
-       }
-       FREE(FullPathModuleName);
-       FullPathModuleName=NULL;
-       return bOK;
+     BOOL bOK=TRUE;
+     char *SciPath=NULL;
+     char *FullPathModuleName=NULL;
 -    
 -    SciPath=getSCIpath();
++
++    SciPath=getSCI();
+     if (SciPath==NULL)
+     {
+         sciprint(_("The SCI environment variable is not set.\n"));
+         return FALSE;
+     }
+     FullPathModuleName=(char*)MALLOC((strlen(SciPath)+strlen("%s/modules/%s/etc/%s.start")+(strlen(ModuleName)*2)+1)*sizeof(char));
+     sprintf(FullPathModuleName,"%s/modules/%s/etc/%s.start",SciPath,ModuleName,ModuleName);
+     FREE(SciPath);
+     SciPath=NULL;
+     /* @TODO add more checks (missing files for example) */
+     if (!FileExist(FullPathModuleName))
+     {
+         fprintf(stderr,_("Warning: Could not find %s\n"),FullPathModuleName);
+         bOK=FALSE;
+     }
+     FREE(FullPathModuleName);
+     FullPathModuleName=NULL;
+     return bOK;
  }
--/*--------------------------------------------------------------------------*/ 
++/*--------------------------------------------------------------------------*/
  static BOOL AppendModules(char *xmlfilename)
  {
-       BOOL bOK = FALSE;
-       if ( FileExist(xmlfilename) )
-       {
-               char *encoding = GetXmlFileEncoding(xmlfilename);
-               /* Don't care about line return / empty line */
-               xmlKeepBlanksDefault(0);
-               /* check if the XML file has been encoded with utf8 (unicode) or not */
-               if (stricmp("utf-8", encoding)==0)
-               {
-                       xmlDocPtr doc = NULL;
-                       xmlXPathContextPtr xpathCtxt = NULL;
-                       xmlXPathObjectPtr xpathObj = NULL;
-                       char *name=NULL;
-                       int activate=0;
-                       int indice=0;
-                       BOOL bConvert = FALSE;
-                       char *shortxmlfilename = getshortpathname(xmlfilename,&bConvert);
-                       if (shortxmlfilename)
-                       {
-                               doc = xmlParseFile (shortxmlfilename);
-                               FREE(shortxmlfilename);
-                               shortxmlfilename = NULL;
-                       }
-                       if (doc == NULL) 
-                       {
-                               printf(_("Error: Could not parse file %s.\n"), xmlfilename);
-                               if (encoding) {FREE(encoding);encoding=NULL;}
-                               return bOK;
-                       }
-                       xpathCtxt = xmlXPathNewContext(doc);
-                       xpathObj = xmlXPathEval((const xmlChar*)"//modules/module", xpathCtxt);
-                       if(xpathObj && xpathObj->nodesetval->nodeMax) 
-                       {
-                               /* the Xpath has been understood and there are node */
-                               int     i;
-                               for(i = 0; i < xpathObj->nodesetval->nodeNr; i++)
-                               {
-                                       xmlAttrPtr attrib=xpathObj->nodesetval->nodeTab[i]->properties;
-                                       /* Get the properties of <module>  */
-                                       while (attrib != NULL)
-                                       {
-                                               /* loop until when have read all the attributes */
-                                               if (xmlStrEqual (attrib->name, (const xmlChar*) "name"))
-                                               { 
-                                                       /* we found the tag name */
-                                                       const char *str=(const char*)attrib->children->content;
-                                                       name = os_strdup(str);
-                                               }
-                                               else if (xmlStrEqual (attrib->name, (const xmlChar*) "activate"))
-                                               { 
-                                                       /* we found the tag activate */
-                                                       const char *str=(const char*)attrib->children->content;
-                                                       if (stricmp(str,"yes")==0 || strcmp(str,"1")==0) {
-                                                               activate=1;
-                                                       }
-                                               }
-                                               attrib = attrib->next;
-                                       }
-                                       if ( (name) && (strlen(name) > 0) && (activate) )
-                                       {
-                                               if ( VerifyModule(name) )
-                                               {
-                                                       if (indice==0) ScilabModules->ModuleList=(char**)MALLOC(sizeof(char*)*(indice+1)); 
-                                                       else ScilabModules->ModuleList=(char**)REALLOC(ScilabModules->ModuleList,sizeof(char*)*(indice+1));
-                                                       ScilabModules->numberofModules=indice+1;
-                                                       
-                                                       ScilabModules->ModuleList[indice]= os_strdup(name);
-                                                       indice++;
-                                               }
-                                               else
-                                               {
-                                                       sciprint(_("%s module not found.\n"),name);
-                                               }
-                                       }
-                                       if (name) {FREE(name);name = NULL;}
-                                       activate = 0;
-                               }
-                               bOK = TRUE;
-                       }
-                       if(xpathObj) xmlXPathFreeObject(xpathObj);
-                       if(xpathCtxt) xmlXPathFreeContext(xpathCtxt);
-                       xmlFreeDoc (doc);
-               }
-               else
-               {
-                       printf(_("Error: Not a valid module file %s (encoding not '%s') Encoding '%s' found.\n"), xmlfilename, "utf-8", encoding);
-               }
-               if (encoding) {FREE(encoding);encoding=NULL;}
-       }
-       return bOK;
+     BOOL bOK = FALSE;
+     if ( FileExist(xmlfilename) )
+     {
+         char *encoding = GetXmlFileEncoding(xmlfilename);
+         /* Don't care about line return / empty line */
+         xmlKeepBlanksDefault(0);
+         /* check if the XML file has been encoded with utf8 (unicode) or not */
+         if (stricmp("utf-8", encoding)==0)
+         {
+             xmlDocPtr doc = NULL;
+             xmlXPathContextPtr xpathCtxt = NULL;
+             xmlXPathObjectPtr xpathObj = NULL;
+             char *name=NULL;
+             int activate=0;
+             int indice=0;
+             BOOL bConvert = FALSE;
+             char *shortxmlfilename = getshortpathname(xmlfilename,&bConvert);
+             if (shortxmlfilename)
+             {
+                 doc = xmlParseFile (shortxmlfilename);
+                 FREE(shortxmlfilename);
+                 shortxmlfilename = NULL;
+             }
 -            if (doc == NULL) 
++            if (doc == NULL)
+             {
+                 printf(_("Error: Could not parse file %s.\n"), xmlfilename);
+                 if (encoding) {FREE(encoding);encoding=NULL;}
+                 return bOK;
+             }
+             xpathCtxt = xmlXPathNewContext(doc);
+             xpathObj = xmlXPathEval((const xmlChar*)"//modules/module", xpathCtxt);
 -            if(xpathObj && xpathObj->nodesetval->nodeMax) 
++            if(xpathObj && xpathObj->nodesetval->nodeMax)
+             {
+                 /* the Xpath has been understood and there are node */
+                 int    i;
+                 for(i = 0; i < xpathObj->nodesetval->nodeNr; i++)
+                 {
+                     xmlAttrPtr attrib=xpathObj->nodesetval->nodeTab[i]->properties;
+                     /* Get the properties of <module>  */
+                     while (attrib != NULL)
+                     {
+                         /* loop until when have read all the attributes */
+                         if (xmlStrEqual (attrib->name, (const xmlChar*) "name"))
 -                        { 
++                        {
+                             /* we found the tag name */
+                             const char *str=(const char*)attrib->children->content;
+                             name = strdup(str);
+                         }
+                         else if (xmlStrEqual (attrib->name, (const xmlChar*) "activate"))
 -                        { 
++                        {
+                             /* we found the tag activate */
+                             const char *str=(const char*)attrib->children->content;
+                             if (stricmp(str,"yes")==0 || strcmp(str,"1")==0) {
+                                 activate=1;
+                             }
+                         }
+                         attrib = attrib->next;
+                     }
+                     if ( (name) && (strlen(name) > 0) && (activate) )
+                     {
+                         if ( VerifyModule(name) )
+                         {
+                             if (indice==0)
+                             {
 -                                ScilabModules->ModuleList=(char**)MALLOC(sizeof(char*)*(indice+1)); 
++                                ScilabModules->ModuleList=(char**)MALLOC(sizeof(char*)*(indice+1));
+                             }
+                             else
+                             {
+                                 ScilabModules->ModuleList=(char**)REALLOC(ScilabModules->ModuleList,sizeof(char*)*(indice+1));
+                             }
+                             ScilabModules->numberofModules=indice+1;
 -                            
++
+                             ScilabModules->ModuleList[indice]= strdup(name);
+                             indice++;
+                         }
+                         else
+                         {
+                             sciprint(_("%s module not found.\n"),name);
+                         }
+                     }
+                     if (name) {FREE(name);name = NULL;}
+                     activate = 0;
+                 }
+                 bOK = TRUE;
+             }
+             if(xpathObj) xmlXPathFreeObject(xpathObj);
+             if(xpathCtxt) xmlXPathFreeContext(xpathCtxt);
+             xmlFreeDoc (doc);
+         }
+         else
+         {
+             printf(_("Error: Not a valid module file %s (encoding not '%s') Encoding '%s' found.\n"), xmlfilename, "utf-8", encoding);
+         }
+         if (encoding) {FREE(encoding);encoding=NULL;}
+     }
+     return bOK;
  }
--/*--------------------------------------------------------------------------*/ 
++/*--------------------------------------------------------------------------*/
Simple merge
Simple merge
@@@ -274,11 -272,9 +272,12 @@@ JROSETTA_API = @JROSETTA_API
  JROSETTA_ENGINE = @JROSETTA_ENGINE@
  JUNIT = @JUNIT@
  LAPACK_LIBS = @LAPACK_LIBS@
+ LCOV = @LCOV@
  LD = @LD@
  LDFLAGS = @LDFLAGS@
 +LEX = @LEX@
 +LEXLIB = @LEXLIB@
 +LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBICONV = @LIBICONV@
  LIBINTL = @LIBINTL@
  LIBM = @LIBM@
@@@ -203,11 -201,9 +201,12 @@@ JROSETTA_API = @JROSETTA_API
  JROSETTA_ENGINE = @JROSETTA_ENGINE@
  JUNIT = @JUNIT@
  LAPACK_LIBS = @LAPACK_LIBS@
+ LCOV = @LCOV@
  LD = @LD@
  LDFLAGS = @LDFLAGS@
 +LEX = @LEX@
 +LEXLIB = @LEXLIB@
 +LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBICONV = @LIBICONV@
  LIBINTL = @LIBINTL@
  LIBM = @LIBM@
@@@ -202,11 -200,9 +200,12 @@@ JROSETTA_API = @JROSETTA_API
  JROSETTA_ENGINE = @JROSETTA_ENGINE@
  JUNIT = @JUNIT@
  LAPACK_LIBS = @LAPACK_LIBS@
+ LCOV = @LCOV@
  LD = @LD@
  LDFLAGS = @LDFLAGS@
 +LEX = @LEX@
 +LEXLIB = @LEXLIB@
 +LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBICONV = @LIBICONV@
  LIBINTL = @LIBINTL@
  LIBM = @LIBM@
@@@ -8,4 -9,10 +9,6 @@@
  // are also available at
  // http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
  
 -if (isdef('genlib') == %f) then
 -  exec(SCI+'/modules/functions/scripts/buildmacros/loadgenlib.sce');
 -end
 -
  genlib('development_toolslib','SCI/modules/development_tools/macros',%f,%t);
+ genlib('assertlib','SCI/modules/development_tools/macros/assert',%f,%t);
@@@ -150,11 -151,9 +151,12 @@@ JROSETTA_API = @JROSETTA_API
  JROSETTA_ENGINE = @JROSETTA_ENGINE@
  JUNIT = @JUNIT@
  LAPACK_LIBS = @LAPACK_LIBS@
+ LCOV = @LCOV@
  LD = @LD@
  LDFLAGS = @LDFLAGS@
 +LEX = @LEX@
 +LEXLIB = @LEXLIB@
 +LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBICONV = @LIBICONV@
  LIBINTL = @LIBINTL@
  LIBM = @LIBM@
@@@ -284,11 -282,9 +282,12 @@@ JROSETTA_API = @JROSETTA_API
  JROSETTA_ENGINE = @JROSETTA_ENGINE@
  JUNIT = @JUNIT@
  LAPACK_LIBS = @LAPACK_LIBS@
+ LCOV = @LCOV@
  LD = @LD@
  LDFLAGS = @LDFLAGS@
 +LEX = @LEX@
 +LEXLIB = @LEXLIB@
 +LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBICONV = @LIBICONV@
  LIBINTL = @LIBINTL@
  LIBM = @LIBM@
@@@ -568,14 -565,13 +571,14 @@@ sci_gateway/fortran/Ex-bvode.f 
  sci_gateway/fortran/bbvode.f
  
  libscidifferential_equations_la_CFLAGS = -I$(srcdir)/includes/ \
 --I$(top_srcdir)/modules/api_scilab/includes \
 --I$(top_srcdir)/modules/output_stream/includes \
 --I$(top_srcdir)/modules/elementary_functions/includes \
 --I$(top_srcdir)/modules/dynamic_link/includes
 +                                              -I$(top_srcdir)/modules/output_stream/includes \
 +                                              -I$(top_srcdir)/modules/dynamic_link/includes \
 +                                              -I$(top_srcdir)/modules/elementary_functions/includes \
 +                                              -I$(top_srcdir)/modules/api_scilab/includes \
 +                                              -I$(top_srcdir)/modules/operations/includes
  
  pkglib_LTLIBRARIES = libscidifferential_equations.la
- libscidifferential_equations_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION)
+ libscidifferential_equations_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION)
  libscidifferential_equations_la_SOURCES = $(DIFFERENTIAL_EQUATIONS_C_SOURCES) $(DIFFERENTIAL_EQUATIONS_FORTRAN_SOURCES) $(GATEWAY_C_SOURCES) $(GATEWAY_FORTRAN_SOURCES)
  
  # For the code check (splint)
@@@ -32,14 -29,12 +32,14 @@@ sci_gateway/fortran/matadd.
  
  pkglib_LTLIBRARIES = libscidouble.la
  
- libscidouble_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION)
+ libscidouble_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION)
  
 -libscidouble_la_CFLAGS = -I$(top_srcdir)/modules/api_scilab/includes \
 --I$(top_srcdir)/modules/output_stream/includes
 +libscidouble_la_CFLAGS =      -I$(top_srcdir)/modules/output_stream/includes \
 +                              -I$(top_srcdir)/modules/elementary_functions/includes \
 +                              -I$(top_srcdir)/modules/operations/includes \
 +                              -I$(top_srcdir)/modules/double/includes
  
 -libscidouble_la_SOURCES = $(GATEWAY_C_SOURCES) $(GATEWAY_FORTRAN_SOURCES)
 +libscidouble_la_SOURCES = $(DOUBLE_C_SOURCES) $(GATEWAY_C_SOURCES) $(GATEWAY_FORTRAN_SOURCES)
  
  # For the code check (splint)
  CHECK_SRC= $(GATEWAY_C_SOURCES)