Merge remote-tracking branch 'origin/master' into YaSp 06/5906/5
Bruno JOFRET [Fri, 13 Jan 2012 07:22:26 +0000 (08:22 +0100)]
Conflicts:
scilab/Makefile.am
scilab/Makefile.in
scilab/Scilab.sln
scilab/configure
scilab/configure.ac
scilab/etc/classpath.xml.vc
scilab/etc/modules.xml.in
scilab/etc/modules.xml.vc
scilab/libs/DetectFrameWork2/DetectFramework.vcxproj.filters
scilab/libs/GetWindowsVersion/GetWindowsVersion.rc
scilab/libs/MALLOC/MALLOC.rc
scilab/libs/doublylinkedlist/doublylinkedlist.rc
scilab/libs/dynamiclibrary/dynamiclibrary.rc
scilab/libs/hashtable/hashtable.rc
scilab/libs/libst/libst.rc
scilab/modules/Makefile.am
scilab/modules/Makefile.in
scilab/modules/action_binding/sci_gateway/cpp/sci_notify.cpp
scilab/modules/api_scilab/src/cpp/api_boolean.cpp
scilab/modules/api_scilab/src/cpp/api_boolean_sparse.cpp
scilab/modules/api_scilab/src/cpp/api_int.cpp
scilab/modules/api_scilab/src/cpp/api_poly.cpp
scilab/modules/api_scilab/src/cpp/api_sparse.cpp
scilab/modules/api_scilab/src/cpp/api_string.cpp
scilab/modules/arnoldi/Makefile.in
scilab/modules/boolean/Makefile.in
scilab/modules/call_scilab/src/c/SendScilabJobs.c
scilab/modules/commons/src/c/commons.vcxproj
scilab/modules/commons/src/jni/ScilabCommons.i
scilab/modules/commons/src/jni/ScilabCommons_wrap.c
scilab/modules/completion/Makefile.am
scilab/modules/completion/Makefile.in
scilab/modules/console/Makefile.am
scilab/modules/console/Makefile.in
scilab/modules/console/src/c/GetCommandLine.c
scilab/modules/console/src/noconsole/noconsole.vcxproj
scilab/modules/core/Makefile.am
scilab/modules/core/Makefile.in
scilab/modules/core/sci_gateway/c/sci_exit.c
scilab/modules/core/sci_gateway/c/sci_getversion.c
scilab/modules/core/sci_gateway/c/sci_lasterror.c
scilab/modules/core/src/c/banier.c
scilab/modules/core/src/c/core.vcxproj
scilab/modules/core/src/c/getdynamicDebugInfo_Windows.c
scilab/modules/core/src/c/stack2.c
scilab/modules/core/src/fortran/fact.f
scilab/modules/core/src/java/org/scilab/modules/core/Scilab.java
scilab/modules/data_structures/Makefile.am
scilab/modules/data_structures/Makefile.in
scilab/modules/development_tools/macros/test_run.sci
scilab/modules/dynamic_link/Makefile.in
scilab/modules/elementary_functions/Makefile.am
scilab/modules/elementary_functions/Makefile.in
scilab/modules/elementary_functions/includes/gw_elementary_functions.h
scilab/modules/elementary_functions/sci_gateway/c/gw_elementary_functions.c
scilab/modules/elementary_functions/sci_gateway/c/sci_frexp.c
scilab/modules/elementary_functions/sci_gateway/c/sci_size.c
scilab/modules/elementary_functions/src/c/convertbase.h
scilab/modules/elementary_functions/src/c/elementary_functions.vcxproj
scilab/modules/elementary_functions/src/c/elementary_functions.vcxproj.filters
scilab/modules/elementary_functions/src/fortran/eispack/eispack_f.rc
scilab/modules/fileio/Makefile.in
scilab/modules/fileio/fileio.vcxproj
scilab/modules/fileio/fileio.vcxproj.filters
scilab/modules/fileio/macros/fullfile.sci
scilab/modules/fileio/sci_gateway/c/sci_basename.c
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_findfiles.c
scilab/modules/fileio/sci_gateway/c/sci_fprintfMat.c
scilab/modules/fileio/sci_gateway/c/sci_fscanfMat.c
scilab/modules/fileio/sci_gateway/c/sci_fullpath.c
scilab/modules/fileio/sci_gateway/c/sci_isdir.c
scilab/modules/fileio/sci_gateway/c/sci_isfile.c
scilab/modules/fileio/sci_gateway/c/sci_mgetl.c
scilab/modules/fileio/sci_gateway/c/sci_movefile.c
scilab/modules/fileio/sci_gateway/c/sci_mputl.c
scilab/modules/fileio/sci_gateway/c/sci_pathconvert.c
scilab/modules/fileio/src/c/mget.c
scilab/modules/fileio/src/c/mopen.c
scilab/modules/functions/sci_gateway/c/sci_whereis.c
scilab/modules/gui/etc/main_menubar.xml
scilab/modules/gui/gui.iss
scilab/modules/gui/src/c/LibScilab_Import.def
scilab/modules/gui/src/c/gui.vcxproj
scilab/modules/gui/src/c/gui.vcxproj.filters
scilab/modules/hdf5/Makefile.am
scilab/modules/hdf5/Makefile.in
scilab/modules/hdf5/sci_gateway/cpp/sci_import_from_hdf5.cpp
scilab/modules/hdf5/src/c/h5_readDataFromFile.c
scilab/modules/hdf5/src/c/h5_writeDataToFile.c
scilab/modules/helptools/Makefile.in
scilab/modules/helptools/data/pages/homepage-en_US.html
scilab/modules/helptools/data/pages/homepage-fr_FR.html
scilab/modules/helptools/includes/gw_helptools.h
scilab/modules/helptools/macros/xmltoformat.sci
scilab/modules/helptools/sci_gateway/c/gw_helptools.c
scilab/modules/helptools/sci_gateway/cpp/sci_buildDoc.cpp
scilab/modules/helptools/sci_gateway/cpp/sci_buildDocv2.cpp
scilab/modules/helptools/sci_gateway/helptools_gateway.xml
scilab/modules/history_manager/sci_gateway/c/sci_saveafterncommands.c
scilab/modules/history_manager/src/c/getCommentDateSession.c
scilab/modules/history_manager/src/c/getCommentDateSession.h
scilab/modules/history_manager/src/cpp/HistoryManager.cpp
scilab/modules/integer/Makefile.in
scilab/modules/intersci/src/exe/intersci-n.c
scilab/modules/io/Makefile.in
scilab/modules/io/sci_gateway/c/sci_file.c
scilab/modules/io/sci_gateway/c/sci_getenv.c
scilab/modules/javasci/src/c/javasci2_helper.c
scilab/modules/javasci/src/java/org/scilab/modules/javasci/Scilab.java
scilab/modules/javasci/tests/java/javasci-JAVA-tests.vcxproj
scilab/modules/jvm/src/c/InitializeJVM.c
scilab/modules/linear_algebra/Makefile.in
scilab/modules/linear_algebra/tests/unit_tests/bdiag.dia.ref
scilab/modules/linear_algebra/tests/unit_tests/bdiag.tst
scilab/modules/localization/src/c/setgetlanguage.c
scilab/modules/maple2scilab/Makefile.in
scilab/modules/maple2scilab/maple2scilab.iss
scilab/modules/mexlib/Makefile.in
scilab/modules/output_stream/Makefile.in
scilab/modules/output_stream/output_stream.iss
scilab/modules/output_stream/sci_gateway/c/sci_msprintf.c
scilab/modules/output_stream/src/java/output_stream-JAVA.vcxproj
scilab/modules/polynomials/src/c/polynomials.rc
scilab/modules/prebuildjava/Makefile.in
scilab/modules/signal_processing/Makefile.am
scilab/modules/signal_processing/Makefile.in
scilab/modules/signal_processing/includes/gw_signal.h
scilab/modules/signal_processing/sci_gateway/c/gw_signal.c
scilab/modules/signal_processing/sci_gateway/signal_processing_gateway.xml
scilab/modules/signal_processing/src/c/Libscilab_Import.def
scilab/modules/signal_processing/src/c/signal_processing.vcxproj
scilab/modules/signal_processing/src/c/signal_processing.vcxproj.filters
scilab/modules/special_functions/src/c/LibScilab_Import.def
scilab/modules/spreadsheet/src/c/xls.c
scilab/modules/statistics/src/dcdflib/dcd_f/dcd_f.rc
scilab/modules/string/Makefile.am
scilab/modules/string/Makefile.in
scilab/modules/string/sci_gateway/c/sci_isalphanum.c
scilab/modules/string/sci_gateway/c/sci_isdigit.c
scilab/modules/string/sci_gateway/c/sci_length.c
scilab/modules/string/sci_gateway/c/sci_strchr.c
scilab/modules/string/sci_gateway/c/sci_strsplit.c
scilab/modules/string/sci_gateway/c/sci_strsubst.c
scilab/modules/string/src/c/string.vcxproj
scilab/modules/string/src/c/string.vcxproj.filters
scilab/modules/texmacs/texmacs.iss
scilab/modules/time/Makefile.in
scilab/modules/types/Makefile.am
scilab/modules/types/Makefile.in
scilab/modules/types/src/java/org/scilab/modules/types/ScilabInteger.java
scilab/modules/types/types.iss
scilab/modules/types/types.vcxproj
scilab/modules/types/types.vcxproj.filters
scilab/modules/ui_data/Makefile.am
scilab/modules/ui_data/Makefile.in
scilab/modules/ui_data/sci_gateway/c/gw_ui_data.c
scilab/modules/ui_data/sci_gateway/cpp/sci_browsevar.cpp
scilab/modules/ui_data/sci_gateway/cpp/sci_editvar.cpp
scilab/modules/ui_data/src/c/ui_data.vcxproj
scilab/modules/ui_data/src/c/ui_data.vcxproj.filters
scilab/modules/ui_data/src/cpp/UpdateBrowseVar.cpp
scilab/modules/umfpack/src/c/taucs_scilab.c
scilab/modules/windows_tools/sci_gateway/c/sci_winqueryreg.c
scilab/modules/windows_tools/src/c/LibScilab_Import.def
scilab/modules/windows_tools/src/c/WScilex/WScilex.rc
scilab/modules/xcos/sci_gateway/c/gw_xcos.c
scilab/modules/xcos/sci_gateway/cpp/sci_xcosConfigureXmlFile.cpp
scilab/modules/xml/Makefile.am
scilab/modules/xml/Makefile.in
scilab/modules/xml/sci_gateway/cpp/sci_xmlDelete.cpp
scilab/modules/xml/sci_gateway/cpp/sci_xmlGetOpenDocs.cpp
scilab/modules/xml/sci_gateway/cpp/sci_xmlWrite.cpp
scilab/modules/xml/sci_gateway/cpp/sci_xmlXPath.cpp
scilab/modules/xml/xml.vcxproj
scilab/scilab-lib.properties.vc
scilab/tools/innosetup/code_modules.iss
scilab/tools/innosetup/components.iss

Change-Id: If35768ca5ba97e9508c0004f5b0ea8d4fa4e0e9f

458 files changed:
1  2 
scilab/.gitignore
scilab/Makefile.am
scilab/Makefile.in
scilab/Scilab.sln
scilab/Scilab_f2c.sln
scilab/bin/bin.iss
scilab/bin/scilab
scilab/configure
scilab/configure.ac
scilab/contrib/Makefile.in
scilab/desktop/Makefile.in
scilab/desktop/images/icons/Makefile.in
scilab/etc/classpath.xml.vc
scilab/libs/GetWindowsVersion/GetWindowsVersion.rc
scilab/libs/LibScilab/libscilab.rc
scilab/libs/LibScilab/libscilab_f2c.rc
scilab/libs/MALLOC/MALLOC.rc
scilab/libs/MALLOC/Makefile.in
scilab/libs/Makefile.in
scilab/libs/doublylinkedlist/Makefile.in
scilab/libs/doublylinkedlist/doublylinkedlist.rc
scilab/libs/dynamiclibrary/Makefile.in
scilab/libs/dynamiclibrary/dynamiclibrary.rc
scilab/libs/hashtable/Makefile.in
scilab/libs/hashtable/hashtable.rc
scilab/libs/libst/Makefile.in
scilab/libs/libst/libst.rc
scilab/modules/Makefile.am
scilab/modules/Makefile.in
scilab/modules/action_binding/Makefile.in
scilab/modules/action_binding/src/c/action_binding.rc
scilab/modules/action_binding/src/noaction_binding/noaction_binding.rc
scilab/modules/api_scilab/Makefile.am
scilab/modules/api_scilab/Makefile.in
scilab/modules/api_scilab/src/c/api_scilab.rc
scilab/modules/api_scilab/src/cpp/api_boolean.cpp
scilab/modules/api_scilab/src/cpp/api_boolean_sparse.cpp
scilab/modules/api_scilab/src/cpp/api_int.cpp
scilab/modules/api_scilab/src/cpp/api_poly.cpp
scilab/modules/api_scilab/src/cpp/api_sparse.cpp
scilab/modules/api_scilab/src/cpp/api_string.cpp
scilab/modules/arnoldi/Makefile.am
scilab/modules/arnoldi/Makefile.in
scilab/modules/arnoldi/src/c/arnoldi.rc
scilab/modules/ast/Makefile.am
scilab/modules/ast/Makefile.in
scilab/modules/ast/includes/run_CallExp.hxx
scilab/modules/ast/includes/run_OpExp.hxx
scilab/modules/ast/includes/runvisitor.hxx
scilab/modules/ast/src/cpp/visitor_common.cpp
scilab/modules/atoms/Makefile.in
scilab/modules/atoms/atoms.iss
scilab/modules/boolean/Makefile.am
scilab/modules/boolean/Makefile.in
scilab/modules/boolean/src/c/boolean.rc
scilab/modules/boolean/src/fortran/boolean_f.rc
scilab/modules/cacsd/Makefile.am
scilab/modules/cacsd/Makefile.in
scilab/modules/cacsd/src/c/cacsd.rc
scilab/modules/cacsd/src/fortran/cacsd_f.rc
scilab/modules/cacsd/src/slicot/slicot_f/slicot_f.rc
scilab/modules/call_scilab/Makefile.in
scilab/modules/call_scilab/src/c/SendScilabJobs.c
scilab/modules/call_scilab/src/c/call_scilab.rc
scilab/modules/commons/Makefile.in
scilab/modules/commons/src/c/commons.rc
scilab/modules/commons/src/c/commons.vcxproj
scilab/modules/commons/src/c/commons.vcxproj.filters
scilab/modules/commons/src/fortran/commons_f.rc
scilab/modules/commons/src/java/org/scilab/modules/commons/ScilabCommons.java
scilab/modules/commons/src/java/org/scilab/modules/commons/ScilabCommonsJNI.java
scilab/modules/commons/src/jni/ScilabCommons.i
scilab/modules/commons/src/jni/ScilabCommons_wrap.c
scilab/modules/compatibility_functions/Makefile.in
scilab/modules/completion/Makefile.am
scilab/modules/completion/Makefile.in
scilab/modules/completion/src/c/completion.rc
scilab/modules/completion/src/nocompletion/nocompletion.rc
scilab/modules/console/Makefile.am
scilab/modules/console/Makefile.in
scilab/modules/console/sci_gateway/c/sci_lines.c
scilab/modules/console/src/c/GetCommandLine.c
scilab/modules/console/src/c/console.rc
scilab/modules/console/src/noconsole/noconsole.rc
scilab/modules/console/src/noconsole/noconsole.vcxproj
scilab/modules/core/Makefile.am
scilab/modules/core/Makefile.in
scilab/modules/core/includes/gw_core.h
scilab/modules/core/sci_gateway/c/sci_errclear.c
scilab/modules/core/sci_gateway/c/sci_format.c
scilab/modules/core/sci_gateway/c/sci_funcprot.c
scilab/modules/core/sci_gateway/c/sci_newfun.c
scilab/modules/core/sci_gateway/c/sci_predef.c
scilab/modules/core/sci_gateway/c/sci_typename.c
scilab/modules/core/src/c/core.vcxproj
scilab/modules/core/src/c/getdynamicDebugInfo_Windows.c
scilab/modules/core/src/c/getos.c
scilab/modules/core/src/c/sciquit.c
scilab/modules/core/src/c/stack2.c
scilab/modules/core/src/c/texmacs.c
scilab/modules/core/src/cpp/scilab.cpp
scilab/modules/data_structures/Makefile.am
scilab/modules/data_structures/Makefile.in
scilab/modules/data_structures/src/c/data_structures.rc
scilab/modules/data_structures/src/fortran/data_structures_f.rc
scilab/modules/demo_tools/Makefile.in
scilab/modules/development_tools/Makefile.in
scilab/modules/development_tools/src/fake/Makefile.in
scilab/modules/differential_equations/Makefile.am
scilab/modules/differential_equations/Makefile.in
scilab/modules/differential_equations/src/c/differential_equations.rc
scilab/modules/differential_equations/src/fortran/differential_equations_f.rc
scilab/modules/double/Makefile.am
scilab/modules/double/Makefile.in
scilab/modules/double/src/c/double.rc
scilab/modules/double/src/fortran/double_f.rc
scilab/modules/dynamic_link/Makefile.am
scilab/modules/dynamic_link/Makefile.in
scilab/modules/dynamic_link/macros/ilib_compile.sci
scilab/modules/dynamic_link/macros/ilib_gen_Make_unix.sci
scilab/modules/dynamic_link/macros/ilib_gen_loader.sci
scilab/modules/dynamic_link/macros/windows/dlwGenerateMakefile.sci
scilab/modules/dynamic_link/src/c/dynamic_link.rc
scilab/modules/dynamic_link/src/fortran/dynamic_link_f.rc
scilab/modules/elementary_functions/Makefile.am
scilab/modules/elementary_functions/Makefile.in
scilab/modules/elementary_functions/includes/gw_elementary_functions.h
scilab/modules/elementary_functions/sci_gateway/c/gw_elementary_functions.c
scilab/modules/elementary_functions/sci_gateway/c/sci_base2dec.c
scilab/modules/elementary_functions/sci_gateway/c/sci_frexp.c
scilab/modules/elementary_functions/sci_gateway/elementary_functions_gateway.xml
scilab/modules/elementary_functions/src/c/elementary_functions.rc
scilab/modules/elementary_functions/src/fortran/eispack/eispack_f.rc
scilab/modules/elementary_functions/src/fortran/elementary_functions_f.rc
scilab/modules/elementary_functions/src/fortran/elementary_functions_f.vfproj
scilab/modules/elementary_functions/src/fortran/linpack/linpack_f.rc
scilab/modules/elementary_functions/src/fortran/slatec/slatec_f.rc
scilab/modules/fftw/Makefile.am
scilab/modules/fftw/Makefile.in
scilab/modules/fftw/src/c/fftw.rc
scilab/modules/fftw/src/nofftw/nofftw.rc
scilab/modules/fileio/Makefile.am
scilab/modules/fileio/Makefile.in
scilab/modules/fileio/macros/fullfile.sci
scilab/modules/fileio/sci_gateway/c/sci_chdir.c
scilab/modules/fileio/sci_gateway/c/sci_copyfile.c
scilab/modules/fileio/sci_gateway/c/sci_fprintfMat.c
scilab/modules/fileio/sci_gateway/c/sci_fscanfMat.c
scilab/modules/fileio/sci_gateway/c/sci_movefile.c
scilab/modules/fileio/sci_gateway/c/sci_tempname.c
scilab/modules/fileio/src/c/fileio.rc
scilab/modules/fileio/src/c/fscanfMat.h
scilab/modules/fileio/tests/unit_tests/mopen.encoding.tst
scilab/modules/functions/Makefile.in
scilab/modules/functions/sci_gateway/c/sci_exec.c
scilab/modules/functions/sci_gateway/c/sci_execstr.c
scilab/modules/functions/sci_gateway/c/sci_lib.c
scilab/modules/functions/sci_gateway/c/sci_libraryinfo.c
scilab/modules/functions/src/c/functions.rc
scilab/modules/functions/src/fortran/functions_f.rc
scilab/modules/functions_manager/Makefile.in
scilab/modules/genetic_algorithms/Makefile.in
scilab/modules/graph/Makefile.in
scilab/modules/graph/src/java/org/scilab/modules/graph/io/ScilabIntegerCodec.java
scilab/modules/graphic_export/Makefile.in
scilab/modules/graphic_export/graphic_export.rc
scilab/modules/graphic_export/src/nographic_export/nographic_export.rc
scilab/modules/graphics/Makefile.in
scilab/modules/graphics/graphic.rc
scilab/modules/graphics/src/nographics/nographics.rc
scilab/modules/gui/Makefile.am
scilab/modules/gui/Makefile.in
scilab/modules/gui/sci_gateway/cpp/sci_toprint.cpp
scilab/modules/gui/src/c/gui.rc
scilab/modules/gui/src/c/gui.vcxproj
scilab/modules/gui/src/c/gui.vcxproj.filters
scilab/modules/gui/src/nogui/nogui.rc
scilab/modules/hdf5/Makefile.am
scilab/modules/hdf5/Makefile.in
scilab/modules/hdf5/src/c/hdf5.rc
scilab/modules/helptools/Makefile.am
scilab/modules/helptools/Makefile.in
scilab/modules/helptools/includes/gw_helptools.h
scilab/modules/helptools/macros/xmltoformat.sci
scilab/modules/helptools/sci_gateway/c/gw_helptools.c
scilab/modules/helptools/sci_gateway/cpp/sci_buildDoc.cpp
scilab/modules/helptools/sci_gateway/cpp/sci_buildDocv2.cpp
scilab/modules/helptools/sci_gateway/helptools_gateway.xml
scilab/modules/helptools/src/c/helptools.rc
scilab/modules/helptools/src/c/helptools.vcxproj
scilab/modules/helptools/src/c/helptools.vcxproj.filters
scilab/modules/history_browser/Makefile.in
scilab/modules/history_browser/src/c/history_browser.rc
scilab/modules/history_browser/src/java/history_browser-JAVA.vcxproj
scilab/modules/history_browser/src/nohistory_browser/nohistory_browser.rc
scilab/modules/history_manager/Makefile.am
scilab/modules/history_manager/Makefile.in
scilab/modules/history_manager/includes/getCommentDateSession.h
scilab/modules/history_manager/sci_gateway/c/sci_historymanager.c
scilab/modules/history_manager/sci_gateway/c/sci_historysize.c
scilab/modules/history_manager/sci_gateway/cpp/sci_historymanager.cpp
scilab/modules/history_manager/src/c/getCommentDateSession.c
scilab/modules/history_manager/src/c/history_manager.rc
scilab/modules/history_manager/src/cpp/HistoryManager.cpp
scilab/modules/integer/Makefile.am
scilab/modules/integer/Makefile.in
scilab/modules/integer/src/c/integer.rc
scilab/modules/integer/src/fortran/integer_f.rc
scilab/modules/interpolation/Makefile.in
scilab/modules/interpolation/src/c/interpolation.rc
scilab/modules/interpolation/src/fortran/interpolation_f.rc
scilab/modules/intersci/Makefile.am
scilab/modules/intersci/Makefile.in
scilab/modules/intersci/src/exe/intersci-n.c
scilab/modules/intersci/src/lib/intersci.rc
scilab/modules/io/Makefile.am
scilab/modules/io/Makefile.in
scilab/modules/io/sci_gateway/c/sci_getenv.c
scilab/modules/io/sci_gateway/c/sci_setenv.c
scilab/modules/io/src/c/io.rc
scilab/modules/io/src/fortran/io_f.rc
scilab/modules/javasci/Makefile.in
scilab/modules/javasci/javasci.rc
scilab/modules/javasci/src/c/javasci2_helper.c
scilab/modules/javasci/src/java/org/scilab/modules/javasci/Scilab.java
scilab/modules/javasci/src/jni/call_scilab.i
scilab/modules/javasci/src/jni/call_scilab_wrap.c
scilab/modules/jvm/Makefile.am
scilab/modules/jvm/Makefile.in
scilab/modules/jvm/sci_gateway/c/sci_javaclasspath.c
scilab/modules/jvm/src/c/InitializeJVM.c
scilab/modules/jvm/src/c/JVM_functions.h
scilab/modules/jvm/src/c/createMainScilabObject.c
scilab/modules/jvm/src/c/libjvm.rc
scilab/modules/jvm/src/nojvm/nojvm.rc
scilab/modules/libscilab-cli/Makefile.am
scilab/modules/libscilab-cli/Makefile.in
scilab/modules/linear_algebra/Makefile.am
scilab/modules/linear_algebra/Makefile.in
scilab/modules/linear_algebra/src/c/linear_algebra.rc
scilab/modules/linear_algebra/src/fortran/linear_algebra_f.rc
scilab/modules/localization/Makefile.am
scilab/modules/localization/Makefile.in
scilab/modules/localization/src/c/setgetlanguage.c
scilab/modules/localization/src/localization.rc
scilab/modules/m2sci/Makefile.in
scilab/modules/matio/Makefile.in
scilab/modules/matio/src/c/matio.rc
scilab/modules/matio/src/nomatio/nomatio.rc
scilab/modules/mexlib/Makefile.am
scilab/modules/mexlib/Makefile.in
scilab/modules/mexlib/src/libmat/libmat.rc
scilab/modules/mexlib/src/libmex/libmex.rc
scilab/modules/mexlib/src/libmx/libmx.rc
scilab/modules/modules_manager/Makefile.in
scilab/modules/operations/Makefile.in
scilab/modules/operations/includes/generic_operations.hxx
scilab/modules/operations/includes/types_addition.hxx
scilab/modules/operations/includes/types_comparison_eq.hxx
scilab/modules/operations/includes/types_comparison_lt_le_gt_ge.hxx
scilab/modules/operations/includes/types_comparison_ne.hxx
scilab/modules/operations/includes/types_divide.hxx
scilab/modules/operations/includes/types_finite.hxx
scilab/modules/operations/includes/types_multiplication.hxx
scilab/modules/operations/includes/types_power.hxx
scilab/modules/operations/includes/types_substraction.hxx
scilab/modules/optimization/Makefile.in
scilab/modules/optimization/src/c/optimization.rc
scilab/modules/optimization/src/fortran/optimization_f.rc
scilab/modules/output_stream/Makefile.am
scilab/modules/output_stream/Makefile.in
scilab/modules/output_stream/output_stream.iss
scilab/modules/output_stream/sci_gateway/cpp/output_stream_gw.cpp
scilab/modules/output_stream/sci_gateway/cpp/sci_diary.cpp
scilab/modules/output_stream/src/c/output_stream.rc
scilab/modules/output_stream/src/fortran/output_stream_f.rc
scilab/modules/overloading/Makefile.in
scilab/modules/parallel/Makefile.in
scilab/modules/parallel/src/c/parallel.rc
scilab/modules/parameters/Makefile.am
scilab/modules/parameters/Makefile.in
scilab/modules/parameters/src/c/parameters.rc
scilab/modules/parse/Makefile.in
scilab/modules/polynomials/Makefile.am
scilab/modules/polynomials/Makefile.in
scilab/modules/polynomials/src/c/polynomials.rc
scilab/modules/polynomials/src/fortran/polynomials_f.rc
scilab/modules/prebuildjava/Makefile.in
scilab/modules/randlib/Makefile.in
scilab/modules/randlib/src/c/randlib.rc
scilab/modules/randlib/src/fortran/randlib_f.rc
scilab/modules/randlib/src/norandlib/norandlib.rc
scilab/modules/renderer/Makefile.in
scilab/modules/renderer/renderer.rc
scilab/modules/renderer/src/norenderer/norenderer.rc
scilab/modules/scicos/Makefile.am
scilab/modules/scicos/Makefile.in
scilab/modules/scicos/scicos.iss
scilab/modules/scicos/src/c/noscicos/noscicos.rc
scilab/modules/scicos/src/c/scicos.c
scilab/modules/scicos/src/c/scicos.rc
scilab/modules/scicos/src/fortran/scicos_f.rc
scilab/modules/scicos/src/scicos_sundials/scicos_sundials.rc
scilab/modules/scicos_blocks/Makefile.am
scilab/modules/scicos_blocks/Makefile.in
scilab/modules/scicos_blocks/src/c/scicos_blocks.rc
scilab/modules/scicos_blocks/src/fortran/scicos_blocks_f.rc
scilab/modules/scinotes/Makefile.in
scilab/modules/scinotes/sci_gateway/cpp/sci_scinotes.cpp
scilab/modules/scinotes/src/c/scinotes.rc
scilab/modules/scinotes/src/java/scinotes-JAVA.vcxproj
scilab/modules/signal_processing/Makefile.in
scilab/modules/signal_processing/includes/gw_signal.h
scilab/modules/signal_processing/macros/wfir_gui.sci
scilab/modules/signal_processing/sci_gateway/c/gw_signal.c
scilab/modules/signal_processing/sci_gateway/signal_processing_gateway.xml
scilab/modules/signal_processing/src/c/signal_processing.rc
scilab/modules/signal_processing/src/fortran/signal_processing_f.rc
scilab/modules/simulated_annealing/Makefile.in
scilab/modules/sound/Makefile.in
scilab/modules/sound/sci_gateway/c/sci_PlaySound.c
scilab/modules/sound/sci_gateway/c/sci_beep.c
scilab/modules/sound/src/c/sound.rc
scilab/modules/sound/src/nosound/nosound.rc
scilab/modules/sparse/Makefile.am
scilab/modules/sparse/Makefile.in
scilab/modules/sparse/src/c/sparse.rc
scilab/modules/sparse/src/fortran/sparse_f.rc
scilab/modules/special_functions/Makefile.am
scilab/modules/special_functions/Makefile.in
scilab/modules/special_functions/includes/gw_special_functions.h
scilab/modules/special_functions/sci_gateway/c/sci_dlgamma.c
scilab/modules/special_functions/sci_gateway/c/sci_gamma.c
scilab/modules/special_functions/sci_gateway/c/sci_lgamma.c
scilab/modules/special_functions/src/c/special_functions.rc
scilab/modules/special_functions/src/c/special_functions.vcxproj
scilab/modules/special_functions/src/fortran/special_functions_f.rc
scilab/modules/spreadsheet/Makefile.in
scilab/modules/spreadsheet/src/c/spreadsheet.rc
scilab/modules/spreadsheet/src/c/xls.c
scilab/modules/spreadsheet/src/nospreadsheet/nospreadsheet.rc
scilab/modules/statistics/.gitignore
scilab/modules/statistics/Makefile.am
scilab/modules/statistics/Makefile.in
scilab/modules/statistics/src/c/statistics.rc
scilab/modules/statistics/src/dcdflib/dcd_f/dcd_f.rc
scilab/modules/string/Makefile.am
scilab/modules/string/Makefile.in
scilab/modules/string/sci_gateway/c/sci_isalphanum.c
scilab/modules/string/sci_gateway/c/sci_isascii.c
scilab/modules/string/sci_gateway/c/sci_isdigit.c
scilab/modules/string/src/c/string.rc
scilab/modules/string/src/c/string.vcxproj
scilab/modules/string/src/c/string.vcxproj.filters
scilab/modules/string/src/c/stringToDouble.c
scilab/modules/string/src/fortran/string_f.rc
scilab/modules/symbol/Makefile.in
scilab/modules/symbolic/Makefile.in
scilab/modules/symbolic/src/c/symbolic.rc
scilab/modules/symbolic/src/fortran/symbolic_f.rc
scilab/modules/system_env/Makefile.in
scilab/modules/tclsci/Makefile.in
scilab/modules/tclsci/src/c/tclsci.rc
scilab/modules/threads/Makefile.am
scilab/modules/threads/Makefile.in
scilab/modules/time/Makefile.am
scilab/modules/time/Makefile.in
scilab/modules/time/src/c/time.rc
scilab/modules/types/Makefile.am
scilab/modules/types/Makefile.in
scilab/modules/types/includes/sparse.hxx
scilab/modules/types/src/cpp/ScilabToJava.cpp
scilab/modules/types/src/java/org/scilab/modules/types/GetScilabVariableJNI.java
scilab/modules/types/src/java/org/scilab/modules/types/ScilabInteger.java
scilab/modules/types/src/jni/getScilabVariable.i
scilab/modules/types/tests/java/org/scilab/tests/modules/types/testEquals.java
scilab/modules/types/types.vcxproj
scilab/modules/types/types.vcxproj.filters
scilab/modules/ui_data/Makefile.am
scilab/modules/ui_data/Makefile.in
scilab/modules/ui_data/sci_gateway/c/gw_ui_data.c
scilab/modules/ui_data/sci_gateway/cpp/sci_browsevar.cpp
scilab/modules/ui_data/sci_gateway/cpp/sci_editvar.cpp
scilab/modules/ui_data/src/c/PutScilabVariable.c
scilab/modules/ui_data/src/c/ui_data.vcxproj
scilab/modules/ui_data/src/c/ui_data.vcxproj.filters
scilab/modules/ui_data/src/cpp/UpdateBrowseVar.cpp
scilab/modules/ui_data/src/java/ui_data-JAVA.vcxproj
scilab/modules/umfpack/Makefile.in
scilab/modules/umfpack/src/c/taucs_scilab.c
scilab/modules/umfpack/src/c/umfpack.rc
scilab/modules/umfpack/src/noumfpack/noumfpack.rc
scilab/modules/windows_tools/Makefile.am
scilab/modules/windows_tools/Makefile.in
scilab/modules/windows_tools/sci_gateway/c/sci_chartooem.c
scilab/modules/windows_tools/sci_gateway/c/sci_dos.c
scilab/modules/windows_tools/sci_gateway/c/sci_oemtochar.c
scilab/modules/windows_tools/sci_gateway/c/sci_winqueryreg.c
scilab/modules/windows_tools/src/c/CScilex/CScilex.rc
scilab/modules/windows_tools/src/c/WScilex/WScilex.rc
scilab/modules/windows_tools/src/c/WScilex/WScilex.vcxproj.filters
scilab/modules/windows_tools/src/c/scilab_windows/console.c
scilab/modules/windows_tools/src/c/scilab_windows/getVideoAdapters.c
scilab/modules/windows_tools/src/c/scilab_windows/scilab_windows.rc
scilab/modules/windows_tools/src/c/scilab_windows/scilab_windows.vcxproj
scilab/modules/windows_tools/src/c/scilab_windows/scilab_windows.vcxproj.filters
scilab/modules/windows_tools/src/c/windows_tools.rc
scilab/modules/windows_tools/src/nowindows_tools/nowindows_tools.rc
scilab/modules/xcos/Makefile.am
scilab/modules/xcos/Makefile.in
scilab/modules/xcos/sci_gateway/c/gw_xcos.c
scilab/modules/xcos/sci_gateway/cpp/sci_Xcos.cpp
scilab/modules/xcos/sci_gateway/cpp/sci_xcosConfigureXmlFile.cpp
scilab/modules/xcos/sci_gateway/cpp/sci_xcosDiagramToHDF5.cpp
scilab/modules/xcos/src/c/xcos.rc
scilab/modules/xcos/src/cpp/xcosUtilities.cpp
scilab/modules/xcos/xcos.iss
scilab/modules/xml/Makefile.am
scilab/modules/xml/Makefile.in
scilab/modules/xml/includes/gw_xml.h
scilab/modules/xml/sci_gateway/c/gw_xml.c
scilab/modules/xml/sci_gateway/cpp/sci_percent_XMLAttr_e.cpp
scilab/modules/xml/sci_gateway/cpp/sci_percent_XMLAttr_length.cpp
scilab/modules/xml/sci_gateway/cpp/sci_percent_XMLAttr_size.cpp
scilab/modules/xml/sci_gateway/cpp/sci_percent_XMLList_e.cpp
scilab/modules/xml/sci_gateway/cpp/sci_percent_XMLList_length.cpp
scilab/modules/xml/sci_gateway/cpp/sci_percent_XMLList_size.cpp
scilab/modules/xml/sci_gateway/cpp/sci_percent_c_i_XMLAttr.cpp
scilab/modules/xml/sci_gateway/cpp/sci_percent_foo_i_XMLList.cpp
scilab/modules/xml/sci_gateway/cpp/sci_percent_s_i_XMLList.cpp
scilab/modules/xml/sci_gateway/cpp/sci_print.cpp
scilab/modules/xml/sci_gateway/cpp/sci_xmlAddNs.cpp
scilab/modules/xml/sci_gateway/cpp/sci_xmlAsNumber.cpp
scilab/modules/xml/sci_gateway/cpp/sci_xmlAsText.cpp
scilab/modules/xml/sci_gateway/cpp/sci_xmlDelete.cpp
scilab/modules/xml/sci_gateway/cpp/sci_xmlDocument.cpp
scilab/modules/xml/sci_gateway/cpp/sci_xmlDump.cpp
scilab/modules/xml/sci_gateway/cpp/sci_xmlElement.cpp
scilab/modules/xml/sci_gateway/cpp/sci_xmlGetNsByHref.cpp
scilab/modules/xml/sci_gateway/cpp/sci_xmlGetNsByPrefix.cpp
scilab/modules/xml/sci_gateway/cpp/sci_xmlGetOpenDocs.cpp
scilab/modules/xml/sci_gateway/cpp/sci_xmlIsValidObject.cpp
scilab/modules/xml/sci_gateway/cpp/sci_xmlNs.cpp
scilab/modules/xml/sci_gateway/cpp/sci_xmlRead.cpp
scilab/modules/xml/sci_gateway/cpp/sci_xmlReadStr.cpp
scilab/modules/xml/sci_gateway/cpp/sci_xmlRemove.cpp
scilab/modules/xml/sci_gateway/cpp/sci_xmlSetAttributes.cpp
scilab/modules/xml/sci_gateway/cpp/sci_xmlValidate.cpp
scilab/modules/xml/sci_gateway/cpp/sci_xmlValidationFile.cpp
scilab/modules/xml/sci_gateway/cpp/sci_xmlWrite.cpp
scilab/modules/xml/sci_gateway/cpp/sci_xmlXPath.cpp
scilab/modules/xml/src/cpp/XMLList_insertion.hpp
scilab/modules/xml/src/cpp/XMLObject.hxx
scilab/modules/xml/src/cpp/extraction.hpp
scilab/modules/xml/src/cpp/insertion.hpp
scilab/modules/xml/xml.vcxproj
scilab/tools/innosetup/components.iss
scilab/tools/innosetup/files.iss

Simple merge
@@@ -42,60 -43,22 +43,51 @@@ scilab_bin_CFLAGS          = -I$(top_srcdir)/m
  
  # Localization dep already exists because of the `exportLocaleToSystem' symbol
  # (causing issues on some platform)
- COMMON_LIBS = \
-     $(top_builddir)/modules/threads/libscithreads.la \
-     $(top_builddir)/modules/core/libscicore.la \
-     $(top_builddir)/modules/completion/libscicompletion.la \
-     $(top_builddir)/modules/localization/libscilocalization.la \
-     $(top_builddir)/modules/api_scilab/libsciapi_scilab.la \
-     $(top_builddir)/modules/io/libsciio.la \
-     $(top_builddir)/modules/output_stream/libscioutput_stream.la \
-     $(top_builddir)/modules/types/libscitypes.la \
-     $(LTLIBINTL)
+ COMMON_LIBS = $(LTLIBINTL)
  
  SCILAB_LIB=$(top_builddir)/modules/libscilab.la
- SCILAB_CLI_LIB=$(top_builddir)/modules/libscilab-cli.la
+ SCILAB_CLI_LIB=$(top_builddir)/modules/libscilab-cli/libscilab-cli.la
  
- COMMON_CPPFLAGS = \ 
++COMMON_CPPFLAGS = \
 +    -I$(top_srcdir)/modules/console/includes/ \
 +      -I$(top_srcdir)/modules/output_stream/includes/ \
 +    -I$(top_srcdir)/modules/parse/includes/ \
 +    -I$(top_srcdir)/modules/ast/includes/ \
 +    -I$(top_srcdir)/modules/symbol/includes/ \
 +    -I$(top_srcdir)/modules/functions_manager/includes/ \
 +    -I$(top_srcdir)/modules/types/includes/ \
 +    -I$(top_srcdir)/modules/system_env/includes/ \
 +    -I$(top_srcdir)/modules/operations/includes/ \
 +    -I$(top_srcdir)/modules/elementary_functions/includes/ \
 +    -I$(top_srcdir)/modules/fileio/includes/ \
 +    -I$(top_srcdir)/modules/string/includes/ \
 +    -I$(top_srcdir)/modules/history_manager/includes/ \
 +    -I$(top_srcdir)/modules/threads/includes/ \
 +    -I$(top_srcdir)/modules/api_scilab/includes/ \
 +    -I$(top_srcdir)/libs/dynamiclibrary/includes/ \
 +    $(EIGEN_CPPFLAGS)
 +
 +scilab_bin_SOURCES = \
 +    $(top_srcdir)/modules/core/src/cpp/scilab.cpp \
 +    $(top_srcdir)/modules/core/src/cpp/tasks.cpp
  
 -scilab_bin_SOURCES            = $(top_srcdir)/modules/console/src/c/others/mainscic.c
 +if IS_MACOSX
 +scilab_bin_SOURCES            +=  $(top_srcdir)/modules/core/src/c/initMacOSXEnv.c
 +endif
  
- scilab_bin_LDADD              = $(COMMON_LIBS) $(SCILAB_LIB)
+ scilab_bin_LDADD              = $(COMMON_LIBS) $(SCILAB_LIB) $(FLIBS)
  
 +scilab_bin_CPPFLAGS           = $(COMMON_CPPFLAGS)
 +
  # Match scilab -nwni (ie command line without graphics)
 -scilab_cli_bin_SOURCES        = $(top_srcdir)/modules/console/src/c/others/mainscic.c
 +
 +scilab_cli_bin_SOURCES        =       $(top_srcdir)/modules/core/src/cpp/scilab.cpp \
 +                                                      $(top_srcdir)/modules/core/src/cpp/tasks.cpp
  
  scilab_cli_bin_CFLAGS                 = -DWITHOUT_GUI -I$(top_srcdir)/modules/io/includes
- scilab_cli_bin_LDADD          = $(COMMON_LIBS) $(SCILAB_CLI_LIB)
+ scilab_cli_bin_LDADD          = $(COMMON_LIBS) $(SCILAB_CLI_LIB) $(FLIBS)
  
 +scilab_cli_bin_CPPFLAGS       = -DWITHOUT_GUI $(COMMON_CPPFLAGS)
  
  if NEED_JAVA
  # Don't do it for scilab_cli_bin. We want to be able to call it without
@@@ -196,43 -194,26 +195,37 @@@ call_scilab_readwritestring_LINK = $(LI
        $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
        $(call_scilab_readwritestring_CFLAGS) $(CFLAGS) \
        $(call_scilab_readwritestring_LDFLAGS) $(LDFLAGS) -o $@
 -am_scilab_bin_OBJECTS = scilab_bin-mainscic.$(OBJEXT)
 +am__scilab_bin_SOURCES_DIST =  \
 +      $(top_srcdir)/modules/core/src/cpp/scilab.cpp \
 +      $(top_srcdir)/modules/core/src/cpp/tasks.cpp \
 +      $(top_srcdir)/modules/core/src/c/initMacOSXEnv.c
 +@IS_MACOSX_TRUE@am__objects_1 = scilab_bin-initMacOSXEnv.$(OBJEXT)
 +am_scilab_bin_OBJECTS = scilab_bin-scilab.$(OBJEXT) \
 +      scilab_bin-tasks.$(OBJEXT) $(am__objects_1)
  scilab_bin_OBJECTS = $(am_scilab_bin_OBJECTS)
  am__DEPENDENCIES_1 =
- am__DEPENDENCIES_2 = $(top_builddir)/modules/threads/libscithreads.la \
-       $(top_builddir)/modules/core/libscicore.la \
-       $(top_builddir)/modules/completion/libscicompletion.la \
-       $(top_builddir)/modules/localization/libscilocalization.la \
-       $(top_builddir)/modules/api_scilab/libsciapi_scilab.la \
-       $(top_builddir)/modules/io/libsciio.la \
-       $(top_builddir)/modules/output_stream/libscioutput_stream.la \
-       $(top_builddir)/modules/types/libscitypes.la \
+ am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
+ scilab_bin_DEPENDENCIES = $(am__DEPENDENCIES_2) $(SCILAB_LIB) \
        $(am__DEPENDENCIES_1)
- scilab_bin_DEPENDENCIES = $(am__DEPENDENCIES_2) $(SCILAB_LIB)
 -scilab_bin_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 -      $(LIBTOOLFLAGS) --mode=link $(CCLD) $(scilab_bin_CFLAGS) \
 -      $(CFLAGS) $(scilab_bin_LDFLAGS) $(LDFLAGS) -o $@
 -am_scilab_cli_bin_OBJECTS = scilab_cli_bin-mainscic.$(OBJEXT)
 +scilab_bin_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
 +      $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
 +      $(CXXFLAGS) $(scilab_bin_LDFLAGS) $(LDFLAGS) -o $@
 +am_scilab_cli_bin_OBJECTS = scilab_cli_bin-scilab.$(OBJEXT) \
 +      scilab_cli_bin-tasks.$(OBJEXT)
  scilab_cli_bin_OBJECTS = $(am_scilab_cli_bin_OBJECTS)
- scilab_cli_bin_DEPENDENCIES = $(am__DEPENDENCIES_2) $(SCILAB_CLI_LIB)
+ scilab_cli_bin_DEPENDENCIES = $(am__DEPENDENCIES_2) $(SCILAB_CLI_LIB) \
+       $(am__DEPENDENCIES_1)
 -scilab_cli_bin_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 -      $(LIBTOOLFLAGS) --mode=link $(CCLD) $(scilab_cli_bin_CFLAGS) \
 -      $(CFLAGS) $(scilab_cli_bin_LDFLAGS) $(LDFLAGS) -o $@
 +scilab_cli_bin_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
 +      $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
 +      $(CXXFLAGS) $(scilab_cli_bin_LDFLAGS) $(LDFLAGS) -o $@
  am__scilab_static_bin_SOURCES_DIST =  \
 -      $(top_srcdir)/modules/console/src/c/others/mainscic.c
 -am__objects_1 = scilab_static_bin-mainscic.$(OBJEXT)
 -@ENABLE_STATIC_TRUE@am_scilab_static_bin_OBJECTS = $(am__objects_1)
 +      $(top_srcdir)/modules/core/src/cpp/scilab.cpp \
 +      $(top_srcdir)/modules/core/src/cpp/tasks.cpp \
 +      $(top_srcdir)/modules/core/src/c/initMacOSXEnv.c
 +@IS_MACOSX_TRUE@am__objects_2 =  \
 +@IS_MACOSX_TRUE@      scilab_static_bin-initMacOSXEnv.$(OBJEXT)
 +am__objects_3 = scilab.$(OBJEXT) tasks.$(OBJEXT) $(am__objects_2)
 +@ENABLE_STATIC_TRUE@am_scilab_static_bin_OBJECTS = $(am__objects_3)
  scilab_static_bin_OBJECTS = $(am_scilab_static_bin_OBJECTS)
  @ENABLE_STATIC_TRUE@scilab_static_bin_DEPENDENCIES =  \
  @ENABLE_STATIC_TRUE@  $(top_builddir)/modules/libscilab.la
@@@ -626,50 -596,16 +623,40 @@@ scilab_bin_CFLAGS = -I$(top_srcdir)/mod
  
  # Localization dep already exists because of the `exportLocaleToSystem' symbol
  # (causing issues on some platform)
- COMMON_LIBS = \
-     $(top_builddir)/modules/threads/libscithreads.la \
-     $(top_builddir)/modules/core/libscicore.la \
-     $(top_builddir)/modules/completion/libscicompletion.la \
-     $(top_builddir)/modules/localization/libscilocalization.la \
-     $(top_builddir)/modules/api_scilab/libsciapi_scilab.la \
-     $(top_builddir)/modules/io/libsciio.la \
-     $(top_builddir)/modules/output_stream/libscioutput_stream.la \
-     $(top_builddir)/modules/types/libscitypes.la \
-     $(LTLIBINTL)
+ COMMON_LIBS = $(LTLIBINTL)
  SCILAB_LIB = $(top_builddir)/modules/libscilab.la
- SCILAB_CLI_LIB = $(top_builddir)/modules/libscilab-cli.la
+ SCILAB_CLI_LIB = $(top_builddir)/modules/libscilab-cli/libscilab-cli.la
 -scilab_bin_SOURCES = $(top_srcdir)/modules/console/src/c/others/mainscic.c
 +COMMON_CPPFLAGS = \
 +    -I$(top_srcdir)/modules/console/includes/ \
 +      -I$(top_srcdir)/modules/output_stream/includes/ \
 +    -I$(top_srcdir)/modules/parse/includes/ \
 +    -I$(top_srcdir)/modules/ast/includes/ \
 +    -I$(top_srcdir)/modules/symbol/includes/ \
 +    -I$(top_srcdir)/modules/functions_manager/includes/ \
 +    -I$(top_srcdir)/modules/types/includes/ \
 +    -I$(top_srcdir)/modules/system_env/includes/ \
 +    -I$(top_srcdir)/modules/operations/includes/ \
 +    -I$(top_srcdir)/modules/elementary_functions/includes/ \
 +    -I$(top_srcdir)/modules/fileio/includes/ \
 +    -I$(top_srcdir)/modules/string/includes/ \
 +    -I$(top_srcdir)/modules/history_manager/includes/ \
 +    -I$(top_srcdir)/modules/threads/includes/ \
 +    -I$(top_srcdir)/modules/api_scilab/includes/ \
 +    -I$(top_srcdir)/libs/dynamiclibrary/includes/ \
 +    $(EIGEN_CPPFLAGS)
 +
 +scilab_bin_SOURCES = $(top_srcdir)/modules/core/src/cpp/scilab.cpp \
 +      $(top_srcdir)/modules/core/src/cpp/tasks.cpp $(am__append_3)
- scilab_bin_LDADD = $(COMMON_LIBS) $(SCILAB_LIB)
+ scilab_bin_LDADD = $(COMMON_LIBS) $(SCILAB_LIB) $(FLIBS)
 +scilab_bin_CPPFLAGS = $(COMMON_CPPFLAGS)
  
  # Match scilab -nwni (ie command line without graphics)
 -scilab_cli_bin_SOURCES = $(top_srcdir)/modules/console/src/c/others/mainscic.c
 +scilab_cli_bin_SOURCES = $(top_srcdir)/modules/core/src/cpp/scilab.cpp \
 +                                                      $(top_srcdir)/modules/core/src/cpp/tasks.cpp
 +
  scilab_cli_bin_CFLAGS = -DWITHOUT_GUI -I$(top_srcdir)/modules/io/includes
- scilab_cli_bin_LDADD = $(COMMON_LIBS) $(SCILAB_CLI_LIB)
+ scilab_cli_bin_LDADD = $(COMMON_LIBS) $(SCILAB_CLI_LIB) $(FLIBS)
 +scilab_cli_bin_CPPFLAGS = -DWITHOUT_GUI $(COMMON_CPPFLAGS)
  @ENABLE_STATIC_TRUE@scilab_static_bin_LDFLAGS = -static -static-libgcc --start-group
  @ENABLE_STATIC_TRUE@scilab_static_bin_CFLAGS = -Wl,--start-group `$(CXX) -print-file-name=libstdc++.a`
  @ENABLE_STATIC_TRUE@scilab_static_bin_LDADD = $(top_builddir)/modules/libscilab.la
@@@ -190,12 -207,7 +190,10 @@@ EndProjec
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hashtable", "libs\hashtable\hashtable.vcxproj", "{2DAEC214-B0B4-4BC3-96B2-77C6AD1450CD}"
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjvm", "modules\jvm\libjvm.vcxproj", "{8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470}"
 +      ProjectSection(ProjectDependencies) = postProject
 +              {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0} = {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}
 +      EndProjectSection
  EndProject
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DetectFramework", "libs\DetectFrameWork2\DetectFramework.vcxproj", "{7DCD755A-2906-47B8-9084-2FE6D7F5D5C3}"
- EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GetWindowsVersion", "libs\GetWindowsVersion\GetWindowsVersion.vcxproj", "{982BF37F-42C4-4D37-8D14-60521B141503}"
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MALLOC", "libs\MALLOC\MALLOC.vcxproj", "{6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}"
@@@ -1,20 -1,20 +1,17 @@@
  Microsoft Visual Studio Solution File, Format Version 11.00
  # Visual Studio 2010
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WScilex", "modules\windows_tools\src\c\WScilex\WScilex.vcxproj", "{CCD80549-EB9C-42AA-9B86-D687377E94F6}"
--      ProjectSection(ProjectDependencies) = postProject
--              {8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942} = {8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}
--      EndProjectSection
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BuildMacros", "modules\functions\scripts\buildmacros\BuildMacros.vcxproj", "{66F2FB48-5D68-4445-A856-119F685A371B}"
--      ProjectSection(ProjectDependencies) = postProject
--              {8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942} = {8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}
--      EndProjectSection
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "elementary_functions", "modules\elementary_functions\src\c\elementary_functions.vcxproj", "{5B110267-7C18-437C-B87D-DBA2B50729E9}"
++      ProjectSection(ProjectDependencies) = postProject
++              {96248E56-C84A-4803-9F50-25E2089AB6B8} = {96248E56-C84A-4803-9F50-25E2089AB6B8}
++              {F0F55692-0355-4BC3-BE9D-552C8AAC5238} = {F0F55692-0355-4BC3-BE9D-552C8AAC5238}
++      EndProjectSection
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "elementary_functions_f", "modules\elementary_functions\src\fortran\elementary_functions_f2c.vcxproj", "{DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}"
        ProjectSection(ProjectDependencies) = postProject
--              {13082624-97F9-47DB-A9A1-AD7D6BF3856A} = {13082624-97F9-47DB-A9A1-AD7D6BF3856A}
                {96248E56-C84A-4803-9F50-25E2089AB6B8} = {96248E56-C84A-4803-9F50-25E2089AB6B8}
                {0BB16C71-0FCD-4FB9-B7C0-F2601330C980} = {0BB16C71-0FCD-4FB9-B7C0-F2601330C980}
                {F0F55692-0355-4BC3-BE9D-552C8AAC5238} = {F0F55692-0355-4BC3-BE9D-552C8AAC5238}
@@@ -34,19 -34,19 +31,28 @@@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C
                {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
                {13082624-97F9-47DB-A9A1-AD7D6BF3856A} = {13082624-97F9-47DB-A9A1-AD7D6BF3856A}
                {E6552427-01DD-4C12-823C-09AD46F77FAD} = {E6552427-01DD-4C12-823C-09AD46F77FAD}
++              {9252A034-7F22-4CB1-A634-4577DA69F2D0} = {9252A034-7F22-4CB1-A634-4577DA69F2D0}
                {45ECEB36-A12B-42F5-9D7A-216A0E70601D} = {45ECEB36-A12B-42F5-9D7A-216A0E70601D}
                {C2EDD447-BB60-41A1-973B-8213FCA9ECD4} = {C2EDD447-BB60-41A1-973B-8213FCA9ECD4}
                {97B3664E-1186-400A-AEC0-AC3F23087689} = {97B3664E-1186-400A-AEC0-AC3F23087689}
--              {53A01263-92BE-4C87-AA9A-79297F882310} = {53A01263-92BE-4C87-AA9A-79297F882310}
++              {C4C3EA58-1C27-4EFB-A5BF-0DB24EC5F87A} = {C4C3EA58-1C27-4EFB-A5BF-0DB24EC5F87A}
++              {BB8D4E6F-F09E-49FC-8BCB-9F496F639F60} = {BB8D4E6F-F09E-49FC-8BCB-9F496F639F60}
++              {0BB16C71-0FCD-4FB9-B7C0-F2601330C980} = {0BB16C71-0FCD-4FB9-B7C0-F2601330C980}
                {C352587B-F5E4-457C-80EE-A1AEAB176C8E} = {C352587B-F5E4-457C-80EE-A1AEAB176C8E}
--              {AB1EEB8F-86F7-45B7-8CEC-B18C8E97EEFF} = {AB1EEB8F-86F7-45B7-8CEC-B18C8E97EEFF}
++              {D2B63E7D-1E66-4EFC-892E-FA6DAF4E5895} = {D2B63E7D-1E66-4EFC-892E-FA6DAF4E5895}
++              {D98B0986-14E4-44FD-B006-CACE4B291F38} = {D98B0986-14E4-44FD-B006-CACE4B291F38}
                {F0F55692-0355-4BC3-BE9D-552C8AAC5238} = {F0F55692-0355-4BC3-BE9D-552C8AAC5238}
++              {1D219098-007C-4F76-9AE6-271ABBB7D393} = {1D219098-007C-4F76-9AE6-271ABBB7D393}
++              {EAF0949C-28D2-497C-954F-FC13B32FF2F3} = {EAF0949C-28D2-497C-954F-FC13B32FF2F3}
                {8091E9B6-4C08-4218-A63D-742867CCFE9F} = {8091E9B6-4C08-4218-A63D-742867CCFE9F}
                {28E4E9CA-3EEC-43EE-9F15-56259C6677B8} = {28E4E9CA-3EEC-43EE-9F15-56259C6677B8}
                {E60B43CC-73EA-457E-8DEE-31D0B2BDFA4B} = {E60B43CC-73EA-457E-8DEE-31D0B2BDFA4B}
                {FD0F48D8-9D0B-42A8-A743-B57198FAB41E} = {FD0F48D8-9D0B-42A8-A743-B57198FAB41E}
++              {18F043DA-1DB5-464F-B67D-CF1C23BE7EA0} = {18F043DA-1DB5-464F-B67D-CF1C23BE7EA0}
                {FAF6A7EB-8A36-4278-B34E-34EA89E55304} = {FAF6A7EB-8A36-4278-B34E-34EA89E55304}
                {3A72C3ED-98F7-49C7-B59C-2C6C47FF9390} = {3A72C3ED-98F7-49C7-B59C-2C6C47FF9390}
++              {3735EFF9-925B-45B1-82CF-762658E69E70} = {3735EFF9-925B-45B1-82CF-762658E69E70}
++              {959384FC-016C-4B01-B848-1B18D26B6CC4} = {959384FC-016C-4B01-B848-1B18D26B6CC4}
        EndProjectSection
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "modules\core\src\c\core.vcxproj", "{C6E2BC17-34D8-46E4-85F3-6293CB21ADCD}"
@@@ -59,14 -59,14 +65,8 @@@ EndProjec
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dumpexts", "tools\Dumpexts\Dumpexts.vcxproj", "{3170E4C2-1173-4264-A222-7EE8CCB3DDF7}"
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "graphics", "modules\graphics\graphics.vcxproj", "{8CCDD3C2-B025-4A12-A986-1AA28D7C0C33}"
--      ProjectSection(ProjectDependencies) = postProject
--              {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
--      EndProjectSection
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "integer", "modules\integer\src\c\integer.vcxproj", "{C7865CAA-EC7C-41EB-8324-2B81C384CA20}"
--      ProjectSection(ProjectDependencies) = postProject
--              {F0F55692-0355-4BC3-BE9D-552C8AAC5238} = {F0F55692-0355-4BC3-BE9D-552C8AAC5238}
--      EndProjectSection
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "integer_f", "modules\integer\src\fortran\integer_f2c.vcxproj", "{FD0F48D8-9D0B-42A8-A743-B57198FAB41E}"
        ProjectSection(ProjectDependencies) = postProject
@@@ -82,13 -82,13 +82,10 @@@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gui", "modules\gui\src\c\gui.vcxproj", "{45CA5B12-7601-4968-AE16-16069FD1A152}"
        ProjectSection(ProjectDependencies) = postProject
--              {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0} = {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}
++              {1F4A0344-99ED-461B-BD53-1593788FB34D} = {1F4A0344-99ED-461B-BD53-1593788FB34D}
        EndProjectSection
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "optimization", "modules\optimization\src\c\optimization.vcxproj", "{425B887B-9FC5-4CD2-B632-DBFC000E3E25}"
--      ProjectSection(ProjectDependencies) = postProject
--              {13082624-97F9-47DB-A9A1-AD7D6BF3856A} = {13082624-97F9-47DB-A9A1-AD7D6BF3856A}
--      EndProjectSection
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "optimization_f", "modules\optimization\src\fortran\optimization_f2c.vcxproj", "{1D219098-007C-4F76-9AE6-271ABBB7D393}"
        ProjectSection(ProjectDependencies) = postProject
@@@ -105,10 -105,10 +102,6 @@@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C
        EndProjectSection
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "randlib", "modules\randlib\src\c\randlib.vcxproj", "{34F8E361-D2D9-43B0-93D2-F6CF5FAF6CEB}"
--      ProjectSection(ProjectDependencies) = postProject
--              {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
--              {BB8D4E6F-F09E-49FC-8BCB-9F496F639F60} = {BB8D4E6F-F09E-49FC-8BCB-9F496F639F60}
--      EndProjectSection
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "randlib_f", "modules\randlib\src\fortran\randlib_f2c.vcxproj", "{BB8D4E6F-F09E-49FC-8BCB-9F496F639F60}"
        ProjectSection(ProjectDependencies) = postProject
@@@ -158,31 -158,31 +151,24 @@@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C
        EndProjectSection
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Scilex", "modules\windows_tools\src\c\CScilex\CScilex.vcxproj", "{9BA6F7E4-AE64-4FD9-A5A7-0996A8B73B77}"
--      ProjectSection(ProjectDependencies) = postProject
--              {8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942} = {8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}
--      EndProjectSection
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BuildHelp", "modules\helptools\src\BuildHelp.vcxproj", "{BFE3C796-D755-4BB2-840A-89A98D2A4AC1}"
--      ProjectSection(ProjectDependencies) = postProject
--              {F1D56B26-F11F-4ECE-AB82-127B5E1C58E0} = {F1D56B26-F11F-4ECE-AB82-127B5E1C58E0}
--      EndProjectSection
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmex", "modules\mexlib\src\libmex\libmex.vcxproj", "{0AEC8745-BB5B-4E66-A59A-7251412C3605}"
        ProjectSection(ProjectDependencies) = postProject
                {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
--              {8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942} = {8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}
        EndProjectSection
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmx", "modules\mexlib\src\libmx\libmx.vcxproj", "{CEF88C5F-6820-46D4-BCCD-44D5581481C5}"
        ProjectSection(ProjectDependencies) = postProject
                {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
--              {8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942} = {8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}
++              {64E090DA-DCB5-4F4D-93D7-E88DDEC9C2EF} = {64E090DA-DCB5-4F4D-93D7-E88DDEC9C2EF}
        EndProjectSection
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmat", "modules\mexlib\src\libmat\libmat.vcxproj", "{8A508625-C2AA-4295-AA76-16E4E456D13D}"
        ProjectSection(ProjectDependencies) = postProject
                {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
--              {8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942} = {8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}
++              {64E090DA-DCB5-4F4D-93D7-E88DDEC9C2EF} = {64E090DA-DCB5-4F4D-93D7-E88DDEC9C2EF}
        EndProjectSection
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SetupAtlas", "tools\SetupAtlas\SetupAtlas.vcxproj", "{AAFF2053-3F1E-4B8B-B174-4407A6B98FA5}"
@@@ -192,9 -192,9 +178,6 @@@ EndProjec
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tclsci", "modules\tclsci\tclsci.vcxproj", "{C456D5B8-8A32-496A-A2EE-164B0D734126}"
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Javasci", "modules\javasci\Javasci.vcxproj", "{0BD503EF-5CB6-4277-BAC4-8955C97F247D}"
--      ProjectSection(ProjectDependencies) = postProject
--              {8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942} = {8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}
--      EndProjectSection
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BuildChm", "modules\helptools\src\BuildChm\BuildChm.vcxproj", "{D319F719-F429-4842-A6F9-B1227FE2A54D}"
  EndProject
@@@ -207,8 -207,6 +190,9 @@@ EndProjec
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hashtable", "libs\hashtable\hashtable.vcxproj", "{2DAEC214-B0B4-4BC3-96B2-77C6AD1450CD}"
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjvm", "modules\jvm\libjvm.vcxproj", "{8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470}"
- EndProject
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DetectFramework", "libs\DetectFrameWork2\DetectFramework.vcxproj", "{7DCD755A-2906-47B8-9084-2FE6D7F5D5C3}"
++      ProjectSection(ProjectDependencies) = postProject
++              {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0} = {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}
++      EndProjectSection
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GetWindowsVersion", "libs\GetWindowsVersion\GetWindowsVersion.vcxproj", "{982BF37F-42C4-4D37-8D14-60521B141503}"
  EndProject
@@@ -246,6 -244,6 +230,9 @@@ EndProjec
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "arnoldi", "modules\arnoldi\arnoldi.vcxproj", "{D575A6BA-094A-45EC-8F8D-2DF7A2C37AA6}"
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "signal_processing", "modules\signal_processing\src\c\signal_processing.vcxproj", "{A3AD381E-C0DD-45BB-ACB2-C0A0DB33A606}"
++      ProjectSection(ProjectDependencies) = postProject
++              {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
++      EndProjectSection
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cacsd_f", "modules\cacsd\src\fortran\cacsd_f2c.vcxproj", "{0BB16C71-0FCD-4FB9-B7C0-F2601330C980}"
        ProjectSection(ProjectDependencies) = postProject
@@@ -268,11 -266,11 +255,6 @@@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C
        EndProjectSection
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "linear_algebra", "modules\linear_algebra\src\c\linear_algebra.vcxproj", "{BC462A57-C5B3-4F93-8067-80363827DCDA}"
--      ProjectSection(ProjectDependencies) = postProject
--              {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
--              {C4C3EA58-1C27-4EFB-A5BF-0DB24EC5F87A} = {C4C3EA58-1C27-4EFB-A5BF-0DB24EC5F87A}
--              {3735EFF9-925B-45B1-82CF-762658E69E70} = {3735EFF9-925B-45B1-82CF-762658E69E70}
--      EndProjectSection
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "special_functions", "modules\special_functions\src\c\special_functions.vcxproj", "{C8C13A46-DEB8-44AA-8BF8-C9BBC7FA0B46}"
        ProjectSection(ProjectDependencies) = postProject
@@@ -320,17 -318,17 +302,8 @@@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C
        EndProjectSection
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "interpolation", "modules\interpolation\src\c\interpolation.vcxproj", "{22F14F8F-67C6-49B1-A730-CE70FFE9EB61}"
--      ProjectSection(ProjectDependencies) = postProject
--              {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
--              {D98B0986-14E4-44FD-B006-CACE4B291F38} = {D98B0986-14E4-44FD-B006-CACE4B291F38}
--              {EAF0949C-28D2-497C-954F-FC13B32FF2F3} = {EAF0949C-28D2-497C-954F-FC13B32FF2F3}
--      EndProjectSection
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "data_structures", "modules\data_structures\src\c\data_structures.vcxproj", "{B7A168A0-DFC0-4C6D-B0CC-6079912A4A76}"
--      ProjectSection(ProjectDependencies) = postProject
--              {F0F55692-0355-4BC3-BE9D-552C8AAC5238} = {F0F55692-0355-4BC3-BE9D-552C8AAC5238}
--              {3A72C3ED-98F7-49C7-B59C-2C6C47FF9390} = {3A72C3ED-98F7-49C7-B59C-2C6C47FF9390}
--      EndProjectSection
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "data_structures_f", "modules\data_structures\src\fortran\data_structures_f2c.vcxproj", "{8091E9B6-4C08-4218-A63D-742867CCFE9F}"
        ProjectSection(ProjectDependencies) = postProject
@@@ -349,13 -347,13 +322,6 @@@ EndProjec
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nofftw", "modules\fftw\src\nofftw\nofftw.vcxproj", "{7D4C4BE5-62F7-4886-9E59-645017329A22}"
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fftw", "modules\fftw\fftw.vcxproj", "{13B86307-5A11-48D6-94BE-71F77BCB82D1}"
--      ProjectSection(ProjectDependencies) = postProject
--              {ECFFEB0C-1EDA-45EE-9A10-B18143852E17} = {ECFFEB0C-1EDA-45EE-9A10-B18143852E17}
--              {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
--              {77154919-8A20-4F35-B7C7-6B3B957BDCA1} = {77154919-8A20-4F35-B7C7-6B3B957BDCA1}
--              {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
--              {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
--      EndProjectSection
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "noscicos", "modules\scicos\src\c\noscicos\noscicos.vcxproj", "{0A0B68FA-98F5-4FC2-A9E9-4AC9CEE6A6B4}"
  EndProject
@@@ -386,6 -384,6 +352,9 @@@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C
        EndProjectSection
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dynamiclibrary", "libs\dynamiclibrary\dynamiclibrary.vcxproj", "{77154919-8A20-4F35-B7C7-6B3B957BDCA1}"
++      ProjectSection(ProjectDependencies) = postProject
++              {DD8A0506-8D31-4CF8-856A-C10ECE9C13A4} = {DD8A0506-8D31-4CF8-856A-C10ECE9C13A4}
++      EndProjectSection
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "localization-Ant", "modules\localization\src\java\localization-JAVA.vcxproj", "{FBA3BC3F-8A2C-4D47-A50D-EB808BE42F43}"
        ProjectSection(ProjectDependencies) = postProject
        EndProjectSection
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nographics", "modules\graphics\src\nographics\nographics.vcxproj", "{0AC1142C-0EFF-4406-9E5D-6111A7A8F614}"
--      ProjectSection(ProjectDependencies) = postProject
--              {8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942} = {8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}
--      EndProjectSection
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "renderer-Ant", "modules\renderer\src\java\renderer-JAVA.vcxproj", "{4235A847-ED0E-43A3-B62B-E59CB857EDE9}"
  EndProject
@@@ -451,6 -449,6 +417,9 @@@ EndProjec
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "action_binding-Ant", "modules\action_binding\src\java\action_binding-JAVA.vcxproj", "{B2911268-79E2-4FE5-AD59-2C3CB7CB794E}"
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "output_stream", "modules\output_stream\src\c\output_stream.vcxproj", "{A5911CD7-F8E8-440C-A23E-4843A0636F3A}"
++      ProjectSection(ProjectDependencies) = postProject
++              {E60B43CC-73EA-457E-8DEE-31D0B2BDFA4B} = {E60B43CC-73EA-457E-8DEE-31D0B2BDFA4B}
++      EndProjectSection
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dynamic_link", "modules\dynamic_link\src\c\dynamic_link.vcxproj", "{EAB6C580-22B3-4359-BA1D-DD7499A96163}"
  EndProject
@@@ -484,7 -482,7 +453,6 @@@ EndProjec
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scicos_blocks_f", "modules\scicos_blocks\src\fortran\scicos_blocks_f2c.vcxproj", "{2F7B6080-8D84-43A7-A967-13FC8AA83DEB}"
        ProjectSection(ProjectDependencies) = postProject
                {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
--              {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
                {3A72C3ED-98F7-49C7-B59C-2C6C47FF9390} = {3A72C3ED-98F7-49C7-B59C-2C6C47FF9390}
        EndProjectSection
  EndProject
@@@ -493,9 -491,9 +461,6 @@@ EndProjec
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "umfpack", "modules\umfpack\src\c\umfpack.vcxproj", "{F52E27B6-D1B2-4BC1-9FC9-BE11B11397F0}"
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "matio", "modules\matio\matio.vcxproj", "{7757B22F-9512-4380-9E40-EFD50575028D}"
--      ProjectSection(ProjectDependencies) = postProject
--              {13082624-97F9-47DB-A9A1-AD7D6BF3856A} = {13082624-97F9-47DB-A9A1-AD7D6BF3856A}
--      EndProjectSection
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "helptools", "modules\helptools\src\c\helptools.vcxproj", "{BED4A0F2-5129-487F-9F94-EC09480F04D7}"
  EndProject
@@@ -522,9 -521,9 +488,13 @@@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C
        ProjectSection(ProjectDependencies) = postProject
                {F0F55692-0355-4BC3-BE9D-552C8AAC5238} = {F0F55692-0355-4BC3-BE9D-552C8AAC5238}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
++              {3A72C3ED-98F7-49C7-B59C-2C6C47FF9390} = {3A72C3ED-98F7-49C7-B59C-2C6C47FF9390}
        EndProjectSection
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "functions", "modules\functions\src\c\functions.vcxproj", "{53A01263-92BE-4C87-AA9A-79297F882310}"
++      ProjectSection(ProjectDependencies) = postProject
++              {E6552427-01DD-4C12-823C-09AD46F77FAD} = {E6552427-01DD-4C12-823C-09AD46F77FAD}
++      EndProjectSection
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "functions_f", "modules\functions\src\fortran\functions_f2c.vcxproj", "{E6552427-01DD-4C12-823C-09AD46F77FAD}"
        ProjectSection(ProjectDependencies) = postProject
@@@ -536,12 -535,12 +506,22 @@@ EndProjec
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "api_scilab", "modules\api_scilab\api_scilab.vcxproj", "{43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}"
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hdf5", "modules\hdf5\src\c\hdf5.vcxproj", "{A824EA62-AF07-4F43-9036-0E63990556BD}"
++      ProjectSection(ProjectDependencies) = postProject
++              {1F4A0344-99ED-461B-BD53-1593788FB34D} = {1F4A0344-99ED-461B-BD53-1593788FB34D}
++      EndProjectSection
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hdf5-Ant", "modules\hdf5\src\java\hdf5-JAVA.vcxproj", "{9B6500B0-66F6-44F0-910D-47A1435B4E02}"
        ProjectSection(ProjectDependencies) = postProject
                {DD8A0506-8D31-4CF8-856A-C10ECE9C13A4} = {DD8A0506-8D31-4CF8-856A-C10ECE9C13A4}
        EndProjectSection
  EndProject
++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "operations", "modules\operations\operations.vcxproj", "{1BB396F7-CE61-4CFC-9C22-266B2CFB2E74}"
++      ProjectSection(ProjectDependencies) = postProject
++              {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
++              {3A72C3ED-98F7-49C7-B59C-2C6C47FF9390} = {3A72C3ED-98F7-49C7-B59C-2C6C47FF9390}
++              {3735EFF9-925B-45B1-82CF-762658E69E70} = {3735EFF9-925B-45B1-82CF-762658E69E70}
++      EndProjectSection
++EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scinotes-Ant", "modules\scinotes\src\java\scinotes-JAVA.vcxproj", "{43B095CB-B86C-44CB-BCE8-87FE8E7D2A0E}"
        ProjectSection(ProjectDependencies) = postProject
                {63965A84-E354-4CBC-BFAC-FDFC8224573F} = {63965A84-E354-4CBC-BFAC-FDFC8224573F}
                {B5E4D0C2-8C6A-4437-81BF-DBFA95900C9D} = {B5E4D0C2-8C6A-4437-81BF-DBFA95900C9D}
        EndProjectSection
  EndProject
--Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scinotes", "modules\scinotes\src\c\scinotes.vcxproj", "{BAE68B54-2C1A-44D0-A0E9-05156A784E79}"
++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "elem_func", "modules\elementary_functions\src\cpp\elem_func\elem_func.vcxproj", "{E1284D3E-4B3F-446B-B541-F661A8A166A7}"
++      ProjectSection(ProjectDependencies) = postProject
++              {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
++      EndProjectSection
  EndProject
--Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xcos", "modules\xcos\src\c\xcos.vcxproj", "{494FA8C9-6C85-4175-BE4C-9A113C7A3278}"
++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "elem_func_gw", "modules\elementary_functions\sci_gateway\cpp\elem_func_gw\elem_func_gw.vcxproj", "{9881F0CE-A1AC-4744-B709-7C1453A77B95}"
++      ProjectSection(ProjectDependencies) = postProject
++              {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
++              {1F4A0344-99ED-461B-BD53-1593788FB34D} = {1F4A0344-99ED-461B-BD53-1593788FB34D}
++      EndProjectSection
  EndProject
--Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xcos-Ant", "modules\xcos\src\java\xcos-JAVA.vcxproj", "{F6DA4FFA-E405-4DCF-883B-A3C1713F8C5D}"
++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "functions_manager", "modules\functions_manager\functions_manager.vcxproj", "{8EAC9381-C059-43EA-B5D7-FD5D6997B0BD}"
        ProjectSection(ProjectDependencies) = postProject
--              {FBA3BC3F-8A2C-4D47-A50D-EB808BE42F43} = {FBA3BC3F-8A2C-4D47-A50D-EB808BE42F43}
-               {B2911268-79E2-4FE5-AD59-2C3CB7CB794E} = {B2911268-79E2-4FE5-AD59-2C3CB7CB794E}
-               {9188FA91-E039-485D-AF1D-781CEA92F541} = {9188FA91-E039-485D-AF1D-781CEA92F541}
-               {F01C26E3-E409-4E74-BA84-C7C4A71A7FDC} = {F01C26E3-E409-4E74-BA84-C7C4A71A7FDC}
 -              {78D8B862-964A-4D0E-93D2-CA8A25BA1207} = {78D8B862-964A-4D0E-93D2-CA8A25BA1207}
 -              {B2911268-79E2-4FE5-AD59-2C3CB7CB794E} = {B2911268-79E2-4FE5-AD59-2C3CB7CB794E}
 -              {9188FA91-E039-485D-AF1D-781CEA92F541} = {9188FA91-E039-485D-AF1D-781CEA92F541}
 -              {F01C26E3-E409-4E74-BA84-C7C4A71A7FDC} = {F01C26E3-E409-4E74-BA84-C7C4A71A7FDC}
++              {9594AC02-20EE-4FBF-95B4-BFA5865ED7CA} = {9594AC02-20EE-4FBF-95B4-BFA5865ED7CA}
++              {9252A034-7F22-4CB1-A634-4577DA69F2D0} = {9252A034-7F22-4CB1-A634-4577DA69F2D0}
        EndProjectSection
  EndProject
++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "parse", "modules\parse\parse.vcxproj", "{74D43792-DBFC-47F0-ADBC-4D7A20CDADA2}"
++EndProject
++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "symbol", "modules\symbol\symbol.vcxproj", "{2C60033B-0DBD-4CA4-80D3-176C9BE9CE2F}"
++EndProject
++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "types", "modules\types\types.vcxproj", "{64E090DA-DCB5-4F4D-93D7-E88DDEC9C2EF}"
++      ProjectSection(ProjectDependencies) = postProject
++              {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
++      EndProjectSection
++EndProject
++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "system_env", "modules\system_env\system_env.vcxproj", "{7CA60AEF-9AFA-4D06-AF28-613C0AA27640}"
++      ProjectSection(ProjectDependencies) = postProject
++              {1F4A0344-99ED-461B-BD53-1593788FB34D} = {1F4A0344-99ED-461B-BD53-1593788FB34D}
++      EndProjectSection
++EndProject
++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core_yasp", "modules\core\core_yasp.vcxproj", "{14373D41-991A-412E-8EA7-A832D98047B8}"
++      ProjectSection(ProjectDependencies) = postProject
++              {9252A034-7F22-4CB1-A634-4577DA69F2D0} = {9252A034-7F22-4CB1-A634-4577DA69F2D0}
++      EndProjectSection
++EndProject
++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "boolean_gw", "modules\boolean\src\cpp\boolean_gw.vcxproj", "{09E6CF32-EF2F-4C63-A2B8-B04964768BD6}"
++EndProject
++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core_gw", "modules\core\src\cpp\core_gw.vcxproj", "{3E933EB6-D427-4828-9B30-B6B9987491F6}"
++      ProjectSection(ProjectDependencies) = postProject
++              {1F4A0344-99ED-461B-BD53-1593788FB34D} = {1F4A0344-99ED-461B-BD53-1593788FB34D}
++      EndProjectSection
++EndProject
++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "io_gw", "modules\io\src\cpp\io_gw.vcxproj", "{719EC179-3AD3-4C6B-BBD8-B44C96B1A204}"
++      ProjectSection(ProjectDependencies) = postProject
++              {9252A034-7F22-4CB1-A634-4577DA69F2D0} = {9252A034-7F22-4CB1-A634-4577DA69F2D0}
++              {C2EDD447-BB60-41A1-973B-8213FCA9ECD4} = {C2EDD447-BB60-41A1-973B-8213FCA9ECD4}
++      EndProjectSection
++EndProject
++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xcos", "modules\xcos\src\c\xcos.vcxproj", "{494FA8C9-6C85-4175-BE4C-9A113C7A3278}"
++EndProject
++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xcos-Ant", "modules\xcos\src\java\xcos-JAVA.vcxproj", "{F6DA4FFA-E405-4DCF-883B-A3C1713F8C5D}"
++EndProject
++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "types_gw", "modules\types\sci_gateway\cpp\types_gw\types_gw.vcxproj", "{C2E5F4F6-5EE7-4B36-BFAC-4AC36BB41420}"
++EndProject
++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "functions_gw", "modules\functions\sci_gateway\cpp\functions_gw.vcxproj", "{67FF36D3-EC5A-4F0D-BF3B-A84A66D77294}"
++EndProject
++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "output_stream_gw", "modules\output_stream\sci_gateway\cpp\output_stream_gw\output_stream_gw.vcxproj", "{C000FDF7-4D32-4630-9595-560D9CC66D11}"
++EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "modelicat", "modules\scicos\src\translator\translator.vcxproj", "{9E0DE362-60A0-4584-9FF1-BB537DA94F40}"
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml2modelica", "modules\scicos\src\xml2modelica\xml2modelica.vcxproj", "{7CF15086-6DED-4F83-9C40-C4951FD373B3}"
@@@ -573,6 -573,6 +600,13 @@@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C
                {9188FA91-E039-485D-AF1D-781CEA92F541} = {9188FA91-E039-485D-AF1D-781CEA92F541}
        EndProjectSection
  EndProject
++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "integer_gw", "modules\integer\src\cpp\integer_gw.vcxproj", "{215274D7-05EC-4D1E-B7BB-B2C957DA960B}"
++      ProjectSection(ProjectDependencies) = postProject
++              {1F4A0344-99ED-461B-BD53-1593788FB34D} = {1F4A0344-99ED-461B-BD53-1593788FB34D}
++      EndProjectSection
++EndProject
++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "matio_gw", "modules\matio\sci_gateway\cpp\matio_gw.vcxproj", "{764FAC09-369D-4C11-A0FF-CE097D9A4FAF}"
++EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "types-Ant", "modules\types\src\java\types-JAVA.vcxproj", "{ABCB724E-8534-4420-AC12-7C33A606ABA3}"
        ProjectSection(ProjectDependencies) = postProject
                {DD8A0506-8D31-4CF8-856A-C10ECE9C13A4} = {DD8A0506-8D31-4CF8-856A-C10ECE9C13A4}
@@@ -582,25 -582,25 +616,31 @@@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "parameters", "modules\parameters\parameters.vcxproj", "{A09E8584-0713-48A5-97BA-ACED0F3728F8}"
  EndProject
--Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "graph-JAVA-tests", "modules\graph\tests\java\graph-JAVA-tests.vcxproj", "{AB7EBA0D-1B00-4B1B-BB00-62AB38E2309A}"
--EndProject
--Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hdf5-JAVA-tests", "modules\hdf5\tests\java\hdf5-JAVA-tests.vcxproj", "{78D46B73-ADD7-40CF-8436-B66897B18D9A}"
++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fileio_gw", "modules\fileio\sci_gateway\cpp\fileio_gw.vcxproj", "{6D9647CE-9CB9-4B16-B34D-8542484EFBB0}"
++      ProjectSection(ProjectDependencies) = postProject
++              {9252A034-7F22-4CB1-A634-4577DA69F2D0} = {9252A034-7F22-4CB1-A634-4577DA69F2D0}
++              {1F4A0344-99ED-461B-BD53-1593788FB34D} = {1F4A0344-99ED-461B-BD53-1593788FB34D}
++      EndProjectSection
  EndProject
--Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xcos-JAVA-tests", "modules\xcos\tests\java\xcos-JAVA-tests.vcxproj", "{DABDF840-2A2F-4B38-90B2-A4393E6DF38B}"
++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "time_gw", "modules\time\sci_gateway\cpp\time_gw.vcxproj", "{28305722-6486-481D-BD0F-B4398D8A09C5}"
++      ProjectSection(ProjectDependencies) = postProject
++              {1F4A0344-99ED-461B-BD53-1593788FB34D} = {1F4A0344-99ED-461B-BD53-1593788FB34D}
++      EndProjectSection
  EndProject
--Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ui_data", "modules\ui_data\src\c\ui_data.vcxproj", "{142D643B-A9EC-49DB-9D48-A925A20F63B1}"
++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "string_gw", "modules\string\sci_gateway\cpp\string_gw.vcxproj", "{AEC1F7B5-28F2-4C1F-A436-98D0352FD3F5}"
++      ProjectSection(ProjectDependencies) = postProject
++              {1F4A0344-99ED-461B-BD53-1593788FB34D} = {1F4A0344-99ED-461B-BD53-1593788FB34D}
++      EndProjectSection
  EndProject
--Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ui_data-Ant", "modules\ui_data\src\java\ui_data-JAVA.vcxproj", "{405E6B33-DBA9-4850-A19F-19298DA5A64D}"
++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "history_browser", "modules\history_browser\src\c\history_browser.vcxproj", "{AB1EEB8F-86F7-45B7-8CEC-B18C8E97EEFF}"
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "history_browser-Ant", "modules\history_browser\src\java\history_browser-JAVA.vcxproj", "{95C21D50-FFD1-4FCE-A545-49FA1F825B28}"
  EndProject
--Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "history_browser", "modules\history_browser\src\c\history_browser.vcxproj", "{AB1EEB8F-86F7-45B7-8CEC-B18C8E97EEFF}"
--EndProject
--Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nolibjvm", "modules\jvm\src\nojvm\nojvm.vcxproj", "{889AD61B-12E9-4F85-8525-B83C16C88C3F}"
++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ui_data", "modules\ui_data\src\c\ui_data.vcxproj", "{142D643B-A9EC-49DB-9D48-A925A20F63B1}"
  EndProject
--Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nogui", "modules\gui\src\nogui\nogui.vcxproj", "{58A50B97-FA8D-4700-9E4A-C4993638EB7A}"
++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ui_data-Ant", "modules\ui_data\src\java\ui_data-JAVA.vcxproj", "{405E6B33-DBA9-4850-A19F-19298DA5A64D}"
  EndProject
--Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nohistory_browser", "modules\history_browser\src\nohistory_browser\nohistory_browser.vcxproj", "{6EA99B1F-99B4-4528-8195-7508EF70CFED}"
++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scinotes", "modules\scinotes\src\c\scinotes.vcxproj", "{BAE68B54-2C1A-44D0-A0E9-05156A784E79}"
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "commons-Ant", "modules\commons\src\java\commons-JAVA.vcxproj", "{9188FA91-E039-485D-AF1D-781CEA92F541}"
        ProjectSection(ProjectDependencies) = postProject
@@@ -615,18 -613,18 +653,46 @@@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "javasci-JAVA-tests", "modules\javasci\tests\java\javasci-JAVA-tests.vcxproj", "{9BE8D73A-7E83-46ED-A9E2-1E3472F52AE5}"
  EndProject
--Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BuildJavadoc", "modules\helptools\src\javadoc\javadoc.vcxproj", "{F1D56B26-F11F-4ECE-AB82-127B5E1C58E0}"
++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "localization_gw", "modules\localization\sci_gateway\cpp\localization_gw.vcxproj", "{7A68EDC6-F0AF-47D1-BB16-B8A9DCD9202D}"
++EndProject
++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjvm_gw", "modules\jvm\sci_gateway\cpp\libjvm_gw.vcxproj", "{2D02DD0E-CBF5-493E-AA06-1E289ED24666}"
+ EndProject
 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ant-all", "Visual-Studio-settings\ant-all\ant-all.vcxproj", "{A9A2020D-5541-44F2-B080-DF3C9426C409}"
++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ast", "modules\ast\ast.vcxproj", "{0D3FA25B-8116-44EC-A45E-260789DAA3D9}"
++      ProjectSection(ProjectDependencies) = postProject
++              {1F4A0344-99ED-461B-BD53-1593788FB34D} = {1F4A0344-99ED-461B-BD53-1593788FB34D}
++              {7CA60AEF-9AFA-4D06-AF28-613C0AA27640} = {7CA60AEF-9AFA-4D06-AF28-613C0AA27640}
++      EndProjectSection
  EndProject
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ant-all", "Visual-Studio-settings\ant-all\ant-all.vcxproj", "{A9A2020D-5541-44F2-B080-DF3C9426C409}"
 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "swig-all", "Visual-Studio-settings\swig-all\swig-all.vcxproj", "{85303A11-CF6B-432F-B3FD-24DEFFB51025}"
++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ast-tools", "modules\ast\ast-tools\ast-tools.vcxproj", "{1F4A0344-99ED-461B-BD53-1593788FB34D}"
  EndProject
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "swig-all", "Visual-Studio-settings\swig-all\swig-all.vcxproj", "{85303A11-CF6B-432F-B3FD-24DEFFB51025}"
 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "giws-all", "Visual-Studio-settings\giws-all\giws-all.vcxproj", "{88E95224-A931-4B3E-AC6C-5A40B3961421}"
++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dynamic_link_gw", "modules\dynamic_link\sci_gateway\cpp\dynamic_link_gw.vcxproj", "{F93FF3EE-217A-4554-AB17-2F8D56B4BF4B}"
  EndProject
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "giws-all", "Visual-Studio-settings\giws-all\giws-all.vcxproj", "{88E95224-A931-4B3E-AC6C-5A40B3961421}"
 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-all", "Visual-Studio-settings\test-all\test-all.vcxproj", "{439D04EC-A444-48BE-8E55-8CD2BB66B782}"
++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "typesmacro", "modules\types\typesmacro\typesmacro.vcxproj", "{9252A034-7F22-4CB1-A634-4577DA69F2D0}"
 +EndProject
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-all", "Visual-Studio-settings\test-all\test-all.vcxproj", "{439D04EC-A444-48BE-8E55-8CD2BB66B782}"
++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "action_binding_gw", "modules\action_binding\sci_gateway\cpp\action_binding_gw.vcxproj", "{3419B733-85A2-4F66-BC04-A5A8DC8FA057}"
++EndProject
++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "threads", "modules\threads\threads.vcxproj", "{50A1FFC8-ADC2-4D9E-A2D0-5DCD63188AE9}"
++EndProject
++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BuildJavadoc", "modules\helptools\src\javadoc\javadoc.vcxproj", "{F1D56B26-F11F-4ECE-AB82-127B5E1C58E0}"
++EndProject
++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "history_manager_gw", "modules\history_manager\sci_gateway\cpp\history_manager_gw.vcxproj", "{CE49C183-2ECE-4EA4-B289-D74E2E664164}"
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "noui_data", "modules\ui_data\src\noui_data\noui_data.vcxproj", "{337A52F8-310E-49E3-A2BA-F19CA32EB617}"
  EndProject
++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "console_gw", "modules\console\sci_gateway\cpp\console_gw.vcxproj", "{273B1F5C-C137-46D1-B516-FFE5764FABE5}"
++EndProject
++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "signal_processing_gw", "modules\signal_processing\sci_gateway\cpp\signal_processing_gw.vcxproj", "{A968A82E-B2DC-4ED2-BD9B-12C1E97ABBB4}"
++      ProjectSection(ProjectDependencies) = postProject
++              {959384FC-016C-4B01-B848-1B18D26B6CC4} = {959384FC-016C-4B01-B848-1B18D26B6CC4}
++      EndProjectSection
++EndProject
++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "linear_algebra_gw", "modules\linear_algebra\sci_gateway\cpp\linear_algebra_gw.vcxproj", "{EE43BE6D-817D-4B09-AC40-7E6AC5BDB80D}"
++EndProject
++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "statistics_gw", "modules\statistics\sci_gateway\cpp\statistics_gw.vcxproj", "{EAE1009F-B967-43C4-9408-97A37EFA8678}"
++      ProjectSection(ProjectDependencies) = postProject
++              {18F043DA-1DB5-464F-B67D-CF1C23BE7EA0} = {18F043DA-1DB5-464F-B67D-CF1C23BE7EA0}
++      EndProjectSection
++EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "types-JAVA-tests", "modules\types\tests\java\types-JAVA-tests.vcxproj", "{3F4504A3-1116-40BD-9612-F5E83D09CC99}"
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml", "modules\xml\xml.vcxproj", "{EF5402DA-29FD-4F1B-B98B-D284D4E27C15}"
@@@ -1647,6 -1639,6 +1705,14 @@@ Globa
                {9B6500B0-66F6-44F0-910D-47A1435B4E02}.Release|Win32.Build.0 = Release|Win32
                {9B6500B0-66F6-44F0-910D-47A1435B4E02}.Release|x64.ActiveCfg = Release|x64
                {9B6500B0-66F6-44F0-910D-47A1435B4E02}.Release|x64.Build.0 = Release|x64
++              {1BB396F7-CE61-4CFC-9C22-266B2CFB2E74}.Debug|Win32.ActiveCfg = Debug|Win32
++              {1BB396F7-CE61-4CFC-9C22-266B2CFB2E74}.Debug|Win32.Build.0 = Debug|Win32
++              {1BB396F7-CE61-4CFC-9C22-266B2CFB2E74}.Debug|x64.ActiveCfg = Debug|x64
++              {1BB396F7-CE61-4CFC-9C22-266B2CFB2E74}.Debug|x64.Build.0 = Debug|x64
++              {1BB396F7-CE61-4CFC-9C22-266B2CFB2E74}.Release|Win32.ActiveCfg = Release|Win32
++              {1BB396F7-CE61-4CFC-9C22-266B2CFB2E74}.Release|Win32.Build.0 = Release|Win32
++              {1BB396F7-CE61-4CFC-9C22-266B2CFB2E74}.Release|x64.ActiveCfg = Release|x64
++              {1BB396F7-CE61-4CFC-9C22-266B2CFB2E74}.Release|x64.Build.0 = Release|x64
                {43B095CB-B86C-44CB-BCE8-87FE8E7D2A0E}.Debug|Win32.ActiveCfg = Debug|Win32
                {43B095CB-B86C-44CB-BCE8-87FE8E7D2A0E}.Debug|Win32.Build.0 = Debug|Win32
                {43B095CB-B86C-44CB-BCE8-87FE8E7D2A0E}.Debug|x64.ActiveCfg = Debug|x64
                {43B095CB-B86C-44CB-BCE8-87FE8E7D2A0E}.Release|Win32.Build.0 = Release|Win32
                {43B095CB-B86C-44CB-BCE8-87FE8E7D2A0E}.Release|x64.ActiveCfg = Release|x64
                {43B095CB-B86C-44CB-BCE8-87FE8E7D2A0E}.Release|x64.Build.0 = Release|x64
--              {BAE68B54-2C1A-44D0-A0E9-05156A784E79}.Debug|Win32.ActiveCfg = Debug|Win32
--              {BAE68B54-2C1A-44D0-A0E9-05156A784E79}.Debug|Win32.Build.0 = Debug|Win32
--              {BAE68B54-2C1A-44D0-A0E9-05156A784E79}.Debug|x64.ActiveCfg = Debug|x64
--              {BAE68B54-2C1A-44D0-A0E9-05156A784E79}.Debug|x64.Build.0 = Debug|x64
--              {BAE68B54-2C1A-44D0-A0E9-05156A784E79}.Release|Win32.ActiveCfg = Release|Win32
--              {BAE68B54-2C1A-44D0-A0E9-05156A784E79}.Release|Win32.Build.0 = Release|Win32
--              {BAE68B54-2C1A-44D0-A0E9-05156A784E79}.Release|x64.ActiveCfg = Release|x64
--              {BAE68B54-2C1A-44D0-A0E9-05156A784E79}.Release|x64.Build.0 = Release|x64
++              {E1284D3E-4B3F-446B-B541-F661A8A166A7}.Debug|Win32.ActiveCfg = Debug|Win32
++              {E1284D3E-4B3F-446B-B541-F661A8A166A7}.Debug|Win32.Build.0 = Debug|Win32
++              {E1284D3E-4B3F-446B-B541-F661A8A166A7}.Debug|x64.ActiveCfg = Debug|x64
++              {E1284D3E-4B3F-446B-B541-F661A8A166A7}.Debug|x64.Build.0 = Debug|x64
++              {E1284D3E-4B3F-446B-B541-F661A8A166A7}.Release|Win32.ActiveCfg = Release|Win32
++              {E1284D3E-4B3F-446B-B541-F661A8A166A7}.Release|Win32.Build.0 = Release|Win32
++              {E1284D3E-4B3F-446B-B541-F661A8A166A7}.Release|x64.ActiveCfg = Release|x64
++              {E1284D3E-4B3F-446B-B541-F661A8A166A7}.Release|x64.Build.0 = Release|x64
++              {9881F0CE-A1AC-4744-B709-7C1453A77B95}.Debug|Win32.ActiveCfg = Debug|Win32
++              {9881F0CE-A1AC-4744-B709-7C1453A77B95}.Debug|Win32.Build.0 = Debug|Win32
++              {9881F0CE-A1AC-4744-B709-7C1453A77B95}.Debug|x64.ActiveCfg = Debug|x64
++              {9881F0CE-A1AC-4744-B709-7C1453A77B95}.Debug|x64.Build.0 = Debug|x64
++              {9881F0CE-A1AC-4744-B709-7C1453A77B95}.Release|Win32.ActiveCfg = Release|Win32
++              {9881F0CE-A1AC-4744-B709-7C1453A77B95}.Release|Win32.Build.0 = Release|Win32
++              {9881F0CE-A1AC-4744-B709-7C1453A77B95}.Release|x64.ActiveCfg = Release|x64
++              {9881F0CE-A1AC-4744-B709-7C1453A77B95}.Release|x64.Build.0 = Release|x64
++              {8EAC9381-C059-43EA-B5D7-FD5D6997B0BD}.Debug|Win32.ActiveCfg = Debug|Win32
++              {8EAC9381-C059-43EA-B5D7-FD5D6997B0BD}.Debug|Win32.Build.0 = Debug|Win32
++              {8EAC9381-C059-43EA-B5D7-FD5D6997B0BD}.Debug|x64.ActiveCfg = Debug|x64
++              {8EAC9381-C059-43EA-B5D7-FD5D6997B0BD}.Debug|x64.Build.0 = Debug|x64
++              {8EAC9381-C059-43EA-B5D7-FD5D6997B0BD}.Release|Win32.ActiveCfg = Release|Win32
++              {8EAC9381-C059-43EA-B5D7-FD5D6997B0BD}.Release|Win32.Build.0 = Release|Win32
++              {8EAC9381-C059-43EA-B5D7-FD5D6997B0BD}.Release|x64.ActiveCfg = Release|x64
++              {8EAC9381-C059-43EA-B5D7-FD5D6997B0BD}.Release|x64.Build.0 = Release|x64
++              {74D43792-DBFC-47F0-ADBC-4D7A20CDADA2}.Debug|Win32.ActiveCfg = Debug|Win32
++              {74D43792-DBFC-47F0-ADBC-4D7A20CDADA2}.Debug|Win32.Build.0 = Debug|Win32
++              {74D43792-DBFC-47F0-ADBC-4D7A20CDADA2}.Debug|x64.ActiveCfg = Debug|x64
++              {74D43792-DBFC-47F0-ADBC-4D7A20CDADA2}.Debug|x64.Build.0 = Debug|x64
++              {74D43792-DBFC-47F0-ADBC-4D7A20CDADA2}.Release|Win32.ActiveCfg = Release|Win32
++              {74D43792-DBFC-47F0-ADBC-4D7A20CDADA2}.Release|Win32.Build.0 = Release|Win32
++              {74D43792-DBFC-47F0-ADBC-4D7A20CDADA2}.Release|x64.ActiveCfg = Release|x64
++              {74D43792-DBFC-47F0-ADBC-4D7A20CDADA2}.Release|x64.Build.0 = Release|x64
++              {2C60033B-0DBD-4CA4-80D3-176C9BE9CE2F}.Debug|Win32.ActiveCfg = Debug|Win32
++              {2C60033B-0DBD-4CA4-80D3-176C9BE9CE2F}.Debug|Win32.Build.0 = Debug|Win32
++              {2C60033B-0DBD-4CA4-80D3-176C9BE9CE2F}.Debug|x64.ActiveCfg = Debug|x64
++              {2C60033B-0DBD-4CA4-80D3-176C9BE9CE2F}.Debug|x64.Build.0 = Debug|x64
++              {2C60033B-0DBD-4CA4-80D3-176C9BE9CE2F}.Release|Win32.ActiveCfg = Release|Win32
++              {2C60033B-0DBD-4CA4-80D3-176C9BE9CE2F}.Release|Win32.Build.0 = Release|Win32
++              {2C60033B-0DBD-4CA4-80D3-176C9BE9CE2F}.Release|x64.ActiveCfg = Release|x64
++              {2C60033B-0DBD-4CA4-80D3-176C9BE9CE2F}.Release|x64.Build.0 = Release|x64
++              {64E090DA-DCB5-4F4D-93D7-E88DDEC9C2EF}.Debug|Win32.ActiveCfg = Debug|Win32
++              {64E090DA-DCB5-4F4D-93D7-E88DDEC9C2EF}.Debug|Win32.Build.0 = Debug|Win32
++              {64E090DA-DCB5-4F4D-93D7-E88DDEC9C2EF}.Debug|x64.ActiveCfg = Debug|x64
++              {64E090DA-DCB5-4F4D-93D7-E88DDEC9C2EF}.Debug|x64.Build.0 = Debug|x64
++              {64E090DA-DCB5-4F4D-93D7-E88DDEC9C2EF}.Release|Win32.ActiveCfg = Release|Win32
++              {64E090DA-DCB5-4F4D-93D7-E88DDEC9C2EF}.Release|Win32.Build.0 = Release|Win32
++              {64E090DA-DCB5-4F4D-93D7-E88DDEC9C2EF}.Release|x64.ActiveCfg = Release|x64
++              {64E090DA-DCB5-4F4D-93D7-E88DDEC9C2EF}.Release|x64.Build.0 = Release|x64
++              {7CA60AEF-9AFA-4D06-AF28-613C0AA27640}.Debug|Win32.ActiveCfg = Debug|Win32
++              {7CA60AEF-9AFA-4D06-AF28-613C0AA27640}.Debug|Win32.Build.0 = Debug|Win32
++              {7CA60AEF-9AFA-4D06-AF28-613C0AA27640}.Debug|x64.ActiveCfg = Debug|x64
++              {7CA60AEF-9AFA-4D06-AF28-613C0AA27640}.Debug|x64.Build.0 = Debug|x64
++              {7CA60AEF-9AFA-4D06-AF28-613C0AA27640}.Release|Win32.ActiveCfg = Release|Win32
++              {7CA60AEF-9AFA-4D06-AF28-613C0AA27640}.Release|Win32.Build.0 = Release|Win32
++              {7CA60AEF-9AFA-4D06-AF28-613C0AA27640}.Release|x64.ActiveCfg = Release|x64
++              {7CA60AEF-9AFA-4D06-AF28-613C0AA27640}.Release|x64.Build.0 = Release|x64
++              {14373D41-991A-412E-8EA7-A832D98047B8}.Debug|Win32.ActiveCfg = Debug|Win32
++              {14373D41-991A-412E-8EA7-A832D98047B8}.Debug|Win32.Build.0 = Debug|Win32
++              {14373D41-991A-412E-8EA7-A832D98047B8}.Debug|x64.ActiveCfg = Debug|x64
++              {14373D41-991A-412E-8EA7-A832D98047B8}.Debug|x64.Build.0 = Debug|x64
++              {14373D41-991A-412E-8EA7-A832D98047B8}.Release|Win32.ActiveCfg = Release|Win32
++              {14373D41-991A-412E-8EA7-A832D98047B8}.Release|Win32.Build.0 = Release|Win32
++              {14373D41-991A-412E-8EA7-A832D98047B8}.Release|x64.ActiveCfg = Release|x64
++              {14373D41-991A-412E-8EA7-A832D98047B8}.Release|x64.Build.0 = Release|x64
++              {09E6CF32-EF2F-4C63-A2B8-B04964768BD6}.Debug|Win32.ActiveCfg = Debug|Win32
++              {09E6CF32-EF2F-4C63-A2B8-B04964768BD6}.Debug|Win32.Build.0 = Debug|Win32
++              {09E6CF32-EF2F-4C63-A2B8-B04964768BD6}.Debug|x64.ActiveCfg = Debug|x64
++              {09E6CF32-EF2F-4C63-A2B8-B04964768BD6}.Debug|x64.Build.0 = Debug|x64
++              {09E6CF32-EF2F-4C63-A2B8-B04964768BD6}.Release|Win32.ActiveCfg = Release|Win32
++              {09E6CF32-EF2F-4C63-A2B8-B04964768BD6}.Release|Win32.Build.0 = Release|Win32
++              {09E6CF32-EF2F-4C63-A2B8-B04964768BD6}.Release|x64.ActiveCfg = Release|x64
++              {09E6CF32-EF2F-4C63-A2B8-B04964768BD6}.Release|x64.Build.0 = Release|x64
++              {3E933EB6-D427-4828-9B30-B6B9987491F6}.Debug|Win32.ActiveCfg = Debug|Win32
++              {3E933EB6-D427-4828-9B30-B6B9987491F6}.Debug|Win32.Build.0 = Debug|Win32
++              {3E933EB6-D427-4828-9B30-B6B9987491F6}.Debug|x64.ActiveCfg = Debug|x64
++              {3E933EB6-D427-4828-9B30-B6B9987491F6}.Debug|x64.Build.0 = Debug|x64
++              {3E933EB6-D427-4828-9B30-B6B9987491F6}.Release|Win32.ActiveCfg = Release|Win32
++              {3E933EB6-D427-4828-9B30-B6B9987491F6}.Release|Win32.Build.0 = Release|Win32
++              {3E933EB6-D427-4828-9B30-B6B9987491F6}.Release|x64.ActiveCfg = Release|x64
++              {3E933EB6-D427-4828-9B30-B6B9987491F6}.Release|x64.Build.0 = Release|x64
++              {719EC179-3AD3-4C6B-BBD8-B44C96B1A204}.Debug|Win32.ActiveCfg = Debug|Win32
++              {719EC179-3AD3-4C6B-BBD8-B44C96B1A204}.Debug|Win32.Build.0 = Debug|Win32
++              {719EC179-3AD3-4C6B-BBD8-B44C96B1A204}.Debug|x64.ActiveCfg = Debug|x64
++              {719EC179-3AD3-4C6B-BBD8-B44C96B1A204}.Debug|x64.Build.0 = Debug|x64
++              {719EC179-3AD3-4C6B-BBD8-B44C96B1A204}.Release|Win32.ActiveCfg = Release|Win32
++              {719EC179-3AD3-4C6B-BBD8-B44C96B1A204}.Release|Win32.Build.0 = Release|Win32
++              {719EC179-3AD3-4C6B-BBD8-B44C96B1A204}.Release|x64.ActiveCfg = Release|x64
++              {719EC179-3AD3-4C6B-BBD8-B44C96B1A204}.Release|x64.Build.0 = Release|x64
                {494FA8C9-6C85-4175-BE4C-9A113C7A3278}.Debug|Win32.ActiveCfg = Debug|Win32
                {494FA8C9-6C85-4175-BE4C-9A113C7A3278}.Debug|Win32.Build.0 = Debug|Win32
                {494FA8C9-6C85-4175-BE4C-9A113C7A3278}.Debug|x64.ActiveCfg = Debug|x64
                {F6DA4FFA-E405-4DCF-883B-A3C1713F8C5D}.Release|Win32.Build.0 = Release|Win32
                {F6DA4FFA-E405-4DCF-883B-A3C1713F8C5D}.Release|x64.ActiveCfg = Release|x64
                {F6DA4FFA-E405-4DCF-883B-A3C1713F8C5D}.Release|x64.Build.0 = Release|x64
++              {C2E5F4F6-5EE7-4B36-BFAC-4AC36BB41420}.Debug|Win32.ActiveCfg = Debug|Win32
++              {C2E5F4F6-5EE7-4B36-BFAC-4AC36BB41420}.Debug|Win32.Build.0 = Debug|Win32
++              {C2E5F4F6-5EE7-4B36-BFAC-4AC36BB41420}.Debug|x64.ActiveCfg = Debug|x64
++              {C2E5F4F6-5EE7-4B36-BFAC-4AC36BB41420}.Debug|x64.Build.0 = Debug|x64
++              {C2E5F4F6-5EE7-4B36-BFAC-4AC36BB41420}.Release|Win32.ActiveCfg = Release|Win32
++              {C2E5F4F6-5EE7-4B36-BFAC-4AC36BB41420}.Release|Win32.Build.0 = Release|Win32
++              {C2E5F4F6-5EE7-4B36-BFAC-4AC36BB41420}.Release|x64.ActiveCfg = Release|x64
++              {C2E5F4F6-5EE7-4B36-BFAC-4AC36BB41420}.Release|x64.Build.0 = Release|x64
++              {67FF36D3-EC5A-4F0D-BF3B-A84A66D77294}.Debug|Win32.ActiveCfg = Debug|Win32
++              {67FF36D3-EC5A-4F0D-BF3B-A84A66D77294}.Debug|Win32.Build.0 = Debug|Win32
++              {67FF36D3-EC5A-4F0D-BF3B-A84A66D77294}.Debug|x64.ActiveCfg = Debug|x64
++              {67FF36D3-EC5A-4F0D-BF3B-A84A66D77294}.Debug|x64.Build.0 = Debug|x64
++              {67FF36D3-EC5A-4F0D-BF3B-A84A66D77294}.Release|Win32.ActiveCfg = Release|Win32
++              {67FF36D3-EC5A-4F0D-BF3B-A84A66D77294}.Release|Win32.Build.0 = Release|Win32
++              {67FF36D3-EC5A-4F0D-BF3B-A84A66D77294}.Release|x64.ActiveCfg = Release|x64
++              {67FF36D3-EC5A-4F0D-BF3B-A84A66D77294}.Release|x64.Build.0 = Release|x64
++              {C000FDF7-4D32-4630-9595-560D9CC66D11}.Debug|Win32.ActiveCfg = Debug|Win32
++              {C000FDF7-4D32-4630-9595-560D9CC66D11}.Debug|Win32.Build.0 = Debug|Win32
++              {C000FDF7-4D32-4630-9595-560D9CC66D11}.Debug|x64.ActiveCfg = Debug|x64
++              {C000FDF7-4D32-4630-9595-560D9CC66D11}.Debug|x64.Build.0 = Debug|x64
++              {C000FDF7-4D32-4630-9595-560D9CC66D11}.Release|Win32.ActiveCfg = Release|Win32
++              {C000FDF7-4D32-4630-9595-560D9CC66D11}.Release|Win32.Build.0 = Release|Win32
++              {C000FDF7-4D32-4630-9595-560D9CC66D11}.Release|x64.ActiveCfg = Release|x64
++              {C000FDF7-4D32-4630-9595-560D9CC66D11}.Release|x64.Build.0 = Release|x64
                {9E0DE362-60A0-4584-9FF1-BB537DA94F40}.Debug|Win32.ActiveCfg = Debug|Win32
                {9E0DE362-60A0-4584-9FF1-BB537DA94F40}.Debug|x64.ActiveCfg = Debug|x64
                {9E0DE362-60A0-4584-9FF1-BB537DA94F40}.Release|Win32.ActiveCfg = Release|Win32
                {968FD6C1-5845-4B22-B61E-F6DE987D47AD}.Release|Win32.Build.0 = Release|Win32
                {968FD6C1-5845-4B22-B61E-F6DE987D47AD}.Release|x64.ActiveCfg = Release|x64
                {968FD6C1-5845-4B22-B61E-F6DE987D47AD}.Release|x64.Build.0 = Release|x64
++              {215274D7-05EC-4D1E-B7BB-B2C957DA960B}.Debug|Win32.ActiveCfg = Debug|Win32
++              {215274D7-05EC-4D1E-B7BB-B2C957DA960B}.Debug|Win32.Build.0 = Debug|Win32
++              {215274D7-05EC-4D1E-B7BB-B2C957DA960B}.Debug|x64.ActiveCfg = Debug|x64
++              {215274D7-05EC-4D1E-B7BB-B2C957DA960B}.Debug|x64.Build.0 = Debug|x64
++              {215274D7-05EC-4D1E-B7BB-B2C957DA960B}.Release|Win32.ActiveCfg = Release|Win32
++              {215274D7-05EC-4D1E-B7BB-B2C957DA960B}.Release|Win32.Build.0 = Release|Win32
++              {215274D7-05EC-4D1E-B7BB-B2C957DA960B}.Release|x64.ActiveCfg = Release|x64
++              {215274D7-05EC-4D1E-B7BB-B2C957DA960B}.Release|x64.Build.0 = Release|x64
++              {764FAC09-369D-4C11-A0FF-CE097D9A4FAF}.Debug|Win32.ActiveCfg = Debug|Win32
++              {764FAC09-369D-4C11-A0FF-CE097D9A4FAF}.Debug|Win32.Build.0 = Debug|Win32
++              {764FAC09-369D-4C11-A0FF-CE097D9A4FAF}.Debug|x64.ActiveCfg = Debug|x64
++              {764FAC09-369D-4C11-A0FF-CE097D9A4FAF}.Debug|x64.Build.0 = Debug|x64
++              {764FAC09-369D-4C11-A0FF-CE097D9A4FAF}.Release|Win32.ActiveCfg = Release|Win32
++              {764FAC09-369D-4C11-A0FF-CE097D9A4FAF}.Release|Win32.Build.0 = Release|Win32
++              {764FAC09-369D-4C11-A0FF-CE097D9A4FAF}.Release|x64.ActiveCfg = Release|x64
++              {764FAC09-369D-4C11-A0FF-CE097D9A4FAF}.Release|x64.Build.0 = Release|x64
                {ABCB724E-8534-4420-AC12-7C33A606ABA3}.Debug|Win32.ActiveCfg = Debug|Win32
                {ABCB724E-8534-4420-AC12-7C33A606ABA3}.Debug|Win32.Build.0 = Debug|Win32
                {ABCB724E-8534-4420-AC12-7C33A606ABA3}.Debug|x64.ActiveCfg = Debug|x64
                {A09E8584-0713-48A5-97BA-ACED0F3728F8}.Release|Win32.Build.0 = Release|Win32
                {A09E8584-0713-48A5-97BA-ACED0F3728F8}.Release|x64.ActiveCfg = Release|x64
                {A09E8584-0713-48A5-97BA-ACED0F3728F8}.Release|x64.Build.0 = Release|x64
--              {AB7EBA0D-1B00-4B1B-BB00-62AB38E2309A}.Debug|Win32.ActiveCfg = Debug|Win32
--              {AB7EBA0D-1B00-4B1B-BB00-62AB38E2309A}.Debug|x64.ActiveCfg = Debug|x64
--              {AB7EBA0D-1B00-4B1B-BB00-62AB38E2309A}.Release|Win32.ActiveCfg = Release|Win32
--              {AB7EBA0D-1B00-4B1B-BB00-62AB38E2309A}.Release|x64.ActiveCfg = Release|x64
--              {78D46B73-ADD7-40CF-8436-B66897B18D9A}.Debug|Win32.ActiveCfg = Debug|Win32
--              {78D46B73-ADD7-40CF-8436-B66897B18D9A}.Debug|x64.ActiveCfg = Debug|x64
--              {78D46B73-ADD7-40CF-8436-B66897B18D9A}.Release|Win32.ActiveCfg = Release|Win32
--              {78D46B73-ADD7-40CF-8436-B66897B18D9A}.Release|x64.ActiveCfg = Release|x64
--              {DABDF840-2A2F-4B38-90B2-A4393E6DF38B}.Debug|Win32.ActiveCfg = Debug|Win32
--              {DABDF840-2A2F-4B38-90B2-A4393E6DF38B}.Debug|x64.ActiveCfg = Debug|x64
--              {DABDF840-2A2F-4B38-90B2-A4393E6DF38B}.Release|Win32.ActiveCfg = Release|Win32
--              {DABDF840-2A2F-4B38-90B2-A4393E6DF38B}.Release|x64.ActiveCfg = Release|x64
++              {6D9647CE-9CB9-4B16-B34D-8542484EFBB0}.Debug|Win32.ActiveCfg = Debug|Win32
++              {6D9647CE-9CB9-4B16-B34D-8542484EFBB0}.Debug|Win32.Build.0 = Debug|Win32
++              {6D9647CE-9CB9-4B16-B34D-8542484EFBB0}.Debug|x64.ActiveCfg = Debug|x64
++              {6D9647CE-9CB9-4B16-B34D-8542484EFBB0}.Debug|x64.Build.0 = Debug|x64
++              {6D9647CE-9CB9-4B16-B34D-8542484EFBB0}.Release|Win32.ActiveCfg = Release|Win32
++              {6D9647CE-9CB9-4B16-B34D-8542484EFBB0}.Release|Win32.Build.0 = Release|Win32
++              {6D9647CE-9CB9-4B16-B34D-8542484EFBB0}.Release|x64.ActiveCfg = Release|x64
++              {6D9647CE-9CB9-4B16-B34D-8542484EFBB0}.Release|x64.Build.0 = Release|x64
++              {28305722-6486-481D-BD0F-B4398D8A09C5}.Debug|Win32.ActiveCfg = Debug|Win32
++              {28305722-6486-481D-BD0F-B4398D8A09C5}.Debug|Win32.Build.0 = Debug|Win32
++              {28305722-6486-481D-BD0F-B4398D8A09C5}.Debug|x64.ActiveCfg = Debug|x64
++              {28305722-6486-481D-BD0F-B4398D8A09C5}.Debug|x64.Build.0 = Debug|x64
++              {28305722-6486-481D-BD0F-B4398D8A09C5}.Release|Win32.ActiveCfg = Release|Win32
++              {28305722-6486-481D-BD0F-B4398D8A09C5}.Release|Win32.Build.0 = Release|Win32
++              {28305722-6486-481D-BD0F-B4398D8A09C5}.Release|x64.ActiveCfg = Release|x64
++              {28305722-6486-481D-BD0F-B4398D8A09C5}.Release|x64.Build.0 = Release|x64
++              {AEC1F7B5-28F2-4C1F-A436-98D0352FD3F5}.Debug|Win32.ActiveCfg = Debug|Win32
++              {AEC1F7B5-28F2-4C1F-A436-98D0352FD3F5}.Debug|Win32.Build.0 = Debug|Win32
++              {AEC1F7B5-28F2-4C1F-A436-98D0352FD3F5}.Debug|x64.ActiveCfg = Debug|x64
++              {AEC1F7B5-28F2-4C1F-A436-98D0352FD3F5}.Debug|x64.Build.0 = Debug|x64
++              {AEC1F7B5-28F2-4C1F-A436-98D0352FD3F5}.Release|Win32.ActiveCfg = Release|Win32
++              {AEC1F7B5-28F2-4C1F-A436-98D0352FD3F5}.Release|Win32.Build.0 = Release|Win32
++              {AEC1F7B5-28F2-4C1F-A436-98D0352FD3F5}.Release|x64.ActiveCfg = Release|x64
++              {AEC1F7B5-28F2-4C1F-A436-98D0352FD3F5}.Release|x64.Build.0 = Release|x64
++              {AB1EEB8F-86F7-45B7-8CEC-B18C8E97EEFF}.Debug|Win32.ActiveCfg = Debug|Win32
++              {AB1EEB8F-86F7-45B7-8CEC-B18C8E97EEFF}.Debug|Win32.Build.0 = Debug|Win32
++              {AB1EEB8F-86F7-45B7-8CEC-B18C8E97EEFF}.Debug|x64.ActiveCfg = Debug|x64
++              {AB1EEB8F-86F7-45B7-8CEC-B18C8E97EEFF}.Debug|x64.Build.0 = Debug|x64
++              {AB1EEB8F-86F7-45B7-8CEC-B18C8E97EEFF}.Release|Win32.ActiveCfg = Release|Win32
++              {AB1EEB8F-86F7-45B7-8CEC-B18C8E97EEFF}.Release|Win32.Build.0 = Release|Win32
++              {AB1EEB8F-86F7-45B7-8CEC-B18C8E97EEFF}.Release|x64.ActiveCfg = Release|x64
++              {AB1EEB8F-86F7-45B7-8CEC-B18C8E97EEFF}.Release|x64.Build.0 = Release|x64
++              {95C21D50-FFD1-4FCE-A545-49FA1F825B28}.Debug|Win32.ActiveCfg = Debug|Win32
++              {95C21D50-FFD1-4FCE-A545-49FA1F825B28}.Debug|Win32.Build.0 = Debug|Win32
++              {95C21D50-FFD1-4FCE-A545-49FA1F825B28}.Debug|x64.ActiveCfg = Debug|x64
++              {95C21D50-FFD1-4FCE-A545-49FA1F825B28}.Debug|x64.Build.0 = Debug|x64
++              {95C21D50-FFD1-4FCE-A545-49FA1F825B28}.Release|Win32.ActiveCfg = Release|Win32
++              {95C21D50-FFD1-4FCE-A545-49FA1F825B28}.Release|Win32.Build.0 = Release|Win32
++              {95C21D50-FFD1-4FCE-A545-49FA1F825B28}.Release|x64.ActiveCfg = Release|x64
++              {95C21D50-FFD1-4FCE-A545-49FA1F825B28}.Release|x64.Build.0 = Release|x64
                {142D643B-A9EC-49DB-9D48-A925A20F63B1}.Debug|Win32.ActiveCfg = Debug|Win32
                {142D643B-A9EC-49DB-9D48-A925A20F63B1}.Debug|Win32.Build.0 = Debug|Win32
                {142D643B-A9EC-49DB-9D48-A925A20F63B1}.Debug|x64.ActiveCfg = Debug|x64
                {405E6B33-DBA9-4850-A19F-19298DA5A64D}.Release|Win32.Build.0 = Release|Win32
                {405E6B33-DBA9-4850-A19F-19298DA5A64D}.Release|x64.ActiveCfg = Release|x64
                {405E6B33-DBA9-4850-A19F-19298DA5A64D}.Release|x64.Build.0 = Release|x64
--              {95C21D50-FFD1-4FCE-A545-49FA1F825B28}.Debug|Win32.ActiveCfg = Debug|Win32
--              {95C21D50-FFD1-4FCE-A545-49FA1F825B28}.Debug|Win32.Build.0 = Debug|Win32
--              {95C21D50-FFD1-4FCE-A545-49FA1F825B28}.Debug|x64.ActiveCfg = Debug|x64
--              {95C21D50-FFD1-4FCE-A545-49FA1F825B28}.Debug|x64.Build.0 = Debug|x64
--              {95C21D50-FFD1-4FCE-A545-49FA1F825B28}.Release|Win32.ActiveCfg = Release|Win32
--              {95C21D50-FFD1-4FCE-A545-49FA1F825B28}.Release|Win32.Build.0 = Release|Win32
--              {95C21D50-FFD1-4FCE-A545-49FA1F825B28}.Release|x64.ActiveCfg = Release|x64
--              {95C21D50-FFD1-4FCE-A545-49FA1F825B28}.Release|x64.Build.0 = Release|x64
--              {AB1EEB8F-86F7-45B7-8CEC-B18C8E97EEFF}.Debug|Win32.ActiveCfg = Debug|Win32
--              {AB1EEB8F-86F7-45B7-8CEC-B18C8E97EEFF}.Debug|Win32.Build.0 = Debug|Win32
--              {AB1EEB8F-86F7-45B7-8CEC-B18C8E97EEFF}.Debug|x64.ActiveCfg = Debug|x64
--              {AB1EEB8F-86F7-45B7-8CEC-B18C8E97EEFF}.Debug|x64.Build.0 = Debug|x64
--              {AB1EEB8F-86F7-45B7-8CEC-B18C8E97EEFF}.Release|Win32.ActiveCfg = Release|Win32
--              {AB1EEB8F-86F7-45B7-8CEC-B18C8E97EEFF}.Release|Win32.Build.0 = Release|Win32
--              {AB1EEB8F-86F7-45B7-8CEC-B18C8E97EEFF}.Release|x64.ActiveCfg = Release|x64
--              {AB1EEB8F-86F7-45B7-8CEC-B18C8E97EEFF}.Release|x64.Build.0 = Release|x64
--              {889AD61B-12E9-4F85-8525-B83C16C88C3F}.Debug|Win32.ActiveCfg = Debug|Win32
--              {889AD61B-12E9-4F85-8525-B83C16C88C3F}.Debug|Win32.Build.0 = Debug|Win32
--              {889AD61B-12E9-4F85-8525-B83C16C88C3F}.Debug|x64.ActiveCfg = Debug|x64
--              {889AD61B-12E9-4F85-8525-B83C16C88C3F}.Debug|x64.Build.0 = Debug|x64
--              {889AD61B-12E9-4F85-8525-B83C16C88C3F}.Release|Win32.ActiveCfg = Release|Win32
--              {889AD61B-12E9-4F85-8525-B83C16C88C3F}.Release|Win32.Build.0 = Release|Win32
--              {889AD61B-12E9-4F85-8525-B83C16C88C3F}.Release|x64.ActiveCfg = Release|x64
--              {889AD61B-12E9-4F85-8525-B83C16C88C3F}.Release|x64.Build.0 = Release|x64
--              {58A50B97-FA8D-4700-9E4A-C4993638EB7A}.Debug|Win32.ActiveCfg = Debug|Win32
--              {58A50B97-FA8D-4700-9E4A-C4993638EB7A}.Debug|Win32.Build.0 = Debug|Win32
--              {58A50B97-FA8D-4700-9E4A-C4993638EB7A}.Debug|x64.ActiveCfg = Debug|x64
--              {58A50B97-FA8D-4700-9E4A-C4993638EB7A}.Debug|x64.Build.0 = Debug|x64
--              {58A50B97-FA8D-4700-9E4A-C4993638EB7A}.Release|Win32.ActiveCfg = Release|Win32
--              {58A50B97-FA8D-4700-9E4A-C4993638EB7A}.Release|Win32.Build.0 = Release|Win32
--              {58A50B97-FA8D-4700-9E4A-C4993638EB7A}.Release|x64.ActiveCfg = Release|x64
--              {58A50B97-FA8D-4700-9E4A-C4993638EB7A}.Release|x64.Build.0 = Release|x64
--              {6EA99B1F-99B4-4528-8195-7508EF70CFED}.Debug|Win32.ActiveCfg = Debug|Win32
--              {6EA99B1F-99B4-4528-8195-7508EF70CFED}.Debug|Win32.Build.0 = Debug|Win32
--              {6EA99B1F-99B4-4528-8195-7508EF70CFED}.Debug|x64.ActiveCfg = Debug|x64
--              {6EA99B1F-99B4-4528-8195-7508EF70CFED}.Debug|x64.Build.0 = Debug|x64
--              {6EA99B1F-99B4-4528-8195-7508EF70CFED}.Release|Win32.ActiveCfg = Release|Win32
--              {6EA99B1F-99B4-4528-8195-7508EF70CFED}.Release|Win32.Build.0 = Release|Win32
--              {6EA99B1F-99B4-4528-8195-7508EF70CFED}.Release|x64.ActiveCfg = Release|x64
--              {6EA99B1F-99B4-4528-8195-7508EF70CFED}.Release|x64.Build.0 = Release|x64
++              {BAE68B54-2C1A-44D0-A0E9-05156A784E79}.Debug|Win32.ActiveCfg = Debug|Win32
++              {BAE68B54-2C1A-44D0-A0E9-05156A784E79}.Debug|Win32.Build.0 = Debug|Win32
++              {BAE68B54-2C1A-44D0-A0E9-05156A784E79}.Debug|x64.ActiveCfg = Debug|x64
++              {BAE68B54-2C1A-44D0-A0E9-05156A784E79}.Debug|x64.Build.0 = Debug|x64
++              {BAE68B54-2C1A-44D0-A0E9-05156A784E79}.Release|Win32.ActiveCfg = Release|Win32
++              {BAE68B54-2C1A-44D0-A0E9-05156A784E79}.Release|Win32.Build.0 = Release|Win32
++              {BAE68B54-2C1A-44D0-A0E9-05156A784E79}.Release|x64.ActiveCfg = Release|x64
++              {BAE68B54-2C1A-44D0-A0E9-05156A784E79}.Release|x64.Build.0 = Release|x64
                {9188FA91-E039-485D-AF1D-781CEA92F541}.Debug|Win32.ActiveCfg = Debug|Win32
                {9188FA91-E039-485D-AF1D-781CEA92F541}.Debug|Win32.Build.0 = Debug|Win32
                {9188FA91-E039-485D-AF1D-781CEA92F541}.Debug|x64.ActiveCfg = Debug|x64
                {9BE8D73A-7E83-46ED-A9E2-1E3472F52AE5}.Debug|x64.ActiveCfg = Debug|x64
                {9BE8D73A-7E83-46ED-A9E2-1E3472F52AE5}.Release|Win32.ActiveCfg = Release|Win32
                {9BE8D73A-7E83-46ED-A9E2-1E3472F52AE5}.Release|x64.ActiveCfg = Release|x64
++              {7A68EDC6-F0AF-47D1-BB16-B8A9DCD9202D}.Debug|Win32.ActiveCfg = Debug|Win32
++              {7A68EDC6-F0AF-47D1-BB16-B8A9DCD9202D}.Debug|Win32.Build.0 = Debug|Win32
++              {7A68EDC6-F0AF-47D1-BB16-B8A9DCD9202D}.Debug|x64.ActiveCfg = Debug|x64
++              {7A68EDC6-F0AF-47D1-BB16-B8A9DCD9202D}.Debug|x64.Build.0 = Debug|x64
++              {7A68EDC6-F0AF-47D1-BB16-B8A9DCD9202D}.Release|Win32.ActiveCfg = Release|Win32
++              {7A68EDC6-F0AF-47D1-BB16-B8A9DCD9202D}.Release|Win32.Build.0 = Release|Win32
++              {7A68EDC6-F0AF-47D1-BB16-B8A9DCD9202D}.Release|x64.ActiveCfg = Release|x64
++              {7A68EDC6-F0AF-47D1-BB16-B8A9DCD9202D}.Release|x64.Build.0 = Release|x64
++              {2D02DD0E-CBF5-493E-AA06-1E289ED24666}.Debug|Win32.ActiveCfg = Debug|Win32
++              {2D02DD0E-CBF5-493E-AA06-1E289ED24666}.Debug|Win32.Build.0 = Debug|Win32
++              {2D02DD0E-CBF5-493E-AA06-1E289ED24666}.Debug|x64.ActiveCfg = Debug|x64
++              {2D02DD0E-CBF5-493E-AA06-1E289ED24666}.Debug|x64.Build.0 = Debug|x64
++              {2D02DD0E-CBF5-493E-AA06-1E289ED24666}.Release|Win32.ActiveCfg = Release|Win32
++              {2D02DD0E-CBF5-493E-AA06-1E289ED24666}.Release|Win32.Build.0 = Release|Win32
++              {2D02DD0E-CBF5-493E-AA06-1E289ED24666}.Release|x64.ActiveCfg = Release|x64
++              {2D02DD0E-CBF5-493E-AA06-1E289ED24666}.Release|x64.Build.0 = Release|x64
++              {0D3FA25B-8116-44EC-A45E-260789DAA3D9}.Debug|Win32.ActiveCfg = Debug|Win32
++              {0D3FA25B-8116-44EC-A45E-260789DAA3D9}.Debug|Win32.Build.0 = Debug|Win32
++              {0D3FA25B-8116-44EC-A45E-260789DAA3D9}.Debug|x64.ActiveCfg = Debug|x64
++              {0D3FA25B-8116-44EC-A45E-260789DAA3D9}.Debug|x64.Build.0 = Debug|x64
++              {0D3FA25B-8116-44EC-A45E-260789DAA3D9}.Release|Win32.ActiveCfg = Release|Win32
++              {0D3FA25B-8116-44EC-A45E-260789DAA3D9}.Release|Win32.Build.0 = Release|Win32
++              {0D3FA25B-8116-44EC-A45E-260789DAA3D9}.Release|x64.ActiveCfg = Release|x64
++              {0D3FA25B-8116-44EC-A45E-260789DAA3D9}.Release|x64.Build.0 = Release|x64
++              {1F4A0344-99ED-461B-BD53-1593788FB34D}.Debug|Win32.ActiveCfg = Debug|Win32
++              {1F4A0344-99ED-461B-BD53-1593788FB34D}.Debug|Win32.Build.0 = Debug|Win32
++              {1F4A0344-99ED-461B-BD53-1593788FB34D}.Debug|x64.ActiveCfg = Debug|x64
++              {1F4A0344-99ED-461B-BD53-1593788FB34D}.Debug|x64.Build.0 = Debug|x64
++              {1F4A0344-99ED-461B-BD53-1593788FB34D}.Release|Win32.ActiveCfg = Release|Win32
++              {1F4A0344-99ED-461B-BD53-1593788FB34D}.Release|Win32.Build.0 = Release|Win32
++              {1F4A0344-99ED-461B-BD53-1593788FB34D}.Release|x64.ActiveCfg = Release|x64
++              {1F4A0344-99ED-461B-BD53-1593788FB34D}.Release|x64.Build.0 = Release|x64
++              {F93FF3EE-217A-4554-AB17-2F8D56B4BF4B}.Debug|Win32.ActiveCfg = Debug|Win32
++              {F93FF3EE-217A-4554-AB17-2F8D56B4BF4B}.Debug|Win32.Build.0 = Debug|Win32
++              {F93FF3EE-217A-4554-AB17-2F8D56B4BF4B}.Debug|x64.ActiveCfg = Debug|x64
++              {F93FF3EE-217A-4554-AB17-2F8D56B4BF4B}.Debug|x64.Build.0 = Debug|x64
++              {F93FF3EE-217A-4554-AB17-2F8D56B4BF4B}.Release|Win32.ActiveCfg = Release|Win32
++              {F93FF3EE-217A-4554-AB17-2F8D56B4BF4B}.Release|Win32.Build.0 = Release|Win32
++              {F93FF3EE-217A-4554-AB17-2F8D56B4BF4B}.Release|x64.ActiveCfg = Release|x64
++              {F93FF3EE-217A-4554-AB17-2F8D56B4BF4B}.Release|x64.Build.0 = Release|x64
++              {9252A034-7F22-4CB1-A634-4577DA69F2D0}.Debug|Win32.ActiveCfg = Debug|Win32
++              {9252A034-7F22-4CB1-A634-4577DA69F2D0}.Debug|Win32.Build.0 = Debug|Win32
++              {9252A034-7F22-4CB1-A634-4577DA69F2D0}.Debug|x64.ActiveCfg = Debug|x64
++              {9252A034-7F22-4CB1-A634-4577DA69F2D0}.Debug|x64.Build.0 = Debug|x64
++              {9252A034-7F22-4CB1-A634-4577DA69F2D0}.Release|Win32.ActiveCfg = Release|Win32
++              {9252A034-7F22-4CB1-A634-4577DA69F2D0}.Release|Win32.Build.0 = Release|Win32
++              {9252A034-7F22-4CB1-A634-4577DA69F2D0}.Release|x64.ActiveCfg = Release|x64
++              {9252A034-7F22-4CB1-A634-4577DA69F2D0}.Release|x64.Build.0 = Release|x64
++              {3419B733-85A2-4F66-BC04-A5A8DC8FA057}.Debug|Win32.ActiveCfg = Debug|Win32
++              {3419B733-85A2-4F66-BC04-A5A8DC8FA057}.Debug|Win32.Build.0 = Debug|Win32
++              {3419B733-85A2-4F66-BC04-A5A8DC8FA057}.Debug|x64.ActiveCfg = Debug|x64
++              {3419B733-85A2-4F66-BC04-A5A8DC8FA057}.Debug|x64.Build.0 = Debug|x64
++              {3419B733-85A2-4F66-BC04-A5A8DC8FA057}.Release|Win32.ActiveCfg = Release|Win32
++              {3419B733-85A2-4F66-BC04-A5A8DC8FA057}.Release|Win32.Build.0 = Release|Win32
++              {3419B733-85A2-4F66-BC04-A5A8DC8FA057}.Release|x64.ActiveCfg = Release|x64
++              {3419B733-85A2-4F66-BC04-A5A8DC8FA057}.Release|x64.Build.0 = Release|x64
++              {50A1FFC8-ADC2-4D9E-A2D0-5DCD63188AE9}.Debug|Win32.ActiveCfg = Debug|Win32
++              {50A1FFC8-ADC2-4D9E-A2D0-5DCD63188AE9}.Debug|Win32.Build.0 = Debug|Win32
++              {50A1FFC8-ADC2-4D9E-A2D0-5DCD63188AE9}.Debug|x64.ActiveCfg = Debug|x64
++              {50A1FFC8-ADC2-4D9E-A2D0-5DCD63188AE9}.Debug|x64.Build.0 = Debug|x64
++              {50A1FFC8-ADC2-4D9E-A2D0-5DCD63188AE9}.Release|Win32.ActiveCfg = Release|Win32
++              {50A1FFC8-ADC2-4D9E-A2D0-5DCD63188AE9}.Release|Win32.Build.0 = Release|Win32
++              {50A1FFC8-ADC2-4D9E-A2D0-5DCD63188AE9}.Release|x64.ActiveCfg = Release|x64
++              {50A1FFC8-ADC2-4D9E-A2D0-5DCD63188AE9}.Release|x64.Build.0 = Release|x64
                {F1D56B26-F11F-4ECE-AB82-127B5E1C58E0}.Debug|Win32.ActiveCfg = Debug|Win32
                {F1D56B26-F11F-4ECE-AB82-127B5E1C58E0}.Debug|x64.ActiveCfg = Debug|x64
                {F1D56B26-F11F-4ECE-AB82-127B5E1C58E0}.Release|Win32.ActiveCfg = Release|Win32
                {F1D56B26-F11F-4ECE-AB82-127B5E1C58E0}.Release|x64.ActiveCfg = Release|x64
--              {A9A2020D-5541-44F2-B080-DF3C9426C409}.Debug|Win32.ActiveCfg = Debug|Win32
--              {A9A2020D-5541-44F2-B080-DF3C9426C409}.Debug|x64.ActiveCfg = Debug|x64
--              {A9A2020D-5541-44F2-B080-DF3C9426C409}.Release|Win32.ActiveCfg = Release|Win32
--              {A9A2020D-5541-44F2-B080-DF3C9426C409}.Release|x64.ActiveCfg = Release|x64
--              {85303A11-CF6B-432F-B3FD-24DEFFB51025}.Debug|Win32.ActiveCfg = Debug|Win32
--              {85303A11-CF6B-432F-B3FD-24DEFFB51025}.Debug|x64.ActiveCfg = Debug|x64
--              {85303A11-CF6B-432F-B3FD-24DEFFB51025}.Release|Win32.ActiveCfg = Release|Win32
--              {85303A11-CF6B-432F-B3FD-24DEFFB51025}.Release|x64.ActiveCfg = Release|x64
--              {88E95224-A931-4B3E-AC6C-5A40B3961421}.Debug|Win32.ActiveCfg = Debug|Win32
--              {88E95224-A931-4B3E-AC6C-5A40B3961421}.Debug|x64.ActiveCfg = Debug|x64
--              {88E95224-A931-4B3E-AC6C-5A40B3961421}.Release|Win32.ActiveCfg = Release|Win32
--              {88E95224-A931-4B3E-AC6C-5A40B3961421}.Release|x64.ActiveCfg = Release|x64
--              {439D04EC-A444-48BE-8E55-8CD2BB66B782}.Debug|Win32.ActiveCfg = Debug|Win32
--              {439D04EC-A444-48BE-8E55-8CD2BB66B782}.Debug|x64.ActiveCfg = Debug|x64
--              {439D04EC-A444-48BE-8E55-8CD2BB66B782}.Release|Win32.ActiveCfg = Release|Win32
--              {439D04EC-A444-48BE-8E55-8CD2BB66B782}.Release|x64.ActiveCfg = Release|x64
++              {CE49C183-2ECE-4EA4-B289-D74E2E664164}.Debug|Win32.ActiveCfg = Debug|Win32
++              {CE49C183-2ECE-4EA4-B289-D74E2E664164}.Debug|Win32.Build.0 = Debug|Win32
++              {CE49C183-2ECE-4EA4-B289-D74E2E664164}.Debug|x64.ActiveCfg = Debug|x64
++              {CE49C183-2ECE-4EA4-B289-D74E2E664164}.Debug|x64.Build.0 = Debug|x64
++              {CE49C183-2ECE-4EA4-B289-D74E2E664164}.Release|Win32.ActiveCfg = Release|Win32
++              {CE49C183-2ECE-4EA4-B289-D74E2E664164}.Release|Win32.Build.0 = Release|Win32
++              {CE49C183-2ECE-4EA4-B289-D74E2E664164}.Release|x64.ActiveCfg = Release|x64
++              {CE49C183-2ECE-4EA4-B289-D74E2E664164}.Release|x64.Build.0 = Release|x64
                {337A52F8-310E-49E3-A2BA-F19CA32EB617}.Debug|Win32.ActiveCfg = Debug|Win32
                {337A52F8-310E-49E3-A2BA-F19CA32EB617}.Debug|Win32.Build.0 = Debug|Win32
                {337A52F8-310E-49E3-A2BA-F19CA32EB617}.Debug|x64.ActiveCfg = Debug|x64
                {337A52F8-310E-49E3-A2BA-F19CA32EB617}.Release|Win32.Build.0 = Release|Win32
                {337A52F8-310E-49E3-A2BA-F19CA32EB617}.Release|x64.ActiveCfg = Release|x64
                {337A52F8-310E-49E3-A2BA-F19CA32EB617}.Release|x64.Build.0 = Release|x64
++              {273B1F5C-C137-46D1-B516-FFE5764FABE5}.Debug|Win32.ActiveCfg = Debug|Win32
++              {273B1F5C-C137-46D1-B516-FFE5764FABE5}.Debug|Win32.Build.0 = Debug|Win32
++              {273B1F5C-C137-46D1-B516-FFE5764FABE5}.Debug|x64.ActiveCfg = Debug|x64
++              {273B1F5C-C137-46D1-B516-FFE5764FABE5}.Debug|x64.Build.0 = Debug|x64
++              {273B1F5C-C137-46D1-B516-FFE5764FABE5}.Release|Win32.ActiveCfg = Release|Win32
++              {273B1F5C-C137-46D1-B516-FFE5764FABE5}.Release|Win32.Build.0 = Release|Win32
++              {273B1F5C-C137-46D1-B516-FFE5764FABE5}.Release|x64.ActiveCfg = Release|x64
++              {273B1F5C-C137-46D1-B516-FFE5764FABE5}.Release|x64.Build.0 = Release|x64
++              {A968A82E-B2DC-4ED2-BD9B-12C1E97ABBB4}.Debug|Win32.ActiveCfg = Debug|Win32
++              {A968A82E-B2DC-4ED2-BD9B-12C1E97ABBB4}.Debug|Win32.Build.0 = Debug|Win32
++              {A968A82E-B2DC-4ED2-BD9B-12C1E97ABBB4}.Debug|x64.ActiveCfg = Debug|x64
++              {A968A82E-B2DC-4ED2-BD9B-12C1E97ABBB4}.Debug|x64.Build.0 = Debug|x64
++              {A968A82E-B2DC-4ED2-BD9B-12C1E97ABBB4}.Release|Win32.ActiveCfg = Release|Win32
++              {A968A82E-B2DC-4ED2-BD9B-12C1E97ABBB4}.Release|Win32.Build.0 = Release|Win32
++              {A968A82E-B2DC-4ED2-BD9B-12C1E97ABBB4}.Release|x64.ActiveCfg = Release|x64
++              {A968A82E-B2DC-4ED2-BD9B-12C1E97ABBB4}.Release|x64.Build.0 = Release|x64
++              {EE43BE6D-817D-4B09-AC40-7E6AC5BDB80D}.Debug|Win32.ActiveCfg = Debug|Win32
++              {EE43BE6D-817D-4B09-AC40-7E6AC5BDB80D}.Debug|Win32.Build.0 = Debug|Win32
++              {EE43BE6D-817D-4B09-AC40-7E6AC5BDB80D}.Debug|x64.ActiveCfg = Debug|x64
++              {EE43BE6D-817D-4B09-AC40-7E6AC5BDB80D}.Debug|x64.Build.0 = Debug|x64
++              {EE43BE6D-817D-4B09-AC40-7E6AC5BDB80D}.Release|Win32.ActiveCfg = Release|Win32
++              {EE43BE6D-817D-4B09-AC40-7E6AC5BDB80D}.Release|Win32.Build.0 = Release|Win32
++              {EE43BE6D-817D-4B09-AC40-7E6AC5BDB80D}.Release|x64.ActiveCfg = Release|x64
++              {EE43BE6D-817D-4B09-AC40-7E6AC5BDB80D}.Release|x64.Build.0 = Release|x64
++              {EAE1009F-B967-43C4-9408-97A37EFA8678}.Debug|Win32.ActiveCfg = Debug|Win32
++              {EAE1009F-B967-43C4-9408-97A37EFA8678}.Debug|Win32.Build.0 = Debug|Win32
++              {EAE1009F-B967-43C4-9408-97A37EFA8678}.Debug|x64.ActiveCfg = Debug|x64
++              {EAE1009F-B967-43C4-9408-97A37EFA8678}.Debug|x64.Build.0 = Debug|x64
++              {EAE1009F-B967-43C4-9408-97A37EFA8678}.Release|Win32.ActiveCfg = Release|Win32
++              {EAE1009F-B967-43C4-9408-97A37EFA8678}.Release|Win32.Build.0 = Release|Win32
++              {EAE1009F-B967-43C4-9408-97A37EFA8678}.Release|x64.ActiveCfg = Release|x64
++              {EAE1009F-B967-43C4-9408-97A37EFA8678}.Release|x64.Build.0 = Release|x64
                {3F4504A3-1116-40BD-9612-F5E83D09CC99}.Debug|Win32.ActiveCfg = Debug|Win32
                {3F4504A3-1116-40BD-9612-F5E83D09CC99}.Debug|x64.ActiveCfg = Debug|x64
                {3F4504A3-1116-40BD-9612-F5E83D09CC99}.Release|Win32.ActiveCfg = Release|Win32
@@@ -47,21 -47,7 +47,20 @@@ Source: bin\libintl.dll; DestDir: {app}
  Source: bin\libintl.lib; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
  Source: bin\GNU_gettext.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
  ;
 +
 +;YaSp files
 +Source: bin\ast.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 +Source: bin\ast-tools.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 +Source: bin\operations.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 +Source: bin\functions_manager.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 +Source: bin\symbol.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 +Source: bin\types.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 +Source: bin\system_env.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 +Source: bin\parse.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 +Source: bin\YaSp.exe; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 +;
 +
  Source: bin\zlib1.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
- Source: bin\DetectFramework.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
  Source: bin\GetWindowsVersion.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
  Source: bin\hashtable.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
  Source: bin\doublylinkedlist.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
Simple merge
@@@ -2516,134 -2498,85 +2522,176 @@@ $as_echo "$ac_res" >&6; 
  
  } # ac_fn_c_check_member
  
 +# ac_fn_cxx_try_cpp LINENO
 +# ------------------------
 +# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
 +ac_fn_cxx_try_cpp ()
 +{
 +  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
 +  if { { ac_try="$ac_cpp conftest.$ac_ext"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
 +esac
 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
 +$as_echo "$ac_try_echo"; } >&5
 +  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
 +  ac_status=$?
 +  if test -s conftest.err; then
 +    grep -v '^ *+' conftest.err >conftest.er1
 +    cat conftest.er1 >&5
 +    mv -f conftest.er1 conftest.err
 +  fi
 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +  test $ac_status = 0; } > conftest.i && {
 +       test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 +       test ! -s conftest.err
 +       }; then :
 +  ac_retval=0
 +else
 +  $as_echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +    ac_retval=1
 +fi
 +  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 +  as_fn_set_status $ac_retval
 +
 +} # ac_fn_cxx_try_cpp
 +
 +# ac_fn_cxx_check_header_mongrel LINENO HEADER VAR INCLUDES
 +# ---------------------------------------------------------
 +# Tests whether HEADER exists, giving a warning if it cannot be compiled using
 +# the include files in INCLUDES and setting the cache variable VAR
 +# accordingly.
 +ac_fn_cxx_check_header_mongrel ()
 +{
 +  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
 +  if eval \${$3+:} false; then :
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 +$as_echo_n "checking for $2... " >&6; }
 +if eval \${$3+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +fi
 +eval ac_res=\$$3
 +             { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 +$as_echo "$ac_res" >&6; }
 +else
 +  # Is the header compilable?
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
 +$as_echo_n "checking $2 usability... " >&6; }
 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +$4
 +#include <$2>
 +_ACEOF
 +if ac_fn_cxx_try_compile "$LINENO"; then :
 +  ac_header_compiler=yes
 +else
 +  ac_header_compiler=no
 +fi
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
 +$as_echo "$ac_header_compiler" >&6; }
 +
 +# Is the header present?
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
 +$as_echo_n "checking $2 presence... " >&6; }
 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +#include <$2>
 +_ACEOF
 +if ac_fn_cxx_try_cpp "$LINENO"; then :
 +  ac_header_preproc=yes
 +else
 +  ac_header_preproc=no
 +fi
 +rm -f conftest.err conftest.i conftest.$ac_ext
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
 +$as_echo "$ac_header_preproc" >&6; }
 +
 +# So?  What about this header?
 +case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in #((
 +  yes:no: )
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
 +$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
 +    ;;
 +  no:yes:* )
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
 +$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
 +$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
 +$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
 +$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
 +( $as_echo "## ------------------------------------------ ##
 +## Report this to http://bugzilla.scilab.org/ ##
 +## ------------------------------------------ ##"
 +     ) | sed "s/^/$as_me: WARNING:     /" >&2
 +    ;;
 +esac
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 +$as_echo_n "checking for $2... " >&6; }
 +if eval \${$3+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  eval "$3=\$ac_header_compiler"
 +fi
 +eval ac_res=\$$3
 +             { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 +$as_echo "$ac_res" >&6; }
 +fi
 +  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 +
 +} # ac_fn_cxx_check_header_mongrel
 +
+ # ac_fn_cxx_try_run LINENO
+ # ------------------------
+ # Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
+ # that executables *can* be run.
+ ac_fn_cxx_try_run ()
+ {
+   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+   if { { ac_try="$ac_link"
+ case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+ eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+ $as_echo "$ac_try_echo"; } >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+   { { case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+ eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+ $as_echo "$ac_try_echo"; } >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; }; then :
+   ac_retval=0
+ else
+   $as_echo "$as_me: program exited with status $ac_status" >&5
+        $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+        ac_retval=$ac_status
+ fi
+   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+   as_fn_set_status $ac_retval
+ } # ac_fn_cxx_try_run
 -# ac_fn_cxx_try_cpp LINENO
 -# ------------------------
 -# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
 -ac_fn_cxx_try_cpp ()
 -{
 -  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
 -  if { { ac_try="$ac_cpp conftest.$ac_ext"
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 -  *) ac_try_echo=$ac_try;;
 -esac
 -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
 -$as_echo "$ac_try_echo"; } >&5
 -  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
 -  ac_status=$?
 -  if test -s conftest.err; then
 -    grep -v '^ *+' conftest.err >conftest.er1
 -    cat conftest.er1 >&5
 -    mv -f conftest.er1 conftest.err
 -  fi
 -  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 -  test $ac_status = 0; } > conftest.i && {
 -       test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 -       test ! -s conftest.err
 -       }; then :
 -  ac_retval=0
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -    ac_retval=1
 -fi
 -  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 -  as_fn_set_status $ac_retval
 -
 -} # ac_fn_cxx_try_cpp
 -
  # ac_fn_cxx_try_link LINENO
  # -------------------------
  # Try to link conftest.$ac_ext, and return whether this succeeded.
@@@ -10695,7 -10564,7 +10963,7 @@@ $as_echo "$ac_java_classpath" >&6; 
  $as_echo_n "checking to see if the java compiler works... " >&6; }
  
      cat << \EOF > conftest.java
- // #line 10698 "configure"
 -// #line 10567 "configure"
++// #line 10966 "configure"
  
  
  public class conftest {
@@@ -10761,7 -10630,7 +11029,7 @@@ $as_echo_n "checking type of jvm... " >
      if test "x$ac_java_jvm_name" = "x" ; then
  
      cat << \EOF > conftest.java
- // #line 10764 "configure"
 -// #line 10633 "configure"
++// #line 11032 "configure"
  import gnu.java.io.EncodingManager;
  
  public class conftest {
@@@ -10824,7 -10693,7 +11092,7 @@@ $as_echo_n "checking java API version..
      # The class java.nio.charset.Charset is new to 1.4
  
      cat << \EOF > conftest.java
- // #line 10827 "configure"
 -// #line 10696 "configure"
++// #line 11095 "configure"
  import java.nio.charset.Charset;
  
  public class conftest {
      # The class java.lang.StringBuilder is new to 1.5
  
      cat << \EOF > conftest.java
- // #line 10871 "configure"
 -// #line 10740 "configure"
++// #line 11139 "configure"
  import java.lang.StringBuilder;
  
  public class conftest {
      # The class java.util.ArrayDeque is new to 1.6
  
      cat << \EOF > conftest.java
- // #line 10915 "configure"
 -// #line 10784 "configure"
++// #line 11183 "configure"
  import java.util.ArrayDeque;
  
  public class conftest {
      # The class java.nio.file.Path is new to 1.7
  
      cat << \EOF > conftest.java
- // #line 10959 "configure"
 -// #line 10828 "configure"
++// #line 11227 "configure"
  import java.nio.file.Path;
  
  public class conftest {
@@@ -12325,7 -12194,7 +12593,7 @@@ $as_echo_n "checking jgraphx... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 12328 "configure"
 -// #line 12197 "configure"
++// #line 12596 "configure"
  import com.mxgraph.model.mxCell;
  
  public class conftest {
@@@ -12419,7 -12288,7 +12687,7 @@@ $as_echo_n "checking minimal version (1
     if test "x" == "x"; then
  
      cat << \EOF > conftest.java
- // #line 12422 "configure"
 -// #line 12291 "configure"
++// #line 12690 "configure"
  import com.mxgraph.view.mxGraph;
  
  public class conftest {
     else
  
      cat << \EOF > conftest.java
- // #line 12473 "configure"
 -// #line 12342 "configure"
++// #line 12741 "configure"
  import com.mxgraph.view.mxGraph;
  
  public class conftest {
@@@ -12547,7 -12416,7 +12815,7 @@@ $as_echo_n "checking jhdf5... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 12550 "configure"
 -// #line 12419 "configure"
++// #line 12818 "configure"
  import ncsa.hdf.hdf5lib.HDF5Constants;
  
  public class conftest {
@@@ -12700,7 -12569,7 +12968,7 @@@ $as_echo_n "checking minimal version (1
     if test "x" == "x"; then
  
      cat << \EOF > conftest.java
- // #line 12703 "configure"
 -// #line 12572 "configure"
++// #line 12971 "configure"
  import ncsa.hdf.hdf5lib.H5;
  
  public class conftest {
     else
  
      cat << \EOF > conftest.java
- // #line 12758 "configure"
 -// #line 12627 "configure"
++// #line 13026 "configure"
  import ncsa.hdf.hdf5lib.H5;
  
  public class conftest {
@@@ -12839,7 -12708,7 +13107,7 @@@ $as_echo_n "checking flexdock... " >&6
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 12842 "configure"
 -// #line 12711 "configure"
++// #line 13110 "configure"
  import org.flexdock.docking.DockingManager;
  
  public class conftest {
@@@ -12933,7 -12802,7 +13201,7 @@@ $as_echo_n "checking minimal version (1
     if test "x" == "x"; then
  
      cat << \EOF > conftest.java
- // #line 12936 "configure"
 -// #line 12805 "configure"
++// #line 13204 "configure"
  import org.flexdock.util.Utilities;
  
  public class conftest {
     else
  
      cat << \EOF > conftest.java
- // #line 12987 "configure"
 -// #line 12856 "configure"
++// #line 13255 "configure"
  import org.flexdock.util.Utilities;
  
  public class conftest {
@@@ -13057,7 -12926,7 +13325,7 @@@ $as_echo_n "checking looks... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 13060 "configure"
 -// #line 12929 "configure"
++// #line 13328 "configure"
  import com.jgoodies.looks.common.MenuItemRenderer;
  
  public class conftest {
@@@ -13164,7 -13033,7 +13432,7 @@@ $as_echo_n "checking jgoodies-looks... 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 13167 "configure"
 -// #line 13036 "configure"
++// #line 13435 "configure"
  import com.jgoodies.looks.common.MenuItemRenderer;
  
  public class conftest {
@@@ -13272,7 -13141,7 +13540,7 @@@ $as_echo_n "checking skinlf... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 13275 "configure"
 -// #line 13144 "configure"
++// #line 13543 "configure"
  import com.l2fprod.util.AccessUtils;
  
  public class conftest {
@@@ -13379,7 -13248,7 +13647,7 @@@ $as_echo_n "checking jogl... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 13382 "configure"
 -// #line 13251 "configure"
++// #line 13650 "configure"
  import javax.media.opengl.glu.GLUnurbs;
  
  public class conftest {
@@@ -13593,7 -13462,7 +13861,7 @@@ $as_echo_n "checking gluegen-rt... " >&
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 13596 "configure"
 -// #line 13465 "configure"
++// #line 13864 "configure"
  import com.sun.gluegen.runtime.CPU;
  
  public class conftest {
@@@ -13756,7 -13625,7 +14024,7 @@@ $as_echo_n "checking jhall... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 13759 "configure"
 -// #line 13628 "configure"
++// #line 14027 "configure"
  import javax.help.JHelp;
  
  public class conftest {
@@@ -13863,7 -13732,7 +14131,7 @@@ $as_echo_n "checking javahelp2... " >&6
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 13866 "configure"
 -// #line 13735 "configure"
++// #line 14134 "configure"
  import javax.help.JHelp;
  
  public class conftest {
@@@ -13971,7 -13840,7 +14239,7 @@@ $as_echo_n "checking jrosetta-API... " 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 13974 "configure"
 -// #line 13843 "configure"
++// #line 14242 "configure"
  import com.artenum.rosetta.interfaces.core.ConsoleConfiguration;
  
  public class conftest {
@@@ -14076,7 -13945,7 +14344,7 @@@ $as_echo_n "checking jrosetta-api... " 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14079 "configure"
 -// #line 13948 "configure"
++// #line 14347 "configure"
  import com.artenum.rosetta.interfaces.core.ConsoleConfiguration;
  
  public class conftest {
@@@ -14184,7 -14053,7 +14452,7 @@@ $as_echo_n "checking jrosetta-engine..
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14187 "configure"
 -// #line 14056 "configure"
++// #line 14455 "configure"
  import com.artenum.rosetta.core.action.AbstractConsoleAction;
  
  public class conftest {
@@@ -14277,7 -14146,7 +14545,7 @@@ $as_echo_n "checking minimal version (1
     if test "x" == "x"; then
  
      cat << \EOF > conftest.java
- // #line 14280 "configure"
 -// #line 14149 "configure"
++// #line 14548 "configure"
  import com.artenum.rosetta.util.ConfigurationBuilder;
  
  public class conftest {
     else
  
      cat << \EOF > conftest.java
- // #line 14331 "configure"
 -// #line 14200 "configure"
++// #line 14599 "configure"
  import com.artenum.rosetta.util.ConfigurationBuilder;
  
  public class conftest {
@@@ -14403,7 -14272,7 +14671,7 @@@ $as_echo_n "checking jeuclid-core... " 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14406 "configure"
 -// #line 14275 "configure"
++// #line 14674 "configure"
  import net.sourceforge.jeuclid.LayoutContext;
  
  public class conftest {
@@@ -14512,7 -14381,7 +14780,7 @@@ $as_echo_n "checking fop... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14515 "configure"
 -// #line 14384 "configure"
++// #line 14783 "configure"
  import org.apache.fop.pdf.PDFInfo;
  
  public class conftest {
@@@ -14619,7 -14488,7 +14887,7 @@@ $as_echo_n "checking batik-all... " >&6
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14622 "configure"
 -// #line 14491 "configure"
++// #line 14890 "configure"
  import org.apache.batik.parser.Parser;
  
  public class conftest {
@@@ -14726,7 -14595,7 +14994,7 @@@ $as_echo_n "checking batik... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14729 "configure"
 -// #line 14598 "configure"
++// #line 14997 "configure"
  import org.apache.batik.parser.Parser;
  
  public class conftest {
@@@ -14820,7 -14689,7 +15088,7 @@@ $as_echo_n "checking minimal version (1
     if test "x" == "x"; then
  
      cat << \EOF > conftest.java
- // #line 14823 "configure"
 -// #line 14692 "configure"
++// #line 15091 "configure"
  import org.apache.batik.Version;
  
  public class conftest {
     else
  
      cat << \EOF > conftest.java
- // #line 14874 "configure"
 -// #line 14743 "configure"
++// #line 15142 "configure"
  import org.apache.batik.Version;
  
  public class conftest {
@@@ -14944,7 -14813,7 +15212,7 @@@ $as_echo_n "checking commons-io... " >&
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14947 "configure"
 -// #line 14816 "configure"
++// #line 15215 "configure"
  import org.apache.commons.io.output.CountingOutputStream;
  
  public class conftest {
@@@ -15051,7 -14920,7 +15319,7 @@@ $as_echo_n "checking xmlgraphics-common
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 15054 "configure"
 -// #line 14923 "configure"
++// #line 15322 "configure"
  import org.apache.xmlgraphics.util.Service;
  
  public class conftest {
@@@ -15158,7 -15027,7 +15426,7 @@@ $as_echo_n "checking avalon-framework..
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 15161 "configure"
 -// #line 15030 "configure"
++// #line 15429 "configure"
  import org.apache.avalon.framework.configuration.ConfigurationException;
  
  public class conftest {
@@@ -15265,7 -15134,7 +15533,7 @@@ $as_echo_n "checking xml-apis-ext... " 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 15268 "configure"
 -// #line 15137 "configure"
++// #line 15536 "configure"
  import org.w3c.dom.svg.SVGDocument;
  
  public class conftest {
@@@ -15372,7 -15241,7 +15640,7 @@@ $as_echo_n "checking xml-commons-apis-e
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 15375 "configure"
 -// #line 15244 "configure"
++// #line 15643 "configure"
  import org.w3c.dom.svg.SVGDocument;
  
  public class conftest {
@@@ -15483,7 -15352,7 +15751,7 @@@ $as_echo_n "checking commons-logging..
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 15486 "configure"
 -// #line 15355 "configure"
++// #line 15754 "configure"
  import org.apache.commons.logging.LogFactory;
  
  public class conftest {
@@@ -15590,7 -15459,7 +15858,7 @@@ $as_echo_n "checking jlatexmath... " >&
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 15593 "configure"
 -// #line 15462 "configure"
++// #line 15861 "configure"
  import org.scilab.forge.jlatexmath.TeXFormula;
  
  public class conftest {
@@@ -15684,7 -15553,7 +15952,7 @@@ $as_echo_n "checking minimal version (0
     if test "x" == "x"; then
  
      cat << \EOF > conftest.java
- // #line 15687 "configure"
 -// #line 15556 "configure"
++// #line 15955 "configure"
  import org.scilab.forge.jlatexmath.TeXFormula;
  
  public class conftest {
     else
  
      cat << \EOF > conftest.java
- // #line 15738 "configure"
 -// #line 15607 "configure"
++// #line 16006 "configure"
  import org.scilab.forge.jlatexmath.TeXFormula;
  
  public class conftest {
@@@ -15814,7 -15683,7 +16082,7 @@@ $as_echo_n "checking checkstyle... " >&
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 15817 "configure"
 -// #line 15686 "configure"
++// #line 16085 "configure"
  import com.puppycrawl.tools.checkstyle.CheckStyleTask;
  
  public class conftest {
@@@ -15921,7 -15790,7 +16189,7 @@@ $as_echo_n "checking commons-beanutils.
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 15924 "configure"
 -// #line 15793 "configure"
++// #line 16192 "configure"
  import org.apache.commons.beanutils.Converter;
  
  public class conftest {
@@@ -16028,7 -15897,7 +16296,7 @@@ $as_echo_n "checking antlr... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 16031 "configure"
 -// #line 15900 "configure"
++// #line 16299 "configure"
  import antlr.TokenStreamException;
  
  public class conftest {
@@@ -16135,7 -16004,7 +16403,7 @@@ $as_echo_n "checking testng... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 16138 "configure"
 -// #line 16007 "configure"
++// #line 16406 "configure"
  import org.testng.TestNG;
  
  public class conftest {
@@@ -16242,8 -16111,8 +16510,8 @@@ $as_echo_n "checking beust-jcommander..
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 16245 "configure"
- import com.thoughtworks.qdox.tools.QDoxTester;
 -// #line 16114 "configure"
++// #line 16513 "configure"
+ import com.beust.jcommander.JCommander;
  
  public class conftest {
      public static void main(String[] argv) {
@@@ -16349,8 -16218,115 +16617,115 @@@ $as_echo_n "checking qdox... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 16352 "configure"
- import bsh.Console;
 -// #line 16221 "configure"
++// #line 16620 "configure"
+ import com.thoughtworks.qdox.tools.QDoxTester;
+ 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"" = "yes"; then
+          { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar qdox used by Parses declarations and Javadoc  (looking for package com.thoughtworks.qdox.tools.QDoxTester)" >&5
+ $as_echo "$as_me: WARNING: Could not find or use the Java package/jar qdox used by Parses declarations and Javadoc  (looking for package com.thoughtworks.qdox.tools.QDoxTester)" >&2;}
+       else
+           as_fn_error $? "Could not find or use the Java package/jar qdox used by Parses declarations and Javadoc  (looking for package com.thoughtworks.qdox.tools.QDoxTester)" "$LINENO" 5
+       fi
+     fi
+         QDOX=$PACKAGE_JAR_FILE
+                 # bsh (Java scripting environment) - dependency of TestNG
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking bsh" >&5
+ $as_echo_n "checking bsh... " >&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/bsh.jar" "$jardir/libbsh.jar" "$jardir/libbsh-java.jar" "$jardir/bsh*.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 16328 "configure"
++// #line 16727 "configure"
+ import bsh.Console;
  
  public class conftest {
      public static void main(String[] argv) {
@@@ -16456,7 -16432,7 +16831,7 @@@ $as_echo_n "checking junit... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 16459 "configure"
 -// #line 16435 "configure"
++// #line 16834 "configure"
  import junit.framework.Assert;
  
  public class conftest {
  fi
  
  
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if ARPACK-ng is available" >&5
+ $as_echo_n "checking if ARPACK-ng is available... " >&6; }
+ echo ""
+ acx_arpack_ok=no
+ # Check whether --with-arpack-library was given.
+ if test "${with_arpack_library+set}" = set; then :
+   withval=$with_arpack_library;
+ fi
+ saved_ldflags="$LDFLAGS"
+ if test "$with_arpack_library" != no -a "$with_arpack_library" != ""; then
+ LDFLAGS="$LDFLAGS -L$with_arpack_library"
+ fi
+ ARPACK_LIBS="-larpack"
+ # Get fortran linker name of ARPACK function to check for.
+ ac_ext=f
+ ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
+ ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_f77_compiler_gnu
+ case $ac_cv_f77_mangling in
+   upper*) ac_val="ZNAUPD" ;;
+   lower*) ac_val="znaupd" ;;
+   *)      ac_val="unknown" ;;
+ esac
+ case $ac_cv_f77_mangling in *," underscore"*) ac_val="$ac_val"_ ;; esac
+ znaupd="$ac_val"
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ # We cannot use ARPACK if BLAS is not found
+ if test "x$acx_blas_ok" != xyes; then
+         acx_arpack_ok=noblas
+ fi
+ # First, check ARPACK_LIBS environment variable
+ if test "x$ARPACK_LIBS" != x; then
+         save_LIBS="$LIBS"; LIBS="$ARPACK_LIBS $BLAS_LIBS $LIBS $FLIBS"
+         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $znaupd in $ARPACK_LIBS" >&5
+ $as_echo_n "checking for $znaupd in $ARPACK_LIBS... " >&6; }
+         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ /* Override any GCC internal prototype to avoid an error.
+    Use char because int might match the return type of a GCC
+    builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+ char $znaupd ();
+ #ifdef F77_DUMMY_MAIN
+ #  ifdef __cplusplus
+      extern "C"
+ #  endif
+    int F77_DUMMY_MAIN() { return 1; }
+ #endif
+ int
+ main ()
+ {
+ return $znaupd ();
+   ;
+   return 0;
+ }
+ _ACEOF
+ if ac_fn_c_try_link "$LINENO"; then :
+   acx_arpack_ok=yes
+ else
+   ARPACK_LIBS="-larpack"
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext conftest.$ac_ext
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_arpack_ok" >&5
+ $as_echo "$acx_arpack_ok" >&6; }
+         LIBS="$save_LIBS"
+         if test acx_arpack_ok = no; then
+                 ARPACK_LIBS=""
+         fi
+ fi
+ LDFLAGS="$saved_ldflags"
+ if test "$with_arpack_library" != no -a "$with_arpack_library" != ""; then
+ ARPACK_LIBS="$ARPACK_LIBS -L$with_arpack_library"
+ fi
+ # Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
+ if test x"$acx_arpack_ok" = xyes; then
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: arpack library found" >&5
+ $as_echo "arpack library found" >&6; }
+         :
+ else
+         acx_arpack_ok=no
+         as_fn_error $? "Impossible to find the ARPACK library. Please note that arpack was bundled with version prior to 5.4.0 and Scilab requires arpack-ng ( http://forge.scilab.org/index.php/p/arpack-ng/ )." "$LINENO" 5
+ fi
 -
+   ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+   save_LIBS="$LIBS"; LIBS="$ARPACK_LIBS $BLAS_LIBS $LIBS $FLIBS"
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the arpack library works" >&5
+ $as_echo_n "checking whether the arpack library works... " >&6; }
+ if ${cv_lib_arpack_ok+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+       if test "$cross_compiling" = yes; then :
+   cv_lib_arpack_ok=yes
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ // External functions from ARPACK library
+ extern "C" int
+ C2F(dnaupd) (int&, const char *, const int&, const char *,
+                            int&, const double&, double*, const int&,
+                            double*, const int&, int*, int*, double*,
+                            double*, const int&, int&, long int, long int);
+ extern "C" int
+ C2F(dneupd) (const int&, const char *, int*, double*,
+                            double*, double*, const int&,
+                            const double&, const double&, double*,
+                            const char*, const int&, const char *,
+                            int&, const double&, double*, const int&,
+                            double*, const int&, int*, int*, double*,
+                            double*, const int&, int&, long int,
+                            long int, long int);
+ extern "C" int
+ C2F(dgemv) (const char *, const int&, const int&,
+                          const double&, const double*, const int&,
+                          const double*, const int&, const double&,
+                          double*, const int&, long int);
+ #include <cfloat>
+ void
+ doit (void)
+ {
+   // Based on Octave function EigsRealNonSymmetricMatrix from liboctave/eigs-base.cc.
+   // Problem matrix.  See bug #31479
+   int n = 4;
+   double *m = new double [n * n];
+   m[0] = 1, m[4] = 0, m[8]  = 0, m[12] = -1;
+   m[1] = 0, m[5] = 1, m[9]  = 0, m[13] = 0;
+   m[2] = 0, m[6] = 0, m[10] = 1, m[14] = 0;
+   m[3] = 0, m[7] = 0, m[11] = 2, m[15] = 1;
+   double *resid = new double [4];
+   resid[0] = 0.960966;
+   resid[1] = 0.741195;
+   resid[2] = 0.150143;
+   resid[3] = 0.868067;
+   int *ip = new int [11];
+   ip[0] = 1;   // ishift
+   ip[1] = 0;   // ip[1] not referenced
+   ip[2] = 300; // mxiter, maximum number of iterations
+   ip[3] = 1;   // NB blocksize in recurrence
+   ip[4] = 0;   // nconv, number of Ritz values that satisfy convergence
+   ip[5] = 0;   // ip[5] not referenced
+   ip[6] = 1;   // mode
+   ip[7] = 0;   // ip[7] to ip[10] are return values
+   ip[8] = 0;
+   ip[9] = 0;
+   ip[10] = 0;
+   int *ipntr = new int [14];
+   int k = 1;
+   int p = 3;
+   int lwork = 3 * p * (p + 2);
+   double *v = new double [n * (p + 1)];
+   double *workl = new double [lwork + 1];
+   double *workd = new double [3 * n + 1];
+   int ido = 0;
+   int info = 0;
+   double tol = DBL_EPSILON;
+   do
+     {
+       C2F(dnaupd) (ido, "I", n, "LM", k, tol, resid, p,
+                                  v, n, ip, ipntr, workd, workl, lwork,
+                                  info, 1L, 2L);
+       if (ido == -1 || ido == 1 || ido == 2)
+         {
+           double *x = workd + ipntr[0] - 1;
+           double *y = workd + ipntr[1] - 1;
+           C2F(dgemv) ("N", n, n, 1.0, m, n, x, 1, 0.0,
+                                    y, 1, 1L);
+         }
+       else
+         {
+           if (info < 0)
+             {
+               return;  // Error
+             }
+           break;
+         }
+     }
+   while (1);
+   int *sel = new int [p];
+   // The dimensions of dr and di are k+1, but k+2 avoids segfault
+   double *dr = new double [k + 1];
+   double *di = new double [k + 1];
+   double *workev = new double [3 * p];
+   for (int i = 0; i < k + 1; i++)
+     dr[i] = di[i] = 0.;
+   int rvec = 1;
+   double sigmar = 0.0;
+   double sigmai = 0.0;
+   // This is n*(k+1), but k+2 avoids segfault
+   double *z = new double [n * (k + 1)];
+   C2F(dneupd) (rvec, "A", sel, dr, di, z, n, sigmar,
+                              sigmai, workev, "I", n, "LM", k, tol,
+                              resid, p, v, n, ip, ipntr, workd,
+                              workl, lwork, info, 1L, 1L, 2L);
+ }
+ #ifdef F77_DUMMY_MAIN
+ #  ifdef __cplusplus
+      extern "C"
+ #  endif
+    int F77_DUMMY_MAIN() { return 1; }
+ #endif
+ int
+ main ()
+ {
+   for (int i = 0; i < 10; i++)
+     doit ();
+   ;
+   return 0;
+ }
+ _ACEOF
+ if ac_fn_cxx_try_run "$LINENO"; then :
+   cv_lib_arpack_ok=yes
+ else
+   cv_lib_arpack_ok=no
+ fi
+ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+   conftest.$ac_objext conftest.beam conftest.$ac_ext
+ fi
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cv_lib_arpack_ok" >&5
+ $as_echo "$cv_lib_arpack_ok" >&6; }
+   LIBS="$save_LIBS"
+   ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+   if test "$cv_lib_arpack_ok" = "yes"; then
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: Working ARPACK library found (probably arpack-ng or a patched version of arpack)à" >&5
+ $as_echo "Working ARPACK library found (probably arpack-ng or a patched version of arpack)à" >&6; }
+   else
+     as_fn_error $? "ARPACK library found, but seems not to work properly. Please make sure you are using arpack-ng" "$LINENO" 5
+   fi
  #################
  ## UMFPACK
  #################
@@@ -24222,7 -24295,7 +24900,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 24225 "configure"
 -#line 24298 "configure"
++#line 24903 "configure"
  #include "confdefs.h"
  
  #include "$CHK_TCL_INCLUDE_PATH/$CHK_TCL_INC_NAME"
@@@ -24532,7 -24605,7 +25210,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 24535 "configure"
 -#line 24608 "configure"
++#line 25213 "configure"
  #include "confdefs.h"
  
  #include "$CHK_TK_INCLUDE_PATH/$CHK_TK_INC_NAME"
@@@ -25113,7 -25186,7 +25791,7 @@@ $as_echo_n "checking saxon... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 25116 "configure"
 -// #line 25189 "configure"
++// #line 25794 "configure"
  import com.icl.saxon.Loader;
  
  public class conftest {
@@@ -25220,7 -25293,7 +25898,7 @@@ $as_echo_n "checking jlatexmath-fop... 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 25223 "configure"
 -// #line 25296 "configure"
++// #line 25901 "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 31529 "configure"
 -#line 31602 "configure"
++#line 32207 "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 31635 "configure"
 -#line 31708 "configure"
++#line 32313 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
@@@ -38030,7 -38148,7 +38758,7 @@@ if test "$enable_stop_on_warning" = yes
     CXXFLAGS="$CXXFLAGS -Werror=implicit-function-declaration -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/threads/Makefile modules/ast/Makefile modules/parse/Makefile modules/symbol/Makefile modules/functions_manager/Makefile modules/system_env/Makefile modules/helptools/Makefile modules/data_structures/Makefile modules/differential_equations/Makefile modules/optimization/Makefile modules/elementary_functions/Makefile modules/special_functions/Makefile modules/io/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/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/xml/Makefile modules/Makefile libs/Makefile Makefile scilab.pc etc/modules.xml etc/classpath.xml etc/Info.plist etc/logging.properties 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 desktop/images/icons/Makefile desktop/Makefile modules/helptools/Makefile modules/data_structures/Makefile modules/differential_equations/Makefile modules/optimization/Makefile modules/elementary_functions/Makefile modules/special_functions/Makefile modules/io/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/randlib/Makefile modules/tclsci/Makefile modules/windows_tools/Makefile modules/core/Makefile modules/prebuildjava/Makefile modules/libscilab-cli/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/m2sci/Makefile modules/compatibility_functions/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/xml/Makefile modules/Makefile libs/Makefile Makefile scilab.pc etc/modules.xml etc/classpath.xml etc/Info.plist etc/logging.properties 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 desktop/images/icons/Makefile desktop/Makefile modules/threads/Makefile modules/ast/Makefile modules/parse/Makefile modules/symbol/Makefile modules/functions_manager/Makefile modules/system_env/Makefile modules/helptools/Makefile modules/data_structures/Makefile modules/differential_equations/Makefile modules/optimization/Makefile modules/elementary_functions/Makefile modules/special_functions/Makefile modules/io/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/randlib/Makefile modules/tclsci/Makefile modules/windows_tools/Makefile modules/core/Makefile modules/prebuildjava/Makefile modules/libscilab-cli/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/m2sci/Makefile modules/compatibility_functions/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/xml/Makefile modules/Makefile libs/Makefile Makefile scilab.pc etc/modules.xml etc/classpath.xml etc/Info.plist etc/logging.properties 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
      "libs/hashtable/Makefile") CONFIG_FILES="$CONFIG_FILES libs/hashtable/Makefile" ;;
      "libs/libst/Makefile") CONFIG_FILES="$CONFIG_FILES libs/libst/Makefile" ;;
      "contrib/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/Makefile" ;;
+     "desktop/images/icons/Makefile") CONFIG_FILES="$CONFIG_FILES desktop/images/icons/Makefile" ;;
+     "desktop/Makefile") CONFIG_FILES="$CONFIG_FILES desktop/Makefile" ;;
 +    "modules/threads/Makefile") CONFIG_FILES="$CONFIG_FILES modules/threads/Makefile" ;;
 +    "modules/ast/Makefile") CONFIG_FILES="$CONFIG_FILES modules/ast/Makefile" ;;
 +    "modules/parse/Makefile") CONFIG_FILES="$CONFIG_FILES modules/parse/Makefile" ;;
 +    "modules/symbol/Makefile") CONFIG_FILES="$CONFIG_FILES modules/symbol/Makefile" ;;
 +    "modules/functions_manager/Makefile") CONFIG_FILES="$CONFIG_FILES modules/functions_manager/Makefile" ;;
 +    "modules/system_env/Makefile") CONFIG_FILES="$CONFIG_FILES modules/system_env/Makefile" ;;
      "modules/helptools/Makefile") CONFIG_FILES="$CONFIG_FILES modules/helptools/Makefile" ;;
      "modules/data_structures/Makefile") CONFIG_FILES="$CONFIG_FILES modules/data_structures/Makefile" ;;
      "modules/differential_equations/Makefile") CONFIG_FILES="$CONFIG_FILES modules/differential_equations/Makefile" ;;
@@@ -1771,12 -1758,8 +1802,14 @@@ libs/doublylinkedlist/Makefil
  libs/hashtable/Makefile
  libs/libst/Makefile
  contrib/Makefile
+ desktop/images/icons/Makefile
+ desktop/Makefile
 +modules/threads/Makefile
 +modules/ast/Makefile
 +modules/parse/Makefile
 +modules/symbol/Makefile
 +modules/functions_manager/Makefile
 +modules/system_env/Makefile
  modules/helptools/Makefile
  modules/data_structures/Makefile
  modules/differential_equations/Makefile
Simple merge
index 0000000,9bbef9b..b0cedb1
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,797 +1,804 @@@
+ # 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@
+ #
+ # Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ # Copyright (C) Scilab Enterprises - 2011 - Clement David
+ #
+ # 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
+ #
+ 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@
+ subdir = desktop
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(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/eigen.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/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/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 =
+ SOURCES =
+ DIST_SOURCES =
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+       html-recursive info-recursive install-data-recursive \
+       install-dvi-recursive install-exec-recursive \
+       install-html-recursive install-info-recursive \
+       install-pdf-recursive install-ps-recursive install-recursive \
+       installcheck-recursive installdirs-recursive pdf-recursive \
+       ps-recursive uninstall-recursive
+ 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)$(desktopdir)" "$(DESTDIR)$(mimedir)"
+ DATA = $(desktop_DATA) $(mime_DATA)
+ RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive       \
+   distclean-recursive maintainer-clean-recursive
+ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+       $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+       distdir
+ ETAGS = etags
+ CTAGS = ctags
+ DIST_SUBDIRS = $(SUBDIRS)
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ am__relativize = \
+   dir0=`pwd`; \
+   sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+   sed_rest='s,^[^/]*/*,,'; \
+   sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+   sed_butlast='s,/*[^/]*$$,,'; \
+   while test -n "$$dir1"; do \
+     first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+     if test "$$first" != "."; then \
+       if test "$$first" = ".."; then \
+         dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+         dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+       else \
+         first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+         if test "$$first2" = "$$first"; then \
+           dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+         else \
+           dir2="../$$dir2"; \
+         fi; \
+         dir0="$$dir0"/"$$first"; \
+       fi; \
+     fi; \
+     dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+   done; \
+   reldir="$$dir2"
+ ACLOCAL = @ACLOCAL@
+ ALL_LINGUAS = @ALL_LINGUAS@
+ ALL_LINGUAS_DOC = @ALL_LINGUAS_DOC@
+ AMTAR = @AMTAR@
+ ANT = @ANT@
+ ANTLR = @ANTLR@
+ AR = @AR@
+ ARPACK_LIBS = @ARPACK_LIBS@
+ AUTOCONF = @AUTOCONF@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+ AVALON_FRAMEWORK = @AVALON_FRAMEWORK@
+ AWK = @AWK@
+ BATIK = @BATIK@
+ BLAS_LIBS = @BLAS_LIBS@
+ BSH = @BSH@
+ CC = @CC@
+ CCACHE = @CCACHE@
+ 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@
++EIGEN_CPPFLAGS = @EIGEN_CPPFLAGS@
+ 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_ENABLE = @JAVA_ENABLE@
+ JAVA_G = @JAVA_G@
+ JAVA_HOME = @JAVA_HOME@
+ JAVA_JNI_INCLUDE = @JAVA_JNI_INCLUDE@
+ JAVA_JNI_LIBS = @JAVA_JNI_LIBS@
+ JCOMMANDER = @JCOMMANDER@
+ 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@
+ LOGGING_LEVEL = @LOGGING_LEVEL@
+ 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@
+ PYTHON = @PYTHON@
+ QDOX = @QDOX@
+ RANLIB = @RANLIB@
+ RELOCATABLE = @RELOCATABLE@
+ RT_LIB = @RT_LIB@
+ SAXON = @SAXON@
+ 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@
+ SUBDIRS = images/icons/
+ # Desktop file
+ # Note that here, it is datadir and NOT pkgdatadir
+ desktopdir = $(datadir)/applications
+ desktop_DATA = scilab-adv-cli.desktop \
+ scilab-cli.desktop \
+ scilab.desktop
+ # Mimetype file
+ # Note that here, it is datadir and NOT pkgdatadir
+ mimedir = $(datadir)/mime/packages
+ mime_DATA = scilab.xml
+ all: all-recursive
+ .SUFFIXES:
+ $(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 desktop/Makefile'; \
+       $(am__cd) $(top_srcdir) && \
+         $(AUTOMAKE) --foreign desktop/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):
+ mostlyclean-libtool:
+       -rm -f *.lo
+ clean-libtool:
+       -rm -rf .libs _libs
+ install-desktopDATA: $(desktop_DATA)
+       @$(NORMAL_INSTALL)
+       test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)"
+       @list='$(desktop_DATA)'; test -n "$(desktopdir)" || 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_DATA) $$files '$(DESTDIR)$(desktopdir)'"; \
+         $(INSTALL_DATA) $$files "$(DESTDIR)$(desktopdir)" || exit $$?; \
+       done
+ uninstall-desktopDATA:
+       @$(NORMAL_UNINSTALL)
+       @list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
+       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+       test -n "$$files" || exit 0; \
+       echo " ( cd '$(DESTDIR)$(desktopdir)' && rm -f" $$files ")"; \
+       cd "$(DESTDIR)$(desktopdir)" && rm -f $$files
+ install-mimeDATA: $(mime_DATA)
+       @$(NORMAL_INSTALL)
+       test -z "$(mimedir)" || $(MKDIR_P) "$(DESTDIR)$(mimedir)"
+       @list='$(mime_DATA)'; test -n "$(mimedir)" || 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_DATA) $$files '$(DESTDIR)$(mimedir)'"; \
+         $(INSTALL_DATA) $$files "$(DESTDIR)$(mimedir)" || exit $$?; \
+       done
+ uninstall-mimeDATA:
+       @$(NORMAL_UNINSTALL)
+       @list='$(mime_DATA)'; test -n "$(mimedir)" || list=; \
+       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+       test -n "$$files" || exit 0; \
+       echo " ( cd '$(DESTDIR)$(mimedir)' && rm -f" $$files ")"; \
+       cd "$(DESTDIR)$(mimedir)" && rm -f $$files
+ # This directory's subdirectories are mostly independent; you can cd
+ # into them and run `make' without going through this Makefile.
+ # To change the values of `make' variables: instead of editing Makefiles,
+ # (1) if the variable is set in `config.status', edit `config.status'
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+       @fail= failcom='exit 1'; \
+       for f in x $$MAKEFLAGS; do \
+         case $$f in \
+           *=* | --[!k]*);; \
+           *k*) failcom='fail=yes';; \
+         esac; \
+       done; \
+       dot_seen=no; \
+       target=`echo $@ | sed s/-recursive//`; \
+       list='$(SUBDIRS)'; for subdir in $$list; do \
+         echo "Making $$target in $$subdir"; \
+         if test "$$subdir" = "."; then \
+           dot_seen=yes; \
+           local_target="$$target-am"; \
+         else \
+           local_target="$$target"; \
+         fi; \
+         ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+         || eval $$failcom; \
+       done; \
+       if test "$$dot_seen" = "no"; then \
+         $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+       fi; test -z "$$fail"
+ $(RECURSIVE_CLEAN_TARGETS):
+       @fail= failcom='exit 1'; \
+       for f in x $$MAKEFLAGS; do \
+         case $$f in \
+           *=* | --[!k]*);; \
+           *k*) failcom='fail=yes';; \
+         esac; \
+       done; \
+       dot_seen=no; \
+       case "$@" in \
+         distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+         *) list='$(SUBDIRS)' ;; \
+       esac; \
+       rev=''; for subdir in $$list; do \
+         if test "$$subdir" = "."; then :; else \
+           rev="$$subdir $$rev"; \
+         fi; \
+       done; \
+       rev="$$rev ."; \
+       target=`echo $@ | sed s/-recursive//`; \
+       for subdir in $$rev; do \
+         echo "Making $$target in $$subdir"; \
+         if test "$$subdir" = "."; then \
+           local_target="$$target-am"; \
+         else \
+           local_target="$$target"; \
+         fi; \
+         ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+         || eval $$failcom; \
+       done && test -z "$$fail"
+ tags-recursive:
+       list='$(SUBDIRS)'; for subdir in $$list; do \
+         test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+       done
+ ctags-recursive:
+       list='$(SUBDIRS)'; for subdir in $$list; do \
+         test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+       done
+ 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: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+               $(TAGS_FILES) $(LISP)
+       set x; \
+       here=`pwd`; \
+       if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+         include_option=--etags-include; \
+         empty_fix=.; \
+       else \
+         include_option=--include; \
+         empty_fix=; \
+       fi; \
+       list='$(SUBDIRS)'; for subdir in $$list; do \
+         if test "$$subdir" = .; then :; else \
+           test ! -f $$subdir/TAGS || \
+             set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+         fi; \
+       done; \
+       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: ctags-recursive $(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
+ 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
+       @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+         if test "$$subdir" = .; then :; else \
+           test -d "$(distdir)/$$subdir" \
+           || $(MKDIR_P) "$(distdir)/$$subdir" \
+           || exit 1; \
+         fi; \
+       done
+       @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+         if test "$$subdir" = .; then :; else \
+           dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+           $(am__relativize); \
+           new_distdir=$$reldir; \
+           dir1=$$subdir; dir2="$(top_distdir)"; \
+           $(am__relativize); \
+           new_top_distdir=$$reldir; \
+           echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+           echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+           ($(am__cd) $$subdir && \
+             $(MAKE) $(AM_MAKEFLAGS) \
+               top_distdir="$$new_top_distdir" \
+               distdir="$$new_distdir" \
+               am__remove_distdir=: \
+               am__skip_length_check=: \
+               am__skip_mode_fix=: \
+               distdir) \
+             || exit 1; \
+         fi; \
+       done
+ check-am: all-am
+ check: check-recursive
+ all-am: Makefile $(DATA)
+ installdirs: installdirs-recursive
+ installdirs-am:
+       for dir in "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(mimedir)"; do \
+         test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+       done
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+ uninstall: uninstall-recursive
+ install-am: all-am
+       @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+ installcheck: installcheck-recursive
+ 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-recursive
+ clean-am: clean-generic clean-libtool mostlyclean-am
+ distclean: distclean-recursive
+       -rm -f Makefile
+ distclean-am: clean-am distclean-generic distclean-tags
+ dvi: dvi-recursive
+ dvi-am:
+ html: html-recursive
+ html-am:
+ info: info-recursive
+ info-am:
+ install-data-am: install-desktopDATA install-mimeDATA
+ install-dvi: install-dvi-recursive
+ install-dvi-am:
+ install-exec-am:
+ install-html: install-html-recursive
+ install-html-am:
+ install-info: install-info-recursive
+ install-info-am:
+ install-man:
+ install-pdf: install-pdf-recursive
+ install-pdf-am:
+ install-ps: install-ps-recursive
+ install-ps-am:
+ installcheck-am:
+ maintainer-clean: maintainer-clean-recursive
+       -rm -f Makefile
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+ mostlyclean: mostlyclean-recursive
+ mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+ pdf: pdf-recursive
+ pdf-am:
+ ps: ps-recursive
+ ps-am:
+ uninstall-am: uninstall-desktopDATA uninstall-mimeDATA
+ .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+       install-am install-strip tags-recursive
+ .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+       all all-am check check-am clean clean-generic clean-libtool \
+       ctags ctags-recursive distclean 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-desktopDATA install-dvi install-dvi-am \
+       install-exec install-exec-am install-html install-html-am \
+       install-info install-info-am install-man install-mimeDATA \
+       install-pdf install-pdf-am install-ps install-ps-am \
+       install-strip installcheck installcheck-am installdirs \
+       installdirs-am maintainer-clean maintainer-clean-generic \
+       mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+       ps ps-am tags tags-recursive uninstall uninstall-am \
+       uninstall-desktopDATA uninstall-mimeDATA
+ # 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:
index 0000000,c9c3435..80d9abc
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,621 +1,628 @@@
+ # 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@
+ #
+ # Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ # Copyright (C) Scilab Enterprises - 2011 - Clement David
+ #
+ # 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
+ #
+ 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@
+ subdir = desktop/images/icons
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+       $(top_srcdir)/m4/compiler.m4 $(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/eigen.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/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/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 =
+ SOURCES =
+ DIST_SOURCES =
+ 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)$(iconsdir)"
+ DATA = $(nobase_icons_DATA)
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ ALL_LINGUAS = @ALL_LINGUAS@
+ ALL_LINGUAS_DOC = @ALL_LINGUAS_DOC@
+ AMTAR = @AMTAR@
+ ANT = @ANT@
+ ANTLR = @ANTLR@
+ AR = @AR@
+ ARPACK_LIBS = @ARPACK_LIBS@
+ AUTOCONF = @AUTOCONF@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+ AVALON_FRAMEWORK = @AVALON_FRAMEWORK@
+ AWK = @AWK@
+ BATIK = @BATIK@
+ BLAS_LIBS = @BLAS_LIBS@
+ BSH = @BSH@
+ CC = @CC@
+ CCACHE = @CCACHE@
+ 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@
++EIGEN_CPPFLAGS = @EIGEN_CPPFLAGS@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FFTW3_LIB = @FFTW3_LIB@
+ FF