Merge remote-tracking branch 'origin/master' into YaSp 50/14350/4
Cedric Delamarre [Fri, 4 Apr 2014 15:23:03 +0000 (17:23 +0200)]
Conflicts:
scilab/Makefile.am
scilab/Makefile.in
scilab/configure
scilab/contrib/Makefile.in
scilab/etc/modules.xml.in
scilab/modules/action_binding/src/noaction_binding/noaction_binding.c
scilab/modules/api_scilab/includes/api_optional.h
scilab/modules/api_scilab/src/cpp/api_int.cpp
scilab/modules/api_scilab/src/cpp/api_list.cpp
scilab/modules/api_scilab/src/cpp/api_pointer.cpp
scilab/modules/api_scilab/src/cpp/api_poly.cpp
scilab/modules/api_scilab/src/cpp/api_string.cpp
scilab/modules/atoms/atoms.iss
scilab/modules/boolean/Makefile.am
scilab/modules/boolean/Makefile.in
scilab/modules/boolean/includes/gw_boolean.h
scilab/modules/boolean/sci_gateway/c/gw_boolean.c
scilab/modules/boolean/src/c/boolean.vcxproj
scilab/modules/boolean/src/c/boolean.vcxproj.filters
scilab/modules/boolean/src/c/matboolean.c
scilab/modules/boolean/src/fortran/boolean_f.vfproj
scilab/modules/boolean/src/fortran/boolean_f2c.vcxproj
scilab/modules/boolean/src/fortran/boolean_f2c.vcxproj.filters
scilab/modules/cacsd/Makefile.in
scilab/modules/cacsd/sci_gateway/c/sci_ricc2.c
scilab/modules/cacsd/sci_gateway/fortran/sci_f_arl2.f
scilab/modules/completion/src/c/completeLine.c
scilab/modules/completion/tests/nonreg_tests/bug_2848.tst
scilab/modules/completion/tests/utilities/sci_getcommonpart.c
scilab/modules/core/Makefile.am
scilab/modules/core/Makefile.in
scilab/modules/core/includes/returnPropertyList.h
scilab/modules/core/sci_gateway/c/sci_funcprot.c
scilab/modules/core/sci_gateway/c/sci_getscilabmode.c
scilab/modules/core/sci_gateway/fortran/sci_f_exists.f
scilab/modules/core/sci_gateway/fortran/sci_f_global.f
scilab/modules/core/src/c/core.vcxproj
scilab/modules/core/src/c/core.vcxproj.filters
scilab/modules/core/src/c/dynamic_gateways.c
scilab/modules/core/src/c/expr.c
scilab/modules/core/src/c/realmain.c
scilab/modules/core/src/c/returnPropertyList.c
scilab/modules/core/src/c/sciquit.c
scilab/modules/core/src/c/terme.c
scilab/modules/data_structures/src/c/hmops.c
scilab/modules/demo_tools/macros/demo_gui.sci
scilab/modules/development_tools/macros/test_run.sci
scilab/modules/differential_equations/sci_gateway/fortran/bint2d.f
scilab/modules/differential_equations/sci_gateway/fortran/bintg.f
scilab/modules/double/Makefile.in
scilab/modules/dynamic_link/sci_gateway/c/sci_link.c
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_find.c
scilab/modules/elementary_functions/sci_gateway/fortran/sci_f_find.f
scilab/modules/elementary_functions/src/c/elementary_functions.vcxproj
scilab/modules/elementary_functions/src/c/elementary_functions_f_Import.def
scilab/modules/elementary_functions/src/fortran/elementary_functions_f.vfproj
scilab/modules/elementary_functions/src/fortran/elementary_functions_f2c.vcxproj
scilab/modules/elementary_functions/src/fortran/elementary_functions_f2c.vcxproj.filters
scilab/modules/elementary_functions/src/fortran/find.f
scilab/modules/elementary_functions/tests/nonreg_tests/bug_12045.dia.ref
scilab/modules/elementary_functions/tests/nonreg_tests/bug_12045.tst
scilab/modules/elementary_functions/tests/unit_tests/cumprod.dia.ref
scilab/modules/elementary_functions/tests/unit_tests/cumprod.tst
scilab/modules/elementary_functions/tests/unit_tests/cumsum.dia.ref
scilab/modules/elementary_functions/tests/unit_tests/cumsum.tst
scilab/modules/elementary_functions/tests/unit_tests/repmat.dia.ref
scilab/modules/elementary_functions/tests/unit_tests/repmat.tst
scilab/modules/external_objects/sci_gateway/c/gw_external_objects.c
scilab/modules/fileio/Makefile.am
scilab/modules/fileio/Makefile.in
scilab/modules/fileio/fileio.vcxproj
scilab/modules/fileio/fileio.vcxproj.filters
scilab/modules/fileio/includes/fullpath.h
scilab/modules/fileio/sci_gateway/c/sci_mget.c
scilab/modules/fileio/sci_gateway/c/sci_mgetl.c
scilab/modules/functions/src/c/librarieslist.c
scilab/modules/graphic_export/etc/graphic_export.start
scilab/modules/graphic_export/graphic_export.iss
scilab/modules/graphic_export/includes/gw_graphic_export.h
scilab/modules/graphic_export/sci_gateway/c/gw_graphic_export.c
scilab/modules/graphic_export/sci_gateway/graphic_export_gateway.xml
scilab/modules/graphic_objects/Makefile.am
scilab/modules/graphic_objects/Makefile.in
scilab/modules/graphic_objects/src/c/graphic_objects.vcxproj
scilab/modules/graphic_objects/src/c/graphic_objects.vcxproj.filters
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/ScilabNativeView.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/ScilabNativeViewJNI.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/xmlloader/CSSParserException.java
scilab/modules/graphics/Makefile.in
scilab/modules/graphics/core_Import.def
scilab/modules/graphics/graphics.vcxproj
scilab/modules/graphics/includes/gw_graphics.h
scilab/modules/graphics/sci_gateway/c/gw_graphics.c
scilab/modules/graphics/sci_gateway/c/sci_draw.c
scilab/modules/graphics/sci_gateway/c/sci_glue.c
scilab/modules/graphics/sci_gateway/c/sci_xget.c
scilab/modules/graphics/sci_gateway/c/sci_xset.c
scilab/modules/graphics/src/c/getHandleProperty/SetHashTable.c
scilab/modules/graphics/src/c/getHandleProperty/getHandleProperty.h
scilab/modules/graphics/src/c/getHandleProperty/get_auto_margins_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_current_axes_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_data_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_datatip_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_datatips_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_default_axes_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_image_type_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_user_data_property.c
scilab/modules/graphics/src/nographics/nographics.c
scilab/modules/gui/Makefile.in
scilab/modules/gui/demos/gui.dem.gateway.sce
scilab/modules/gui/includes/GetConsoleShowHiddenHandles.h
scilab/modules/gui/includes/GetUicontrolBackgroundColor.h
scilab/modules/gui/includes/GetUicontrolFontAngle.h
scilab/modules/gui/includes/GetUicontrolFontName.h
scilab/modules/gui/includes/GetUicontrolFontSize.h
scilab/modules/gui/includes/GetUicontrolFontUnits.h
scilab/modules/gui/includes/GetUicontrolFontWeight.h
scilab/modules/gui/includes/GetUicontrolHorizontalAlignment.h
scilab/modules/gui/includes/GetUicontrolListboxTop.h
scilab/modules/gui/includes/GetUicontrolMax.h
scilab/modules/gui/includes/GetUicontrolMin.h
scilab/modules/gui/includes/GetUicontrolPosition.h
scilab/modules/gui/includes/GetUicontrolRelief.h
scilab/modules/gui/includes/GetUicontrolSliderStep.h
scilab/modules/gui/includes/GetUicontrolString.h
scilab/modules/gui/includes/GetUicontrolStyle.h
scilab/modules/gui/includes/GetUicontrolTooltipString.h
scilab/modules/gui/includes/GetUicontrolUnits.h
scilab/modules/gui/includes/GetUicontrolValue.h
scilab/modules/gui/includes/GetUicontrolVerticalAlignment.h
scilab/modules/gui/includes/GetUimenuChecked.h
scilab/modules/gui/includes/GetUiobjectEnable.h
scilab/modules/gui/includes/GetUiobjectForegroundColor.h
scilab/modules/gui/includes/gw_gui.h
scilab/modules/gui/sci_gateway/c/gw_gui.c
scilab/modules/gui/sci_gateway/c/sci_helpbrowser.c
scilab/modules/gui/sci_gateway/c/sci_toolbar.c
scilab/modules/gui/src/c/gui.vcxproj
scilab/modules/gui/src/cpp/GetUicontrolString.cpp
scilab/modules/gui/src/cpp/GetUicontrolTooltipString.cpp
scilab/modules/gui/src/cpp/GetUicontrolUnits.cpp
scilab/modules/gui/src/cpp/InitUIMenu.cpp
scilab/modules/gui/src/cpp/SetUicontrolBackgroundColor.cpp
scilab/modules/gui/src/cpp/SetUicontrolPosition.cpp
scilab/modules/gui/src/cpp/SetUicontrolSliderStep.cpp
scilab/modules/gui/src/cpp/SetUicontrolValue.cpp
scilab/modules/gui/src/cpp/SetUiobjectForegroundColor.cpp
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/label/SwingScilabLabel.java
scilab/modules/helptools/Makefile.in
scilab/modules/helptools/data/configuration/scilab_macros.txt
scilab/modules/helptools/data/pages/homepage-en_US.html
scilab/modules/helptools/data/pages/homepage-fr_FR.html
scilab/modules/history_browser/Makefile.am
scilab/modules/history_browser/Makefile.in
scilab/modules/history_browser/src/c/history_browser.vcxproj
scilab/modules/history_browser/src/nohistory_browser/nohistory_browser.c
scilab/modules/intersci/Makefile.in
scilab/modules/io/includes/setenvc.h
scilab/modules/jvm/Makefile.am
scilab/modules/jvm/Makefile.in
scilab/modules/jvm/includes/gw_jvm.h
scilab/modules/jvm/libjvm.vcxproj
scilab/modules/jvm/libjvm.vcxproj.filters
scilab/modules/jvm/sci_gateway/c/gw_jvm.c
scilab/modules/linear_algebra/Makefile.am
scilab/modules/linear_algebra/Makefile.in
scilab/modules/linear_algebra/includes/gw_linear_algebra.h
scilab/modules/linear_algebra/sci_gateway/c/gw_linear_algebra.c
scilab/modules/linear_algebra/sci_gateway/c/gw_linear_algebra2.c
scilab/modules/linear_algebra/sci_gateway/c/sci_spec.c
scilab/modules/linear_algebra/src/c/linear_algebra.vcxproj
scilab/modules/linear_algebra/src/c/linear_algebra.vcxproj.filters
scilab/modules/linear_algebra/src/c/linear_algebra_f_Import.def
scilab/modules/linear_algebra/src/fortran/linear_algebra_Import.def
scilab/modules/localization/Makefile.in
scilab/modules/localization/src/c/setgetlanguage.c
scilab/modules/localization/tests/unit_tests/unicode_io.dia.ref
scilab/modules/matio/Makefile.in
scilab/modules/mexlib/src/c/mexlib.c
scilab/modules/polynomials/sci_gateway/fortran/polops.f
scilab/modules/polynomials/sci_gateway/fortran/sci_f_poly.f
scilab/modules/preferences/src/c/getScilabPreference.c
scilab/modules/scicos/src/c/ezxml.c
scilab/modules/scinotes/Makefile.in
scilab/modules/spreadsheet/src/c/csvDefault.c
scilab/modules/spreadsheet/src/c/csvRead.c
scilab/modules/string/Makefile.am
scilab/modules/string/Makefile.in
scilab/modules/string/sci_gateway/c/sci_convstr.c
scilab/modules/string/sci_gateway/c/sci_length.c
scilab/modules/string/src/c/convstr.c
scilab/modules/ui_data/Makefile.in
scilab/modules/xml/includes/gw_xml.h
scilab/tools/innosetup/icons.iss

Change-Id: I772ff02ce896e5c32e16ad9abbe4089c9f3a3d02

446 files changed:
1  2 
scilab/.gitignore
scilab/Makefile.in
scilab/bin/scilab
scilab/configure
scilab/configure.ac
scilab/contrib/Makefile.in
scilab/desktop/Makefile.in
scilab/desktop/images/icons/Makefile.in
scilab/modules/Makefile.am
scilab/modules/Makefile.in
scilab/modules/action_binding/Makefile.in
scilab/modules/api_scilab/Makefile.in
scilab/modules/api_scilab/includes/api_optional.h
scilab/modules/api_scilab/includes/returnPropertyList.h
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_common.cpp
scilab/modules/api_scilab/src/cpp/api_double.cpp
scilab/modules/api_scilab/src/cpp/api_error.cpp
scilab/modules/api_scilab/src/cpp/api_int.cpp
scilab/modules/api_scilab/src/cpp/api_list.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/api_scilab/src/cpp/returnPropertyList.cpp
scilab/modules/arnoldi/Makefile.am
scilab/modules/arnoldi/Makefile.in
scilab/modules/arnoldi/sci_gateway/c/sci_dnaupd.c
scilab/modules/arnoldi/sci_gateway/c/sci_dneupd.c
scilab/modules/arnoldi/sci_gateway/c/sci_dsaupd.c
scilab/modules/arnoldi/sci_gateway/c/sci_dseupd.c
scilab/modules/arnoldi/sci_gateway/c/sci_znaupd.c
scilab/modules/arnoldi/sci_gateway/c/sci_zneupd.c
scilab/modules/ast/Makefile.in
scilab/modules/atoms/Makefile.in
scilab/modules/boolean/Makefile.am
scilab/modules/boolean/Makefile.in
scilab/modules/boolean/src/c/boolean.vcxproj
scilab/modules/boolean/src/c/boolean.vcxproj.filters
scilab/modules/boolean/src/fortran/boolean_f2c.vcxproj
scilab/modules/boolean/src/fortran/boolean_f2c.vcxproj.filters
scilab/modules/cacsd/Makefile.am
scilab/modules/cacsd/Makefile.in
scilab/modules/cacsd/sci_gateway/c/sci_dhinf.c
scilab/modules/cacsd/sci_gateway/c/sci_hinf.c
scilab/modules/cacsd/sci_gateway/c/sci_linmeq.c
scilab/modules/cacsd/sci_gateway/c/sci_mucomp.c
scilab/modules/cacsd/sci_gateway/c/sci_rrankqr.c
scilab/modules/cacsd/sci_gateway/c/sci_zrankqr.c
scilab/modules/call_scilab/Makefile.in
scilab/modules/call_scilab/tests/nonreg_tests/bug_8115.tst
scilab/modules/commons/Makefile.am
scilab/modules/commons/Makefile.in
scilab/modules/commons/src/c/commons.vcxproj
scilab/modules/commons/src/c/commons.vcxproj.filters
scilab/modules/compatibility_functions/Makefile.in
scilab/modules/completion/Makefile.in
scilab/modules/completion/src/c/completeLine.c
scilab/modules/completion/tests/utilities/sci_getcommonpart.c
scilab/modules/console/Makefile.in
scilab/modules/console/src/c/cmdLine/autoCompletionCli.c
scilab/modules/core/Makefile.am
scilab/modules/core/Makefile.in
scilab/modules/core/core.iss
scilab/modules/core/includes/callinterf.h
scilab/modules/core/includes/stack-c.h
scilab/modules/core/sci_gateway/c/sci_warning.c
scilab/modules/core/src/c/callinterf.c
scilab/modules/core/src/c/core.vcxproj
scilab/modules/core/src/c/core.vcxproj.filters
scilab/modules/core/src/c/dynamic_gateways.c
scilab/modules/core/src/c/dynamic_tclsci.c
scilab/modules/core/src/c/sci_tools.c
scilab/modules/data_structures/Makefile.in
scilab/modules/demo_tools/Makefile.in
scilab/modules/demo_tools/demo_tools.iss
scilab/modules/development_tools/Makefile.in
scilab/modules/development_tools/macros/test_run.sci
scilab/modules/development_tools/src/fake/Makefile.in
scilab/modules/differential_equations/Makefile.in
scilab/modules/dynamic_link/Makefile.in
scilab/modules/dynamic_link/macros/ilib_compile.sci
scilab/modules/elementary_functions/Makefile.am
scilab/modules/elementary_functions/Makefile.in
scilab/modules/elementary_functions/sci_gateway/c/sci_base2dec.c
scilab/modules/elementary_functions/sci_gateway/elementary_functions_gateway.xml
scilab/modules/elementary_functions/src/c/elementary_functions.vcxproj
scilab/modules/elementary_functions/src/c/elementary_functions.vcxproj.filters
scilab/modules/elementary_functions/src/c/elementary_functions_f_Import.def
scilab/modules/elementary_functions/src/fortran/elementary_functions_f.vfproj
scilab/modules/elementary_functions/src/fortran/elementary_functions_f2c.vcxproj
scilab/modules/elementary_functions/src/fortran/elementary_functions_f2c.vcxproj.filters
scilab/modules/elementary_functions/tests/nonreg_tests/bug_8412.dia.ref
scilab/modules/elementary_functions/tests/nonreg_tests/bug_8412.tst
scilab/modules/elementary_functions/tests/unit_tests/find.dia.ref
scilab/modules/elementary_functions/tests/unit_tests/find.tst
scilab/modules/elementary_functions/tests/unit_tests/prod.dia.ref
scilab/modules/elementary_functions/tests/unit_tests/prod.tst
scilab/modules/elementary_functions/tests/unit_tests/repmat.tst
scilab/modules/elementary_functions/tests/unit_tests/sum.dia.ref
scilab/modules/elementary_functions/tests/unit_tests/sum.tst
scilab/modules/external_objects/Makefile.am
scilab/modules/external_objects/Makefile.in
scilab/modules/external_objects/sci_gateway/c/gw_external_objects.c
scilab/modules/external_objects/src/cpp/ScilabObjects.cpp
scilab/modules/external_objects_java/Makefile.am
scilab/modules/external_objects_java/Makefile.in
scilab/modules/external_objects_java/src/cpp/ScilabJavaEnvironment.cpp
scilab/modules/fftw/Makefile.am
scilab/modules/fftw/Makefile.in
scilab/modules/fileio/Makefile.am
scilab/modules/fileio/Makefile.in
scilab/modules/fileio/fileio.vcxproj
scilab/modules/fileio/fileio.vcxproj.filters
scilab/modules/fileio/help/en_US/mseek.xml
scilab/modules/fileio/macros/%_listvarinfile.sci
scilab/modules/fileio/sci_gateway/c/sci_getURL.c
scilab/modules/fileio/sci_gateway/c/sci_splitURL.c
scilab/modules/fileio/src/c/dlManager.c
scilab/modules/functions/Makefile.in
scilab/modules/functions_manager/Makefile.in
scilab/modules/genetic_algorithms/Makefile.in
scilab/modules/graph/Makefile.in
scilab/modules/graphic_export/Makefile.am
scilab/modules/graphic_export/Makefile.in
scilab/modules/graphic_export/etc/graphic_export.start
scilab/modules/graphic_export/graphic_export.vcxproj
scilab/modules/graphic_export/graphic_export.vcxproj.filters
scilab/modules/graphic_export/includes/gw_graphic_export.h
scilab/modules/graphic_export/sci_gateway/c/gw_graphic_export.c
scilab/modules/graphic_export/sci_gateway/c/sci_xs2emf.c
scilab/modules/graphic_export/sci_gateway/c/xs2file.c
scilab/modules/graphic_export/sci_gateway/cpp/sci_driver.cpp
scilab/modules/graphic_export/sci_gateway/graphic_export_gateway.xml
scilab/modules/graphic_export/src/nographic_export/nographic_export.c
scilab/modules/graphic_objects/Makefile.am
scilab/modules/graphic_objects/Makefile.in
scilab/modules/graphic_objects/includes/ScilabView.hxx
scilab/modules/graphic_objects/src/c/graphic_objects.vcxproj
scilab/modules/graphic_objects/src/c/graphic_objects.vcxproj.filters
scilab/modules/graphic_objects/src/cpp/FigureList.cpp
scilab/modules/graphic_objects/src/nographic_objects/nographic_objects.c
scilab/modules/graphics/Makefile.am
scilab/modules/graphics/Makefile.in
scilab/modules/graphics/core_Import.def
scilab/modules/graphics/graphics.iss
scilab/modules/graphics/graphics.vcxproj
scilab/modules/graphics/graphics.vcxproj.filters
scilab/modules/graphics/includes/gw_graphics.h
scilab/modules/graphics/macros/%h_p.sci
scilab/modules/graphics/macros/datatips/datatipsGUI.sci
scilab/modules/graphics/sci_gateway/c/sci_Legend.c
scilab/modules/graphics/sci_gateway/c/sci_StringBox.c
scilab/modules/graphics/sci_gateway/c/sci_addcolor.c
scilab/modules/graphics/sci_gateway/c/sci_champ.c
scilab/modules/graphics/sci_gateway/c/sci_color.c
scilab/modules/graphics/sci_gateway/c/sci_contour2di.c
scilab/modules/graphics/sci_gateway/c/sci_delete.c
scilab/modules/graphics/sci_gateway/c/sci_drawlater.c
scilab/modules/graphics/sci_gateway/c/sci_drawnow.c
scilab/modules/graphics/sci_gateway/c/sci_fec.c
scilab/modules/graphics/sci_gateway/c/sci_geom3d.c
scilab/modules/graphics/sci_gateway/c/sci_get.c
scilab/modules/graphics/sci_gateway/c/sci_glue.c
scilab/modules/graphics/sci_gateway/c/sci_grayplot.c
scilab/modules/graphics/sci_gateway/c/sci_light.c
scilab/modules/graphics/sci_gateway/c/sci_matplot1.c
scilab/modules/graphics/sci_gateway/c/sci_move.c
scilab/modules/graphics/sci_gateway/c/sci_name2rgb.c
scilab/modules/graphics/sci_gateway/c/sci_newaxes.c
scilab/modules/graphics/sci_gateway/c/sci_param3d.c
scilab/modules/graphics/sci_gateway/c/sci_param3d1.c
scilab/modules/graphics/sci_gateway/c/sci_plot2d.c
scilab/modules/graphics/sci_gateway/c/sci_plot2d1.c
scilab/modules/graphics/sci_gateway/c/sci_plot3d.c
scilab/modules/graphics/sci_gateway/c/sci_relocate_handle.c
scilab/modules/graphics/sci_gateway/c/sci_rubberbox.c
scilab/modules/graphics/sci_gateway/c/sci_set.c
scilab/modules/graphics/sci_gateway/c/sci_show_window.c
scilab/modules/graphics/sci_gateway/c/sci_swap_handles.c
scilab/modules/graphics/sci_gateway/c/sci_xarc.c
scilab/modules/graphics/sci_gateway/c/sci_xarcs.c
scilab/modules/graphics/sci_gateway/c/sci_xarrows.c
scilab/modules/graphics/sci_gateway/c/sci_xchange.c
scilab/modules/graphics/sci_gateway/c/sci_xdel.c
scilab/modules/graphics/sci_gateway/c/sci_xfarcs.c
scilab/modules/graphics/sci_gateway/c/sci_xfpoly.c
scilab/modules/graphics/sci_gateway/c/sci_xfpolys.c
scilab/modules/graphics/sci_gateway/c/sci_xgetmouse.c
scilab/modules/graphics/sci_gateway/c/sci_xgraduate.c
scilab/modules/graphics/sci_gateway/c/sci_xgrid.c
scilab/modules/graphics/sci_gateway/c/sci_xlfont.c
scilab/modules/graphics/sci_gateway/c/sci_xname.c
scilab/modules/graphics/sci_gateway/c/sci_xpoly.c
scilab/modules/graphics/sci_gateway/c/sci_xpolys.c
scilab/modules/graphics/sci_gateway/c/sci_xrect.c
scilab/modules/graphics/sci_gateway/c/sci_xrects.c
scilab/modules/graphics/sci_gateway/c/sci_xsegs.c
scilab/modules/graphics/sci_gateway/c/sci_xstring.c
scilab/modules/graphics/sci_gateway/c/sci_xstringb.c
scilab/modules/graphics/sci_gateway/c/sci_xtitle.c
scilab/modules/graphics/sci_gateway/c/sci_zoom_rect.c
scilab/modules/graphics/sci_gateway/cpp/graphics_gw.cpp
scilab/modules/graphics/sci_gateway/cpp/sci_xget.cpp
scilab/modules/graphics/sci_gateway/cpp/sci_xset.cpp
scilab/modules/graphics/src/c/InitObjects.c
scilab/modules/graphics/src/c/SetProperty.c
scilab/modules/graphics/src/c/getHandleProperty/GetHashTable.c
scilab/modules/graphics/src/c/getHandleProperty/SetHashTable.c
scilab/modules/graphics/src/c/getHandleProperty/getHandleProperty.h
scilab/modules/graphics/src/c/getHandleProperty/get_auto_margins_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_constraints_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_current_axes_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_current_figure_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_data_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_data_property.h
scilab/modules/graphics/src/c/getHandleProperty/get_datatip_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_datatips_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_default_axes_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_display_function_data_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_dockable_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_figure_style_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_figures_id_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_grid_style_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_grid_thickness_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_groupname_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_image_type_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_infobar_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_layout_options_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_layout_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_line_width_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_mark_offset_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_mark_stride_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_marks_count_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_menubar_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_rect_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_resize_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_scrollable_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_tabtitle_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_ticks_format_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_ticks_st_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_toolbar_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_user_data_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_display_function_data_property.c
scilab/modules/gui/Makefile.am
scilab/modules/gui/Makefile.in
scilab/modules/gui/includes/GetUicontrol.h
scilab/modules/gui/includes/gw_gui.h
scilab/modules/gui/sci_gateway/c/gw_gui.c
scilab/modules/gui/sci_gateway/c/sci_ClipBoard.c
scilab/modules/gui/sci_gateway/c/sci_delmenu.c
scilab/modules/gui/sci_gateway/c/sci_exportUI.c
scilab/modules/gui/sci_gateway/c/sci_figure.c
scilab/modules/gui/sci_gateway/c/sci_setmenu.c
scilab/modules/gui/sci_gateway/c/sci_toolbar.c
scilab/modules/gui/sci_gateway/c/sci_uicontrol.c
scilab/modules/gui/sci_gateway/c/sci_uigetcolor.c
scilab/modules/gui/sci_gateway/c/sci_uigetfont.c
scilab/modules/gui/sci_gateway/c/sci_uimenu.c
scilab/modules/gui/sci_gateway/c/sci_unsetmenu.c
scilab/modules/gui/sci_gateway/c/sci_waitbar.c
scilab/modules/gui/sci_gateway/c/sci_x_choice.c
scilab/modules/gui/sci_gateway/c/sci_x_mdialog.c
scilab/modules/gui/sci_gateway/cpp/gui_gw.cpp
scilab/modules/gui/sci_gateway/cpp/sci_datatip_set_display.cpp
scilab/modules/gui/sci_gateway/cpp/sci_datatip_set_interp.cpp
scilab/modules/gui/sci_gateway/cpp/sci_datatip_set_style.cpp
scilab/modules/gui/sci_gateway/cpp/sci_loadGui.cpp
scilab/modules/gui/sci_gateway/cpp/sci_printfigure.cpp
scilab/modules/gui/sci_gateway/cpp/sci_raise_window.cpp
scilab/modules/gui/sci_gateway/cpp/sci_saveGui.cpp
scilab/modules/gui/src/c/InitializeGUI.c
scilab/modules/gui/src/c/gui.vcxproj
scilab/modules/gui/src/c/gui.vcxproj.filters
scilab/modules/gui/src/cpp/GetConsoleShowHiddenHandles.cpp
scilab/modules/gui/src/cpp/GetUicontrolBackgroundColor.cpp
scilab/modules/gui/src/cpp/GetUicontrolFontAngle.cpp
scilab/modules/gui/src/cpp/GetUicontrolFontName.cpp
scilab/modules/gui/src/cpp/GetUicontrolFontSize.cpp
scilab/modules/gui/src/cpp/GetUicontrolFontUnits.cpp
scilab/modules/gui/src/cpp/GetUicontrolFontWeight.cpp
scilab/modules/gui/src/cpp/GetUicontrolHorizontalAlignment.cpp
scilab/modules/gui/src/cpp/GetUicontrolIcon.cpp
scilab/modules/gui/src/cpp/GetUicontrolListboxTop.cpp
scilab/modules/gui/src/cpp/GetUicontrolMax.cpp
scilab/modules/gui/src/cpp/GetUicontrolMin.cpp
scilab/modules/gui/src/cpp/GetUicontrolPosition.cpp
scilab/modules/gui/src/cpp/GetUicontrolRelief.cpp
scilab/modules/gui/src/cpp/GetUicontrolSliderStep.cpp
scilab/modules/gui/src/cpp/GetUicontrolString.cpp
scilab/modules/gui/src/cpp/GetUicontrolStyle.cpp
scilab/modules/gui/src/cpp/GetUicontrolTooltipString.cpp
scilab/modules/gui/src/cpp/GetUicontrolUnits.cpp
scilab/modules/gui/src/cpp/GetUicontrolValue.cpp
scilab/modules/gui/src/cpp/GetUicontrolVerticalAlignment.cpp
scilab/modules/gui/src/cpp/GetUimenuChecked.cpp
scilab/modules/gui/src/cpp/GetUimenuLabel.cpp
scilab/modules/gui/src/cpp/GetUiobjectEnable.cpp
scilab/modules/gui/src/cpp/GetUiobjectForegroundColor.cpp
scilab/modules/gui/src/cpp/InitUIMenu.cpp
scilab/modules/hdf5/Makefile.am
scilab/modules/hdf5/Makefile.in
scilab/modules/hdf5/sci_gateway/cpp/sci_h5read.cpp
scilab/modules/hdf5/sci_gateway/cpp/sci_h5write.cpp
scilab/modules/hdf5/src/cpp/h5create.hpp
scilab/modules/helptools/Makefile.am
scilab/modules/helptools/Makefile.in
scilab/modules/history_browser/Makefile.am
scilab/modules/history_browser/Makefile.in
scilab/modules/history_browser/sci_gateway/c/gw_history_browser.c
scilab/modules/history_browser/src/c/history_browser.vcxproj
scilab/modules/history_browser/src/nohistory_browser/nohistory_browser.c
scilab/modules/history_manager/Makefile.in
scilab/modules/integer/Makefile.in
scilab/modules/interpolation/Makefile.in
scilab/modules/io/Makefile.in
scilab/modules/io/includes/setenvc.h
scilab/modules/io/macros/%_save.sci
scilab/modules/io/src/c/setenvc.c
scilab/modules/javasci/Makefile.am
scilab/modules/javasci/Makefile.in
scilab/modules/jvm/Makefile.am
scilab/modules/jvm/Makefile.in
scilab/modules/jvm/includes/gw_jvm.h
scilab/modules/jvm/libjvm.vcxproj
scilab/modules/jvm/libjvm.vcxproj.filters
scilab/modules/jvm/sci_gateway/cpp/libjvm_gw.vcxproj
scilab/modules/jvm/sci_gateway/cpp/libjvm_gw.vcxproj.filters
scilab/modules/linear_algebra/Makefile.am
scilab/modules/linear_algebra/Makefile.in
scilab/modules/linear_algebra/includes/gw_linear_algebra.h
scilab/modules/linear_algebra/sci_gateway/c/sci_norm.c
scilab/modules/linear_algebra/sci_gateway/cpp/linear_algebra_gw.cpp
scilab/modules/linear_algebra/sci_gateway/cpp/linear_algebra_gw.vcxproj
scilab/modules/linear_algebra/sci_gateway/cpp/linear_algebra_gw.vcxproj.filters
scilab/modules/linear_algebra/src/c/linear_algebra.vcxproj
scilab/modules/linear_algebra/src/c/linear_algebra.vcxproj.filters
scilab/modules/linear_algebra/src/c/linear_algebra_f_Import.def
scilab/modules/linear_algebra/src/c/norm.h
scilab/modules/localization/Makefile.am
scilab/modules/localization/Makefile.in
scilab/modules/localization/src/c/InitializeLocalization.c
scilab/modules/localization/src/c/setgetlanguage.c
scilab/modules/m2sci/Makefile.in
scilab/modules/matio/Makefile.am
scilab/modules/matio/Makefile.in
scilab/modules/matio/sci_gateway/c/sci_matfile_listvar.c
scilab/modules/matio/sci_gateway/c/sci_matfile_open.c
scilab/modules/matio/sci_gateway/c/sci_matfile_varwrite.c
scilab/modules/mexlib/Makefile.in
scilab/modules/modules_manager/Makefile.in
scilab/modules/mpi/Makefile.in
scilab/modules/operations/Makefile.in
scilab/modules/operations/macros/%p_p_s.sci
scilab/modules/optimization/Makefile.in
scilab/modules/optimization/sci_gateway/c/sci_qld.c
scilab/modules/optimization/sci_gateway/c/sci_qp_solve.c
scilab/modules/output_stream/Makefile.in
scilab/modules/overloading/Makefile.in
scilab/modules/overloading/macros/generic_i_h.sci
scilab/modules/parallel/Makefile.in
scilab/modules/parameters/Makefile.in
scilab/modules/parse/Makefile.in
scilab/modules/polynomials/Makefile.in
scilab/modules/prebuildjava/Makefile.in
scilab/modules/preferences/Makefile.am
scilab/modules/preferences/Makefile.in
scilab/modules/preferences/src/c/getScilabPreference.c
scilab/modules/randlib/Makefile.in
scilab/modules/renderer/Makefile.in
scilab/modules/scicos/Makefile.am
scilab/modules/scicos/Makefile.in
scilab/modules/scicos/src/c/ezxml.c
scilab/modules/scicos/src/c/scicos.c
scilab/modules/scicos/src/c/scicos.vcxproj
scilab/modules/scicos/src/c/scicos.vcxproj.filters
scilab/modules/scicos_blocks/Makefile.am
scilab/modules/scicos_blocks/Makefile.in
scilab/modules/scicos_blocks/src/c/bouncexy.c
scilab/modules/scicos_blocks/src/c/cscopxy3d.c
scilab/modules/scicos_blocks/src/c/fromws_c.c
scilab/modules/scicos_blocks/src/c/readau.c
scilab/modules/scicos_blocks/src/c/readc.c
scilab/modules/scicos_blocks/src/c/tows_c.c
scilab/modules/scinotes/Makefile.am
scilab/modules/scinotes/Makefile.in
scilab/modules/scinotes/src/noscinotes/noscinotes.c
scilab/modules/signal_processing/Makefile.in
scilab/modules/simulated_annealing/Makefile.in
scilab/modules/sound/Makefile.in
scilab/modules/sparse/Makefile.in
scilab/modules/special_functions/Makefile.am
scilab/modules/special_functions/Makefile.in
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/spreadsheet/Makefile.in
scilab/modules/spreadsheet/sci_gateway/c/gw_csv_helpers.c
scilab/modules/spreadsheet/sci_gateway/c/sci_csvRead.c
scilab/modules/spreadsheet/src/c/csvDefault.c
scilab/modules/spreadsheet/src/c/csvRead.c
scilab/modules/statistics/Makefile.in
scilab/modules/string/Makefile.am
scilab/modules/string/Makefile.in
scilab/modules/string/src/c/convstr.c
scilab/modules/symbol/Makefile.in
scilab/modules/symbolic/Makefile.in
scilab/modules/system_env/Makefile.in
scilab/modules/tclsci/Makefile.am
scilab/modules/tclsci/Makefile.in
scilab/modules/threads/Makefile.in
scilab/modules/time/Makefile.in
scilab/modules/types/Makefile.in
scilab/modules/ui_data/Makefile.am
scilab/modules/ui_data/Makefile.in
scilab/modules/ui_data/src/noui_data/noui_data.c
scilab/modules/umfpack/Makefile.am
scilab/modules/umfpack/Makefile.in
scilab/modules/windows_tools/Makefile.in
scilab/modules/windows_tools/src/c/scilab_windows/splashScreen.cpp
scilab/modules/xcos/Makefile.am
scilab/modules/xcos/Makefile.in
scilab/modules/xcos/src/noxcos/noxcos.c
scilab/modules/xml/Makefile.am
scilab/modules/xml/Makefile.in
scilab/modules/xml/sci_gateway/c/gw_xml.c
scilab/modules/xml/sci_gateway/cpp/sci_htmlDump.cpp
scilab/modules/xml/sci_gateway/cpp/sci_htmlRead.cpp
scilab/modules/xml/sci_gateway/cpp/sci_htmlReadStr.cpp
scilab/modules/xml/sci_gateway/cpp/sci_htmlWrite.cpp
scilab/modules/xml/sci_gateway/cpp/sci_xmlAddNs.cpp
scilab/modules/xml/sci_gateway/cpp/sci_xmlAppend.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_xmlName.cpp
scilab/modules/xml/sci_gateway/cpp/sci_xmlNs.cpp
scilab/modules/xml/sci_gateway/cpp/sci_xmlValidate.cpp
scilab/modules/xml/sci_gateway/cpp/sci_xmlWrite.cpp
scilab/modules/xml/src/c/XMLMlistsManagement.c
scilab/modules/xml/xml.vcxproj
scilab/modules/xml/xml.vcxproj.filters
scilab/scilab-lib.properties.in
scilab/tools/innosetup/Create_ISS.sce
scilab/tools/innosetup/code.iss
scilab/tools/innosetup/components.iss

Simple merge
Simple merge
Simple merge
@@@ -11440,7 -11049,7 +11448,7 @@@ $as_echo "$ac_java_classpath" >&6; 
  $as_echo_n "checking to see if the java compiler works... " >&6; }
  
      cat << \EOF > conftest.java
- // #line 11443 "configure"
 -// #line 11052 "configure"
++// #line 11451 "configure"
  import java.util.regex.Pattern;
  
  
@@@ -11527,7 -11136,7 +11535,7 @@@ $as_echo_n "checking type of jvm... " >
      if test "x$ac_java_jvm_name" = "x" ; then
  
      cat << \EOF > conftest.java
- // #line 11530 "configure"
 -// #line 11139 "configure"
++// #line 11538 "configure"
  import java.util.regex.Pattern;
  
  import gnu.java.io.EncodingManager;
@@@ -11611,7 -11220,7 +11619,7 @@@ $as_echo_n "checking java API version..
      # The class java.nio.charset.Charset is new to 1.4
  
      cat << \EOF > conftest.java
- // #line 11614 "configure"
 -// #line 11223 "configure"
++// #line 11622 "configure"
  import java.util.regex.Pattern;
  
  import java.nio.charset.Charset;
      # The class java.lang.StringBuilder is new to 1.5
  
      cat << \EOF > conftest.java
- // #line 11679 "configure"
 -// #line 11288 "configure"
++// #line 11687 "configure"
  import java.util.regex.Pattern;
  
  import java.lang.StringBuilder;
      # The class java.util.ArrayDeque is new to 1.6
  
      cat << \EOF > conftest.java
- // #line 11744 "configure"
 -// #line 11353 "configure"
++// #line 11752 "configure"
  import java.util.regex.Pattern;
  
  import java.util.ArrayDeque;
      # The class java.nio.file.Path is new to 1.7
  
      cat << \EOF > conftest.java
- // #line 11809 "configure"
 -// #line 11418 "configure"
++// #line 11817 "configure"
  import java.util.regex.Pattern;
  
  import java.nio.file.Path;
@@@ -13184,7 -12793,7 +13192,7 @@@ $as_echo_n "checking jgraphx... " >&6; 
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 13187 "configure"
 -// #line 12796 "configure"
++// #line 13195 "configure"
  import java.util.regex.Pattern;
  
  import com.mxgraph.model.mxCell;
@@@ -13291,7 -12900,7 +13299,7 @@@ $as_echo_n "checking minimal version (2
     if test "x" == "x"; then
  
      cat << \EOF > conftest.java
- // #line 13294 "configure"
 -// #line 12903 "configure"
++// #line 13302 "configure"
  import java.util.regex.Pattern;
  
  import com.mxgraph.view.mxGraph;
     else
  
      cat << \EOF > conftest.java
- // #line 13366 "configure"
 -// #line 12975 "configure"
++// #line 13374 "configure"
  import java.util.regex.Pattern;
  
  import com.mxgraph.view.mxGraph;
@@@ -13457,7 -13066,7 +13465,7 @@@ $as_echo_n "checking scirenderer... " >
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 13460 "configure"
 -// #line 13069 "configure"
++// #line 13468 "configure"
  import java.util.regex.Pattern;
  
  import org.scilab.forge.scirenderer.PackageInfo;
@@@ -13564,7 -13173,7 +13572,7 @@@ $as_echo_n "checking minimal version (1
     if test "x" == "x"; then
  
      cat << \EOF > conftest.java
- // #line 13567 "configure"
 -// #line 13176 "configure"
++// #line 13575 "configure"
  import java.util.regex.Pattern;
  
  import org.scilab.forge.scirenderer.PackageInfo;
     else
  
      cat << \EOF > conftest.java
- // #line 13639 "configure"
 -// #line 13248 "configure"
++// #line 13647 "configure"
  import java.util.regex.Pattern;
  
  import org.scilab.forge.scirenderer.PackageInfo;
@@@ -13735,7 -13344,7 +13743,7 @@@ $as_echo_n "checking flexdock... " >&6
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 13738 "configure"
 -// #line 13347 "configure"
++// #line 13746 "configure"
  import java.util.regex.Pattern;
  
  import org.flexdock.docking.DockingManager;
@@@ -13842,7 -13451,7 +13850,7 @@@ $as_echo_n "checking minimal version (1
     if test "x" == "x"; then
  
      cat << \EOF > conftest.java
- // #line 13845 "configure"
 -// #line 13454 "configure"
++// #line 13853 "configure"
  import java.util.regex.Pattern;
  
  import org.flexdock.util.Utilities;
     else
  
      cat << \EOF > conftest.java
- // #line 13917 "configure"
 -// #line 13526 "configure"
++// #line 13925 "configure"
  import java.util.regex.Pattern;
  
  import org.flexdock.util.Utilities;
@@@ -14005,7 -13614,7 +14013,7 @@@ $as_echo_n "checking looks... " >&6; 
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14008 "configure"
 -// #line 13617 "configure"
++// #line 14016 "configure"
  import java.util.regex.Pattern;
  
  import com.jgoodies.looks.common.MenuItemRenderer;
@@@ -14122,7 -13731,7 +14130,7 @@@ $as_echo_n "checking jgoodies-looks... 
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14125 "configure"
 -// #line 13734 "configure"
++// #line 14133 "configure"
  import java.util.regex.Pattern;
  
  import com.jgoodies.looks.common.MenuItemRenderer;
@@@ -14240,7 -13849,7 +14248,7 @@@ $as_echo_n "checking skinlf... " >&6; 
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14243 "configure"
 -// #line 13852 "configure"
++// #line 14251 "configure"
  import java.util.regex.Pattern;
  
  import com.l2fprod.util.AccessUtils;
@@@ -14357,7 -13966,7 +14365,7 @@@ $as_echo_n "checking jogl2... " >&6; 
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14360 "configure"
 -// #line 13969 "configure"
++// #line 14368 "configure"
  import java.util.regex.Pattern;
  
  import javax.media.opengl.glu.GLUnurbs;
@@@ -14580,7 -14189,7 +14588,7 @@@ $as_echo_n "checking gluegen2-rt... " >
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14583 "configure"
 -// #line 14192 "configure"
++// #line 14591 "configure"
  import java.util.regex.Pattern;
  
  import jogamp.common.os.MachineDescriptionRuntime;
@@@ -14754,7 -14363,7 +14762,7 @@@ $as_echo_n "checking jhall... " >&6; 
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14757 "configure"
 -// #line 14366 "configure"
++// #line 14765 "configure"
  import java.util.regex.Pattern;
  
  import javax.help.JHelp;
@@@ -14871,7 -14480,7 +14879,7 @@@ $as_echo_n "checking javahelp2... " >&6
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14874 "configure"
 -// #line 14483 "configure"
++// #line 14882 "configure"
  import java.util.regex.Pattern;
  
  import javax.help.JHelp;
@@@ -14989,7 -14598,7 +14997,7 @@@ $as_echo_n "checking jrosetta-API... " 
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14992 "configure"
 -// #line 14601 "configure"
++// #line 15000 "configure"
  import java.util.regex.Pattern;
  
  import com.artenum.rosetta.interfaces.core.ConsoleConfiguration;
@@@ -15104,7 -14713,7 +15112,7 @@@ $as_echo_n "checking jrosetta-api... " 
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 15107 "configure"
 -// #line 14716 "configure"
++// #line 15115 "configure"
  import java.util.regex.Pattern;
  
  import com.artenum.rosetta.interfaces.core.ConsoleConfiguration;
@@@ -15222,7 -14831,7 +15230,7 @@@ $as_echo_n "checking jrosetta-engine..
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 15225 "configure"
 -// #line 14834 "configure"
++// #line 15233 "configure"
  import java.util.regex.Pattern;
  
  import com.artenum.rosetta.core.action.AbstractConsoleAction;
@@@ -15328,7 -14937,7 +15336,7 @@@ $as_echo_n "checking minimal version (1
     if test "x" == "x"; then
  
      cat << \EOF > conftest.java
- // #line 15331 "configure"
 -// #line 14940 "configure"
++// #line 15339 "configure"
  import java.util.regex.Pattern;
  
  import com.artenum.rosetta.util.ConfigurationBuilder;
     else
  
      cat << \EOF > conftest.java
- // #line 15403 "configure"
 -// #line 15012 "configure"
++// #line 15411 "configure"
  import java.util.regex.Pattern;
  
  import com.artenum.rosetta.util.ConfigurationBuilder;
@@@ -15493,7 -15102,7 +15501,7 @@@ $as_echo_n "checking jeuclid-core... " 
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 15496 "configure"
 -// #line 15105 "configure"
++// #line 15504 "configure"
  import java.util.regex.Pattern;
  
  import net.sourceforge.jeuclid.LayoutContext;
@@@ -15612,7 -15221,7 +15620,7 @@@ $as_echo_n "checking fop... " >&6; 
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 15615 "configure"
 -// #line 15224 "configure"
++// #line 15623 "configure"
  import java.util.regex.Pattern;
  
  import org.apache.fop.pdf.PDFInfo;
@@@ -15729,10 -15345,10 +15744,10 @@@ $as_echo_n "checking freehep-graphics2d
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 15732 "configure"
 -// #line 15348 "configure"
++// #line 15747 "configure"
  import java.util.regex.Pattern;
  
- import org.apache.batik.parser.Parser;
+ import org.freehep.graphics2d.VectorGraphics;
  
  public class conftest {
      public static void main(String[] argv) {
@@@ -15846,10 -15462,10 +15861,10 @@@ $as_echo_n "checking freehep-graphicsio
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 15849 "configure"
 -// #line 15465 "configure"
++// #line 15864 "configure"
  import java.util.regex.Pattern;
  
- import org.apache.batik.parser.Parser;
+ import org.freehep.graphicsio.emf.EMFGraphics2D;
  
  public class conftest {
      public static void main(String[] argv) {
@@@ -15942,30 -15558,616 +15957,616 @@@ $as_echo "$as_me: WARNING: Could not fi
        fi
      fi
  
-                    BATIK=$PACKAGE_JAR_FILE
+                     FREEHEP_GRAPHICSIO_EMF=$PACKAGE_JAR_FILE
+                     # Freehep GraphicsIO
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking freehep-graphicsio" >&5
+ $as_echo_n "checking freehep-graphicsio... " >&6; }
+     PACKAGE_JAR_FILE=
+     found_jar=no
+     saved_ac_java_classpath=$ac_java_classpath
+     DEFAULT_JAR_DIR="/usr/share/java /usr/lib/java /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(find /usr/share/java/ -maxdepth 1 -type d 2>/dev/null) $(find /usr/lib64/ -maxdepth 1 -type d 2>/dev/null) $(find  /usr/lib/ -maxdepth 1 -type d 2>/dev/null)  $(find /usr/share/*/lib -maxdepth 1 -type d 2>/dev/null)"
+     for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR; do
+       for jar in "$jardir/freehep-graphicsio.jar" "$jardir/libfreehep-graphicsio.jar" "$jardir/libfreehep-graphicsio-java.jar" "$jardir/freehep-graphicsio*.jar"; do
+ # TODO check the behaviour when spaces
+         jars_resolved=`ls $jar 2>/dev/null`
+         for jar_resolved in $jars_resolved; do # If several jars matches
+           if test -e "$jar_resolved"; then
+             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+     cat << \EOF > conftest.java
 -// #line 15582 "configure"
++// #line 15981 "configure"
+ import java.util.regex.Pattern;
+ import org.freehep.graphicsio.VectorGraphicsIO;
+ public class conftest {
+     public static void main(String[] argv) {
+     }
+     private static int compare(String v1, String v2) {
+         String s1 = normalisedVersion(v1);
+         String s2 = normalisedVersion(v2);
+         return s1.compareTo(s2);
+     }
+     private static String normalisedVersion(String version) {
+         return normalisedVersion(version, ".", 4);
+     }
+     private static String normalisedVersion(String version, String sep, int maxWidth) {
+         String[] split = Pattern.compile(sep, Pattern.LITERAL).split(version);
+         StringBuilder sb = new StringBuilder();
+         for (String s : split) {
+             sb.append(String.format("%" + maxWidth + 's', s));
+         }
+         return sb.toString();
+     }
+ }
+ EOF
+     CLASSPATH=$ac_java_classpath
+     export CLASSPATH
+     cmd="$JAVAC ${JAVAC_FLAGS} conftest.java"
+     if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5) ; then
+        if test ""no"" = "no"; then
+            echo "yes" >&5
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
+ $as_echo "$jar_resolved" >&6; }
+               found_jar=yes
+               PACKAGE_JAR_FILE=$jar_resolved
+               break 3
+        else
+               cmd="$JAVA conftest"
+               if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5); then
+                echo "yes" >&5
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
+ $as_echo "$jar_resolved" >&6; }
+               found_jar=yes
+               PACKAGE_JAR_FILE=$jar_resolved
+               break 3
+             else
+                 echo "configure: failed program was:" >&5
+                 cat conftest.java >&5
+                 if test -s conftest.java.output; then
+                    STDOUT=`cat conftest.java.output`
                  fi
+                 echo "configure: CLASSPATH was $CLASSPATH" >&5
  
+             ac_java_classpath=$saved_ac_java_classpath
  
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking minimal version (1.7) of batik" >&5
- $as_echo_n "checking minimal version (1.7) of batik... " >&6; }
-    saved_ac_java_classpath=$ac_java_classpath
-    export ac_java_classpath="$BATIK:$ac_java_classpath"
-    if test "x" == "x"; then
+                             fi
+         fi
+         if test -f conftest.java.output; then
+            rm conftest.java.output
+         fi
+     else
+         echo "configure: failed program was:" >&5
+         cat conftest.java >&5
+         echo "configure: CLASSPATH was $CLASSPATH" >&5
+             ac_java_classpath=$saved_ac_java_classpath
+             fi
+           fi
+         done
+       done
+     done
+     if test "$found_jar" = "no"; then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+       if test "" = "yes"; then
+          { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar freehep-graphicsio used by Freehep GraphicsIO (looking for package org.freehep.graphicsio.VectorGraphicsIO)" >&5
+ $as_echo "$as_me: WARNING: Could not find or use the Java package/jar freehep-graphicsio used by Freehep GraphicsIO (looking for package org.freehep.graphicsio.VectorGraphicsIO)" >&2;}
+       else
+           as_fn_error $? "Could not find or use the Java package/jar freehep-graphicsio used by Freehep GraphicsIO (looking for package org.freehep.graphicsio.VectorGraphicsIO)" "$LINENO" 5
+       fi
+     fi
+                     FREEHEP_GRAPHICSIO=$PACKAGE_JAR_FILE
+                     # Freehep IO
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking freehep-io" >&5
+ $as_echo_n "checking freehep-io... " >&6; }
+     PACKAGE_JAR_FILE=
+     found_jar=no
+     saved_ac_java_classpath=$ac_java_classpath
+     DEFAULT_JAR_DIR="/usr/share/java /usr/lib/java /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(find /usr/share/java/ -maxdepth 1 -type d 2>/dev/null) $(find /usr/lib64/ -maxdepth 1 -type d 2>/dev/null) $(find  /usr/lib/ -maxdepth 1 -type d 2>/dev/null)  $(find /usr/share/*/lib -maxdepth 1 -type d 2>/dev/null)"
+     for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR; do
+       for jar in "$jardir/freehep-io.jar" "$jardir/libfreehep-io.jar" "$jardir/libfreehep-io-java.jar" "$jardir/freehep-io*.jar"; do
+ # TODO check the behaviour when spaces
+         jars_resolved=`ls $jar 2>/dev/null`
+         for jar_resolved in $jars_resolved; do # If several jars matches
+           if test -e "$jar_resolved"; then
+             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 15956 "configure"
 -// #line 15699 "configure"
++// #line 16098 "configure"
  import java.util.regex.Pattern;
  
- import org.apache.batik.Version;
+ import org.freehep.util.io.XMLSequence;
  
  public class conftest {
      public static void main(String[] argv) {
-         String minVersion="1.7";
  
-                             System.out.println(Version.getVersion());
-                                   if (compare(minVersion, Version.getVersion()) > 0) {
-                                    System.exit(-1);
-                                 }
+     }
+     private static int compare(String v1, String v2) {
+         String s1 = normalisedVersion(v1);
+         String s2 = normalisedVersion(v2);
+         return s1.compareTo(s2);
+     }
+     private static String normalisedVersion(String version) {
+         return normalisedVersion(version, ".", 4);
+     }
+     private static String normalisedVersion(String version, String sep, int maxWidth) {
+         String[] split = Pattern.compile(sep, Pattern.LITERAL).split(version);
+         StringBuilder sb = new StringBuilder();
+         for (String s : split) {
+             sb.append(String.format("%" + maxWidth + 's', s));
+         }
+         return sb.toString();
+     }
+ }
+ EOF
+     CLASSPATH=$ac_java_classpath
+     export CLASSPATH
+     cmd="$JAVAC ${JAVAC_FLAGS} conftest.java"
+     if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5) ; then
+        if test ""no"" = "no"; then
+            echo "yes" >&5
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
+ $as_echo "$jar_resolved" >&6; }
+               found_jar=yes
+               PACKAGE_JAR_FILE=$jar_resolved
+               break 3
+        else
+               cmd="$JAVA conftest"
+               if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5); then
+                echo "yes" >&5
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
+ $as_echo "$jar_resolved" >&6; }
+               found_jar=yes
+               PACKAGE_JAR_FILE=$jar_resolved
+               break 3
+             else
+                 echo "configure: failed program was:" >&5
+                 cat conftest.java >&5
+                 if test -s conftest.java.output; then
+                    STDOUT=`cat conftest.java.output`
+                 fi
+                 echo "configure: CLASSPATH was $CLASSPATH" >&5
+             ac_java_classpath=$saved_ac_java_classpath
+                             fi
+         fi
+         if test -f conftest.java.output; then
+            rm conftest.java.output
+         fi
+     else
+         echo "configure: failed program was:" >&5
+         cat conftest.java >&5
+         echo "configure: CLASSPATH was $CLASSPATH" >&5
+             ac_java_classpath=$saved_ac_java_classpath
+             fi
+           fi
+         done
+       done
+     done
+     if test "$found_jar" = "no"; then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+       if test "" = "yes"; then
+          { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar freehep-io used by Freehep IO (looking for package org.freehep.util.io.XMLSequence)" >&5
+ $as_echo "$as_me: WARNING: Could not find or use the Java package/jar freehep-io used by Freehep IO (looking for package org.freehep.util.io.XMLSequence)" >&2;}
+       else
+           as_fn_error $? "Could not find or use the Java package/jar freehep-io used by Freehep IO (looking for package org.freehep.util.io.XMLSequence)" "$LINENO" 5
+       fi
+     fi
+                     FREEHEP_IO=$PACKAGE_JAR_FILE
+                     # Freehep Util
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking freehep-util" >&5
+ $as_echo_n "checking freehep-util... " >&6; }
+     PACKAGE_JAR_FILE=
+     found_jar=no
+     saved_ac_java_classpath=$ac_java_classpath
+     DEFAULT_JAR_DIR="/usr/share/java /usr/lib/java /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(find /usr/share/java/ -maxdepth 1 -type d 2>/dev/null) $(find /usr/lib64/ -maxdepth 1 -type d 2>/dev/null) $(find  /usr/lib/ -maxdepth 1 -type d 2>/dev/null)  $(find /usr/share/*/lib -maxdepth 1 -type d 2>/dev/null)"
+     for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR; do
+       for jar in "$jardir/freehep-util.jar" "$jardir/libfreehep-util.jar" "$jardir/libfreehep-util-java.jar" "$jardir/freehep-util*.jar"; do
+ # TODO check the behaviour when spaces
+         jars_resolved=`ls $jar 2>/dev/null`
+         for jar_resolved in $jars_resolved; do # If several jars matches
+           if test -e "$jar_resolved"; then
+             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+     cat << \EOF > conftest.java
 -// #line 15816 "configure"
++// #line 16215 "configure"
+ import java.util.regex.Pattern;
+ import org.freehep.util.StringUtilities;
+ public class conftest {
+     public static void main(String[] argv) {
+     }
+     private static int compare(String v1, String v2) {
+         String s1 = normalisedVersion(v1);
+         String s2 = normalisedVersion(v2);
+         return s1.compareTo(s2);
+     }
+     private static String normalisedVersion(String version) {
+         return normalisedVersion(version, ".", 4);
+     }
+     private static String normalisedVersion(String version, String sep, int maxWidth) {
+         String[] split = Pattern.compile(sep, Pattern.LITERAL).split(version);
+         StringBuilder sb = new StringBuilder();
+         for (String s : split) {
+             sb.append(String.format("%" + maxWidth + 's', s));
+         }
+         return sb.toString();
+     }
+ }
+ EOF
+     CLASSPATH=$ac_java_classpath
+     export CLASSPATH
+     cmd="$JAVAC ${JAVAC_FLAGS} conftest.java"
+     if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5) ; then
+        if test ""no"" = "no"; then
+            echo "yes" >&5
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
+ $as_echo "$jar_resolved" >&6; }
+               found_jar=yes
+               PACKAGE_JAR_FILE=$jar_resolved
+               break 3
+        else
+               cmd="$JAVA conftest"
+               if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5); then
+                echo "yes" >&5
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
+ $as_echo "$jar_resolved" >&6; }
+               found_jar=yes
+               PACKAGE_JAR_FILE=$jar_resolved
+               break 3
+             else
+                 echo "configure: failed program was:" >&5
+                 cat conftest.java >&5
+                 if test -s conftest.java.output; then
+                    STDOUT=`cat conftest.java.output`
+                 fi
+                 echo "configure: CLASSPATH was $CLASSPATH" >&5
+             ac_java_classpath=$saved_ac_java_classpath
+                             fi
+         fi
+         if test -f conftest.java.output; then
+            rm conftest.java.output
+         fi
+     else
+         echo "configure: failed program was:" >&5
+         cat conftest.java >&5
+         echo "configure: CLASSPATH was $CLASSPATH" >&5
+             ac_java_classpath=$saved_ac_java_classpath
+             fi
+           fi
+         done
+       done
+     done
+     if test "$found_jar" = "no"; then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+       if test "" = "yes"; then
+          { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar freehep-util used by Freehep Util (looking for package org.freehep.util.StringUtilities)" >&5
+ $as_echo "$as_me: WARNING: Could not find or use the Java package/jar freehep-util used by Freehep Util (looking for package org.freehep.util.StringUtilities)" >&2;}
+       else
+           as_fn_error $? "Could not find or use the Java package/jar freehep-util used by Freehep Util (looking for package org.freehep.util.StringUtilities)" "$LINENO" 5
+       fi
+     fi
+                     FREEHEP_UTIL=$PACKAGE_JAR_FILE
+                 fi
+                 # xml.apache.org SVG Library (under mandriva for example)
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking batik-all" >&5
+ $as_echo_n "checking batik-all... " >&6; }
+     PACKAGE_JAR_FILE=
+     found_jar=no
+     saved_ac_java_classpath=$ac_java_classpath
+     DEFAULT_JAR_DIR="/usr/share/java /usr/lib/java /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(find /usr/share/java/ -maxdepth 1 -type d 2>/dev/null) $(find /usr/lib64/ -maxdepth 1 -type d 2>/dev/null) $(find  /usr/lib/ -maxdepth 1 -type d 2>/dev/null)  $(find /usr/share/*/lib -maxdepth 1 -type d 2>/dev/null)"
+     for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR; do
+       for jar in "$jardir/batik-all.jar" "$jardir/libbatik-all.jar" "$jardir/libbatik-all-java.jar" "$jardir/batik-all*.jar"; do
+ # TODO check the behaviour when spaces
+         jars_resolved=`ls $jar 2>/dev/null`
+         for jar_resolved in $jars_resolved; do # If several jars matches
+           if test -e "$jar_resolved"; then
+             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+     cat << \EOF > conftest.java
 -// #line 15934 "configure"
++// #line 16333 "configure"
+ import java.util.regex.Pattern;
+ import org.apache.batik.parser.Parser;
+ public class conftest {
+     public static void main(String[] argv) {
+     }
+     private static int compare(String v1, String v2) {
+         String s1 = normalisedVersion(v1);
+         String s2 = normalisedVersion(v2);
+         return s1.compareTo(s2);
+     }
+     private static String normalisedVersion(String version) {
+         return normalisedVersion(version, ".", 4);
+     }
+     private static String normalisedVersion(String version, String sep, int maxWidth) {
+         String[] split = Pattern.compile(sep, Pattern.LITERAL).split(version);
+         StringBuilder sb = new StringBuilder();
+         for (String s : split) {
+             sb.append(String.format("%" + maxWidth + 's', s));
+         }
+         return sb.toString();
+     }
+ }
+ EOF
+     CLASSPATH=$ac_java_classpath
+     export CLASSPATH
+     cmd="$JAVAC ${JAVAC_FLAGS} conftest.java"
+     if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5) ; then
+        if test ""no"" = "no"; then
+            echo "yes" >&5
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
+ $as_echo "$jar_resolved" >&6; }
+               found_jar=yes
+               PACKAGE_JAR_FILE=$jar_resolved
+               break 3
+        else
+               cmd="$JAVA conftest"
+               if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5); then
+                echo "yes" >&5
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
+ $as_echo "$jar_resolved" >&6; }
+               found_jar=yes
+               PACKAGE_JAR_FILE=$jar_resolved
+               break 3
+             else
+                 echo "configure: failed program was:" >&5
+                 cat conftest.java >&5
+                 if test -s conftest.java.output; then
+                    STDOUT=`cat conftest.java.output`
+                 fi
+                 echo "configure: CLASSPATH was $CLASSPATH" >&5
+             ac_java_classpath=$saved_ac_java_classpath
+                             fi
+         fi
+         if test -f conftest.java.output; then
+            rm conftest.java.output
+         fi
+     else
+         echo "configure: failed program was:" >&5
+         cat conftest.java >&5
+         echo "configure: CLASSPATH was $CLASSPATH" >&5
+             ac_java_classpath=$saved_ac_java_classpath
+             fi
+           fi
+         done
+       done
+     done
+     if test "$found_jar" = "no"; then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+       if test ""yes"" = "yes"; then
+          { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar batik-all used by Apache SVG Library (looking for package org.apache.batik.parser.Parser)" >&5
+ $as_echo "$as_me: WARNING: Could not find or use the Java package/jar batik-all used by Apache SVG Library (looking for package org.apache.batik.parser.Parser)" >&2;}
+       else
+           as_fn_error $? "Could not find or use the Java package/jar batik-all used by Apache SVG Library (looking for package org.apache.batik.parser.Parser)" "$LINENO" 5
+       fi
+     fi
+                 BATIK=$PACKAGE_JAR_FILE
+                 if test -z "$BATIK"; then
+                    # Other other distribs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking batik" >&5
+ $as_echo_n "checking batik... " >&6; }
+     PACKAGE_JAR_FILE=
+     found_jar=no
+     saved_ac_java_classpath=$ac_java_classpath
+     DEFAULT_JAR_DIR="/usr/share/java /usr/lib/java /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(find /usr/share/java/ -maxdepth 1 -type d 2>/dev/null) $(find /usr/lib64/ -maxdepth 1 -type d 2>/dev/null) $(find  /usr/lib/ -maxdepth 1 -type d 2>/dev/null)  $(find /usr/share/*/lib -maxdepth 1 -type d 2>/dev/null)"
+     for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR; do
+       for jar in "$jardir/batik.jar" "$jardir/libbatik.jar" "$jardir/libbatik-java.jar" "$jardir/batik*.jar"; do
+ # TODO check the behaviour when spaces
+         jars_resolved=`ls $jar 2>/dev/null`
+         for jar_resolved in $jars_resolved; do # If several jars matches
+           if test -e "$jar_resolved"; then
+             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+     cat << \EOF > conftest.java
 -// #line 16051 "configure"
++// #line 16450 "configure"
+ import java.util.regex.Pattern;
+ import org.apache.batik.parser.Parser;
+ public class conftest {
+     public static void main(String[] argv) {
+     }
+     private static int compare(String v1, String v2) {
+         String s1 = normalisedVersion(v1);
+         String s2 = normalisedVersion(v2);
+         return s1.compareTo(s2);
+     }
+     private static String normalisedVersion(String version) {
+         return normalisedVersion(version, ".", 4);
+     }
+     private static String normalisedVersion(String version, String sep, int maxWidth) {
+         String[] split = Pattern.compile(sep, Pattern.LITERAL).split(version);
+         StringBuilder sb = new StringBuilder();
+         for (String s : split) {
+             sb.append(String.format("%" + maxWidth + 's', s));
+         }
+         return sb.toString();
+     }
+ }
+ EOF
+     CLASSPATH=$ac_java_classpath
+     export CLASSPATH
+     cmd="$JAVAC ${JAVAC_FLAGS} conftest.java"
+     if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5) ; then
+        if test ""no"" = "no"; then
+            echo "yes" >&5
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
+ $as_echo "$jar_resolved" >&6; }
+               found_jar=yes
+               PACKAGE_JAR_FILE=$jar_resolved
+               break 3
+        else
+               cmd="$JAVA conftest"
+               if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5); then
+                echo "yes" >&5
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
+ $as_echo "$jar_resolved" >&6; }
+               found_jar=yes
+               PACKAGE_JAR_FILE=$jar_resolved
+               break 3
+             else
+                 echo "configure: failed program was:" >&5
+                 cat conftest.java >&5
+                 if test -s conftest.java.output; then
+                    STDOUT=`cat conftest.java.output`
+                 fi
+                 echo "configure: CLASSPATH was $CLASSPATH" >&5
+             ac_java_classpath=$saved_ac_java_classpath
+                             fi
+         fi
+         if test -f conftest.java.output; then
+            rm conftest.java.output
+         fi
+     else
+         echo "configure: failed program was:" >&5
+         cat conftest.java >&5
+         echo "configure: CLASSPATH was $CLASSPATH" >&5
+             ac_java_classpath=$saved_ac_java_classpath
+             fi
+           fi
+         done
+       done
+     done
+     if test "$found_jar" = "no"; then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+       if test "" = "yes"; then
+          { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar batik used by Apache SVG Library (looking for package org.apache.batik.parser.Parser)" >&5
+ $as_echo "$as_me: WARNING: Could not find or use the Java package/jar batik used by Apache SVG Library (looking for package org.apache.batik.parser.Parser)" >&2;}
+       else
+           as_fn_error $? "Could not find or use the Java package/jar batik used by Apache SVG Library (looking for package org.apache.batik.parser.Parser)" "$LINENO" 5
+       fi
+     fi
+                    BATIK=$PACKAGE_JAR_FILE
+                 fi
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking minimal version (1.7) of batik" >&5
+ $as_echo_n "checking minimal version (1.7) of batik... " >&6; }
+    saved_ac_java_classpath=$ac_java_classpath
+    export ac_java_classpath="$BATIK:$ac_java_classpath"
+    if test "x" == "x"; then
+     cat << \EOF > conftest.java
 -// #line 16158 "configure"
++// #line 16557 "configure"
+ import java.util.regex.Pattern;
+ import org.apache.batik.Version;
+ public class conftest {
+     public static void main(String[] argv) {
+         String minVersion="1.7";
+                             System.out.println(Version.getVersion());
+                                   if (compare(minVersion, Version.getVersion()) > 0) {
+                                    System.exit(-1);
+                                 }
  
      }
  
     else
  
      cat << \EOF > conftest.java
- // #line 16028 "configure"
 -// #line 16230 "configure"
++// #line 16629 "configure"
  import java.util.regex.Pattern;
  
  import org.apache.batik.Version;
@@@ -16116,7 -16318,7 +16717,7 @@@ $as_echo_n "checking commons-io... " >&
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 16119 "configure"
 -// #line 16321 "configure"
++// #line 16720 "configure"
  import java.util.regex.Pattern;
  
  import org.apache.commons.io.output.CountingOutputStream;
@@@ -16233,7 -16435,7 +16834,7 @@@ $as_echo_n "checking xmlgraphics-common
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 16236 "configure"
 -// #line 16438 "configure"
++// #line 16837 "configure"
  import java.util.regex.Pattern;
  
  import org.apache.xmlgraphics.util.Service;
@@@ -16350,7 -16552,7 +16951,7 @@@ $as_echo_n "checking avalon-framework..
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 16353 "configure"
 -// #line 16555 "configure"
++// #line 16954 "configure"
  import java.util.regex.Pattern;
  
  import org.apache.avalon.framework.configuration.ConfigurationException;
@@@ -16467,7 -16669,7 +17068,7 @@@ $as_echo_n "checking xml-apis-ext... " 
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 16470 "configure"
 -// #line 16672 "configure"
++// #line 17071 "configure"
  import java.util.regex.Pattern;
  
  import org.w3c.dom.svg.SVGDocument;
@@@ -16584,7 -16786,7 +17185,7 @@@ $as_echo_n "checking xml-commons-apis-e
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 16587 "configure"
 -// #line 16789 "configure"
++// #line 17188 "configure"
  import java.util.regex.Pattern;
  
  import org.w3c.dom.svg.SVGDocument;
@@@ -16705,7 -16907,7 +17306,7 @@@ $as_echo_n "checking commons-logging..
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 16708 "configure"
 -// #line 16910 "configure"
++// #line 17309 "configure"
  import java.util.regex.Pattern;
  
  import org.apache.commons.logging.LogFactory;
@@@ -16822,7 -17024,7 +17423,7 @@@ $as_echo_n "checking jlatexmath... " >&
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 16825 "configure"
 -// #line 17027 "configure"
++// #line 17426 "configure"
  import java.util.regex.Pattern;
  
  import org.scilab.forge.jlatexmath.TeXFormula;
@@@ -16929,7 -17131,7 +17530,7 @@@ $as_echo_n "checking minimal version (1
     if test "x" == "x"; then
  
      cat << \EOF > conftest.java
- // #line 16932 "configure"
 -// #line 17134 "configure"
++// #line 17533 "configure"
  import java.util.regex.Pattern;
  
  import org.scilab.forge.jlatexmath.TeXFormula;
     else
  
      cat << \EOF > conftest.java
- // #line 17004 "configure"
 -// #line 17206 "configure"
++// #line 17605 "configure"
  import java.util.regex.Pattern;
  
  import org.scilab.forge.jlatexmath.TeXFormula;
@@@ -17092,7 -17294,7 +17693,7 @@@ $as_echo_n "checking jlatexmath-fop... 
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 17095 "configure"
 -// #line 17297 "configure"
++// #line 17696 "configure"
  import java.util.regex.Pattern;
  
  import org.scilab.forge.jlatexmath.fop.JLaTeXMathObj;
@@@ -17215,7 -17417,7 +17816,7 @@@ $as_echo_n "checking checkstyle... " >&
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 17218 "configure"
 -// #line 17420 "configure"
++// #line 17819 "configure"
  import java.util.regex.Pattern;
  
  import com.puppycrawl.tools.checkstyle.CheckStyleTask;
@@@ -17332,7 -17534,7 +17933,7 @@@ $as_echo_n "checking commons-beanutils.
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 17335 "configure"
 -// #line 17537 "configure"
++// #line 17936 "configure"
  import java.util.regex.Pattern;
  
  import org.apache.commons.beanutils.Converter;
@@@ -17449,7 -17651,7 +18050,7 @@@ $as_echo_n "checking antlr... " >&6; 
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 17452 "configure"
 -// #line 17654 "configure"
++// #line 18053 "configure"
  import java.util.regex.Pattern;
  
  import antlr.TokenStreamException;
@@@ -17566,7 -17768,7 +18167,7 @@@ $as_echo_n "checking junit4... " >&6; 
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 17569 "configure"
 -// #line 17771 "configure"
++// #line 18170 "configure"
  import java.util.regex.Pattern;
  
  import org.junit.Assert;
@@@ -17683,7 -17885,7 +18284,7 @@@ $as_echo_n "checking cobertura... " >&6
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 17686 "configure"
 -// #line 17888 "configure"
++// #line 18287 "configure"
  import java.util.regex.Pattern;
  
  import net.sourceforge.cobertura.merge.Main;
@@@ -17800,7 -18002,7 +18401,7 @@@ $as_echo_n "checking asm3... " >&6; 
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 17803 "configure"
 -// #line 18005 "configure"
++// #line 18404 "configure"
  import java.util.regex.Pattern;
  
  import org.objectweb.asm.Type;
@@@ -17916,7 -18118,7 +18517,7 @@@ $as_echo_n "checking asm... " >&6; 
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 17919 "configure"
 -// #line 18121 "configure"
++// #line 18520 "configure"
  import java.util.regex.Pattern;
  
  import org.objectweb.asm.Type;
@@@ -18032,7 -18234,7 +18633,7 @@@ $as_echo_n "checking ecj... " >&6; 
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 18035 "configure"
 -// #line 18237 "configure"
++// #line 18636 "configure"
  import java.util.regex.Pattern;
  
  import org.eclipse.jdt.core.compiler.batch.BatchCompiler;
  
  
  #################
 +## EIGEN
 +#################
 +
 +
 +ac_ext=cpp
 +ac_cpp='$CXXCPP $CPPFLAGS'
 +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
 +$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
 +if test -z "$CXXCPP"; then
 +  if ${ac_cv_prog_CXXCPP+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +      # Double quotes because CXXCPP needs to be expanded
 +    for CXXCPP in "$CXX -E" "/lib/cpp"
 +    do
 +      ac_preproc_ok=false
 +for ac_cxx_preproc_warn_flag in '' yes
 +do
 +  # Use a header file that comes with gcc, so configuring glibc
 +  # with a fresh cross-compiler works.
 +  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 +  # <limits.h> exists even on freestanding compilers.
 +  # On the NeXT, cc -E runs the code through the compiler's parser,
 +  # not just through cpp. "Syntax error" is here to catch this case.
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +#ifdef __STDC__
 +# include <limits.h>
 +#else
 +# include <assert.h>
 +#endif
 +                   Syntax error
 +_ACEOF
 +if ac_fn_cxx_try_cpp "$LINENO"; then :
 +
 +else
 +  # Broken: fails on valid input.
 +continue
 +fi
 +rm -f conftest.err conftest.i conftest.$ac_ext
 +
 +  # OK, works on sane cases.  Now check whether nonexistent headers
 +  # can be detected and how.
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +#include <ac_nonexistent.h>
 +_ACEOF
 +if ac_fn_cxx_try_cpp "$LINENO"; then :
 +  # Broken: success on invalid input.
 +continue
 +else
 +  # Passes both tests.
 +ac_preproc_ok=:
 +break
 +fi
 +rm -f conftest.err conftest.i conftest.$ac_ext
 +
 +done
 +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 +rm -f conftest.i conftest.err conftest.$ac_ext
 +if $ac_preproc_ok; then :
 +  break
 +fi
 +
 +    done
 +    ac_cv_prog_CXXCPP=$CXXCPP
 +
 +fi
 +  CXXCPP=$ac_cv_prog_CXXCPP
 +else
 +  ac_cv_prog_CXXCPP=$CXXCPP
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
 +$as_echo "$CXXCPP" >&6; }
 +ac_preproc_ok=false
 +for ac_cxx_preproc_warn_flag in '' yes
 +do
 +  # Use a header file that comes with gcc, so configuring glibc
 +  # with a fresh cross-compiler works.
 +  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 +  # <limits.h> exists even on freestanding compilers.
 +  # On the NeXT, cc -E runs the code through the compiler's parser,
 +  # not just through cpp. "Syntax error" is here to catch this case.
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +#ifdef __STDC__
 +# include <limits.h>
 +#else
 +# include <assert.h>
 +#endif
 +                   Syntax error
 +_ACEOF
 +if ac_fn_cxx_try_cpp "$LINENO"; then :
 +
 +else
 +  # Broken: fails on valid input.
 +continue
 +fi
 +rm -f conftest.err conftest.i conftest.$ac_ext
 +
 +  # OK, works on sane cases.  Now check whether nonexistent headers
 +  # can be detected and how.
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +#include <ac_nonexistent.h>
 +_ACEOF
 +if ac_fn_cxx_try_cpp "$LINENO"; then :
 +  # Broken: success on invalid input.
 +continue
 +else
 +  # Passes both tests.
 +ac_preproc_ok=:
 +break
 +fi
 +rm -f conftest.err conftest.i conftest.$ac_ext
 +
 +done
 +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 +rm -f conftest.i conftest.err conftest.$ac_ext
 +if $ac_preproc_ok; then :
 +
 +else
 +  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 +as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
 +See \`config.log' for more details" "$LINENO" 5; }
 +fi
 +
 +ac_ext=cpp
 +ac_cpp='$CXXCPP $CPPFLAGS'
 +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 +
 +
 +
 +ac_ext=cpp
 +ac_cpp='$CXXCPP $CPPFLAGS'
 +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 +
 +
 +
 +# Check whether --with-eigen_include was given.
 +if test "${with_eigen_include+set}" = set; then :
 +  withval=$with_eigen_include; with_eigen_include=$withval
 +else
 +  with_eigen_include='yes'
 +
 +fi
 +
 +
 +
 +save_CPPFLAGS="$CPPFLAGS"
 +
 +if test "x$with_eigen_include" != "xyes"; then
 +      CPPFLAGS="-I$with_eigen_include"
 +      ac_fn_cxx_check_header_mongrel "$LINENO" "Eigen/Sparse" "ac_cv_header_Eigen_Sparse" "$ac_includes_default"
 +if test "x$ac_cv_header_Eigen_Sparse" = xyes; then :
 +  EIGEN_CPPFLAGS="$CPPFLAGS"
 +else
 +  as_fn_error $? "Cannot find headers (Eigen/Sparse) of the library EIGEN in $with_eigen_include. Please install the dev package (Debian : libeigen3-dev)" "$LINENO" 5
 +
 +fi
 +
 +
 +    PATH_TO_EIGEN=$with_eigen_include
 +else
 +      ac_fn_cxx_check_header_mongrel "$LINENO" "Eigen/Sparse" "ac_cv_header_Eigen_Sparse" "$ac_includes_default"
 +if test "x$ac_cv_header_Eigen_Sparse" = xyes; then :
 +  EIGEN_CPPFLAGS=""
 +else
 +         $as_unset ac_cv_header_Eigen_Sparse
 +                CPPFLAGS="-I/usr/include/eigen3/"
 +                ac_fn_cxx_check_header_mongrel "$LINENO" "Eigen/Sparse" "ac_cv_header_Eigen_Sparse" "$ac_includes_default"
 +if test "x$ac_cv_header_Eigen_Sparse" = xyes; then :
 +  EIGEN_CPPFLAGS=$CPPFLAGS
 +else
 +  as_fn_error $? "Cannot find headers (Eigen/Sparse) of the library eigen. Please install the dev package (Debian : libeigen3-dev)" "$LINENO" 5
 +
 +fi
 +
 +
 +
 +fi
 +
 +
 +    PATH_TO_EIGEN="/usr/include/eigen3/"
 +fi
 +CPPFLAGS="$save_CPPFLAGS"
 +
 +CHK_EIGEN_WORLD=3
 +CHK_EIGEN_MAJOR=1
 +CHK_EIGEN_MINOR=0
 +
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if Eigen is version $CHK_EIGEN_WORLD.$CHK_EIGEN_MAJOR.$CHK_EIGEN_MINOR or later" >&5
 +$as_echo_n "checking if Eigen is version $CHK_EIGEN_WORLD.$CHK_EIGEN_MAJOR.$CHK_EIGEN_MINOR or later... " >&6; }
 +cat > conftest.$ac_ext <<EOF
- #line 22170 "configure"
++#line 22771 "configure"
 +#include "confdefs.h"
 +
 +#include "$PATH_TO_EIGEN/Eigen/Sparse"
 +#if EIGEN_VERSION_AT_LEAST(3,1,0)
 +EIGEN_VERSION_OK
 +#endif
 +
 +EOF
 +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 +  grep "EIGEN_VERSION_OK" >/dev/null 2>&1; then
 +  rm -rf conftest*
 +  \
 +EIGEN_VERSION_OK=1
 +else
 +  rm -rf conftest*
 +  \
 +EIGEN_VERSION_OK=0
 +fi
 +rm -f conftest*
 +
 +if test $EIGEN_VERSION_OK = 0; then
 +   as_fn_error $? "Version $CHK_EIGEN_WORLD.$CHK_EIGEN_MAJOR.$CHK_EIGEN_MINOR of Eigen expected (at least)" "$LINENO" 5
 +else
 +   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 +$as_echo "yes" >&6; }
 +fi
 +
 +
 +
 +$as_echo "#define WITH_EIGEN /**/" >>confdefs.h
 +
 +ac_ext=c
 +ac_cpp='$CPP $CPPFLAGS'
 +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 +ac_compiler_gnu=$ac_cv_c_compiler_gnu
 +
 +
 +
 +
 +#################
  ## MPI
  #################
  
@@@ -26658,7 -26776,7 +27318,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 26661 "configure"
 -#line 26779 "configure"
++#line 27321 "configure"
  #include "confdefs.h"
  
  #include "$CHK_TCL_INCLUDE_PATH/$CHK_TCL_INC_NAME"
@@@ -26969,7 -27087,7 +27629,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 26972 "configure"
 -#line 27090 "configure"
++#line 27632 "configure"
  #include "confdefs.h"
  
  #include "$CHK_TK_INCLUDE_PATH/$CHK_TK_INC_NAME"
@@@ -27553,7 -27671,7 +28213,7 @@@ $as_echo_n "checking saxon9he... " >&6
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 27556 "configure"
 -// #line 27674 "configure"
++// #line 28216 "configure"
  import java.util.regex.Pattern;
  
  import net.sf.saxon.Version;
@@@ -27668,7 -27786,7 +28328,7 @@@ $as_echo_n "checking saxon... " >&6; 
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 27671 "configure"
 -// #line 27789 "configure"
++// #line 28331 "configure"
  import java.util.regex.Pattern;
  
  import net.sf.saxon.Version;
@@@ -27784,7 -27902,7 +28444,7 @@@ $as_echo_n "checking saxon... " >&6; 
              export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 27787 "configure"
 -// #line 27905 "configure"
++// #line 28447 "configure"
  import java.util.regex.Pattern;
  
  import com.icl.saxon.Loader;
@@@ -15,9 -15,9 +15,9 @@@ dnl Process this file with autoconf to 
  
  
  AC_REVISION($Revision$)dnl
 -AC_INIT([Scilab],[5],[http://bugzilla.scilab.org/])
 +AC_INIT([Scilab],[6],[http://bugzilla.scilab.org/])
  AC_PREREQ(2.68)
- AC_CONFIG_MACRO_DIR([m4/])
+ AC_CONFIG_MACRO_DIR([m4])
  
  SCI_BUILDDIR="`pwd`"
  SCI_SRCDIR="$srcdir"
@@@ -407,80 -409,80 +415,81 @@@ target_alias = @target_alias
  top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
 +yacc_present = @yacc_present@
- SKELETON_FILES = toolbox_skeleton/src/fortran/builder_fortran.sce \
- toolbox_skeleton/src/fortran/fsum.f \
- toolbox_skeleton/src/c/csum.c \
- toolbox_skeleton/src/c/builder_c.sce \
- toolbox_skeleton/src/c/multiplybypi.c \
- toolbox_skeleton/src/c/csub.c \
- toolbox_skeleton/src/c/multiplybypi.h \
- toolbox_skeleton/src/c/csub.h \
- toolbox_skeleton/src/c/csum.h \
- toolbox_skeleton/src/java/org/scilab/contrib/toolboxskeleton/Sum.java \
- toolbox_skeleton/src/java/builder_java.sce \
- toolbox_skeleton/src/cleaner_src.sce \
- toolbox_skeleton/src/builder_src.sce \
- toolbox_skeleton/etc/toolbox_skeleton.quit \
- toolbox_skeleton/etc/toolbox_skeleton.start \
- toolbox_skeleton/etc/toolbox_skeleton_preferences.xml \
- toolbox_skeleton/etc/toolbox_skeleton_preferences.xsl \
- toolbox_skeleton/license.txt \
- toolbox_skeleton/DESCRIPTION \
+ SKELETON_FILES = loader.sce \
+ toolbox_skeleton/builder.sce \
  toolbox_skeleton/changelog.txt \
+ toolbox_skeleton/demos/cpp_find.dem.sce \
+ toolbox_skeleton/demos/c_sum.dem.sce \
+ toolbox_skeleton/demos/fortran_sum.dem.sce \
+ toolbox_skeleton/demos/scilab_sum.dem.sce \
+ toolbox_skeleton/demos/toolbox_skeleton.dem.gateway.sce \
+ toolbox_skeleton/DESCRIPTION \
  toolbox_skeleton/DESCRIPTION-FUNCTIONS \
+ toolbox_skeleton/etc/toolbox_skeleton_preferences.xml \
+ toolbox_skeleton/etc/toolbox_skeleton_preferences.xsl \
+ toolbox_skeleton/etc/toolbox_skeleton.quit \
+ toolbox_skeleton/etc/toolbox_skeleton.start \
  toolbox_skeleton/help/builder_help.sce \
- toolbox_skeleton/help/fr_FR/scilab_sum.xml \
- toolbox_skeleton/help/fr_FR/c_sub.xml \
- toolbox_skeleton/help/fr_FR/fortran_sum.xml \
- toolbox_skeleton/help/fr_FR/c_sum.xml \
- toolbox_skeleton/help/fr_FR/build_help.sce \
- toolbox_skeleton/help/en_US/scilab_sum.xml \
- toolbox_skeleton/help/en_US/c_sub.xml \
- toolbox_skeleton/help/en_US/fortran_sum.xml \
- toolbox_skeleton/help/en_US/c_sum.xml \
+ toolbox_skeleton/help/cleaner_help.sce \
  toolbox_skeleton/help/en_US/build_help.sce \
  toolbox_skeleton/help/en_US/c_multiplybypi.xml \
- toolbox_skeleton/demos/c_sum.dem.sce \
- toolbox_skeleton/demos/toolbox_skeleton.dem.gateway.sce \
- toolbox_skeleton/demos/cpp_find.dem.sce \
- toolbox_skeleton/demos/scilab_sum.dem.sce \
- toolbox_skeleton/demos/fortran_sum.dem.sce \
+ toolbox_skeleton/help/en_US/c_sub.xml \
+ toolbox_skeleton/help/en_US/c_sum.xml \
+ toolbox_skeleton/help/en_US/fortran_sum.xml \
+ toolbox_skeleton/help/en_US/scilab_sum.xml \
+ toolbox_skeleton/help/fr_FR/build_help.sce \
+ toolbox_skeleton/help/fr_FR/c_multiplybypi.xml \
+ toolbox_skeleton/help/fr_FR/c_sub.xml \
+ toolbox_skeleton/help/fr_FR/c_sum.xml \
+ toolbox_skeleton/help/fr_FR/fortran_sum.xml \
+ toolbox_skeleton/help/fr_FR/scilab_sum.xml \
+ toolbox_skeleton/license.txt \
+ toolbox_skeleton/locales/en_US.po \
+ toolbox_skeleton/locales/fr_FR.po \
+ toolbox_skeleton/macros/buildmacros.sce \
+ toolbox_skeleton/macros/cleanmacros.sce \
+ toolbox_skeleton/macros/scilab_error.sci \
+ toolbox_skeleton/macros/scilab_sum.sci \
  toolbox_skeleton/readme.txt \
+ toolbox_skeleton/sci_gateway/builder_gateway.sce \
+ toolbox_skeleton/sci_gateway/c/builder_gateway_c.sce \
+ toolbox_skeleton/sci_gateway/cpp/builder_gateway_cpp.sce \
+ toolbox_skeleton/sci_gateway/cpp/sci_cpp_find.cxx \
+ toolbox_skeleton/sci_gateway/c/sci_cerror.c \
+ toolbox_skeleton/sci_gateway/c/sci_csub.c \
+ toolbox_skeleton/sci_gateway/c/sci_csum.c \
+ toolbox_skeleton/sci_gateway/c/sci_foo.c \
+ toolbox_skeleton/sci_gateway/c/sci_multiplybypi.c \
+ toolbox_skeleton/sci_gateway/fortran/builder_gateway_fortran.sce \
+ toolbox_skeleton/sci_gateway/fortran/sci_fsum.c \
+ toolbox_skeleton/src/builder_src.sce \
+ toolbox_skeleton/src/c/builder_c.sce \
+ toolbox_skeleton/src/c/csub.c \
+ toolbox_skeleton/src/c/csub.h \
+ toolbox_skeleton/src/c/csum.c \
+ toolbox_skeleton/src/c/csum.h \
+ toolbox_skeleton/src/cleaner_src.sce \
+ toolbox_skeleton/src/c/multiplybypi.c \
+ toolbox_skeleton/src/c/multiplybypi.h \
+ toolbox_skeleton/src/fortran/builder_fortran.sce \
+ toolbox_skeleton/src/fortran/fsum.f \
+ toolbox_skeleton/src/java/builder_java.sce \
+ toolbox_skeleton/src/java/org/scilab/contrib/toolboxskeleton/Sum.java \
+ toolbox_skeleton/tests/unit_tests/c_sum.dia.ref \
  toolbox_skeleton/tests/unit_tests/c_sum.tst \
+ toolbox_skeleton/tests/unit_tests/fortran_sum.dia.ref \
  toolbox_skeleton/tests/unit_tests/fortran_sum.tst \
+ toolbox_skeleton/tests/unit_tests/java_sum.dia.ref \
+ toolbox_skeleton/tests/unit_tests/java_sum.tst \
  toolbox_skeleton/tests/unit_tests/scilab_sum.dia.ref \
- toolbox_skeleton/tests/unit_tests/fortran_sum.dia.ref \
- toolbox_skeleton/tests/unit_tests/c_sum.dia.ref \
  toolbox_skeleton/tests/unit_tests/scilab_sum.tst \
- toolbox_skeleton/tests/unit_tests/java_sum.tst \
- toolbox_skeleton/tests/unit_tests/java_sum.dia.ref \
- toolbox_skeleton/sci_gateway/fortran/builder_gateway_fortran.sce \
- toolbox_skeleton/sci_gateway/fortran/sci_fsum.c \
- toolbox_skeleton/sci_gateway/c/sci_csub.c \
- toolbox_skeleton/sci_gateway/c/sci_multiplybypi.c \
- toolbox_skeleton/sci_gateway/c/sci_foo.c \
- toolbox_skeleton/sci_gateway/c/sci_cerror.c \
- toolbox_skeleton/sci_gateway/c/sci_csum.c \
- toolbox_skeleton/sci_gateway/c/builder_gateway_c.sce \
- toolbox_skeleton/sci_gateway/cpp/builder_gateway_cpp.sce \
- toolbox_skeleton/sci_gateway/cpp/sci_cpp_find.cxx \
- toolbox_skeleton/sci_gateway/builder_gateway.sce \
- toolbox_skeleton/builder.sce \
- toolbox_skeleton/locales/en_US.po \
- toolbox_skeleton/locales/fr_FR.po \
- toolbox_skeleton/macros/scilab_sum.sci \
- toolbox_skeleton/macros/scilab_error.sci \
- toolbox_skeleton/macros/buildmacros.sce \
- toolbox_skeleton/macros/cleanmacros.sce \
  toolbox_skeleton/toolbox_skeleton_redist.iss \
- toolbox_skeleton/toolbox_skeleton.iss \
  xcos_toolbox_skeleton/builder.sce \
  xcos_toolbox_skeleton/changelog.txt \
- xcos_toolbox_skeleton/cleaner.sce \
+ xcos_toolbox_skeleton/demos/allSum.dem.sce \
  xcos_toolbox_skeleton/demos/Blocks.zcos \
  xcos_toolbox_skeleton/demos/xcos_toolbox_skeleton.dem.gateway.sce \
- xcos_toolbox_skeleton/demos/allSum.dem.sce \
  xcos_toolbox_skeleton/DESCRIPTION \
  xcos_toolbox_skeleton/DESCRIPTION-FUNCTIONS \
  xcos_toolbox_skeleton/etc/xcos_toolbox_skeleton.quit \
Simple merge
@@@ -130,10 -121,10 +130,10 @@@ libscilab_la_rootdir = $(mydatadir
  pkglib_LTLIBRARIES = libscilab-cli.la libscilab.la
  libscilab_la_SOURCES =
  
- libscilab_la_LDFLAGS = $(LAPACK_LIBS) $(BLAS_LIBS) $(AM_LDFLAGS) $(SCI_LDFLAGS)
+ libscilab_la_LDFLAGS = $(AM_LDFLAGS) $(SCI_LDFLAGS)
  
  
 -GUI_LIBS = $(top_builddir)/modules/gui/libscigui.la \
 +GUI_LIBS =    $(top_builddir)/modules/gui/libscigui.la \
        $(top_builddir)/modules/renderer/libscirenderer.la \
        $(top_builddir)/modules/graphics/libscigraphics.la \
        $(top_builddir)/modules/graphic_export/libscigraphic_export.la \
Simple merge
Simple merge
@@@ -9,13 -9,15 +9,13 @@@
   * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
   */
  
- #ifndef __OPTINAL_API__
- #define __OPTINAL_API__
+ #ifndef __OPTIONAL_API__
+ #define __OPTIONAL_API__
  
  #if !defined(__INTERNAL_API_SCILAB__)
- #error Do not include api_optinal.h. Include api_scilab.h instead.
+ #error Do not include api_optional.h. Include api_scilab.h instead.
  #endif
  
 -#include "stack-optional.h"
 -
  #ifdef __cplusplus
  extern "C" {
  #endif
index bbe4890,0000000..07a4e07
mode 100644,000000..100644
--- /dev/null
@@@ -1,82 -1,0 +1,91 @@@
 +/*
 + * Scilab (http://www.scilab.org/) - This file is part of Scilab
 + * Copyright (C) 2006 - INRIA - Jean-Baptiste Silvy
 + *
 + * This file must be used under the terms of the CeCILL.
 + * This source file is licensed as described in the file COPYING, which
 + * you should have received as part of this distribution.  The terms
 + * are also available at
 + * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
 + *
 + */
 +
 +#ifndef _RETURN_PROPERTY_LIST_H_
 +#define _RETURN_PROPERTY_LIST_H_
 +
 +#ifdef __cplusplus
 +extern "C" {
 +#endif
 +
 +#include "dynlib_api_scilab.h"
++
++    typedef struct
++    {
++        int curElement ; /**< the number of the current element in the stack the first one is the name.
++                            vary from 1 to nbElements */
++        int nbElements ; /**< the number of element which will be inserted in the list. */
++        int stackPointer ; /**< use to differentiate returned list. Not useful for now. */
++    } returnedList ;
++
 +    /**
 +     * Construct a new tlist and allocate scilab stack for return in the console.
 +     * Only one tlist should be used at the same time.
 +     * @param nbElement Number of element of element in the list not including the name.
 +     * @param name      Array of string of size nbElement containing the names of the list
 +     *                  and its properties. Its size is nbElement + 1.
 +     * @return a pointer to the newly created list or NULL if an error occurred.
 +     */
 +    void* createReturnedList(int nbElements, char* elementName[]);
 +
 +    /**
 +     * free the list. Must be done after using the list.
 +     * @return  0 if deletion was successful
 +     *          1 if the list has not been totally filled
 +     *         -1 if an other error happened
 +     */
 +    int destroyReturnedList(void* list);
 +
 +    /**
 +     * add a new row vector in the list.
 +     * @param[in/out] void the returned tList
 +     * @param[in]     vector       values to be inserted of size nbValues
 +     * @return        0  if the call was successful
 +     *                1  if the list is full so the item can not be inserted
 +     *                -1 if an other error occurred
 +     */
 +    int addRowVectorToReturnedList(void* list, const double vector[], int nbValues);
 +
 +    /**
 +     * add a new column vector in the list.
 +     * @param[in/out] void the returned tList
 +     * @param[in]     vector       values to be inserted of size nbValues
 +     * @return        0  if the call was successful
 +     *                1  if the list is full so the item can not be inserted
 +     *                -1 if an other error occurred
 +     */
 +    int addColVectorToReturnedList(void* list, const double vector[], int nbValues);
 +
 +    /**
 +     * add a new column vector in the list.
 +     * @param[in/out] void the returned tList
 +     * @param[in]     matrix   values to be inserted of size nbRow x nbCol
 +     * @return        0  if the call was successful
 +     *                1  if the list is full so the item can not be inserted
 +     *                -1 if an other error occurred
 +     */
 +    int addMatrixToReturnedList(void* list, const double matrix[], int nbRow, int nbCol);
 +
 +    /**
 +     * add a new string column vector in the list.
 +     * @param[in/out] void the returned tList
 +     * @param[in]     vector   values to be inserted of size nbValues
 +     * @return        0  if the call was successful
 +     *                1  if the list is full so the item can not be inserted
 +     *                -1 if an other error occurred
 +     */
 +    int addStringColVectorToReturnedList(void* list, char* vector[], int nbValues);
++    int addStringToReturnedList( returnedList * list, char * str);
 +#ifdef __cplusplus
 +}
 +#endif
 +#endif /* _RETURN_PROPERTY_LIST_H_ */
@@@ -430,9 -449,18 +430,9 @@@ SciErr createNamedComplexZMatrixOfDoubl
  SciErr createCommonNamedMatrixOfDouble(void* _pvCtx, const char* _pstName, int _iComplex, int _iRows, int _iCols, const double* _pdblReal, const double* _pdblImg)
  {
      SciErr sciErr = sciErrInit();
 -    int iVarID[nsiz];
 -    int iSaveRhs = Rhs;
 -    int iSaveTop = Top;
 -    int iSize = _iRows * _iCols;
 -    int *piAddr = NULL;
 -    double *pdblReal = NULL;
 -    double *pdblImg = NULL;
 -    int iOne = 1;
 -
      if (!checkNamedVarFormat(_pvCtx, _pstName))
      {
-         addErrorMessage(&sciErr, API_ERROR_INVALID_NAME, _("%s: Invalid variable name."), "createCommonNamedMatrixOfDouble");
+         addErrorMessage(&sciErr, API_ERROR_INVALID_NAME, _("%s: Invalid variable name: %s."), "createCommonNamedMatrixOfDouble", _pstName);
          return sciErr;
      }
  
@@@ -83,11 -85,11 +83,11 @@@ int addErrorMessage(SciErr* _psciErr, i
          {
              _psciErr->pstMsg[i - 1] = _psciErr->pstMsg[i];
          }
--        _psciErr->pstMsg[MESSAGE_STACK_SIZE - 1] = strdup(pstMsg);
++        _psciErr->pstMsg[MESSAGE_STACK_SIZE - 1] = os_strdup(pstMsg);
      }
      else
      {
--        _psciErr->pstMsg[_psciErr->iMsgCount++] = strdup(pstMsg);
++        _psciErr->pstMsg[_psciErr->iMsgCount++] = os_strdup(pstMsg);
      }
  
      _psciErr->iErr = _iErr;
@@@ -764,9 -653,9 +764,9 @@@ SciErr createCommonNamedMatrixOfInteger
          return sciErr;
      }
  
 -    if (!checkNamedVarFormat(_pvCtx, _pstName))
 +    if (_pvCtx == NULL)
      {
-         addErrorMessage(&sciErr, API_ERROR_INVALID_POINTER, _("%s: Invalid argument address"), "allocMatrixOfInteger");
+         addErrorMessage(&sciErr, API_ERROR_INVALID_NAME, _("%s: Invalid variable name: %s."), "createCommonNamedMatrixOfInteger", _pstName);
          return sciErr;
      }
  
@@@ -136,7 -135,26 +138,27 @@@ static void popListAddress(int _iRhsPos
  static void popNamedListAddress(std::string _stNamedList)
  {
      StackNamedList::iterator it = stackNamedListPosition.find(_stNamedList);
 -    if (it != stackNamedListPosition.end())
 -    {
 -        delete it->second->back();
 -        it->second->pop_back();
 -        if (it->second->size() > 0 && it->second->back()->m_iLast == 1)
 -        {
 -            //close cascade
 -            popNamedListAddress(_stNamedList);
 -        }
 -
 -        StackNamedList::iterator jt = stackNamedListPosition.find(_stNamedList);
 -        if (jt != stackNamedListPosition.end() && jt->second->empty())
 -        {
 -            int iVarID[nsiz];
 -            delete jt->second;
 -            stackNamedListPosition.erase(jt);
 -            C2F(str2name)(_stNamedList.c_str(), iVarID, (unsigned long)_stNamedList.size());
 -            createNamedVariable(iVarID);
 -        }
 -    }
 +    // FIXME
++//    if (it != stackNamedListPosition.end())
++//    {
++//        delete it->second->back();
++//        it->second->pop_back();
++//        if (it->second->size() > 0 && it->second->back()->m_iLast == 1)
++//        {
++//            //close cascade
++//            popNamedListAddress(_stNamedList);
++//        }
++//
++//        StackNamedList::iterator jt = stackNamedListPosition.find(_stNamedList);
++//        if (jt != stackNamedListPosition.end() && jt->second->empty())
++//        {
++//            int iVarID[nsiz];
++//            delete jt->second;
++//            stackNamedListPosition.erase(jt);
++//            C2F(str2name)(_stNamedList.c_str(), iVarID, (unsigned long)_stNamedList.size());
++//            createNamedVariable(iVarID);
++//        }
++//    }
  }
  
  /*get last store address*/
@@@ -246,12 -293,9 +246,12 @@@ SciErr createCommonNamedMatrixOfPoly(vo
          return sciErr;
      }
  
 -    if (!checkNamedVarFormat(_pvCtx, _pstName))
 +    wchar_t* pstTemp = to_wide_string(_pstVarName);
 +    Polynom* pP = new Polynom(pstTemp, _iRows, _iCols, _piNbCoef);
 +    FREE(pstTemp);
 +    if (pP == NULL)
      {
-         addErrorMessage(&sciErr, API_ERROR_NO_MORE_MEMORY, _("%s: No more memory to allocated variable"), _iComplex ? "createComplexMatrixOfPoly" : "createMatrixOfPoly");
+         addErrorMessage(&sciErr, API_ERROR_INVALID_NAME, _("%s: Invalid variable name: %s."), "createCommonNamedMatrixOfPoly", _pstName);
          return sciErr;
      }
  
@@@ -82,9 -76,7 +82,9 @@@ SciErr getCommonSparseMatrix(void* _pvC
          return sciErr;
      }
  
 -    *_piNbItem = _piAddress[4];
 +    Sparse* pS = ((InternalType*)_piAddress)->getAs<Sparse>();
 +
-     *_piNbItem = pS->nonZeros();
++    *_piNbItem = (int)pS->nonZeros();
  
      if (_piNbItemRow == NULL)
      {
@@@ -171,10 -215,9 +171,10 @@@ SciErr createNamedMatrixOfString(void* 
          return sciErr;
      }
  
 -    if (!checkNamedVarFormat(_pvCtx, _pstName))
 +    String* pS = new String(_iRows, _iCols);
 +    if (pS == NULL)
      {
-         addErrorMessage(&sciErr, API_ERROR_NO_MORE_MEMORY, _("%s: No more memory to allocated variable"), "createMatrixOfString");
+         addErrorMessage(&sciErr, API_ERROR_INVALID_NAME, _("%s: Invalid variable name: %s."), "createNamedMatrixOfString", _pstName);
          return sciErr;
      }
  
index 326808f,0000000..35aa396
mode 100644,000000..100644
--- /dev/null
@@@ -1,158 -1,0 +1,177 @@@
 +/*
 + * Scilab (http://www.scilab.org/) - This file is part of Scilab
 + * Copyright (C) 2006 - INRIA - Jean-Baptiste SILVY
 + *
 + * 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
 + *
 + */
 +/*------------------------------------------------------------------------*/
 +/* file: returnProperty.c                                                 */
 +/* desc : a set of functions used to return a tList in Scilab             */
 +/*------------------------------------------------------------------------*/
 +
 +#include "returnPropertyList.h"
 +#include "returnProperty.h"
 +#include "MALLOC.h"
 +#include "sciprint.h"
 +#include "localization.h"
 +#include "tlist.hxx"
 +#include "double.hxx"
 +#include "string.hxx"
 +/*------------------------------------------------------------------------*/
 +void* createReturnedList(int nbElements, char * elementName[])
 +{
 +    //returnedList * newList = NULL ;
 +    //int nbRow = 1 ;
 +
 +    //newList = (returnedList*)MALLOC(sizeof(returnedList)) ;
 +    //if (newList == NULL)
 +    //{
 +    //  sciprint(_("Error returning tlist, memory full.\n")) ;
 +    //  return NULL ;
 +    //}
 +
 +    //newList->nbElements = nbElements + 1 ;
 +
 +    ///* create the tlist in the stack and get the stack pointer in newList->stackPointer */
 +    //CreateVar(Rhs+1,TYPED_LIST_DATATYPE, &(newList->nbElements), &nbRow, &(newList->stackPointer));
 +
 +    ///* create the first element : names of properties */
 +    //CreateListVarFromPtr(Rhs+1, 1,MATRIX_OF_STRING_DATATYPE, &nbRow, &(newList->nbElements), elementName);
 +    //
 +    //newList->curElement = 1 ;
 +
 +    //return newList ;
 +
 +    //create fieldname list
 +    types::String* pField = (types::String*)sciReturnStringMatrix(elementName, 1, nbElements + 1);
 +    //create TList
 +    types::TList* pL = new types::TList();
 +    //add field list in list
 +    pL->append(pField);
 +    return pL;
 +
 +}
 +/*------------------------------------------------------------------------*/
 +int destroyReturnedList(void* list)
 +{
 +    /* safe test to know if the list has been correctly filled */
 +    //if (list->curElement != list->nbElements)
 +    //{
 +    //  sciprint(_("tlist not completely filled.\n")) ;
 +    //  FREE(list) ;
 +    //  return 1 ;
 +    //}
 +
 +    //FREE(list) ;
 +    //return 0 ;
 +
 +    delete (types::TList*)list;
 +    return 0;
 +}
 +/*------------------------------------------------------------------------*/
 +int addRowVectorToReturnedList(void* list, const double vector[], int nbValues)
 +{
 +    //int nbRow = 1 ;
 +    ///* check we are not using all the allocated space for the list */
 +    //if (list->curElement >= list->nbElements)
 +    //{
 +    //  sciprint(_("List full.\n")) ;
 +    //  return 1 ;
 +    //}
 +
 +    ///* add a new element */
 +    //list->curElement++ ;
 +    //CreateListVarFromPtr(Rhs+1, list->curElement,MATRIX_OF_DOUBLE_DATATYPE, &nbRow, &nbValues, &vector);
 +    //return 0 ;
 +
 +    types::TList* pL = (types::TList*)list;
 +    pL->append((types::InternalType*)sciReturnMatrix((double*)vector, nbValues, 1));
 +    return 0;
 +}
 +/*------------------------------------------------------------------------*/
 +int addColVectorToReturnedList(void* list, const double vector[], int nbValues)
 +{
 +    //int nbCol = 1 ;
 +    ///* check we are not using all the allocated space for the list */
 +    //if (list->curElement >= list->nbElements)
 +    //{
 +    //  sciprint(_("List full.\n")) ;
 +    //  return 1 ;
 +    //}
 +
 +    ///* add a new element */
 +    //list->curElement++ ;
 +    //CreateListVarFromPtr(Rhs+1, list->curElement,MATRIX_OF_DOUBLE_DATATYPE, &nbValues, &nbCol, &vector);
 +
 +    //return 0 ;
 +
 +    types::TList* pL = (types::TList*)list;
 +    pL->append((types::InternalType*)sciReturnMatrix((double*)vector, nbValues, 1));
 +    return 0;
 +}
 +/*------------------------------------------------------------------------*/
 +int addMatrixToReturnedList(void* list, const double matrix[], int nbRow, int nbCol)
 +{
 +    ///* check we are not using all the allocated space for the list */
 +    //if (list->curElement >= list->nbElements)
 +    //{
 +    //  sciprint(_("List full.\n")) ;
 +    //  return 1 ;
 +    //}
 +
 +    ///* add a new element */
 +    //list->curElement++ ;
 +    //CreateListVarFromPtr(Rhs+1, list->curElement,MATRIX_OF_DOUBLE_DATATYPE, &nbRow, &nbCol, &matrix);
 +
 +    //return 0 ;
 +
 +    types::TList* pL = (types::TList*)list;
 +    pL->append((types::InternalType*)sciReturnMatrix((double*)matrix, nbRow, nbCol));
 +    return 0;
 +}
 +/*------------------------------------------------------------------------*/
 +int addStringColVectorToReturnedList(void* list, char * vector[], int nbValues)
 +{
 +    //int nbCol = 1 ;
 +    ///* check we are not using all the allocated space for the list */
 +    //if (list->curElement >= list->nbElements)
 +    //{
 +    //  sciprint(_("List full.\n")) ;
 +    //  return 1 ;
 +    //}
 +
 +    ///* add a new element */
 +    //list->curElement++ ;
 +    //CreateListVarFromPtr(Rhs+1, list->curElement,MATRIX_OF_STRING_DATATYPE, &nbValues, &nbCol, vector);
 +
 +    //return 0 ;
 +
 +    types::TList* pL = (types::TList*)list;
 +    pL->append((types::InternalType*)sciReturnStringMatrix(vector, nbValues, 1));
 +    return 0;
 +}
 +/*------------------------------------------------------------------------*/
++int addStringToReturnedList( returnedList * list, char * str)
++{
++//    int nbValues = 1;
++//    int nbCol = 1 ;
++//    /* check we are not using all the allocated space for the list */
++//    if ( list->curElement >= list->nbElements )
++//    {
++//        sciprint(_("List full.\n")) ;
++//        return 1 ;
++//    }
++//
++//    /* add a new element */
++//    list->curElement++ ;
++//    CreateListVarFromPtr( Rhs + 1, list->curElement, MATRIX_OF_STRING_DATATYPE, &nbValues, &nbCol, &str);
++    types::TList* pL = (types::TList*)list;
++    pL->append((types::InternalType*)sciReturnString(str));
++
++    return 0 ;
++}
Simple merge
Simple merge
index 8c448f1,0000000..fc8f79d
mode 100644,000000..100644
--- /dev/null
@@@ -1,1308 -1,0 +1,1315 @@@
 +# Makefile.in generated by automake 1.14 from Makefile.am.
 +# @configure_input@
 +
 +# Copyright (C) 1994-2013 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) 2006-2008 - INRIA - Sylvestre LEDRU <sylvestre.ledru@inria.fr>
 +# Copyright (C) 2008      - INRIA - Pierre MARECHAL <pierre.marechal@inria.fr>
 +#
 +# 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.1-en.txt
 +#
 +
 +##########
 +### Makefile included stuff
 +### Target, variable, suffixes which are supposed to be useful in every makefile.am
 +##########
 +
 +
 +
 +VPATH = @srcdir@
 +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
 +am__make_running_with_option = \
 +  case $${target_option-} in \
 +      ?) ;; \
 +      *) echo "am__make_running_with_option: internal error: invalid" \
 +              "target option '$${target_option-}' specified" >&2; \
 +         exit 1;; \
 +  esac; \
 +  has_opt=no; \
 +  sane_makeflags=$$MAKEFLAGS; \
 +  if $(am__is_gnu_make); then \
 +    sane_makeflags=$$MFLAGS; \
 +  else \
 +    case $$MAKEFLAGS in \
 +      *\\[\ \ ]*) \
 +        bs=\\; \
 +        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
 +          | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
 +    esac; \
 +  fi; \
 +  skip_next=no; \
 +  strip_trailopt () \
 +  { \
 +    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
 +  }; \
 +  for flg in $$sane_makeflags; do \
 +    test $$skip_next = yes && { skip_next=no; continue; }; \
 +    case $$flg in \
 +      *=*|--*) continue;; \
 +        -*I) strip_trailopt 'I'; skip_next=yes;; \
 +      -*I?*) strip_trailopt 'I';; \
 +        -*O) strip_trailopt 'O'; skip_next=yes;; \
 +      -*O?*) strip_trailopt 'O';; \
 +        -*l) strip_trailopt 'l'; skip_next=yes;; \
 +      -*l?*) strip_trailopt 'l';; \
 +      -[dEDm]) skip_next=yes;; \
 +      -[JT]) skip_next=yes;; \
 +    esac; \
 +    case $$flg in \
 +      *$$target_option*) has_opt=yes; break;; \
 +    esac; \
 +  done; \
 +  test $$has_opt = yes
 +am__make_dryrun = (target_option=n; $(am__make_running_with_option))
 +am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 +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@
 +DIST_COMMON = $(top_srcdir)/Makefile.incl.am $(srcdir)/Makefile.in \
 +      $(srcdir)/Makefile.am $(top_srcdir)/config/mkinstalldirs \
 +      $(top_srcdir)/config/depcomp $(libsciast_la_include_HEADERS)
 +@NEED_JAVA_TRUE@am__append_1 = java
 +subdir = modules/ast
 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 +am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
 +      $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
 +      $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.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/mpi.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 =
 +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__uninstall_files_from_dir = { \
 +  test -z "$$files" \
 +    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
 +    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
 +         $(am__cd) "$$dir" && rm -f $$files; }; \
 +  }
 +am__installdirs = "$(DESTDIR)$(pkglibdir)" \
 +      "$(DESTDIR)$(libsciast_la_etcdir)" \
 +      "$(DESTDIR)$(libsciast_la_includedir)"
 +LTLIBRARIES = $(pkglib_LTLIBRARIES)
 +libsciast_la_LIBADD =
 +am__dirstamp = $(am__leading_dot)dirstamp
 +am_libsciast_la_OBJECTS = src/cpp/libsciast_la-libAst.lo \
 +      src/cpp/libsciast_la-visitor_common.lo \
 +      src/cpp/libsciast_la-printvisitor.lo \
 +      src/cpp/libsciast_la-debugvisitor.lo \
 +      src/cpp/libsciast_la-mutevisitor.lo \
 +      src/cpp/libsciast_la-shortcutvisitor.lo \
 +      src/cpp/libsciast_la-scilabexception.lo \
 +      src/cpp/libsciast_la-macrovarvisitor.lo
 +libsciast_la_OBJECTS = $(am_libsciast_la_OBJECTS)
 +AM_V_lt = $(am__v_lt_@AM_V@)
 +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 +am__v_lt_0 = --silent
 +am__v_lt_1 = 
 +AM_V_P = $(am__v_P_@AM_V@)
 +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 +am__v_P_0 = false
 +am__v_P_1 = :
 +AM_V_GEN = $(am__v_GEN_@AM_V@)
 +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 +am__v_GEN_0 = @echo "  GEN     " $@;
 +am__v_GEN_1 = 
 +AM_V_at = $(am__v_at_@AM_V@)
 +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 +am__v_at_0 = @
 +am__v_at_1 = 
 +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/modules/core/includes
 +depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 +am__depfiles_maybe = depfiles
 +am__mv = mv -f
 +CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 +      $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
 +      $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
 +      $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 +      $(AM_CXXFLAGS) $(CXXFLAGS)
 +AM_V_CXX = $(am__v_CXX_@AM_V@)
 +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
 +am__v_CXX_0 = @echo "  CXX     " $@;
 +am__v_CXX_1 = 
 +CXXLD = $(CXX)
 +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
 +      $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
 +      $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
 +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
 +am__v_CXXLD_0 = @echo "  CXXLD   " $@;
 +am__v_CXXLD_1 = 
 +SOURCES = $(libsciast_la_SOURCES)
 +DIST_SOURCES = $(libsciast_la_SOURCES)
 +am__can_run_installinfo = \
 +  case $$AM_UPDATE_INFO_DIR in \
 +    n|no|NO) false;; \
 +    *) (install-info --version) >/dev/null 2>&1;; \
 +  esac
 +DATA = $(libsciast_la_etc_DATA)
 +HEADERS = $(libsciast_la_include_HEADERS)
 +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 +# Read a list of newline-separated strings from the standard input,
 +# and print each of them once, without duplicates.  Input order is
 +# *not* preserved.
 +am__uniquify_input = $(AWK) '\
 +  BEGIN { nonempty = 0; } \
 +  { items[$$0] = 1; nonempty = 1; } \
 +  END { if (nonempty) { for (i in items) print i; }; } \
 +'
 +# Make sure the list of sources is unique.  This is necessary because,
 +# e.g., the same source file might be shared among _SOURCES variables
 +# for different programs/libraries.
 +am__define_uniq_tagged_files = \
 +  list='$(am__tagged_files)'; \
 +  unique=`for i in $$list; do \
 +    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 +  done | $(am__uniquify_input)`
 +ETAGS = etags
 +CTAGS = ctags
 +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 +ACLOCAL = @ACLOCAL@
 +ALL_LINGUAS = @ALL_LINGUAS@
 +ALL_LINGUAS_DOC = @ALL_LINGUAS_DOC@
 +AMTAR = @AMTAR@
 +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 +ANT = @ANT@
 +ANTLR = @ANTLR@
 +AR = @AR@
 +ARPACK_LIBS = @ARPACK_LIBS@
 +ASM3 = @ASM3@
 +AUTOCONF = @AUTOCONF@
 +AUTOHEADER = @AUTOHEADER@
 +AUTOMAKE = @AUTOMAKE@
 +AVALON_FRAMEWORK = @AVALON_FRAMEWORK@
 +AWK = @AWK@
 +BATIK = @BATIK@
 +BLAS_LIBS = @BLAS_LIBS@
 +CC = @CC@
 +CCACHE = @CCACHE@
 +CCDEPMODE = @CCDEPMODE@
 +CFLAGS = @CFLAGS@
 +CHECKSTYLE = @CHECKSTYLE@
 +COBERTURA = @COBERTURA@
 +COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
 +COMMONS_IO = @COMMONS_IO@
 +COMMONS_LOGGING = @COMMONS_LOGGING@
 +CPP = @CPP@
 +CPPFLAGS = @CPPFLAGS@
 +CURL_CFLAGS = @CURL_CFLAGS@
 +CURL_CONFIG = @CURL_CONFIG@
 +CURL_LIBS = @CURL_LIBS@
 +CURL_VERSION = @CURL_VERSION@
 +CXX = @CXX@
 +CXXCPP = @CXXCPP@
 +CXXDEPMODE = @CXXDEPMODE@
 +CXXFLAGS = @CXXFLAGS@
 +CYGPATH_W = @CYGPATH_W@
 +DEFS = @DEFS@
 +DEMOTOOLS_ENABLE = @DEMOTOOLS_ENABLE@
 +DEPDIR = @DEPDIR@
++DLLTOOL = @DLLTOOL@
 +DOCBOOK_ROOT = @DOCBOOK_ROOT@
 +DOXYGEN_BIN = @DOXYGEN_BIN@
 +DSYMUTIL = @DSYMUTIL@
 +DUMPBIN = @DUMPBIN@
 +ECHO_C = @ECHO_C@
 +ECHO_N = @ECHO_N@
 +ECHO_T = @ECHO_T@
 +ECJ = @ECJ@
 +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@
++FREEHEP_GRAPHICS2D = @FREEHEP_GRAPHICS2D@
++FREEHEP_GRAPHICSIO = @FREEHEP_GRAPHICSIO@
++FREEHEP_GRAPHICSIO_EMF = @FREEHEP_GRAPHICSIO_EMF@
++FREEHEP_IO = @FREEHEP_IO@
++FREEHEP_UTIL = @FREEHEP_UTIL@
 +GENHTML = @GENHTML@
 +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 +GIWS_BIN = @GIWS_BIN@
 +GLUEGEN2_RT = @GLUEGEN2_RT@
 +GMSGFMT = @GMSGFMT@
 +GMSGFMT_015 = @GMSGFMT_015@
 +GRAPHICS_ENABLE = @GRAPHICS_ENABLE@
 +GREP = @GREP@
 +GUI_ENABLE = @GUI_ENABLE@
 +HDF5_CFLAGS = @HDF5_CFLAGS@
 +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@
 +JDB = @JDB@
 +JEUCLID_CORE = @JEUCLID_CORE@
 +JGRAPHX = @JGRAPHX@
 +JHALL = @JHALL@
 +JLATEXMATH = @JLATEXMATH@
 +JLATEXMATH_FOP = @JLATEXMATH_FOP@
 +JOGL2 = @JOGL2@
 +JROSETTA_API = @JROSETTA_API@
 +JROSETTA_ENGINE = @JROSETTA_ENGINE@
 +JUNIT4 = @JUNIT4@
 +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@
++MANIFEST_TOOL = @MANIFEST_TOOL@
 +MATIO_CFLAGS = @MATIO_CFLAGS@
 +MATIO_ENABLE = @MATIO_ENABLE@
 +MATIO_LIBS = @MATIO_LIBS@
 +MKDIR_P = @MKDIR_P@
 +MPI_ENABLE = @MPI_ENABLE@
 +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@
 +OPENMPI_CC = @OPENMPI_CC@
 +OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 +OPENMPI_CXX = @OPENMPI_CXX@
 +OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 +OPENMPI_LIBS = @OPENMPI_LIBS@
 +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@
 +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@
 +SCIRENDERER = @SCIRENDERER@
 +SCIRENDERER_CP = @SCIRENDERER_CP@
 +SCI_CFLAGS = @SCI_CFLAGS@
 +SCI_CXXFLAGS = @SCI_CXXFLAGS@
 +SCI_FFLAGS = @SCI_FFLAGS@
 +SCI_LDFLAGS = @SCI_LDFLAGS@
 +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@
 +SWIG_SCILAB = @SWIG_SCILAB@
 +TCLTK_LIBS = @TCLTK_LIBS@
 +TCL_INC_PATH = @TCL_INC_PATH@
 +TK_INC_PATH = @TK_INC_PATH@
 +UMFPACK_CFLAGS = @UMFPACK_CFLAGS@
 +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_AR = @ac_ct_AR@
 +ac_ct_CC = @ac_ct_CC@
 +ac_ct_CXX = @ac_ct_CXX@
 +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 +ac_ct_F77 = @ac_ct_F77@
 +am__include = @am__include@
 +am__leading_dot = @am__leading_dot@
 +am__quote = @am__quote@
 +am__tar = @am__tar@
 +am__untar = @am__untar@
 +bindir = @bindir@
 +build = @build@
 +build_alias = @build_alias@
 +build_cpu = @build_cpu@
 +build_os = @build_os@
 +build_vendor = @build_vendor@
 +builddir = @builddir@
 +cxx_present = @cxx_present@
 +datadir = @datadir@
 +datarootdir = @datarootdir@
 +docdir = @docdir@
 +dvidir = @dvidir@
 +exec_prefix = @exec_prefix@
 +host = @host@
 +host_alias = @host_alias@
 +host_cpu = @host_cpu@
 +host_os = @host_os@
 +host_vendor = @host_vendor@
 +htmldir = @htmldir@
 +includedir = @includedir@
 +infodir = @infodir@
 +install_sh = @install_sh@
 +libdir = @libdir@
 +libexecdir = @libexecdir@
 +localedir = @localedir@
 +localstatedir = @localstatedir@
 +mandir = @mandir@
 +mkdir_p = @mkdir_p@
 +oldincludedir = @oldincludedir@
 +pdfdir = @pdfdir@
 +prefix = @prefix@
 +program_transform_name = @program_transform_name@
 +psdir = @psdir@
 +sbindir = @sbindir@
 +sharedstatedir = @sharedstatedir@
 +srcdir = @srcdir@
 +sysconfdir = @sysconfdir@
 +target_alias = @target_alias@
 +top_build_prefix = @top_build_prefix@
 +top_builddir = @top_builddir@
 +top_srcdir = @top_srcdir@
 +yacc_present = @yacc_present@
 +pkglib_LTLIBRARIES = libsciast.la
 +libsciast_la_SOURCES = \
 +      src/cpp/libAst.cpp \
 +      src/cpp/visitor_common.cpp \
 +      src/cpp/printvisitor.cpp \
 +      src/cpp/debugvisitor.cpp \
 +      src/cpp/mutevisitor.cpp \
 +      src/cpp/shortcutvisitor.cpp \
 +      src/cpp/scilabexception.cpp \
 +      src/cpp/macrovarvisitor.cpp
 +
 +libsciast_la_CPPFLAGS = \
 +      -Iincludes \
 +      -Isrc/cpp \
 +    -I$(top_srcdir)/modules/dynamic_link/includes \
 +    -I$(top_srcdir)/modules/symbol/includes \
 +      -I$(top_srcdir)/modules/types/includes \
 +      -I$(top_srcdir)/modules/functions_manager/includes \
 +      -I$(top_srcdir)/modules/console/includes \
 +      -I$(top_srcdir)/modules/elementary_functions/includes \
 +      -I$(top_srcdir)/modules/operations/includes \
 +      -I$(top_srcdir)/modules/output_stream/includes \
 +      -I$(top_srcdir)/modules/system_env/includes \
 +      -I$(top_srcdir)/modules/api_scilab/includes \
 +      -I$(top_srcdir)/modules/string/includes \
 +      -I$(top_srcdir)/modules/threads/includes \
 +      -I$(top_srcdir)/modules/localization/includes \
 +    $(EIGEN_CPPFLAGS) \
 +      $(AM_CPPFLAGS)
 +
 +libsciast_la_includedir = $(pkgincludedir)
 +libsciast_la_include_HEADERS = 
 +
 +#### Target ######
 +modulename = ast
 +
 +####io : init scripts ####
 +libsciast_la_etcdir = $(mydatadir)/etc
 +libsciast_la_etc_DATA = etc/ast.quit etc/ast.start
 +
 +# Where all the Scilab stuff is installed (macros, help, ...)
 +mydatadir = $(pkgdatadir)/modules/$(modulename)
 +
 +# Set AM_* SCI detected settings
 +AM_CPPFLAGS = $(SCI_CPPFLAGS)
 +AM_CFLAGS = $(SCI_CFLAGS)
 +AM_CXXFLAGS = $(SCI_CXXFLAGS)
 +# append includes to AM_FFLAGS to manage fortran includes
 +AM_FFLAGS = $(SCI_FFLAGS) -I$(top_srcdir)/modules/core/includes/
 +
 +# Tag shared libraries with the Scilab version
 +AM_LDFLAGS = $(SCI_LDFLAGS) -version-number $(SCILAB_LIBRARY_VERSION)
 +
 +# splint options
 +SPLINT_OPTIONS = -weak -booltype BOOL
 +
 +########################### JAVA ######################################
 +#### We are delegating java compilation to ant... Thanks to that
 +#### the procedure will be the same with Microsoft Windows (C)
 +#### and Linux/Unix
 +#######################################################################
 +TARGETS_ALL = $(am__append_1)
 +
 +################ MACROS ######################
 +# Rule to build a macro
 +# NOT USED  AT THE MOMENT
 +SUFFIXES = .sci 
 +
 +########### INSTALL DOCUMENTATION ###################
 +
 +# Install documentation files into the right target
 +# We do not use the automake mechanism (libxxxx_la_help_fr_DATA) because
 +# automake needs the html files to be present which is not the case when
 +# we are building Scilab
 +
 +# Where it should be installed
 +pkgdocdir = $(mydatadir)
 +
 +# What is the mask of the help source
 +DOCMASKXML = *.xml
 +
 +# What is the mask of the MathML sources
 +DOCMASKMML = *.mml
 +
 +########### INSTALL DATA ###################
 +# Install macros, help & demos
 +# Where it should be installed
 +pkgmacrosdir = $(mydatadir)
 +# Which directory we process
 +MACRODIRS = macros/
 +# Mask of the Scilab sources macros
 +MACROMASK = *.sci
 +# Mask of the Scilab executable sources macros
 +MACROBUILDMASK = *.sce
 +# Mask of the Scilab compiled macros
 +MACROBINMASK = *.bin
 +# List of the standard directory for tests
 +TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 +# Where the demos should be installed
 +pkgdemosdir = $(mydatadir)
 +# List of the standard directory for demos
 +DEMOS_DIR = demos
 +# List of the standard directory for examples
 +EXAMPLES_DIR = examples
 +# Where to export JAVA archives (.jar)
 +JARDIR = jar/
 +# JAR files mask
 +JARMASK = *.jar
 +# Chapter file 
 +HELP_CHAPTERDIR = help/
 +HELP_CHAPTERFILE = addchapter.sce
 +HELP_CHAPTERLANG = en_US fr_FR pt_BR
 +all: all-am
 +
 +.SUFFIXES:
 +.SUFFIXES: .sci .bin .cpp .lo .o .obj
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.incl.am $(am__configure_deps)
 +      @for dep in $?; do \
 +        case '$(am__configure_deps)' in \
 +          *$$dep*) \
 +            ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
 +              && { if test -f $@; then exit 0; else break; fi; }; \
 +            exit 1;; \
 +        esac; \
 +      done; \
 +      echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign modules/ast/Makefile'; \
 +      $(am__cd) $(top_srcdir) && \
 +        $(AUTOMAKE) --foreign modules/ast/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_srcdir)/Makefile.incl.am:
 +
 +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 +      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 +      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 +      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(am__aclocal_m4_deps):
 +
 +install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
 +      @$(NORMAL_INSTALL)
 +      @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
 +      list2=; for p in $$list; do \
 +        if test -f $$p; then \
 +          list2="$$list2 $$p"; \
 +        else :; fi; \
 +      done; \
 +      test -z "$$list2" || { \
 +        echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \
 +        $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \
 +        echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \
 +        $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \
 +      }
 +
 +uninstall-pkglibLTLIBRARIES:
 +      @$(NORMAL_UNINSTALL)
 +      @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
 +      for p in $$list; do \
 +        $(am__strip_dir) \
 +        echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \
 +        $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \
 +      done
 +
 +clean-pkglibLTLIBRARIES:
 +      -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
 +      @list='$(pkglib_LTLIBRARIES)'; \
 +      locs=`for p in $$list; do echo $$p; done | \
 +            sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
 +            sort -u`; \
 +      test -z "$$locs" || { \
 +        echo rm -f $${locs}; \
 +        rm -f $${locs}; \
 +      }
 +src/cpp/$(am__dirstamp):
 +      @$(MKDIR_P) src/cpp
 +      @: > src/cpp/$(am__dirstamp)
 +src/cpp/$(DEPDIR)/$(am__dirstamp):
 +      @$(MKDIR_P) src/cpp/$(DEPDIR)
 +      @: > src/cpp/$(DEPDIR)/$(am__dirstamp)
 +src/cpp/libsciast_la-libAst.lo: src/cpp/$(am__dirstamp) \
 +      src/cpp/$(DEPDIR)/$(am__dirstamp)
 +src/cpp/libsciast_la-visitor_common.lo: src/cpp/$(am__dirstamp) \
 +      src/cpp/$(DEPDIR)/$(am__dirstamp)
 +src/cpp/libsciast_la-printvisitor.lo: src/cpp/$(am__dirstamp) \
 +      src/cpp/$(DEPDIR)/$(am__dirstamp)
 +src/cpp/libsciast_la-debugvisitor.lo: src/cpp/$(am__dirstamp) \
 +      src/cpp/$(DEPDIR)/$(am__dirstamp)
 +src/cpp/libsciast_la-mutevisitor.lo: src/cpp/$(am__dirstamp) \
 +      src/cpp/$(DEPDIR)/$(am__dirstamp)
 +src/cpp/libsciast_la-shortcutvisitor.lo: src/cpp/$(am__dirstamp) \
 +      src/cpp/$(DEPDIR)/$(am__dirstamp)
 +src/cpp/libsciast_la-scilabexception.lo: src/cpp/$(am__dirstamp) \
 +      src/cpp/$(DEPDIR)/$(am__dirstamp)
 +src/cpp/libsciast_la-macrovarvisitor.lo: src/cpp/$(am__dirstamp) \
 +      src/cpp/$(DEPDIR)/$(am__dirstamp)
 +
 +libsciast.la: $(libsciast_la_OBJECTS) $(libsciast_la_DEPENDENCIES) $(EXTRA_libsciast_la_DEPENDENCIES) 
 +      $(AM_V_CXXLD)$(CXXLINK) -rpath $(pkglibdir) $(libsciast_la_OBJECTS) $(libsciast_la_LIBADD) $(LIBS)
 +
 +mostlyclean-compile:
 +      -rm -f *.$(OBJEXT)
 +      -rm -f src/cpp/*.$(OBJEXT)
 +      -rm -f src/cpp/*.lo
 +
 +distclean-compile:
 +      -rm -f *.tab.c
 +
 +@AMDEP_TRUE@@am__include@ @am__quote@src/cpp/$(DEPDIR)/libsciast_la-debugvisitor.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@src/cpp/$(DEPDIR)/libsciast_la-libAst.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@src/cpp/$(DEPDIR)/libsciast_la-macrovarvisitor.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@src/cpp/$(DEPDIR)/libsciast_la-mutevisitor.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@src/cpp/$(DEPDIR)/libsciast_la-printvisitor.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@src/cpp/$(DEPDIR)/libsciast_la-scilabexception.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@src/cpp/$(DEPDIR)/libsciast_la-shortcutvisitor.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@src/cpp/$(DEPDIR)/libsciast_la-visitor_common.Plo@am__quote@
 +
 +.cpp.o:
 +@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
 +@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
 +@am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
 +
 +.cpp.obj:
 +@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
 +@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
 +@am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 +
 +.cpp.lo:
 +@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
 +@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
 +@am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
 +
 +src/cpp/libsciast_la-libAst.lo: src/cpp/libAst.cpp
 +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciast_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT src/cpp/libsciast_la-libAst.lo -MD -MP -MF src/cpp/$(DEPDIR)/libsciast_la-libAst.Tpo -c -o src/cpp/libsciast_la-libAst.lo `test -f 'src/cpp/libAst.cpp' || echo '$(srcdir)/'`src/cpp/libAst.cpp
 +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) src/cpp/$(DEPDIR)/libsciast_la-libAst.Tpo src/cpp/$(DEPDIR)/libsciast_la-libAst.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    $(AM_V_CXX)source='src/cpp/libAst.cpp' object='src/cpp/libsciast_la-libAst.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciast_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o src/cpp/libsciast_la-libAst.lo `test -f 'src/cpp/libAst.cpp' || echo '$(srcdir)/'`src/cpp/libAst.cpp
 +
 +src/cpp/libsciast_la-visitor_common.lo: src/cpp/visitor_common.cpp
 +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciast_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT src/cpp/libsciast_la-visitor_common.lo -MD -MP -MF src/cpp/$(DEPDIR)/libsciast_la-visitor_common.Tpo -c -o src/cpp/libsciast_la-visitor_common.lo `test -f 'src/cpp/visitor_common.cpp' || echo '$(srcdir)/'`src/cpp/visitor_common.cpp
 +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) src/cpp/$(DEPDIR)/libsciast_la-visitor_common.Tpo src/cpp/$(DEPDIR)/libsciast_la-visitor_common.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    $(AM_V_CXX)source='src/cpp/visitor_common.cpp' object='src/cpp/libsciast_la-visitor_common.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciast_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o src/cpp/libsciast_la-visitor_common.lo `test -f 'src/cpp/visitor_common.cpp' || echo '$(srcdir)/'`src/cpp/visitor_common.cpp
 +
 +src/cpp/libsciast_la-printvisitor.lo: src/cpp/printvisitor.cpp
 +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciast_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT src/cpp/libsciast_la-printvisitor.lo -MD -MP -MF src/cpp/$(DEPDIR)/libsciast_la-printvisitor.Tpo -c -o src/cpp/libsciast_la-printvisitor.lo `test -f 'src/cpp/printvisitor.cpp' || echo '$(srcdir)/'`src/cpp/printvisitor.cpp
 +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) src/cpp/$(DEPDIR)/libsciast_la-printvisitor.Tpo src/cpp/$(DEPDIR)/libsciast_la-printvisitor.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    $(AM_V_CXX)source='src/cpp/printvisitor.cpp' object='src/cpp/libsciast_la-printvisitor.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciast_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o src/cpp/libsciast_la-printvisitor.lo `test -f 'src/cpp/printvisitor.cpp' || echo '$(srcdir)/'`src/cpp/printvisitor.cpp
 +
 +src/cpp/libsciast_la-debugvisitor.lo: src/cpp/debugvisitor.cpp
 +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciast_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT src/cpp/libsciast_la-debugvisitor.lo -MD -MP -MF src/cpp/$(DEPDIR)/libsciast_la-debugvisitor.Tpo -c -o src/cpp/libsciast_la-debugvisitor.lo `test -f 'src/cpp/debugvisitor.cpp' || echo '$(srcdir)/'`src/cpp/debugvisitor.cpp
 +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) src/cpp/$(DEPDIR)/libsciast_la-debugvisitor.Tpo src/cpp/$(DEPDIR)/libsciast_la-debugvisitor.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    $(AM_V_CXX)source='src/cpp/debugvisitor.cpp' object='src/cpp/libsciast_la-debugvisitor.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciast_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o src/cpp/libsciast_la-debugvisitor.lo `test -f 'src/cpp/debugvisitor.cpp' || echo '$(srcdir)/'`src/cpp/debugvisitor.cpp
 +
 +src/cpp/libsciast_la-mutevisitor.lo: src/cpp/mutevisitor.cpp
 +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciast_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT src/cpp/libsciast_la-mutevisitor.lo -MD -MP -MF src/cpp/$(DEPDIR)/libsciast_la-mutevisitor.Tpo -c -o src/cpp/libsciast_la-mutevisitor.lo `test -f 'src/cpp/mutevisitor.cpp' || echo '$(srcdir)/'`src/cpp/mutevisitor.cpp
 +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) src/cpp/$(DEPDIR)/libsciast_la-mutevisitor.Tpo src/cpp/$(DEPDIR)/libsciast_la-mutevisitor.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    $(AM_V_CXX)source='src/cpp/mutevisitor.cpp' object='src/cpp/libsciast_la-mutevisitor.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciast_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o src/cpp/libsciast_la-mutevisitor.lo `test -f 'src/cpp/mutevisitor.cpp' || echo '$(srcdir)/'`src/cpp/mutevisitor.cpp
 +
 +src/cpp/libsciast_la-shortcutvisitor.lo: src/cpp/shortcutvisitor.cpp
 +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciast_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT src/cpp/libsciast_la-shortcutvisitor.lo -MD -MP -MF src/cpp/$(DEPDIR)/libsciast_la-shortcutvisitor.Tpo -c -o src/cpp/libsciast_la-shortcutvisitor.lo `test -f 'src/cpp/shortcutvisitor.cpp' || echo '$(srcdir)/'`src/cpp/shortcutvisitor.cpp
 +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) src/cpp/$(DEPDIR)/libsciast_la-shortcutvisitor.Tpo src/cpp/$(DEPDIR)/libsciast_la-shortcutvisitor.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    $(AM_V_CXX)source='src/cpp/shortcutvisitor.cpp' object='src/cpp/libsciast_la-shortcutvisitor.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciast_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o src/cpp/libsciast_la-shortcutvisitor.lo `test -f 'src/cpp/shortcutvisitor.cpp' || echo '$(srcdir)/'`src/cpp/shortcutvisitor.cpp
 +
 +src/cpp/libsciast_la-scilabexception.lo: src/cpp/scilabexception.cpp
 +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciast_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT src/cpp/libsciast_la-scilabexception.lo -MD -MP -MF src/cpp/$(DEPDIR)/libsciast_la-scilabexception.Tpo -c -o src/cpp/libsciast_la-scilabexception.lo `test -f 'src/cpp/scilabexception.cpp' || echo '$(srcdir)/'`src/cpp/scilabexception.cpp
 +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) src/cpp/$(DEPDIR)/libsciast_la-scilabexception.Tpo src/cpp/$(DEPDIR)/libsciast_la-scilabexception.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    $(AM_V_CXX)source='src/cpp/scilabexception.cpp' object='src/cpp/libsciast_la-scilabexception.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciast_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o src/cpp/libsciast_la-scilabexception.lo `test -f 'src/cpp/scilabexception.cpp' || echo '$(srcdir)/'`src/cpp/scilabexception.cpp
 +
 +src/cpp/libsciast_la-macrovarvisitor.lo: src/cpp/macrovarvisitor.cpp
 +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciast_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT src/cpp/libsciast_la-macrovarvisitor.lo -MD -MP -MF src/cpp/$(DEPDIR)/libsciast_la-macrovarvisitor.Tpo -c -o src/cpp/libsciast_la-macrovarvisitor.lo `test -f 'src/cpp/macrovarvisitor.cpp' || echo '$(srcdir)/'`src/cpp/macrovarvisitor.cpp
 +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) src/cpp/$(DEPDIR)/libsciast_la-macrovarvisitor.Tpo src/cpp/$(DEPDIR)/libsciast_la-macrovarvisitor.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    $(AM_V_CXX)source='src/cpp/macrovarvisitor.cpp' object='src/cpp/libsciast_la-macrovarvisitor.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciast_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o src/cpp/libsciast_la-macrovarvisitor.lo `test -f 'src/cpp/macrovarvisitor.cpp' || echo '$(srcdir)/'`src/cpp/macrovarvisitor.cpp
 +
 +mostlyclean-libtool:
 +      -rm -f *.lo
 +
 +clean-libtool:
 +      -rm -rf .libs _libs
 +      -rm -rf src/cpp/.libs src/cpp/_libs
 +install-libsciast_la_etcDATA: $(libsciast_la_etc_DATA)
 +      @$(NORMAL_INSTALL)
 +      @list='$(libsciast_la_etc_DATA)'; test -n "$(libsciast_la_etcdir)" || list=; \
 +      if test -n "$$list"; then \
 +        echo " $(MKDIR_P) '$(DESTDIR)$(libsciast_la_etcdir)'"; \
 +        $(MKDIR_P) "$(DESTDIR)$(libsciast_la_etcdir)" || exit 1; \
 +      fi; \
 +      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)$(libsciast_la_etcdir)'"; \
 +        $(INSTALL_DATA) $$files "$(DESTDIR)$(libsciast_la_etcdir)" || exit $$?; \
 +      done
 +
 +uninstall-libsciast_la_etcDATA:
 +      @$(NORMAL_UNINSTALL)
 +      @list='$(libsciast_la_etc_DATA)'; test -n "$(libsciast_la_etcdir)" || list=; \
 +      files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 +      dir='$(DESTDIR)$(libsciast_la_etcdir)'; $(am__uninstall_files_from_dir)
 +install-libsciast_la_includeHEADERS: $(libsciast_la_include_HEADERS)
 +      @$(NORMAL_INSTALL)
 +      @list='$(libsciast_la_include_HEADERS)'; test -n "$(libsciast_la_includedir)" || list=; \
 +      if test -n "$$list"; then \
 +        echo " $(MKDIR_P) '$(DESTDIR)$(libsciast_la_includedir)'"; \
 +        $(MKDIR_P) "$(DESTDIR)$(libsciast_la_includedir)" || exit 1; \
 +      fi; \
 +      for p in $$list; do \
 +        if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 +        echo "$$d$$p"; \
 +      done | $(am__base_list) | \
 +      while read files; do \
 +        echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libsciast_la_includedir)'"; \
 +        $(INSTALL_HEADER) $$files "$(DESTDIR)$(libsciast_la_includedir)" || exit $$?; \
 +      done
 +
 +uninstall-libsciast_la_includeHEADERS:
 +      @$(NORMAL_UNINSTALL)
 +      @list='$(libsciast_la_include_HEADERS)'; test -n "$(libsciast_la_includedir)" || list=; \
 +      files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 +      dir='$(DESTDIR)$(libsciast_la_includedir)'; $(am__uninstall_files_from_dir)
 +
 +ID: $(am__tagged_files)
 +      $(am__define_uniq_tagged_files); mkid -fID $$unique
 +tags: tags-am
 +TAGS: tags
 +
 +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 +      set x; \
 +      here=`pwd`; \
 +      $(am__define_uniq_tagged_files); \
 +      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-am
 +
 +CTAGS: ctags
 +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 +      $(am__define_uniq_tagged_files); \
 +      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"
 +cscopelist: cscopelist-am
 +
 +cscopelist-am: $(am__tagged_files)
 +      list='$(am__tagged_files)'; \
 +      case "$(srcdir)" in \
 +        [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
 +        *) sdir=$(subdir)/$(srcdir) ;; \
 +      esac; \
 +      for i in $$list; do \
 +        if test -f "$$i"; then \
 +          echo "$(subdir)/$$i"; \
 +        else \
 +          echo "$$sdir/$$i"; \
 +        fi; \
 +      done >> $(top_builddir)/cscope.files
 +
 +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
 +check-am: all-am
 +      $(MAKE) $(AM_MAKEFLAGS) check-local
 +check: check-am
 +all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) all-local
 +installdirs:
 +      for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(libsciast_la_etcdir)" "$(DESTDIR)$(libsciast_la_includedir)"; do \
 +        test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 +      done
 +install: install-am
 +install-exec: install-exec-am
 +install-data: install-data-am
 +uninstall: uninstall-am
 +
 +install-am: all-am
 +      @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 +
 +installcheck: installcheck-am
 +install-strip:
 +      if test -z '$(STRIP)'; then \
 +        $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 +          install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 +            install; \
 +      else \
 +        $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 +          install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 +          "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
 +      fi
 +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)
 +      -rm -f src/cpp/$(DEPDIR)/$(am__dirstamp)
 +      -rm -f src/cpp/$(am__dirstamp)
 +
 +maintainer-clean-generic:
 +      @echo "This command is intended for maintainers to use"
 +      @echo "it deletes files that may require special tools to rebuild."
 +clean: clean-am
 +
 +clean-am: clean-generic clean-libtool clean-local \
 +      clean-pkglibLTLIBRARIES mostlyclean-am
 +
 +distclean: distclean-am
 +      -rm -rf src/cpp/$(DEPDIR)
 +      -rm -f Makefile
 +distclean-am: clean-am distclean-compile distclean-generic \
 +      distclean-local distclean-tags
 +
 +dvi: dvi-am
 +
 +dvi-am:
 +
 +html: html-am
 +
 +html-am:
 +
 +info: info-am
 +
 +info-am:
 +
 +install-data-am: install-data-local install-libsciast_la_etcDATA \
 +      install-libsciast_la_includeHEADERS
 +
 +install-dvi: install-dvi-am
 +
 +install-dvi-am:
 +
 +install-exec-am: install-pkglibLTLIBRARIES
 +
 +install-html: install-html-am
 +
 +install-html-am: install-html-local
 +
 +install-info: install-info-am
 +
 +install-info-am:
 +
 +install-man:
 +
 +install-pdf: install-pdf-am
 +
 +install-pdf-am:
 +
 +install-ps: install-ps-am
 +
 +install-ps-am:
 +
 +installcheck-am:
 +
 +maintainer-clean: maintainer-clean-am
 +      -rm -rf src/cpp/$(DEPDIR)
 +      -rm -f Makefile
 +maintainer-clean-am: distclean-am maintainer-clean-generic
 +
 +mostlyclean: mostlyclean-am
 +
 +mostlyclean-am: mostlyclean-compile mostlyclean-generic \
 +      mostlyclean-libtool
 +
 +pdf: pdf-am
 +
 +pdf-am:
 +
 +ps: ps-am
 +
 +ps-am:
 +
 +uninstall-am: uninstall-libsciast_la_etcDATA \
 +      uninstall-libsciast_la_includeHEADERS \
 +      uninstall-pkglibLTLIBRARIES
 +
 +.MAKE: check-am install-am install-strip
 +
 +.PHONY: CTAGS GTAGS TAGS all all-am all-local check check-am \
 +      check-local clean clean-generic clean-libtool clean-local \
 +      clean-pkglibLTLIBRARIES cscopelist-am ctags ctags-am distclean \
 +      distclean-compile distclean-generic distclean-libtool \
 +      distclean-local distclean-tags distdir dvi dvi-am html html-am \
 +      info info-am install install-am install-data install-data-am \
 +      install-data-local install-dvi install-dvi-am install-exec \
 +      install-exec-am install-html install-html-am \
 +      install-html-local install-info install-info-am \
 +      install-libsciast_la_etcDATA \
 +      install-libsciast_la_includeHEADERS install-man install-pdf \
 +      install-pdf-am install-pkglibLTLIBRARIES install-ps \
 +      install-ps-am install-strip installcheck installcheck-am \
 +      installdirs maintainer-clean maintainer-clean-generic \
 +      mostlyclean mostlyclean-compile mostlyclean-generic \
 +      mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
 +      uninstall-am uninstall-libsciast_la_etcDATA \
 +      uninstall-libsciast_la_includeHEADERS \
 +      uninstall-pkglibLTLIBRARIES
 +
 +
 +# This target enables tests for Scilab
 +check-local: $(top_builddir)/scilab-bin test
 +      if test -d $(mydatadir)/tests; then \
 +        @COMMAND="try test_run('$(modulename)');catch exit(-1);end;exit(0)"; export LANG=C; $(top_builddir)/bin/scilab -nwni -nb -e "$$COMMAND"; \
 +      fi
 +check-code:
 +      if test -f build.xml; then \
 +              $(ANT) checkstyle; \
 +      fi
 +      if test -x "$(SPLINT)"; then \
 +              $(SPLINT) $(SPLINT_OPTIONS) -I$(top_srcdir)/modules/core/includes/ -I$(top_srcdir)/libs/MALLOC/includes/ -I$(top_srcdir)/modules/localization/includes/ $(INCLUDE_FLAGS) $(CHECK_SRC); \
 +      fi
 +@NEED_JAVA_TRUE@java:
 +# Some configurations needs to export JAVA_HOME in the current env
 +@NEED_JAVA_TRUE@      @if test "$(JAVA_HOME)"; then export JAVA_HOME=$(JAVA_HOME); fi; \
 +@NEED_JAVA_TRUE@      if test -z "$(USEANT)"; then USEANT=0; else USEANT=1; fi; \
 +@NEED_JAVA_TRUE@      if test -f build.xml -a $$USEANT -eq 1; then \
 +@NEED_JAVA_TRUE@              $(ANT); \
 +@NEED_JAVA_TRUE@      fi
 +
 +@NEED_JAVA_TRUE@clean-java:
 +# Some configurations needs to export JAVA_HOME in the current env
 +@NEED_JAVA_TRUE@      @if test "$(JAVA_HOME)"; then export JAVA_HOME=$(JAVA_HOME); fi; \
 +@NEED_JAVA_TRUE@      if test -z "$(USEANT)"; then USEANT=0; else USEANT=1; fi; \
 +@NEED_JAVA_TRUE@      if test -f build.xml -a $$USEANT -eq 1; then \
 +@NEED_JAVA_TRUE@              $(ANT) clean; \
 +@NEED_JAVA_TRUE@      fi;
 +
 +# If the user request for the SWIG generation of the wrappers Java => C/C++ 
 +# We call the target swig-build on the variable SWIG_WRAPPERS
 +
 +@SWIG_TRUE@swig: $(SWIG_WRAPPERS)
 +@SWIG_TRUE@   @SWIG_PACKAGENAME=org.scilab.modules.$(modulename); \
 +@SWIG_TRUE@   SWIG_OUTDIR=src/java/org/scilab/modules/$(modulename)/; \
 +@SWIG_TRUE@   if test -n "$(SWIG_WRAPPERS)"; then \
 +@SWIG_TRUE@           for file in $(SWIG_WRAPPERS) ; do \
 +@SWIG_TRUE@                   echo "Swig process of $$file (Java) ..."; \
 +@SWIG_TRUE@                   $(SWIG_BIN) $(SWIG_JAVA) -package $$SWIG_PACKAGENAME  -outdir $$SWIG_OUTDIR $$file; \
 +@SWIG_TRUE@           done; \
 +@SWIG_TRUE@   fi
 +
 +@SWIG_TRUE@swig-scilab: $(SWIG_SCILAB_WRAPPERS)
 +@SWIG_TRUE@   @SWIG_OUTDIR=src/swig/; \
 +@SWIG_TRUE@   if test -n "$(SWIG_SCILAB_WRAPPERS)"; then \
 +@SWIG_TRUE@           for file in $(SWIG_SCILAB_WRAPPERS) ; do \
 +@SWIG_TRUE@                   echo "Swig process of $$file (Scilab) ..."; \
 +@SWIG_TRUE@                   $(SWIG_BIN) $(SWIG_SCILAB)  -outdir $$SWIG_OUTDIR $$file; \
 +@SWIG_TRUE@           done; \
 +@SWIG_TRUE@   fi
 +
 +# If the user request for the SWIG generation of the wrappers Java => C/C++ 
 +# We call the target swig-build on the variable SWIG_WRAPPERS
 +
 +@GIWS_TRUE@giws: $(GIWS_WRAPPERS)
 +@GIWS_TRUE@   @GIWS_OUTPUTDIR=src/jni/; \
 +@GIWS_TRUE@   MANDATORY_OPTIONS="--throws-exception-on-error --description-file"; \
 +@GIWS_TRUE@   if test -n "$(GIWS_WRAPPERS)"; then \
 +@GIWS_TRUE@           for file in $(GIWS_WRAPPERS) ; do \
 +@GIWS_TRUE@                   echo "GIWS process of $$file ..."; \
 +@GIWS_TRUE@                   if test -z "$(GIWS_OPTIONS)"; then \
 +@GIWS_TRUE@                           $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
 +@GIWS_TRUE@                   else \
 +@GIWS_TRUE@                           echo "Custom GIWS call with '$$GIWS_OPTIONS'"; \
 +@GIWS_TRUE@                           $(GIWS_BIN) $$GIWS_OPTIONS --output-dir $$GIWS_OUTPUTDIR $$MANDATORY_OPTIONS $$file; \
 +@GIWS_TRUE@                   fi \
 +@GIWS_TRUE@           done; \
 +@GIWS_TRUE@   fi
 +
 +@GIWS_TRUE@giws-exception:
 +@GIWS_TRUE@   @GIWS_OUTPUTDIR=src/jni/;\
 +@GIWS_TRUE@   echo "GIWS: Generation of exception class ..."; \
 +@GIWS_TRUE@   $(GIWS_BIN) --generate-exception-class --output-dir $$GIWS_OUTPUTDIR 
 +
 +macros:
 +      -@( if test ! -x $(top_builddir)/scilab-bin; then \
 +              echo "Error : Cannot build $< : Scilab has not been built"; \
 +      else \
 +              $(top_builddir)/bin/scilab -ns -nwni -e "exec('macros/buildmacros.sce');quit;";\
 +      fi)
 +
 +# Removes the macros
 +clean-macros:
 +# Removes macros (*.bin generated from .sci)
 +      @for dir in $(MACRODIRS) $(MACROSDIRSEXT) ; do \
 +              echo "rm -f $(builddir)/$$dir/$(MACROBINMASK)"; \
 +              rm -f $(builddir)/$$dir/$(MACROBINMASK); \
 +      done
 +
 +test:
 +# More tests could be added here
 +      @if test -z "$(USEANT)"; then USEANT=0; else USEANT=1; fi; \
 +      if test -f build.xml -a $$USEANT -eq 1; then \
 +              $(ANT) test; \
 +      fi
 +
 +all-local: $(TARGETS_ALL)
 +
 +.sci.bin:
 +      -@( if test ! -x $(top_builddir)/scilab-bin; then \
 +      echo "Error : Cannot build $< : Scilab has not been build"; \
 +      else \
 +      echo "Creating $@"; \
 +      $(top_builddir)/bin/scilab -ns -nwni -e "exec('$(abs_srcdir)/$<');save('$(abs_srcdir)/$@');exit;"; \
 +      fi )
 +
 +install-html-local:
 +
 +install-data-local-local:
 +# Mainly for javasci
 +      @if test -d $(srcdir)/javadoc; then \
 +              cp -R $(srcdir)/javadoc $(DESTDIR)/$(mydatadir)/; \
 +      fi
 +# If the user wants the help sources to be installed
 +@INSTALL_HELP_XML_TRUE@       @echo "-------- Install of XML sources of help files --------"; \
 +@INSTALL_HELP_XML_TRUE@       for lang in $(ALL_LINGUAS); do \
 +@INSTALL_HELP_XML_TRUE@        if test -d $(srcdir)/help/$$lang; then \
 +@INSTALL_HELP_XML_TRUE@         $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)/help/$$lang && \
 +@INSTALL_HELP_XML_TRUE@               if ls -lLd $(srcdir)/help/$$lang/$(DOCMASKXML) >/dev/null 2>&1; then \
 +@INSTALL_HELP_XML_TRUE@                 for file in $(srcdir)/help/$$lang/$(DOCMASKXML) ; do \
 +@INSTALL_HELP_XML_TRUE@                   echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgdocdir)/help/$$lang" ; \
 +@INSTALL_HELP_XML_TRUE@               $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgdocdir)/help/$$lang ; \
 +@INSTALL_HELP_XML_TRUE@                 done ; \
 +@INSTALL_HELP_XML_TRUE@               fi; \
 +@INSTALL_HELP_XML_TRUE@        fi; \
 +@INSTALL_HELP_XML_TRUE@       done; \
 +@INSTALL_HELP_XML_TRUE@       @echo "-------- Install of MathML sources --------"; \
 +@INSTALL_HELP_XML_TRUE@        if test -d $(srcdir)/help/mml/; then \
 +@INSTALL_HELP_XML_TRUE@         $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)/help/mml/ && \
 +@INSTALL_HELP_XML_TRUE@               if ls -lLd $(srcdir)/help/mml/$(DOCMASKMML) >/dev/null 2>&1; then \
 +@INSTALL_HELP_XML_TRUE@                 for file in $(srcdir)/help/mml/$(DOCMASKMML) ; do \
 +@INSTALL_HELP_XML_TRUE@                   echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgdocdir)/help/mml" ; \
 +@INSTALL_HELP_XML_TRUE@               $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgdocdir)/help/mml ; \
 +@INSTALL_HELP_XML_TRUE@                 done ; \
 +@INSTALL_HELP_XML_TRUE@               fi; \
 +@INSTALL_HELP_XML_TRUE@       fi
 +install-data-local:
 +# Install the tests
 +      @echo "-------- Install tests (if any) --------"; \
 +      for dir in $(TESTS_DIR) $(TESTS_DIREXT) ; do \
 +        if test -d $(srcdir)/$$dir/; then \
 +          $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
 +                for file in `find $(srcdir)/$$dir | sed "s|^$(srcdir)/$$dir||" 2>/dev/null`; do \
 +                  if test -d "$(srcdir)/$$dir/$$file"; then \
 +                        echo $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir/$$file; \
 +                        $(mkinstalldirs) "$(DESTDIR)$(pkgmacrosdir)/$$dir/$$file"; \
 +                  else \
 +                    echo "$(INSTALL_DATA) $(srcdir)/$$dir/$$file $(DESTDIR)$(pkgmacrosdir)/`dirname $$dir/$$file`" ; \
 +                $(INSTALL_DATA) "$(srcdir)/$$dir/$$file" "$(DESTDIR)$(pkgmacrosdir)/`dirname $$dir/$$file`" ; \
 +                  fi \
 +                done; \
 +        fi; \
 +      done
 +# Install the help chapter
 +      @echo "-------- Install the help chapter (if any) --------"; \
 +      for lang in $(HELP_CHAPTERLANG); do \
 +              HELPFILE=$(srcdir)/$(HELP_CHAPTERDIR)$$lang/$(HELP_CHAPTERFILE); \
 +              if test -f $$HELPFILE; then \
 +                      echo $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)/$(HELP_CHAPTERDIR)/$$lang/; \
 +                      $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)/$(HELP_CHAPTERDIR)/$$lang/; \
 +                      echo $(INSTALL_DATA) $$HELPFILE $(DESTDIR)$(pkgdocdir)/$$HELPFILE; \
 +                      $(INSTALL_DATA) $$HELPFILE $(DESTDIR)$(pkgdocdir)/$$HELPFILE; \
 +              fi; \
 +      done
 +# Install the demos & examples
 +      @echo "-------- Install demos & examples (if any) --------"; \
 +      for dir in $(DEMOS_DIR) $(DEMOS_DIREXT) $(EXAMPLES_DIR) $(EXAMPLES_DIREXT) ; do \
 +        if test -d $(srcdir)/$$dir/; then \
 +          $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)/$$dir && \
 +                for file in `find $(srcdir)/$$dir | sed "s|^$(srcdir)/$$dir||" 2>/dev/null`; do \
 +                  if test -d "$(srcdir)/$$dir/$$file"; then \
 +                        echo $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)/$$dir/$$file; \
 +                        $(mkinstalldirs) "$(DESTDIR)$(pkgdocdir)/$$dir/$$file"; \
 +                  else \
 +                    echo "$(INSTALL_DATA) $(srcdir)/$$dir/$$file $(DESTDIR)$(pkgdocdir)/`dirname $$dir/$$file`" ; \
 +                $(INSTALL_DATA) "$(srcdir)/$$dir/$$file" "$(DESTDIR)$(pkgdocdir)/`dirname $$dir/$$file`" ; \
 +                  fi \
 +                done; \
 +        fi; \
 +      done
 +# Install the macros
 +      @echo "-------- Install macros (if any) --------"; \
 +      for dir in $(MACRODIRS) $(MACROSDIRSEXT) ; do \
 +        $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
 +              if test -d $(srcdir)/$$dir/; then \
 +                      FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
 +                      if test -n "$(MACROSSPECIALEXT)"; then \
 +                              specialExtDir=""; \
 +                              for specialExt in $(MACROSSPECIALEXT); do \
 +                                      specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
 +                              done; \
 +                              FILELIST="$$FILELIST $$specialExtDir"; \
 +                      fi; \
 +                for file in `ls -1 $$FILELIST 2>/dev/null`; do \
 +                  echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
 +              $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \
 +                done; \
 +              fi; \
 +      done
 +# Install java files (.jar)
 +      @if ls -lLd $(srcdir)/$(JARDIR)$(JARMASK) >/dev/null 2>&1; then \
 +      echo "-------- Install jar files --------"; \
 +    $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)/$(JARDIR); \
 +        for file in $(srcdir)/$(JARDIR)$(JARMASK); do\
 +                  echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgdocdir)/$(JARDIR)" ; \
 +              $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgdocdir)/$(JARDIR) ; \
 +        done ; \
 +      fi
 +
 +########### CLEAN ###################
 +# Clean help (generated automatically by Scilab)
 +# It used to clean the macro (clean-macros) but this was causing
 +# make clean && make to fail Scilab startup
 +@NEED_JAVA_TRUE@clean-local: clean-java
 +@NEED_JAVA_FALSE@clean-local:
 +
 +distclean-local:
 +      rm -f $(builddir)/help/*/.last_successful_build_javaHelp $(builddir)/help/*/.list_*
 +
 +.PHONY: macros java swig giws
 +
 +# 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:
Simple merge
@@@ -4,45 -4,25 +4,43 @@@
  # This file is distributed under the same license as the Scilab package.
  
  
 -BOOLEAN_C_SOURCES = src/c/matboolean.c \
 -src/c/vect_or.c \
 -src/c/vect_and.c
 +BOOLEAN_CPP_SOURCES = \
 +    src/cpp/boolean_gw.cpp
  
 -BOOLEAN_FORTRAN_SOURCES = src/fortran/logic.f
 +BOOLEAN_C_SOURCES = \
 +    src/c/vect_or.c \
 +    src/c/vect_and.c
  
 -GATEWAY_C_SOURCES = sci_gateway/c/sci_and.c \
 -sci_gateway/c/sci_or.c \
 -sci_gateway/c/sci_bool2s.c \
 -sci_gateway/c/gw_boolean.c
 +BOOLEAN_FORTRAN_SOURCES = src/fortran/logic.f
  
 -GATEWAY_FORTRAN_SOURCES =  sci_gateway/fortran/sci_f_bool2s.f
 +GATEWAY_CPP_SOURCES = \
 +    sci_gateway/cpp/sci_bool2s.cpp \
 +    sci_gateway/cpp/sci_find.cpp
  
 -libsciboolean_la_CPPFLAGS= -I$(srcdir)/includes/ \
 -                              -I$(srcdir)/src/c/ \
 -                              -I$(top_srcdir)/modules/api_scilab/includes/ \
 -                              -I$(top_srcdir)/modules/localization/includes/ \
 -                              -I$(top_srcdir)/modules/output_stream/includes/ \
 -                              $(AM_CPPFLAGS)
 +GATEWAY_C_SOURCES = sci_gateway/c/sci_and.c \
 +    sci_gateway/c/sci_or.c
 +
 +GATEWAY_FORTRAN_SOURCES =
 +
 +libsciboolean_la_CPPFLAGS = \
 +    -I$(srcdir)/includes/ \
 +    -I$(top_srcdir)/modules/dynamic_link/includes \
 +    -I$(top_srcdir)/modules/functions_manager/includes \
 +    -I$(top_srcdir)/modules/types/includes \
 +    -I$(top_srcdir)/modules/symbol/includes \
 +    -I$(top_srcdir)/modules/ast/includes \
 +    -I$(top_srcdir)/modules/elementary_functions/includes \
 +    -I$(top_srcdir)/modules/console/includes \
 +    -I$(top_srcdir)/modules/core/includes \
 +    -I$(top_srcdir)/modules/operations/includes \
 +    -I$(top_srcdir)/modules/output_stream/includes \
 +    -I$(top_srcdir)/modules/api_scilab/includes \
 +    -I$(top_srcdir)/modules/system_env/includes \
 +    -I$(top_srcdir)/modules/threads/includes \
 +    -I$(top_srcdir)/modules/localization/includes \
 +    -I$(top_srcdir)/modules/string/includes \
 +    $(EIGEN_CPPFLAGS) \
 +    $(AM_CPPFLAGS)
  
  if MAINTAINER_MODE
  pkglib_LTLIBRARIES = libsciboolean.la
Simple merge
@@@ -276,4 -291,4 +276,4 @@@ cd .
    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
    <ImportGroup Label="ExtensionTargets">
    </ImportGroup>
--</Project>
++</Project>
@@@ -53,4 -80,4 +53,4 @@@
        <Filter>Resource Files</Filter>
      </ResourceCompile>
    </ItemGroup>
--</Project>
++</Project>
@@@ -281,4 -283,4 +281,4 @@@ cd .
    <ImportGroup Label="ExtensionTargets">
      <Import Project="..\..\..\..\Visual-Studio-settings\f2c.targets" />
    </ImportGroup>
--</Project>
++</Project>
      <ClCompile Include="logic.c">
        <Filter>Source Files</Filter>
      </ClCompile>
++<<<<<<< HEAD
++=======
+     <ClCompile Include="..\..\sci_gateway\fortran\sci_f_bool2s.c">
+       <Filter>Source Files</Filter>
+     </ClCompile>
++>>>>>>> origin/master
    </ItemGroup>
    <ItemGroup>
      <f2c_rule Include="logic.f">
        <Filter>Fortran files</Filter>
      </f2c_rule>
++<<<<<<< HEAD
++=======
+     <f2c_rule Include="..\..\sci_gateway\fortran\sci_f_bool2s.f">
+       <Filter>Fortran files</Filter>
+     </f2c_rule>
++>>>>>>> origin/master
    </ItemGroup>
    <ItemGroup>
      <None Include="Elementary_functions_Import.def">
@@@ -209,10 -215,10 +209,10 @@@ noinst_LTLIBRARIES = libscicacsd-algo.l
  endif
  
  
- libscicacsd_la_LDFLAGS = $(ATLAS_LIBS) $(AM_LDFLAGS)
+ libscicacsd_la_LDFLAGS = $(AM_LDFLAGS)
  
 -libscicacsd_algo_la_SOURCES = $(CACSD_FORTRAN_SOURCES) $(SLICOT_FORTRAN_SOURCES)
 -libscicacsd_la_SOURCES = $(GATEWAY_FORTRAN_SOURCES) $(GATEWAY_C_SOURCES)
 +libscicacsd_algo_la_SOURCES = $(CACSD_FORTRAN_SOURCES) $(SLICOT_FORTRAN_SOURCES) $(CACSD_C_SOURCES)
 +libscicacsd_la_SOURCES = $(GATEWAY_C_SOURCES) $(GATEWAY_CPP_SOURCES)
  libscicacsd_algo_la_CPPFLAGS = $(libscicacsd_la_CPPFLAGS)
  
  
@@@ -830,9 -833,9 +837,9 @@@ libscicacsd_la_CPPFLAGS = -I$(srcdir)/i
  @MAINTAINER_MODE_TRUE@pkglib_LTLIBRARIES = libscicacsd.la
  @MAINTAINER_MODE_FALSE@noinst_LTLIBRARIES = libscicacsd-algo.la libscicacsd.la
  @MAINTAINER_MODE_TRUE@noinst_LTLIBRARIES = libscicacsd-algo.la
- libscicacsd_la_LDFLAGS = $(ATLAS_LIBS) $(AM_LDFLAGS)
+ libscicacsd_la_LDFLAGS = $(AM_LDFLAGS)
 -libscicacsd_algo_la_SOURCES = $(CACSD_FORTRAN_SOURCES) $(SLICOT_FORTRAN_SOURCES)
 -libscicacsd_la_SOURCES = $(GATEWAY_FORTRAN_SOURCES) $(GATEWAY_C_SOURCES)
 +libscicacsd_algo_la_SOURCES = $(CACSD_FORTRAN_SOURCES) $(SLICOT_FORTRAN_SOURCES) $(CACSD_C_SOURCES)
 +libscicacsd_la_SOURCES = $(GATEWAY_C_SOURCES) $(GATEWAY_CPP_SOURCES)
  libscicacsd_algo_la_CPPFLAGS = $(libscicacsd_la_CPPFLAGS)
  
  # For the code check (splint)
@@@ -27,7 -27,7 +27,7 @@@
  #include <stdio.h>
  #include <stdlib.h>
  #include "call_scilab.h"
--#include "scilabmode.h"
++#include "sci_mode.h"
  /*--------------------------------------------------------------------------*/
  int main(void)
  {
Simple merge
Simple merge
Simple merge
@@@ -41,13 -42,23 +40,21 @@@ static int findMatchingPrefixSuffix(con
      size_t stringLength = 0;
  
      //get a working copy of find
 -    pointerOnFindCopy = strdup(find);
 -
 +    pointerOnFindCopy = os_strdup(find);
-     convstr(&pointerOnFindCopy, &pointerOnFindCopy, UPPER, 1);
      //last character of string
      lastchar = *(string + strlen(string) - 1);
      stringLength = strlen(string);
  
+     // Convert to upper-case
+     {
+         char* str;
+         for (str = pointerOnFindCopy; *str != '\0'; str++)
+         {
+             *str = toupper(*str);
+         }
+     }
      //Tips : no infinite loop there, tmpfind