Merge remote-tracking branch 'origin/master' into graphic 40/6740/2
Vincent COUVERT [Wed, 21 Mar 2012 21:10:03 +0000 (22:10 +0100)]
Conflicts:
scilab/CHANGES_5.4.X
scilab/Scilab.sln
scilab/Scilab_f2c.sln
scilab/configure
scilab/modules/Makefile.in
scilab/modules/core/includes/callinterf.h
scilab/modules/core/src/c/callinterf.c
scilab/modules/core/src/java/org/scilab/modules/core/Scilab.java
scilab/modules/graphic_export/src/c/xs2file.c
scilab/modules/graphics/help/en_US/2d_plot/champ_properties.xml
scilab/modules/graphics/help/en_US/3d_plot/param3d_properties.xml
scilab/modules/graphics/help/en_US/axes_operations/axes_properties.xml
scilab/modules/graphics/help/en_US/geometric_shapes/arc_properties.xml
scilab/modules/graphics/help/en_US/geometric_shapes/rectangle_properties.xml
scilab/modules/graphics/help/en_US/polygon/polyline_properties.xml
scilab/modules/graphics/help/en_US/segs_properties.xml
scilab/modules/graphics/help/en_US/xget.xml
scilab/modules/graphics/help/en_US/xset.xml
scilab/modules/graphics/help/fr_FR/bar_histogram/bar.xml
scilab/modules/graphics/help/fr_FR/bar_histogram/barh.xml
scilab/modules/graphics/help/fr_FR/bar_histogram/barhomogenize.xml
scilab/modules/graphics/help/fr_FR/handle/swap_handles.xml
scilab/modules/graphics/includes/gw_graphics.h
scilab/modules/graphics/macros/contourf.sci
scilab/modules/graphics/sci_gateway/c/gw_graphics.c
scilab/modules/gui/Makefile.am
scilab/modules/gui/Makefile.in
scilab/modules/gui/help/en_US/getcallbackobject.xml
scilab/modules/gui/help/en_US/uicontrol.xml
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/CallScilabBridge.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/messagebox/SwingScilabMessageBox.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/window/SwingScilabWindow.java
scilab/modules/gui/src/java/org/scilab/modules/gui/utils/WindowsConfigurationManager.java
scilab/modules/gui/src/jni/CallScilabBridge.cpp
scilab/modules/gui/src/jni/CallScilabBridge.hxx
scilab/modules/prebuildjava/build.xml
scilab/modules/renderer/Makefile.am
scilab/modules/renderer/Makefile.in
scilab/modules/renderer/src/jni/ArcFillDrawerGL.cpp
scilab/modules/renderer/src/jni/ArcFillDrawerGL.hxx
scilab/modules/renderer/src/jni/ArcLineDrawerGL.cpp
scilab/modules/renderer/src/jni/ArcLineDrawerGL.hxx
scilab/modules/renderer/src/jni/BackTrihedronDrawerGL.cpp
scilab/modules/renderer/src/jni/BackTrihedronDrawerGL.hxx
scilab/modules/renderer/src/jni/CallRenderer.hxx
scilab/modules/renderer/src/jni/CenteredTextDrawerGL.cpp
scilab/modules/renderer/src/jni/CenteredTextDrawerGL.hxx
scilab/modules/renderer/src/jni/DrawableArcGL.cpp
scilab/modules/renderer/src/jni/DrawableArcGL.hxx
scilab/modules/renderer/src/jni/DrawableAxesGL.cpp
scilab/modules/renderer/src/jni/DrawableAxesGL.hxx
scilab/modules/renderer/src/jni/DrawableFecGL.cpp
scilab/modules/renderer/src/jni/DrawableFecGL.hxx
scilab/modules/renderer/src/jni/DrawableFigureGL.cpp
scilab/modules/renderer/src/jni/DrawableFigureGL.hxx
scilab/modules/renderer/src/jni/DrawableGrayplotGL.cpp
scilab/modules/renderer/src/jni/DrawableGrayplotGL.hxx
scilab/modules/renderer/src/jni/DrawablePolylineGL.cpp
scilab/modules/renderer/src/jni/DrawablePolylineGL.hxx
scilab/modules/renderer/src/jni/DrawableRectangleGL.cpp
scilab/modules/renderer/src/jni/DrawableRectangleGL.hxx
scilab/modules/renderer/src/jni/DrawableSegsGL.cpp
scilab/modules/renderer/src/jni/DrawableSegsGL.hxx
scilab/modules/renderer/src/jni/DrawableSubwinGL.cpp
scilab/modules/renderer/src/jni/DrawableSubwinGL.hxx
scilab/modules/renderer/src/jni/DrawableSurfaceGL.cpp
scilab/modules/renderer/src/jni/DrawableSurfaceGL.hxx
scilab/modules/renderer/src/jni/DrawableTextGL.cpp
scilab/modules/renderer/src/jni/DrawableTextGL.hxx
scilab/modules/renderer/src/jni/FecFacetDrawerGL.cpp
scilab/modules/renderer/src/jni/FecFacetDrawerGL.hxx
scilab/modules/renderer/src/jni/FecLineDrawerGL.cpp
scilab/modules/renderer/src/jni/FilledTextDrawerGL.cpp
scilab/modules/renderer/src/jni/FilledTextDrawerGL.hxx
scilab/modules/renderer/src/jni/FullBoxDrawerGL.cpp
scilab/modules/renderer/src/jni/FullBoxDrawerGL.hxx
scilab/modules/renderer/src/jni/GraphicSynchronizerJava.cpp
scilab/modules/renderer/src/jni/GraphicSynchronizerJava.hxx
scilab/modules/renderer/src/jni/GridDrawerGL.cpp
scilab/modules/renderer/src/jni/GridDrawerGL.hxx
scilab/modules/renderer/src/jni/HalfBoxDrawerGL.cpp
scilab/modules/renderer/src/jni/HalfBoxDrawerGL.hxx
scilab/modules/renderer/src/jni/IsoViewCameraGL.cpp
scilab/modules/renderer/src/jni/IsoViewCameraGL.hxx
scilab/modules/renderer/src/jni/IsometricCameraGL.cpp
scilab/modules/renderer/src/jni/IsometricCameraGL.hxx
scilab/modules/renderer/src/jni/PolylineArrowDrawerGL.cpp
scilab/modules/renderer/src/jni/PolylineArrowDrawerGL.hxx
scilab/modules/renderer/src/jni/PolylineBarDrawerGL.cpp
scilab/modules/renderer/src/jni/PolylineBarDrawerGL.hxx
scilab/modules/renderer/src/jni/PolylineFillDrawerGL.cpp
scilab/modules/renderer/src/jni/PolylineFillDrawerGL.hxx
scilab/modules/renderer/src/jni/PolylineInterpColorDrawerGL.cpp
scilab/modules/renderer/src/jni/PolylineInterpColorDrawerGL.hxx
scilab/modules/renderer/src/jni/PolylineLineDrawerGL.cpp
scilab/modules/renderer/src/jni/PolylineLineDrawerGL.hxx
scilab/modules/renderer/src/jni/PolylineMarkDrawerGL.cpp
scilab/modules/renderer/src/jni/PolylineMarkDrawerGL.hxx
scilab/modules/renderer/src/jni/RectangleFillDrawerGL.cpp
scilab/modules/renderer/src/jni/RectangleFillDrawerGL.hxx
scilab/modules/renderer/src/jni/RectangleLineDrawerGL.cpp
scilab/modules/renderer/src/jni/RectangleLineDrawerGL.hxx
scilab/modules/renderer/src/jni/RectangleMarkDrawerGL.cpp
scilab/modules/renderer/src/jni/RectangleMarkDrawerGL.hxx
scilab/modules/renderer/src/jni/RenderingChecker.cpp
scilab/modules/renderer/src/jni/RenderingChecker.hxx
scilab/modules/renderer/src/jni/SegsArrowDrawerGL.cpp
scilab/modules/renderer/src/jni/SegsArrowDrawerGL.hxx
scilab/modules/renderer/src/jni/SegsLineDrawerGL.cpp
scilab/modules/renderer/src/jni/SegsLineDrawerGL.hxx
scilab/modules/renderer/src/jni/SegsMarkDrawerGL.cpp
scilab/modules/renderer/src/jni/SegsMarkDrawerGL.hxx
scilab/modules/renderer/src/jni/StandardTextDrawerGL.cpp
scilab/modules/renderer/src/jni/StandardTextDrawerGL.hxx
scilab/modules/renderer/src/jni/SubwinBackgroundDrawerGL.cpp
scilab/modules/renderer/src/jni/SubwinBackgroundDrawerGL.hxx
scilab/modules/renderer/src/jni/SurfaceFacetDrawerGL.cpp
scilab/modules/renderer/src/jni/SurfaceFacetDrawerGL.hxx
scilab/modules/renderer/src/jni/SurfaceLineDrawerGL.cpp
scilab/modules/renderer/src/jni/SurfaceLineDrawerGL.hxx
scilab/modules/renderer/src/jni/SurfaceMarkDrawerGL.cpp
scilab/modules/renderer/src/jni/SurfaceMarkDrawerGL.hxx
scilab/modules/renderer/src/jni/TicksDrawerGL.cpp
scilab/modules/renderer/src/jni/TicksDrawerGL.hxx
scilab/modules/scicos_blocks/includes/scoBase.h
scilab/modules/scicos_blocks/includes/scoGetProperty.h
scilab/modules/scicos_blocks/includes/scoMemoryScope.h
scilab/modules/scicos_blocks/includes/scoMisc.h
scilab/modules/scicos_blocks/includes/scoSetProperty.h
scilab/modules/scicos_blocks/includes/scoWindowScope.h
scilab/modules/scicos_blocks/src/c/bouncexy.c
scilab/modules/scicos_blocks/src/c/canimxy.c
scilab/modules/scicos_blocks/src/c/canimxy3d.c
scilab/modules/scicos_blocks/src/c/cevscpe.c
scilab/modules/scicos_blocks/src/c/cfscope.c
scilab/modules/scicos_blocks/src/c/cmat3d.c
scilab/modules/scicos_blocks/src/c/cmatview.c
scilab/modules/scicos_blocks/src/c/cmscope.c
scilab/modules/scicos_blocks/src/c/cscope.c
scilab/modules/scicos_blocks/src/c/cscopxy.c
scilab/modules/scicos_blocks/src/c/cscopxy3d.c
scilab/modules/scicos_blocks/src/c/scoGetProperty.c
scilab/modules/scicos_blocks/src/c/scoMemoryScope.c
scilab/modules/scicos_blocks/src/c/scoMisc.c
scilab/modules/scicos_blocks/src/c/scoSetProperty.c
scilab/modules/scicos_blocks/src/c/scoWindowScope.c
scilab/modules/types/src/java/org/scilab/modules/types/ScilabBooleanSparse.java
scilab/modules/types/src/java/org/scilab/modules/types/ScilabSparse.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/XcosTab.java
scilab/scilab-lib.properties.vc

Change-Id: I40ddaeba45e0f1e747c434981e1aba5772dbcc30

169 files changed:
1  2 
scilab/CHANGES_5.4.X
scilab/Makefile.in
scilab/Scilab.sln
scilab/Scilab_f2c.sln
scilab/build.incl.xml
scilab/configure
scilab/configure.ac
scilab/contrib/Makefile.in
scilab/desktop/Makefile.in
scilab/desktop/images/icons/Makefile.in
scilab/etc/classpath.xml.in
scilab/etc/classpath.xml.vc
scilab/etc/librarypath.xml
scilab/etc/modules.xml.in
scilab/etc/modules.xml.vc
scilab/libs/MALLOC/Makefile.in
scilab/libs/Makefile.in
scilab/libs/doublylinkedlist/Makefile.in
scilab/libs/dynamiclibrary/Makefile.in
scilab/libs/hashtable/Makefile.in
scilab/libs/libst/Makefile.in
scilab/modules/Makefile.am
scilab/modules/Makefile.in
scilab/modules/action_binding/Makefile.in
scilab/modules/api_scilab/Makefile.in
scilab/modules/arnoldi/Makefile.in
scilab/modules/atoms/Makefile.in
scilab/modules/boolean/Makefile.in
scilab/modules/cacsd/Makefile.in
scilab/modules/call_scilab/Makefile.in
scilab/modules/call_scilab/src/c/call_scilab.c
scilab/modules/commons/Makefile.in
scilab/modules/compatibility_functions/Makefile.in
scilab/modules/completion/Makefile.in
scilab/modules/console/Makefile.in
scilab/modules/core/Makefile.in
scilab/modules/core/includes/callinterf.h
scilab/modules/core/src/c/callinterf.c
scilab/modules/core/src/c/dynamic_gateways.c
scilab/modules/core/src/c/dynamic_gateways.h
scilab/modules/core/src/java/org/scilab/modules/core/Scilab.java
scilab/modules/data_structures/Makefile.in
scilab/modules/demo_tools/Makefile.in
scilab/modules/development_tools/Makefile.in
scilab/modules/development_tools/src/fake/Makefile.in
scilab/modules/differential_equations/Makefile.in
scilab/modules/double/Makefile.in
scilab/modules/dynamic_link/Makefile.in
scilab/modules/elementary_functions/Makefile.in
scilab/modules/fftw/Makefile.in
scilab/modules/fileio/Makefile.in
scilab/modules/functions/Makefile.in
scilab/modules/genetic_algorithms/Makefile.in
scilab/modules/graph/Makefile.in
scilab/modules/graph/src/java/org/scilab/modules/graph/ScilabGraph.java
scilab/modules/graphic_export/Makefile.in
scilab/modules/graphic_export/src/c/xs2file.c
scilab/modules/graphic_objects/Makefile.in
scilab/modules/graphic_objects/src/c/graphic_objects.vcxproj
scilab/modules/graphic_objects/src/jni/CallGraphicController.cpp
scilab/modules/graphic_objects/src/jni/CallGraphicController.hxx
scilab/modules/graphic_objects/src/jni/ScilabNativeView_wrap.c
scilab/modules/graphics/Makefile.in
scilab/modules/graphics/help/en_US/2d_plot/champ_properties.xml
scilab/modules/graphics/help/en_US/3d_plot/param3d_properties.xml
scilab/modules/graphics/help/en_US/axes_operations/axes_properties.xml
scilab/modules/graphics/help/en_US/geometric_shapes/arc_properties.xml
scilab/modules/graphics/help/en_US/geometric_shapes/rectangle_properties.xml
scilab/modules/graphics/help/en_US/polygon/polyline_properties.xml
scilab/modules/graphics/help/en_US/segs_properties.xml
scilab/modules/graphics/help/en_US/xget.xml
scilab/modules/graphics/help/en_US/xset.xml
scilab/modules/graphics/help/fr_FR/bar_histogram/bar.xml
scilab/modules/graphics/help/fr_FR/bar_histogram/barh.xml
scilab/modules/graphics/help/fr_FR/bar_histogram/barhomogenize.xml
scilab/modules/graphics/help/fr_FR/handle/swap_handles.xml
scilab/modules/graphics/includes/gw_graphics.h
scilab/modules/graphics/locales/graphics.pot
scilab/modules/graphics/macros/contourf.sci
scilab/modules/graphics/sci_gateway/c/gw_graphics.c
scilab/modules/graphics/sci_gateway/c/sci_xget.c
scilab/modules/gui/Makefile.am
scilab/modules/gui/Makefile.in
scilab/modules/gui/etc/main_menubar.xml
scilab/modules/gui/help/en_US/getcallbackobject.xml
scilab/modules/gui/help/en_US/uicontrol.xml
scilab/modules/gui/sci_gateway/cpp/sci_toprint.cpp
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/CallScilabBridge.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/messagebox/SwingScilabMessageBox.java
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/window/SwingScilabWindow.java
scilab/modules/gui/src/java/org/scilab/modules/gui/utils/ClosingOperationsManager.java
scilab/modules/gui/src/java/org/scilab/modules/gui/utils/WindowsConfigurationManager.java
scilab/modules/gui/src/jni/CallScilabBridge.cpp
scilab/modules/gui/src/jni/CallScilabBridge.hxx
scilab/modules/gui/src/jni/Jxclick.cpp
scilab/modules/gui/src/jni/Jxclick.hxx
scilab/modules/gui/src/jni/Jxgetmouse.cpp
scilab/modules/gui/src/jni/Jxgetmouse.hxx
scilab/modules/hdf5/Makefile.in
scilab/modules/helptools/Makefile.in
scilab/modules/history_browser/Makefile.in
scilab/modules/history_manager/Makefile.in
scilab/modules/integer/Makefile.in
scilab/modules/interpolation/Makefile.in
scilab/modules/intersci/Makefile.in
scilab/modules/io/Makefile.in
scilab/modules/javasci/Javasci.vcxproj
scilab/modules/javasci/Makefile.in
scilab/modules/javasci/src/jni/call_scilab.i
scilab/modules/javasci/src/jni/call_scilab_wrap.c
scilab/modules/jvm/Makefile.in
scilab/modules/linear_algebra/Makefile.in
scilab/modules/localization/Makefile.in
scilab/modules/m2sci/Makefile.in
scilab/modules/matio/Makefile.in
scilab/modules/mexlib/Makefile.in
scilab/modules/modules_manager/Makefile.in
scilab/modules/optimization/Makefile.in
scilab/modules/output_stream/Makefile.in
scilab/modules/overloading/Makefile.in
scilab/modules/parallel/Makefile.in
scilab/modules/parameters/Makefile.in
scilab/modules/polynomials/Makefile.in
scilab/modules/prebuildjava/Makefile.in
scilab/modules/prebuildjava/build.xml
scilab/modules/preferences/Makefile.in
scilab/modules/randlib/Makefile.in
scilab/modules/renderer/Makefile.am
scilab/modules/renderer/Makefile.in
scilab/modules/renderer/src/jni/CallRenderer.cpp
scilab/modules/renderer/src/jni/CallRenderer.hxx
scilab/modules/scicos/Makefile.in
scilab/modules/scicos_blocks/Makefile.in
scilab/modules/scicos_blocks/src/c/bouncexy.c
scilab/modules/scicos_blocks/src/c/canimxy.c
scilab/modules/scicos_blocks/src/c/canimxy3d.c
scilab/modules/scicos_blocks/src/c/cevscpe.c
scilab/modules/scicos_blocks/src/c/cfscope.c
scilab/modules/scicos_blocks/src/c/cmat3d.c
scilab/modules/scicos_blocks/src/c/cmatview.c
scilab/modules/scicos_blocks/src/c/cmscope.c
scilab/modules/scicos_blocks/src/c/cscope.c
scilab/modules/scicos_blocks/src/c/cscopxy.c
scilab/modules/scicos_blocks/src/c/cscopxy3d.c
scilab/modules/scinotes/Makefile.in
scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/SciNotes.java
scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/utils/ConfigSciNotesManager.java
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.in
scilab/modules/spreadsheet/Makefile.in
scilab/modules/statistics/Makefile.in
scilab/modules/string/Makefile.in
scilab/modules/symbolic/Makefile.in
scilab/modules/tclsci/Makefile.in
scilab/modules/time/Makefile.in
scilab/modules/types/Makefile.in
scilab/modules/ui_data/Makefile.in
scilab/modules/umfpack/Makefile.in
scilab/modules/windows_tools/Makefile.in
scilab/modules/xcos/Makefile.in
scilab/modules/xcos/src/java/org/scilab/modules/xcos/XcosTab.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/BasicBlock.java
scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/listener/PaletteManagerMouseListener.java
scilab/modules/xml/Makefile.in
scilab/scilab-lib.properties.in
scilab/scilab-lib.properties.vc

  
  * Bug #10656 fixed - Exception when an empty help browser was closed.
  
+ * Bug #10673 fixed - Typos fixed in the help page of ssrand.
+ * Bug #10769 fixed - Remove some dead code from bsplin3val.
+ * Bug #10685 fixed - inttrap help page moved to differential calculus module.
+ * Bug #10710 fixed - Wrong error message fixed in xml module.
+ * Bug #10716 fixed - The help page of acos badly talked about vectors instead of matrices.
+ * Bug #10717 fixed - Typos fixed in the help page of acosd.
+ * Bug #10720 fixed - Typos fixed in the help page of acosh.
+ * Bug #10724 fixed - Missing links in the help page of acot added.
+ * Bug #10725 fixed - Typos fixed in the help page of acot.
+ * Bug #10726 fixed - Missing links in the help page of acsc added.
+ * Bug #10727 fixed - Missing links in the help page of asech added.
+ * Bug #10728 fixed - Wrong link in the help page of asind fixed.
+ * Bug #10729 fixed - Missing links in the help page of asinh added.
+ * Bug #10730 fixed - Missing links in the help page of asinhm added.
+ * Bug #10731 fixed - Typos fixed in the help page of atan.
+ * Bug #10732 fixed - Wrong link in the help page of atand fixed.
+ * Bug #10733 fixed - Missing link in the help page of atanm added.
+ * Bug #10734 fixed - Missing link in the help page of cos added.
+ * Bug #10735 fixed - Missing information about input argument in the help page of cotd added.
+ * Bug #10736 fixed - Missing "Arguments" section in the help page of coth added.
+ * Bug #10737 fixed - Missing "Arguments" section in the help page of cothm added.
+ * Bug #10738 fixed - Typos fixed in the help page of cscd.
+ * Bug #10739 fixed - Typos fixed in the help page of csgn.
+ * Bug #10740 fixed - Typos fixed in the help page of sec.
+ * Bug #10741 fixed - Typos fixed in the help page of secd.
+ * Bug #10742 fixed - Missing link in the help page of sin added.
+ * Bug #10743 fixed - Wrong link in the help page of sind fixed.
+ * Bug #10744 fixed - Typos fixed in the help page of sinh.
+ * Bug #10745 fixed - Typos fixed in the help page of tand.
+ * Bug #10782 fixed - 'iconvert' did not check input arguments.
 +* Bug #10797 fixed - contour, contour2d, contourf did not check input arguments.
 +
+ * Bug #10807 fixed - It was not possible to overload fft and fftw for list,
+                      tlist, mlist type.
+ * Bug #10809, #10810 fixed - error_table help page was not up-to-date.
+ * Bug #10828 fixed - Developer arguments were not displayed in the help of
+                      Scilab scripts.
+ * Bug #10836 fixed - resize_matrix with boolean failed.
+ * Bug #10839 fixed - dec2hex function was limited to 32 bits.
+ * Bug #10847 fixed - dec2base returned a wrong error message with a complex
+                      number as input argument.
+ * Bug #10861 fixed - debug([]) returned a wrong error message.
+ * Bug #10879 fixed - typo in the dec2base help page.
  
              Changes between version 5.3.3 and 5.4.0-alpha-1 of Scilab
              =========================================================
Simple merge
@@@ -546,11 -526,8 +526,13 @@@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "types", "modules\types\types.vcxproj", "{626B9142-13A1-4765-A072-FB08952E7BB8}"
  EndProject
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "graphic_objects", "modules\graphic_objects\src\c\graphic_objects.vcxproj", "{30F9EE41-587B-4618-8DE7-698D3FBA4985}"
 +      ProjectSection(ProjectDependencies) = postProject
 +              {DD8A0506-8D31-4CF8-856A-C10ECE9C13A4} = {DD8A0506-8D31-4CF8-856A-C10ECE9C13A4}
 +      EndProjectSection
 +EndProject
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "preferences", "modules\preferences\src\c\preferences.vcxproj", "{7B893E9F-D032-44DE-9B71-197A29C4989B}"
+ EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-level", "Visual-Studio-settings\test-level\test-level.vcxproj", "{07F766A8-A2C1-4D9D-86DE-FD9C19952C7A}"
  EndProject
  Global
                {626B9142-13A1-4765-A072-FB08952E7BB8}.Release|Win32.Build.0 = Release|Win32
                {626B9142-13A1-4765-A072-FB08952E7BB8}.Release|x64.ActiveCfg = Release|x64
                {626B9142-13A1-4765-A072-FB08952E7BB8}.Release|x64.Build.0 = Release|x64
 +              {30F9EE41-587B-4618-8DE7-698D3FBA4985}.Debug|Win32.ActiveCfg = Debug|Win32
 +              {30F9EE41-587B-4618-8DE7-698D3FBA4985}.Debug|Win32.Build.0 = Debug|Win32
 +              {30F9EE41-587B-4618-8DE7-698D3FBA4985}.Debug|x64.ActiveCfg = Debug|x64
 +              {30F9EE41-587B-4618-8DE7-698D3FBA4985}.Debug|x64.Build.0 = Debug|x64
 +              {30F9EE41-587B-4618-8DE7-698D3FBA4985}.Release|Win32.ActiveCfg = Release|Win32
 +              {30F9EE41-587B-4618-8DE7-698D3FBA4985}.Release|Win32.Build.0 = Release|Win32
 +              {30F9EE41-587B-4618-8DE7-698D3FBA4985}.Release|x64.ActiveCfg = Release|x64
 +              {30F9EE41-587B-4618-8DE7-698D3FBA4985}.Release|x64.Build.0 = Release|x64
+               {7B893E9F-D032-44DE-9B71-197A29C4989B}.Debug|Win32.ActiveCfg = Debug|Win32
+               {7B893E9F-D032-44DE-9B71-197A29C4989B}.Debug|Win32.Build.0 = Debug|Win32
+               {7B893E9F-D032-44DE-9B71-197A29C4989B}.Debug|x64.ActiveCfg = Debug|x64
+               {7B893E9F-D032-44DE-9B71-197A29C4989B}.Debug|x64.Build.0 = Debug|x64
+               {7B893E9F-D032-44DE-9B71-197A29C4989B}.Release|Win32.ActiveCfg = Release|Win32
+               {7B893E9F-D032-44DE-9B71-197A29C4989B}.Release|Win32.Build.0 = Release|Win32
+               {7B893E9F-D032-44DE-9B71-197A29C4989B}.Release|x64.ActiveCfg = Release|x64
+               {7B893E9F-D032-44DE-9B71-197A29C4989B}.Release|x64.Build.0 = Release|x64
                {07F766A8-A2C1-4D9D-86DE-FD9C19952C7A}.Debug|Win32.ActiveCfg = Debug|Win32
                {07F766A8-A2C1-4D9D-86DE-FD9C19952C7A}.Debug|x64.ActiveCfg = Debug|x64
                {07F766A8-A2C1-4D9D-86DE-FD9C19952C7A}.Release|Win32.ActiveCfg = Release|Win32
@@@ -544,11 -524,8 +524,13 @@@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "types", "modules\types\types.vcxproj", "{626B9142-13A1-4765-A072-FB08952E7BB8}"
  EndProject
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "graphic_objects", "modules\graphic_objects\src\c\graphic_objects.vcxproj", "{30F9EE41-587B-4618-8DE7-698D3FBA4985}"
 +      ProjectSection(ProjectDependencies) = postProject
 +              {DD8A0506-8D31-4CF8-856A-C10ECE9C13A4} = {DD8A0506-8D31-4CF8-856A-C10ECE9C13A4}
 +      EndProjectSection
 +EndProject
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "preferences", "modules\preferences\src\c\preferences.vcxproj", "{7B893E9F-D032-44DE-9B71-197A29C4989B}"
+ EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-level", "Visual-Studio-settings\test-level\test-level.vcxproj", "{07F766A8-A2C1-4D9D-86DE-FD9C19952C7A}"
  EndProject
  Global
                {626B9142-13A1-4765-A072-FB08952E7BB8}.Release|Win32.Build.0 = Release|Win32
                {626B9142-13A1-4765-A072-FB08952E7BB8}.Release|x64.ActiveCfg = Release|x64
                {626B9142-13A1-4765-A072-FB08952E7BB8}.Release|x64.Build.0 = Release|x64
 +              {30F9EE41-587B-4618-8DE7-698D3FBA4985}.Debug|Win32.ActiveCfg = Debug|Win32
 +              {30F9EE41-587B-4618-8DE7-698D3FBA4985}.Debug|Win32.Build.0 = Debug|Win32
 +              {30F9EE41-587B-4618-8DE7-698D3FBA4985}.Debug|x64.ActiveCfg = Debug|x64
 +              {30F9EE41-587B-4618-8DE7-698D3FBA4985}.Debug|x64.Build.0 = Debug|x64
 +              {30F9EE41-587B-4618-8DE7-698D3FBA4985}.Release|Win32.ActiveCfg = Release|Win32
 +              {30F9EE41-587B-4618-8DE7-698D3FBA4985}.Release|Win32.Build.0 = Release|Win32
 +              {30F9EE41-587B-4618-8DE7-698D3FBA4985}.Release|x64.ActiveCfg = Release|x64
 +              {30F9EE41-587B-4618-8DE7-698D3FBA4985}.Release|x64.Build.0 = Release|x64
+               {7B893E9F-D032-44DE-9B71-197A29C4989B}.Debug|Win32.ActiveCfg = Debug|Win32
+               {7B893E9F-D032-44DE-9B71-197A29C4989B}.Debug|Win32.Build.0 = Debug|Win32
+               {7B893E9F-D032-44DE-9B71-197A29C4989B}.Debug|x64.ActiveCfg = Debug|x64
+               {7B893E9F-D032-44DE-9B71-197A29C4989B}.Debug|x64.Build.0 = Debug|x64
+               {7B893E9F-D032-44DE-9B71-197A29C4989B}.Release|Win32.ActiveCfg = Release|Win32
+               {7B893E9F-D032-44DE-9B71-197A29C4989B}.Release|Win32.Build.0 = Release|Win32
+               {7B893E9F-D032-44DE-9B71-197A29C4989B}.Release|x64.ActiveCfg = Release|x64
+               {7B893E9F-D032-44DE-9B71-197A29C4989B}.Release|x64.Build.0 = Release|x64
                {07F766A8-A2C1-4D9D-86DE-FD9C19952C7A}.Debug|Win32.ActiveCfg = Debug|Win32
                {07F766A8-A2C1-4D9D-86DE-FD9C19952C7A}.Debug|x64.ActiveCfg = Debug|x64
                {07F766A8-A2C1-4D9D-86DE-FD9C19952C7A}.Release|Win32.ActiveCfg = Release|Win32
Simple merge
@@@ -12185,17 -12184,18 +12185,18 @@@ $as_echo_n "checking jgraphx... " >&6; 
      PACKAGE_JAR_FILE=
      found_jar=no
      saved_ac_java_classpath=$ac_java_classpath
-     DEFAULT_JAR_DIR="/usr/share/java /usr/lib/java /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/* 2>/dev/null) $(ls -d /usr/lib64/* 2>/dev/null) $(ls -d /usr/lib/* 2>/dev/null)  $(ls -d /usr/share/*/lib 2>/dev/null)"
-     for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
+     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/jgraphx.jar" "$jardir/libjgraphx.jar" "$jardir/libjgraphx-java.jar" "$jardir/jgraphx*.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"
+         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 12198 "configure"
++// #line 12199 "configure"
  import com.mxgraph.model.mxCell;
  
  public class conftest {
@@@ -12289,7 -12281,7 +12282,7 @@@ $as_echo_n "checking minimal version (1
     if test "x" == "x"; then
  
      cat << \EOF > conftest.java
- // #line 12292 "configure"
 -// #line 12284 "configure"
++// #line 12285 "configure"
  import com.mxgraph.view.mxGraph;
  
  public class conftest {
     else
  
      cat << \EOF > conftest.java
- // #line 12343 "configure"
 -// #line 12335 "configure"
++// #line 12336 "configure"
  import com.mxgraph.view.mxGraph;
  
  public class conftest {
@@@ -12403,17 -12395,18 +12396,18 @@@ $as_echo_n "checking jhdf5... " >&6; 
      PACKAGE_JAR_FILE=
      found_jar=no
      saved_ac_java_classpath=$ac_java_classpath
-     DEFAULT_JAR_DIR="/usr/share/java /usr/lib/java /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/* 2>/dev/null) $(ls -d /usr/lib64/* 2>/dev/null) $(ls -d /usr/lib/* 2>/dev/null)  $(ls -d /usr/share/*/lib 2>/dev/null)"
-     for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
+     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/jhdf5.jar" "$jardir/libjhdf5.jar" "$jardir/libjhdf5-java.jar" "$jardir/jhdf5*.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"
+         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 12416 "configure"
 -// #line 12409 "configure"
++// #line 12410 "configure"
  import ncsa.hdf.hdf5lib.HDF5Constants;
  
  public class conftest {
@@@ -12568,7 -12553,7 +12554,7 @@@ $as_echo_n "checking minimal version (1
     if test "x" == "x"; then
  
      cat << \EOF > conftest.java
- // #line 12571 "configure"
 -// #line 12556 "configure"
++// #line 12557 "configure"
  import ncsa.hdf.hdf5lib.H5;
  
  public class conftest {
     else
  
      cat << \EOF > conftest.java
- // #line 12626 "configure"
 -// #line 12611 "configure"
++// #line 12612 "configure"
  import ncsa.hdf.hdf5lib.H5;
  
  public class conftest {
  
                  fi
  
 -                # Docking system
 +
 +                              # scirenderer
 +
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking scirenderer" >&5
 +$as_echo_n "checking scirenderer... " >&6; }
 +    PACKAGE_JAR_FILE=
 +    found_jar=no
 +    saved_ac_java_classpath=$ac_java_classpath
-     DEFAULT_JAR_DIR="/usr/share/java /usr/lib/java /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/* 2>/dev/null) $(ls -d /usr/lib64/* 2>/dev/null) $(ls -d /usr/lib/* 2>/dev/null)  $(ls -d /usr/share/*/lib 2>/dev/null)"
-     for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
++    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/scirenderer.jar" "$jardir/libscirenderer.jar" "$jardir/libscirenderer-java.jar" "$jardir/scirenderer*.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"
++        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 12707 "configure"
++// #line 12694 "configure"
 +import org.scilab.forge.scirenderer.PackageInfo;
 +
 +public class conftest {
 +    public static void main(String[] argv) {
 +
 +    }
 +}
 +EOF
 +
 +    CLASSPATH=$ac_java_classpath
 +    export CLASSPATH
 +    cmd="$JAVAC ${JAVAC_FLAGS} conftest.java"
 +    if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5) ; then
 +       if test ""no"" = "no"; then
 +           echo "yes" >&5
 +
-             { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
++              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
 +$as_echo "$jar_resolved" >&6; }
-             found_jar=yes
-             PACKAGE_JAR_FILE=$jar_resolved
-             break
++              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 "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
 +$as_echo "$jar_resolved" >&6; }
-             found_jar=yes
-             PACKAGE_JAR_FILE=$jar_resolved
-             break
++              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
-       # If ls returns several results and the first one is OK, stop the search
-       if test "$found_jar" = "yes"; then
-         break
-       fi
++          fi
++        done
 +      done
-       # If found, no need to search in other directory
-       if test "$found_jar" = "yes"; then
-         break
-       fi
 +    done
 +    if test "$found_jar" = "no"; then
 +      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
 +      if test "" = "yes"; then
 +         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar scirenderer used by Scilab Renderer (looking for package org.scilab.forge.scirenderer.PackageInfo)" >&5
 +$as_echo "$as_me: WARNING: Could not find or use the Java package/jar scirenderer used by Scilab Renderer (looking for package org.scilab.forge.scirenderer.PackageInfo)" >&2;}
 +      else
 +          as_fn_error $? "Could not find or use the Java package/jar scirenderer used by Scilab Renderer (looking for package org.scilab.forge.scirenderer.PackageInfo)" "$LINENO" 5
 +      fi
 +    fi
 +
 +                              SCIRENDERER=$PACKAGE_JAR_FILE
 +
 +
 +
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking minimal version (0.3.3) of scirenderer" >&5
 +$as_echo_n "checking minimal version (0.3.3) of scirenderer... " >&6; }
 +   saved_ac_java_classpath=$ac_java_classpath
 +   export ac_java_classpath="$SCIRENDERER:$ac_java_classpath"
 +   if test "x=" == "x"; then
 +
 +    cat << \EOF > conftest.java
- // #line 12801 "configure"
++// #line 12780 "configure"
 +import org.scilab.forge.scirenderer.PackageInfo;
 +
 +public class conftest {
 +    public static void main(String[] argv) {
 +        String minVersion="0.3.3";
 +
 +                            System.out.println(PackageInfo.VERSION);
 +                                  if (minVersion.compareTo(PackageInfo.VERSION) > 0) {
 +                                   System.exit(-1);
 +                                }
 +
 +    }
 +}
 +EOF
 +
 +    CLASSPATH=$ac_java_classpath
 +    export CLASSPATH
 +    cmd="$JAVAC ${JAVAC_FLAGS} conftest.java"
 +    if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5) ; then
 +       if test ""yes"" = "no"; then
 +           echo "yes" >&5
 +              echo "yes"
 +       else
 +              cmd="$JAVA conftest"
 +              if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5); then
 +               echo "yes" >&5
 +                  echo "yes"
 +            else
 +                echo "configure: failed program was:" >&5
 +                cat conftest.java >&5
 +                if test -s conftest.java.output; then
 +                   STDOUT=`cat conftest.java.output`
 +                fi
 +                echo "configure: CLASSPATH was $CLASSPATH" >&5
 +                  as_fn_error $? "Wrong version of scirenderer. Expected at least 0.3.3. Found $STDOUT" "$LINENO" 5
 +                            fi
 +        fi
 +        if test -f conftest.java.output; then
 +           rm conftest.java.output
 +        fi
 +    else
 +        echo "configure: failed program was:" >&5
 +        cat conftest.java >&5
 +        echo "configure: CLASSPATH was $CLASSPATH" >&5
 +          as_fn_error $? "Wrong version of scirenderer. Expected at least 0.3.3. Found $STDOUT" "$LINENO" 5
 +            fi
 +
 +   else
 +
 +    cat << \EOF > conftest.java
- // #line 12852 "configure"
++// #line 12831 "configure"
 +import org.scilab.forge.scirenderer.PackageInfo;
 +
 +public class conftest {
 +    public static void main(String[] argv) {
 +        String minVersion="0.3.3";
 +
 +                            System.out.println(PackageInfo.VERSION);
 +                                  if (minVersion.compareTo(PackageInfo.VERSION) != 0) {
 +                                   System.exit(-1);
 +                                }
 +
 +    }
 +}
 +EOF
 +
 +    CLASSPATH=$ac_java_classpath
 +    export CLASSPATH
 +    cmd="$JAVAC ${JAVAC_FLAGS} conftest.java"
 +    if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5) ; then
 +       if test ""yes"" = "no"; then
 +           echo "yes" >&5
 +              echo "yes"
 +       else
 +              cmd="$JAVA conftest"
 +              if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5); then
 +               echo "yes" >&5
 +                  echo "yes"
 +            else
 +                echo "configure: failed program was:" >&5
 +                cat conftest.java >&5
 +                if test -s conftest.java.output; then
 +                   STDOUT=`cat conftest.java.output`
 +                fi
 +                echo "configure: CLASSPATH was $CLASSPATH" >&5
 +                  as_fn_error $? "Wrong version of scirenderer. Expected exact version 0.3.3. Found $STDOUT" "$LINENO" 5
 +                            fi
 +        fi
 +        if test -f conftest.java.output; then
 +           rm conftest.java.output
 +        fi
 +    else
 +        echo "configure: failed program was:" >&5
 +        cat conftest.java >&5
 +        echo "configure: CLASSPATH was $CLASSPATH" >&5
 +          as_fn_error $? "Wrong version of scirenderer. Expected exact version 0.3.3. Found $STDOUT" "$LINENO" 5
 +            fi
 +
 +    fi
 +   ac_java_classpath=$saved_ac_java_classpath
 +
 +
 +               # Docking system
  
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking flexdock" >&5
  $as_echo_n "checking flexdock... " >&6; }
      PACKAGE_JAR_FILE=
      found_jar=no
      saved_ac_java_classpath=$ac_java_classpath
-     DEFAULT_JAR_DIR="/usr/share/java /usr/lib/java /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/* 2>/dev/null) $(ls -d /usr/lib64/* 2>/dev/null) $(ls -d /usr/lib/* 2>/dev/null)  $(ls -d /usr/share/*/lib 2>/dev/null)"
-     for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
+     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/flexdock.jar" "$jardir/libflexdock.jar" "$jardir/libflexdock-java.jar" "$jardir/flexdock*.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"
+         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 12921 "configure"
 -// #line 12692 "configure"
++// #line 12901 "configure"
  import org.flexdock.docking.DockingManager;
  
  public class conftest {
@@@ -13012,7 -12775,7 +12984,7 @@@ $as_echo_n "checking minimal version (1
     if test "x" == "x"; then
  
      cat << \EOF > conftest.java
- // #line 13015 "configure"
 -// #line 12778 "configure"
++// #line 12987 "configure"
  import org.flexdock.util.Utilities;
  
  public class conftest {
     else
  
      cat << \EOF > conftest.java
- // #line 13066 "configure"
 -// #line 12829 "configure"
++// #line 13038 "configure"
  import org.flexdock.util.Utilities;
  
  public class conftest {
@@@ -13122,17 -12885,18 +13094,18 @@@ $as_echo_n "checking looks... " >&6; 
      PACKAGE_JAR_FILE=
      found_jar=no
      saved_ac_java_classpath=$ac_java_classpath
-     DEFAULT_JAR_DIR="/usr/share/java /usr/lib/java /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/* 2>/dev/null) $(ls -d /usr/lib64/* 2>/dev/null) $(ls -d /usr/lib/* 2>/dev/null)  $(ls -d /usr/share/*/lib 2>/dev/null)"
-     for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
+     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/looks.jar" "$jardir/liblooks.jar" "$jardir/liblooks-java.jar" "$jardir/looks*.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"
+         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 13135 "configure"
 -// #line 12899 "configure"
++// #line 13108 "configure"
  import com.jgoodies.looks.common.MenuItemRenderer;
  
  public class conftest {
@@@ -13225,17 -12981,18 +13190,18 @@@ $as_echo_n "checking jgoodies-looks... 
      PACKAGE_JAR_FILE=
      found_jar=no
      saved_ac_java_classpath=$ac_java_classpath
-     DEFAULT_JAR_DIR="/usr/share/java /usr/lib/java /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/* 2>/dev/null) $(ls -d /usr/lib64/* 2>/dev/null) $(ls -d /usr/lib/* 2>/dev/null)  $(ls -d /usr/share/*/lib 2>/dev/null)"
-     for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
+     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/jgoodies-looks.jar" "$jardir/libjgoodies-looks.jar" "$jardir/libjgoodies-looks-java.jar" "$jardir/jgoodies-looks*.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"
+         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 13238 "configure"
 -// #line 12995 "configure"
++// #line 13204 "configure"
  import com.jgoodies.looks.common.MenuItemRenderer;
  
  public class conftest {
@@@ -13329,17 -13078,18 +13287,18 @@@ $as_echo_n "checking skinlf... " >&6; 
      PACKAGE_JAR_FILE=
      found_jar=no
      saved_ac_java_classpath=$ac_java_classpath
-     DEFAULT_JAR_DIR="/usr/share/java /usr/lib/java /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/* 2>/dev/null) $(ls -d /usr/lib64/* 2>/dev/null) $(ls -d /usr/lib/* 2>/dev/null)  $(ls -d /usr/share/*/lib 2>/dev/null)"
-     for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
+     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/skinlf.jar" "$jardir/libskinlf.jar" "$jardir/libskinlf-java.jar" "$jardir/skinlf*.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"
+         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 13342 "configure"
 -// #line 13092 "configure"
++// #line 13301 "configure"
  import com.l2fprod.util.AccessUtils;
  
  public class conftest {
@@@ -13432,17 -13174,18 +13383,18 @@@ $as_echo_n "checking jogl... " >&6; 
      PACKAGE_JAR_FILE=
      found_jar=no
      saved_ac_java_classpath=$ac_java_classpath
-     DEFAULT_JAR_DIR="/usr/share/java /usr/lib/java /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/* 2>/dev/null) $(ls -d /usr/lib64/* 2>/dev/null) $(ls -d /usr/lib/* 2>/dev/null)  $(ls -d /usr/share/*/lib 2>/dev/null)"
-     for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
+     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/jogl.jar" "$jardir/libjogl.jar" "$jardir/libjogl-java.jar" "$jardir/jogl*.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"
+         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 13445 "configure"
 -// #line 13188 "configure"
++// #line 13397 "configure"
  import javax.media.opengl.glu.GLUnurbs;
  
  public class conftest {
@@@ -13643,17 -13378,18 +13587,18 @@@ $as_echo_n "checking gluegen-rt... " >&
      PACKAGE_JAR_FILE=
      found_jar=no
      saved_ac_java_classpath=$ac_java_classpath
-     DEFAULT_JAR_DIR="/usr/share/java /usr/lib/java /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/* 2>/dev/null) $(ls -d /usr/lib64/* 2>/dev/null) $(ls -d /usr/lib/* 2>/dev/null)  $(ls -d /usr/share/*/lib 2>/dev/null)"
-     for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
+     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/gluegen-rt.jar" "$jardir/libgluegen-rt.jar" "$jardir/libgluegen-rt-java.jar" "$jardir/gluegen-rt*.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"
+         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 13656 "configure"
 -// #line 13392 "configure"
++// #line 13601 "configure"
  import com.sun.gluegen.runtime.CPU;
  
  public class conftest {
@@@ -13803,17 -13531,18 +13740,18 @@@ $as_echo_n "checking jhall... " >&6; 
      PACKAGE_JAR_FILE=
      found_jar=no
      saved_ac_java_classpath=$ac_java_classpath
-     DEFAULT_JAR_DIR="/usr/share/java /usr/lib/java /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/* 2>/dev/null) $(ls -d /usr/lib64/* 2>/dev/null) $(ls -d /usr/lib/* 2>/dev/null)  $(ls -d /usr/share/*/lib 2>/dev/null)"
-     for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
+     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/jhall.jar" "$jardir/libjhall.jar" "$jardir/libjhall-java.jar" "$jardir/jhall*.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"
+         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 13816 "configure"
 -// #line 13545 "configure"
++// #line 13754 "configure"
  import javax.help.JHelp;
  
  public class conftest {
@@@ -13906,17 -13627,18 +13836,18 @@@ $as_echo_n "checking javahelp2... " >&6
      PACKAGE_JAR_FILE=
      found_jar=no
      saved_ac_java_classpath=$ac_java_classpath
-     DEFAULT_JAR_DIR="/usr/share/java /usr/lib/java /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/* 2>/dev/null) $(ls -d /usr/lib64/* 2>/dev/null) $(ls -d /usr/lib/* 2>/dev/null)  $(ls -d /usr/share/*/lib 2>/dev/null)"
-     for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
+     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/javahelp2.jar" "$jardir/libjavahelp2.jar" "$jardir/libjavahelp2-java.jar" "$jardir/javahelp2*.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"
+         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 13919 "configure"
 -// #line 13641 "configure"
++// #line 13850 "configure"
  import javax.help.JHelp;
  
  public class conftest {
@@@ -14010,17 -13724,18 +13933,18 @@@ $as_echo_n "checking jrosetta-API... " 
      PACKAGE_JAR_FILE=
      found_jar=no
      saved_ac_java_classpath=$ac_java_classpath
-     DEFAULT_JAR_DIR="/usr/share/java /usr/lib/java /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/* 2>/dev/null) $(ls -d /usr/lib64/* 2>/dev/null) $(ls -d /usr/lib/* 2>/dev/null)  $(ls -d /usr/share/*/lib 2>/dev/null)"
-     for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
+     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/jrosetta-API.jar" "$jardir/libjrosetta-API.jar" "$jardir/libjrosetta-API-java.jar" "$jardir/jrosetta-API*.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"
+         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 14023 "configure"
 -// #line 13738 "configure"
++// #line 13947 "configure"
  import com.artenum.rosetta.interfaces.core.ConsoleConfiguration;
  
  public class conftest {
@@@ -14111,17 -13818,18 +14027,18 @@@ $as_echo_n "checking jrosetta-api... " 
      PACKAGE_JAR_FILE=
      found_jar=no
      saved_ac_java_classpath=$ac_java_classpath
-     DEFAULT_JAR_DIR="/usr/share/java /usr/lib/java /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/* 2>/dev/null) $(ls -d /usr/lib64/* 2>/dev/null) $(ls -d /usr/lib/* 2>/dev/null)  $(ls -d /usr/share/*/lib 2>/dev/null)"
-     for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
+     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/jrosetta-api.jar" "$jardir/libjrosetta-api.jar" "$jardir/libjrosetta-api-java.jar" "$jardir/jrosetta-api*.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"
+         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 14124 "configure"
 -// #line 13832 "configure"
++// #line 14041 "configure"
  import com.artenum.rosetta.interfaces.core.ConsoleConfiguration;
  
  public class conftest {
@@@ -14215,17 -13915,18 +14124,18 @@@ $as_echo_n "checking jrosetta-engine..
      PACKAGE_JAR_FILE=
      found_jar=no
      saved_ac_java_classpath=$ac_java_classpath
-     DEFAULT_JAR_DIR="/usr/share/java /usr/lib/java /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/* 2>/dev/null) $(ls -d /usr/lib64/* 2>/dev/null) $(ls -d /usr/lib/* 2>/dev/null)  $(ls -d /usr/share/*/lib 2>/dev/null)"
-     for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
+     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/jrosetta-engine.jar" "$jardir/libjrosetta-engine.jar" "$jardir/libjrosetta-engine-java.jar" "$jardir/jrosetta-engine*.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"
+         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 14228 "configure"
 -// #line 13929 "configure"
++// #line 14138 "configure"
  import com.artenum.rosetta.core.action.AbstractConsoleAction;
  
  public class conftest {
@@@ -14318,7 -14011,7 +14220,7 @@@ $as_echo_n "checking minimal version (1
     if test "x" == "x"; then
  
      cat << \EOF > conftest.java
- // #line 14321 "configure"
 -// #line 14014 "configure"
++// #line 14223 "configure"
  import com.artenum.rosetta.util.ConfigurationBuilder;
  
  public class conftest {
     else
  
      cat << \EOF > conftest.java
- // #line 14372 "configure"
 -// #line 14065 "configure"
++// #line 14274 "configure"
  import com.artenum.rosetta.util.ConfigurationBuilder;
  
  public class conftest {
@@@ -14430,17 -14123,18 +14332,18 @@@ $as_echo_n "checking jeuclid-core... " 
      PACKAGE_JAR_FILE=
      found_jar=no
      saved_ac_java_classpath=$ac_java_classpath
-     DEFAULT_JAR_DIR="/usr/share/java /usr/lib/java /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/* 2>/dev/null) $(ls -d /usr/lib64/* 2>/dev/null) $(ls -d /usr/lib/* 2>/dev/null)  $(ls -d /usr/share/*/lib 2>/dev/null)"
-     for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
+     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/jeuclid-core.jar" "$jardir/libjeuclid-core.jar" "$jardir/libjeuclid-core-java.jar" "$jardir/jeuclid-core*.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"
+         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 14443 "configure"
 -// #line 14137 "configure"
++// #line 14346 "configure"
  import net.sourceforge.jeuclid.LayoutContext;
  
  public class conftest {
@@@ -14535,17 -14221,18 +14430,18 @@@ $as_echo_n "checking fop... " >&6; 
      PACKAGE_JAR_FILE=
      found_jar=no
      saved_ac_java_classpath=$ac_java_classpath
-     DEFAULT_JAR_DIR="/usr/share/java /usr/lib/java /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/* 2>/dev/null) $(ls -d /usr/lib64/* 2>/dev/null) $(ls -d /usr/lib/* 2>/dev/null)  $(ls -d /usr/share/*/lib 2>/dev/null)"
-     for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
+     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/fop.jar" "$jardir/libfop.jar" "$jardir/libfop-java.jar" "$jardir/fop*.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"
+         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 14548 "configure"
 -// #line 14235 "configure"
++// #line 14444 "configure"
  import org.apache.fop.pdf.PDFInfo;
  
  public class conftest {
@@@ -14638,17 -14317,18 +14526,18 @@@ $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 $(ls -d /usr/share/java/* 2>/dev/null) $(ls -d /usr/lib64/* 2>/dev/null) $(ls -d /usr/lib/* 2>/dev/null)  $(ls -d /usr/share/*/lib 2>/dev/null)"
-     for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
+     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"
+         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 14651 "configure"
 -// #line 14331 "configure"
++// #line 14540 "configure"
  import org.apache.batik.parser.Parser;
  
  public class conftest {
@@@ -14741,17 -14413,18 +14622,18 @@@ $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 $(ls -d /usr/share/java/* 2>/dev/null) $(ls -d /usr/lib64/* 2>/dev/null) $(ls -d /usr/lib/* 2>/dev/null)  $(ls -d /usr/share/*/lib 2>/dev/null)"
-     for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
+     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"
+         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 14754 "configure"
 -// #line 14427 "configure"
++// #line 14636 "configure"
  import org.apache.batik.parser.Parser;
  
  public class conftest {
@@@ -14845,7 -14510,7 +14719,7 @@@ $as_echo_n "checking minimal version (1
     if test "x" == "x"; then
  
      cat << \EOF > conftest.java
- // #line 14848 "configure"
 -// #line 14513 "configure"
++// #line 14722 "configure"
  import org.apache.batik.Version;
  
  public class conftest {
     else
  
      cat << \EOF > conftest.java
- // #line 14899 "configure"
 -// #line 14564 "configure"
++// #line 14773 "configure"
  import org.apache.batik.Version;
  
  public class conftest {
@@@ -14955,17 -14620,18 +14829,18 @@@ $as_echo_n "checking commons-io... " >&
      PACKAGE_JAR_FILE=
      found_jar=no
      saved_ac_java_classpath=$ac_java_classpath
-     DEFAULT_JAR_DIR="/usr/share/java /usr/lib/java /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/* 2>/dev/null) $(ls -d /usr/lib64/* 2>/dev/null) $(ls -d /usr/lib/* 2>/dev/null)  $(ls -d /usr/share/*/lib 2>/dev/null)"
-     for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
+     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/commons-io.jar" "$jardir/libcommons-io.jar" "$jardir/libcommons-io-java.jar" "$jardir/commons-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"
+         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 14968 "configure"
 -// #line 14634 "configure"
++// #line 14843 "configure"
  import org.apache.commons.io.output.CountingOutputStream;
  
  public class conftest {
@@@ -15058,17 -14716,18 +14925,18 @@@ $as_echo_n "checking xmlgraphics-common
      PACKAGE_JAR_FILE=
      found_jar=no
      saved_ac_java_classpath=$ac_java_classpath
-     DEFAULT_JAR_DIR="/usr/share/java /usr/lib/java /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/* 2>/dev/null) $(ls -d /usr/lib64/* 2>/dev/null) $(ls -d /usr/lib/* 2>/dev/null)  $(ls -d /usr/share/*/lib 2>/dev/null)"
-     for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
+     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/xmlgraphics-commons.jar" "$jardir/libxmlgraphics-commons.jar" "$jardir/libxmlgraphics-commons-java.jar" "$jardir/xmlgraphics-commons*.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"
+         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 15071 "configure"
 -// #line 14730 "configure"
++// #line 14939 "configure"
  import org.apache.xmlgraphics.util.Service;
  
  public class conftest {
@@@ -15161,17 -14812,18 +15021,18 @@@ $as_echo_n "checking avalon-framework..
      PACKAGE_JAR_FILE=
      found_jar=no
      saved_ac_java_classpath=$ac_java_classpath
-     DEFAULT_JAR_DIR="/usr/share/java /usr/lib/java /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/* 2>/dev/null) $(ls -d /usr/lib64/* 2>/dev/null) $(ls -d /usr/lib/* 2>/dev/null)  $(ls -d /usr/share/*/lib 2>/dev/null)"
-     for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
+     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/avalon-framework.jar" "$jardir/libavalon-framework.jar" "$jardir/libavalon-framework-java.jar" "$jardir/avalon-framework*.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"
+         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 15174 "configure"
 -// #line 14826 "configure"
++// #line 15035 "configure"
  import org.apache.avalon.framework.configuration.ConfigurationException;
  
  public class conftest {
@@@ -15264,17 -14908,18 +15117,18 @@@ $as_echo_n "checking xml-apis-ext... " 
      PACKAGE_JAR_FILE=
      found_jar=no
      saved_ac_java_classpath=$ac_java_classpath
-     DEFAULT_JAR_DIR="/usr/share/java /usr/lib/java /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/* 2>/dev/null) $(ls -d /usr/lib64/* 2>/dev/null) $(ls -d /usr/lib/* 2>/dev/null)  $(ls -d /usr/share/*/lib 2>/dev/null)"
-     for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
+     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/xml-apis-ext.jar" "$jardir/libxml-apis-ext.jar" "$jardir/libxml-apis-ext-java.jar" "$jardir/xml-apis-ext*.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"
+         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 15277 "configure"
 -// #line 14922 "configure"
++// #line 15131 "configure"
  import org.w3c.dom.svg.SVGDocument;
  
  public class conftest {
@@@ -15367,17 -15004,18 +15213,18 @@@ $as_echo_n "checking xml-commons-apis-e
      PACKAGE_JAR_FILE=
      found_jar=no
      saved_ac_java_classpath=$ac_java_classpath
-     DEFAULT_JAR_DIR="/usr/share/java /usr/lib/java /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/* 2>/dev/null) $(ls -d /usr/lib64/* 2>/dev/null) $(ls -d /usr/lib/* 2>/dev/null)  $(ls -d /usr/share/*/lib 2>/dev/null)"
-     for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
+     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/xml-commons-apis-ext.jar" "$jardir/libxml-commons-apis-ext.jar" "$jardir/libxml-commons-apis-ext-java.jar" "$jardir/xml-commons-apis-ext*.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"
+         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 15380 "configure"
 -// #line 15018 "configure"
++// #line 15227 "configure"
  import org.w3c.dom.svg.SVGDocument;
  
  public class conftest {
@@@ -15474,17 -15104,18 +15313,18 @@@ $as_echo_n "checking commons-logging..
      PACKAGE_JAR_FILE=
      found_jar=no
      saved_ac_java_classpath=$ac_java_classpath
-     DEFAULT_JAR_DIR="/usr/share/java /usr/lib/java /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/* 2>/dev/null) $(ls -d /usr/lib64/* 2>/dev/null) $(ls -d /usr/lib/* 2>/dev/null)  $(ls -d /usr/share/*/lib 2>/dev/null)"
-     for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
+     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/commons-logging.jar" "$jardir/libcommons-logging.jar" "$jardir/libcommons-logging-java.jar" "$jardir/commons-logging*.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"
+         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 15487 "configure"
 -// #line 15118 "configure"
++// #line 15327 "configure"
  import org.apache.commons.logging.LogFactory;
  
  public class conftest {
@@@ -15577,17 -15200,18 +15409,18 @@@ $as_echo_n "checking jlatexmath... " >&
      PACKAGE_JAR_FILE=
      found_jar=no
      saved_ac_java_classpath=$ac_java_classpath
-     DEFAULT_JAR_DIR="/usr/share/java /usr/lib/java /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/* 2>/dev/null) $(ls -d /usr/lib64/* 2>/dev/null) $(ls -d /usr/lib/* 2>/dev/null)  $(ls -d /usr/share/*/lib 2>/dev/null)"
-     for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
+     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/jlatexmath.jar" "$jardir/libjlatexmath.jar" "$jardir/libjlatexmath-java.jar" "$jardir/jlatexmath*.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"
+         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 15590 "configure"
 -// #line 15214 "configure"
++// #line 15423 "configure"
  import org.scilab.forge.jlatexmath.TeXFormula;
  
  public class conftest {
@@@ -15681,7 -15297,7 +15506,7 @@@ $as_echo_n "checking minimal version (0
     if test "x" == "x"; then
  
      cat << \EOF > conftest.java
- // #line 15684 "configure"
 -// #line 15300 "configure"
++// #line 15509 "configure"
  import org.scilab.forge.jlatexmath.TeXFormula;
  
  public class conftest {
     else
  
      cat << \EOF > conftest.java
- // #line 15735 "configure"
 -// #line 15351 "configure"
++// #line 15560 "configure"
  import org.scilab.forge.jlatexmath.TeXFormula;
  
  public class conftest {
@@@ -15797,17 -15413,18 +15622,18 @@@ $as_echo_n "checking checkstyle... " >&
      PACKAGE_JAR_FILE=
      found_jar=no
      saved_ac_java_classpath=$ac_java_classpath
-     DEFAULT_JAR_DIR="/usr/share/java /usr/lib/java /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/* 2>/dev/null) $(ls -d /usr/lib64/* 2>/dev/null) $(ls -d /usr/lib/* 2>/dev/null)  $(ls -d /usr/share/*/lib 2>/dev/null)"
-     for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
+     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/checkstyle.jar" "$jardir/libcheckstyle.jar" "$jardir/libcheckstyle-java.jar" "$jardir/checkstyle*.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"
+         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 15810 "configure"
 -// #line 15427 "configure"
++// #line 15636 "configure"
  import com.puppycrawl.tools.checkstyle.CheckStyleTask;
  
  public class conftest {
@@@ -15900,17 -15509,18 +15718,18 @@@ $as_echo_n "checking commons-beanutils.
      PACKAGE_JAR_FILE=
      found_jar=no
      saved_ac_java_classpath=$ac_java_classpath
-     DEFAULT_JAR_DIR="/usr/share/java /usr/lib/java /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/* 2>/dev/null) $(ls -d /usr/lib64/* 2>/dev/null) $(ls -d /usr/lib/* 2>/dev/null)  $(ls -d /usr/share/*/lib 2>/dev/null)"
-     for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
+     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/commons-beanutils.jar" "$jardir/libcommons-beanutils.jar" "$jardir/libcommons-beanutils-java.jar" "$jardir/commons-beanutils*.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"
+         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 15913 "configure"
 -// #line 15523 "configure"
++// #line 15732 "configure"
  import org.apache.commons.beanutils.Converter;
  
  public class conftest {
@@@ -16003,17 -15605,18 +15814,18 @@@ $as_echo_n "checking antlr... " >&6; 
      PACKAGE_JAR_FILE=
      found_jar=no
      saved_ac_java_classpath=$ac_java_classpath
-     DEFAULT_JAR_DIR="/usr/share/java /usr/lib/java /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/* 2>/dev/null) $(ls -d /usr/lib64/* 2>/dev/null) $(ls -d /usr/lib/* 2>/dev/null)  $(ls -d /usr/share/*/lib 2>/dev/null)"
-     for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
+     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/antlr.jar" "$jardir/libantlr.jar" "$jardir/libantlr-java.jar" "$jardir/antlr*.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"
+         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 16016 "configure"
 -// #line 15619 "configure"
++// #line 15828 "configure"
  import antlr.TokenStreamException;
  
  public class conftest {
@@@ -16106,17 -15701,18 +15910,18 @@@ $as_echo_n "checking testng... " >&6; 
      PACKAGE_JAR_FILE=
      found_jar=no
      saved_ac_java_classpath=$ac_java_classpath
-     DEFAULT_JAR_DIR="/usr/share/java /usr/lib/java /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/* 2>/dev/null) $(ls -d /usr/lib64/* 2>/dev/null) $(ls -d /usr/lib/* 2>/dev/null)  $(ls -d /usr/share/*/lib 2>/dev/null)"
-     for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
+     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/testng.jar" "$jardir/libtestng.jar" "$jardir/libtestng-java.jar" "$jardir/testng*.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"
+         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 16119 "configure"
 -// #line 15715 "configure"
++// #line 15924 "configure"
  import org.testng.TestNG;
  
  public class conftest {
@@@ -16209,17 -15797,18 +16006,18 @@@ $as_echo_n "checking beust-jcommander..
      PACKAGE_JAR_FILE=
      found_jar=no
      saved_ac_java_classpath=$ac_java_classpath
-     DEFAULT_JAR_DIR="/usr/share/java /usr/lib/java /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/* 2>/dev/null) $(ls -d /usr/lib64/* 2>/dev/null) $(ls -d /usr/lib/* 2>/dev/null)  $(ls -d /usr/share/*/lib 2>/dev/null)"
-     for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
+     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/beust-jcommander.jar" "$jardir/libbeust-jcommander.jar" "$jardir/libbeust-jcommander-java.jar" "$jardir/beust-jcommander*.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"
+         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 16222 "configure"
 -// #line 15811 "configure"
++// #line 16020 "configure"
  import com.beust.jcommander.JCommander;
  
  public class conftest {
@@@ -16311,17 -15892,18 +16101,18 @@@ $as_echo_n "checking jcommander... " >&
      PACKAGE_JAR_FILE=
      found_jar=no
      saved_ac_java_classpath=$ac_java_classpath
-     DEFAULT_JAR_DIR="/usr/share/java /usr/lib/java /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/* 2>/dev/null) $(ls -d /usr/lib64/* 2>/dev/null) $(ls -d /usr/lib/* 2>/dev/null)  $(ls -d /usr/share/*/lib 2>/dev/null)"
-     for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
+     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/jcommander.jar" "$jardir/libjcommander.jar" "$jardir/libjcommander-java.jar" "$jardir/jcommander*.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"
+         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 16324 "configure"
 -// #line 15906 "configure"
++// #line 16115 "configure"
  import com.beust.jcommander.JCommander;
  
  public class conftest {
@@@ -16415,17 -15989,18 +16198,18 @@@ $as_echo_n "checking qdox... " >&6; 
      PACKAGE_JAR_FILE=
      found_jar=no
      saved_ac_java_classpath=$ac_java_classpath
-     DEFAULT_JAR_DIR="/usr/share/java /usr/lib/java /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/* 2>/dev/null) $(ls -d /usr/lib64/* 2>/dev/null) $(ls -d /usr/lib/* 2>/dev/null)  $(ls -d /usr/share/*/lib 2>/dev/null)"
-     for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
+     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/qdox.jar" "$jardir/libqdox.jar" "$jardir/libqdox-java.jar" "$jardir/qdox*.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"
+         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 16428 "configure"
 -// #line 16003 "configure"
++// #line 16212 "configure"
  import com.thoughtworks.qdox.tools.QDoxTester;
  
  public class conftest {
@@@ -16518,17 -16085,18 +16294,18 @@@ $as_echo_n "checking bsh... " >&6; 
      PACKAGE_JAR_FILE=
      found_jar=no
      saved_ac_java_classpath=$ac_java_classpath
-     DEFAULT_JAR_DIR="/usr/share/java /usr/lib/java /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/* 2>/dev/null) $(ls -d /usr/lib64/* 2>/dev/null) $(ls -d /usr/lib/* 2>/dev/null)  $(ls -d /usr/share/*/lib 2>/dev/null)"
-     for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
+     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/bsh.jar" "$jardir/libbsh.jar" "$jardir/libbsh-java.jar" "$jardir/bsh*.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"
+         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 16531 "configure"
 -// #line 16099 "configure"
++// #line 16308 "configure"
  import bsh.Console;
  
  public class conftest {
@@@ -16621,17 -16181,18 +16390,18 @@@ $as_echo_n "checking junit... " >&6; 
      PACKAGE_JAR_FILE=
      found_jar=no
      saved_ac_java_classpath=$ac_java_classpath
-     DEFAULT_JAR_DIR="/usr/share/java /usr/lib/java /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/* 2>/dev/null) $(ls -d /usr/lib64/* 2>/dev/null) $(ls -d /usr/lib/* 2>/dev/null)  $(ls -d /usr/share/*/lib 2>/dev/null)"
-     for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
+     DEFAULT_JAR_DIR="/usr/share/java /usr/lib/java /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(find /usr/share/java/ -maxdepth 1 -type d 2>/dev/null) $(find /usr/lib64/ -maxdepth 1 -type d 2>/dev/null) $(find  /usr/lib/ -maxdepth 1 -type d 2>/dev/null)  $(find /usr/share/*/lib -maxdepth 1 -type d 2>/dev/null)"
+     for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR; do
        for jar in "$jardir/junit.jar" "$jardir/libjunit.jar" "$jardir/libjunit-java.jar" "$jardir/junit*.jar"; do
  # TODO check the behaviour when spaces
-     jars_resolved=`ls $jar 2>/dev/null`
-     for jar_resolved in $jars_resolved; do # If several jars matches
-         if test -e "$jar_resolved"; then
-           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+         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 16634 "configure"
 -// #line 16195 "configure"
++// #line 16404 "configure"
  import junit.framework.Assert;
  
  public class conftest {
@@@ -24494,7 -24047,7 +24256,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 24497 "configure"
 -#line 24050 "configure"
++#line 24259 "configure"
  #include "confdefs.h"
  
  #include "$CHK_TCL_INCLUDE_PATH/$CHK_TCL_INC_NAME"
@@@ -24804,7 -24357,7 +24566,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 24807 "configure"
 -#line 24360 "configure"
++#line 24569 "configure"
  #include "confdefs.h"
  
  #include "$CHK_TK_INCLUDE_PATH/$CHK_TK_INC_NAME"
@@@ -25371,17 -24924,18 +25133,18 @@@ $as_echo_n "checking saxon... " >&6; 
      PACKAGE_JAR_FILE=
      found_jar=no
      saved_ac_java_classpath=$ac_java_classpath
-     DEFAULT_JAR_DIR="/usr/share/java /usr/lib/java /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/* 2>/dev/null) $(ls -d /usr/lib64/* 2>/dev/null) $(ls -d /usr/lib/* 2>/dev/null)  $(ls -d /usr/share/*/lib 2>/dev/null)"
-     for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
+     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/saxon.jar" "$jardir/libsaxon.jar" "$jardir/libsaxon-java.jar" "$jardir/saxon*.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"
+         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 25384 "configure"
 -// #line 24938 "configure"
++// #line 25147 "configure"
  import com.icl.saxon.Loader;
  
  public class conftest {
@@@ -25474,17 -25020,18 +25229,18 @@@ $as_echo_n "checking jlatexmath-fop... 
      PACKAGE_JAR_FILE=
      found_jar=no
      saved_ac_java_classpath=$ac_java_classpath
-     DEFAULT_JAR_DIR="/usr/share/java /usr/lib/java /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/* 2>/dev/null) $(ls -d /usr/lib64/* 2>/dev/null) $(ls -d /usr/lib/* 2>/dev/null)  $(ls -d /usr/share/*/lib 2>/dev/null)"
-     for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
+     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/jlatexmath-fop.jar" "$jardir/libjlatexmath-fop.jar" "$jardir/libjlatexmath-fop-java.jar" "$jardir/jlatexmath-fop*.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"
+         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 25487 "configure"
 -// #line 25034 "configure"
++// #line 25243 "configure"
  import org.scilab.forge.jlatexmath.fop.JLaTeXMathObj;
  
  public class conftest {
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<_LT_EOF
- #line 31793 "configure"
 -#line 31333 "configure"
++#line 31542 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<_LT_EOF
- #line 31899 "configure"
 -#line 31439 "configure"
++#line 31648 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
@@@ -38339,7 -37879,7 +38088,7 @@@ if test "$enable_stop_on_warning" = yes
     CXXFLAGS="$CXXFLAGS -Werror=implicit-function-declaration -O0"
  fi
  
- ac_config_files="$ac_config_files libs/MALLOC/Makefile libs/dynamiclibrary/Makefile libs/doublylinkedlist/Makefile libs/hashtable/Makefile libs/libst/Makefile contrib/Makefile desktop/images/icons/Makefile desktop/Makefile modules/helptools/Makefile modules/data_structures/Makefile modules/differential_equations/Makefile modules/optimization/Makefile modules/elementary_functions/Makefile modules/special_functions/Makefile modules/io/Makefile modules/completion/Makefile modules/history_manager/Makefile modules/jvm/Makefile modules/commons/Makefile modules/sound/Makefile modules/statistics/Makefile modules/mexlib/Makefile modules/sparse/Makefile modules/linear_algebra/Makefile modules/polynomials/Makefile modules/symbolic/Makefile modules/signal_processing/Makefile modules/arnoldi/Makefile modules/interpolation/Makefile modules/intersci/Makefile modules/localization/Makefile modules/cacsd/Makefile modules/boolean/Makefile modules/integer/Makefile modules/double/Makefile modules/fileio/Makefile modules/spreadsheet/Makefile modules/string/Makefile modules/time/Makefile modules/graphics/Makefile modules/graphic_export/Makefile modules/graphic_objects/Makefile modules/renderer/Makefile modules/action_binding/Makefile modules/gui/Makefile modules/randlib/Makefile modules/tclsci/Makefile modules/windows_tools/Makefile modules/core/Makefile modules/prebuildjava/Makefile modules/api_scilab/Makefile modules/call_scilab/Makefile modules/types/Makefile modules/hdf5/Makefile modules/fftw/Makefile modules/umfpack/Makefile modules/scicos/Makefile modules/scicos_blocks/Makefile modules/functions/Makefile modules/dynamic_link/Makefile modules/overloading/Makefile modules/javasci/Makefile modules/m2sci/Makefile modules/compatibility_functions/Makefile modules/development_tools/Makefile modules/output_stream/Makefile modules/console/Makefile modules/demo_tools/Makefile modules/genetic_algorithms/Makefile modules/simulated_annealing/Makefile modules/parameters/Makefile modules/matio/Makefile modules/atoms/Makefile modules/xcos/Makefile modules/scinotes/Makefile modules/ui_data/Makefile modules/graph/Makefile modules/parallel/Makefile modules/modules_manager/Makefile modules/history_browser/Makefile modules/xml/Makefile modules/Makefile libs/Makefile Makefile scilab.pc etc/modules.xml etc/classpath.xml etc/Info.plist etc/logging.properties scilab.properties scilab-lib.properties scilab-lib-doc.properties modules/helptools/etc/SciDocConf.xml modules/core/includes/version.h"
 -ac_config_files="$ac_config_files libs/MALLOC/Makefile libs/dynamiclibrary/Makefile libs/doublylinkedlist/Makefile libs/hashtable/Makefile libs/libst/Makefile contrib/Makefile desktop/images/icons/Makefile desktop/Makefile modules/helptools/Makefile modules/data_structures/Makefile modules/differential_equations/Makefile modules/optimization/Makefile modules/elementary_functions/Makefile modules/special_functions/Makefile modules/io/Makefile modules/completion/Makefile modules/history_manager/Makefile modules/jvm/Makefile modules/commons/Makefile modules/sound/Makefile modules/statistics/Makefile modules/mexlib/Makefile modules/sparse/Makefile modules/linear_algebra/Makefile modules/polynomials/Makefile modules/symbolic/Makefile modules/signal_processing/Makefile modules/arnoldi/Makefile modules/interpolation/Makefile modules/intersci/Makefile modules/localization/Makefile modules/cacsd/Makefile modules/boolean/Makefile modules/integer/Makefile modules/double/Makefile modules/fileio/Makefile modules/spreadsheet/Makefile modules/string/Makefile modules/time/Makefile modules/graphics/Makefile modules/graphic_export/Makefile modules/renderer/Makefile modules/action_binding/Makefile modules/gui/Makefile modules/randlib/Makefile modules/tclsci/Makefile modules/windows_tools/Makefile modules/core/Makefile modules/prebuildjava/Makefile modules/api_scilab/Makefile modules/call_scilab/Makefile modules/types/Makefile modules/hdf5/Makefile modules/fftw/Makefile modules/umfpack/Makefile modules/scicos/Makefile modules/scicos_blocks/Makefile modules/functions/Makefile modules/dynamic_link/Makefile modules/overloading/Makefile modules/javasci/Makefile modules/m2sci/Makefile modules/compatibility_functions/Makefile modules/development_tools/Makefile modules/output_stream/Makefile modules/console/Makefile modules/demo_tools/Makefile modules/genetic_algorithms/Makefile modules/simulated_annealing/Makefile modules/parameters/Makefile modules/matio/Makefile modules/atoms/Makefile modules/xcos/Makefile modules/scinotes/Makefile modules/ui_data/Makefile modules/graph/Makefile modules/parallel/Makefile modules/modules_manager/Makefile modules/history_browser/Makefile modules/preferences/Makefile modules/xml/Makefile modules/Makefile libs/Makefile Makefile scilab.pc etc/modules.xml etc/classpath.xml etc/Info.plist etc/logging.properties scilab.properties scilab-lib.properties scilab-lib-doc.properties modules/helptools/etc/SciDocConf.xml modules/core/includes/version.h"
++ac_config_files="$ac_config_files libs/MALLOC/Makefile libs/dynamiclibrary/Makefile libs/doublylinkedlist/Makefile libs/hashtable/Makefile libs/libst/Makefile contrib/Makefile desktop/images/icons/Makefile desktop/Makefile modules/helptools/Makefile modules/data_structures/Makefile modules/differential_equations/Makefile modules/optimization/Makefile modules/elementary_functions/Makefile modules/special_functions/Makefile modules/io/Makefile modules/completion/Makefile modules/history_manager/Makefile modules/jvm/Makefile modules/commons/Makefile modules/sound/Makefile modules/statistics/Makefile modules/mexlib/Makefile modules/sparse/Makefile modules/linear_algebra/Makefile modules/polynomials/Makefile modules/symbolic/Makefile modules/signal_processing/Makefile modules/arnoldi/Makefile modules/interpolation/Makefile modules/intersci/Makefile modules/localization/Makefile modules/cacsd/Makefile modules/boolean/Makefile modules/integer/Makefile modules/double/Makefile modules/fileio/Makefile modules/spreadsheet/Makefile modules/string/Makefile modules/time/Makefile modules/graphics/Makefile modules/graphic_export/Makefile modules/graphic_objects/Makefile modules/renderer/Makefile modules/action_binding/Makefile modules/gui/Makefile modules/randlib/Makefile modules/tclsci/Makefile modules/windows_tools/Makefile modules/core/Makefile modules/prebuildjava/Makefile modules/api_scilab/Makefile modules/call_scilab/Makefile modules/types/Makefile modules/hdf5/Makefile modules/fftw/Makefile modules/umfpack/Makefile modules/scicos/Makefile modules/scicos_blocks/Makefile modules/functions/Makefile modules/dynamic_link/Makefile modules/overloading/Makefile modules/javasci/Makefile modules/m2sci/Makefile modules/compatibility_functions/Makefile modules/development_tools/Makefile modules/output_stream/Makefile modules/console/Makefile modules/demo_tools/Makefile modules/genetic_algorithms/Makefile modules/simulated_annealing/Makefile modules/parameters/Makefile modules/matio/Makefile modules/atoms/Makefile modules/xcos/Makefile modules/scinotes/Makefile modules/ui_data/Makefile modules/graph/Makefile modules/parallel/Makefile modules/modules_manager/Makefile modules/history_browser/Makefile modules/preferences/Makefile modules/xml/Makefile modules/Makefile libs/Makefile Makefile scilab.pc etc/modules.xml etc/classpath.xml etc/Info.plist etc/logging.properties scilab.properties scilab-lib.properties scilab-lib-doc.properties modules/helptools/etc/SciDocConf.xml modules/core/includes/version.h"
  
  
  # Detection of the module for the future version of Scilab 6
Simple merge
Simple merge
Simple merge
@@@ -177,12 -173,9 +179,13 @@@ The option is "disableUnderMode" and ca
        <load on="SciNotes"/>
  </path>
  
 +
 +<!-- TO DO Load only when we need -->
 +<path value="$SCILAB/modules/graphic_objects/jar/org.scilab.modules.graphic_objects.jar"/>
 +
  <!-- TO DO Load only when we need -->
  <path value="$SCILAB/modules/ui_data/jar/org.scilab.modules.ui_data.jar"/>
+ <path value="$SCILAB/modules/javasci/jar/org.scilab.modules.javasci.jar"/>
  
  <!-- TO DO Load only when we need -->
  <path value="$SCILAB/modules/graph/jar/org.scilab.modules.graph.jar"/>
@@@ -177,14 -173,11 +179,15 @@@ The option is "disableUnderMode" and ca
        <load on="SciNotes"/>
  </path>
  
 +
 +<!-- TO DO Load only when we need -->
 +<path value="$SCILAB/modules/graphic_objects/jar/org.scilab.modules.graphic_objects.jar"/>
 +
  <!-- TO DO Load only when we need -->
  <path value="$SCILAB/modules/ui_data/jar/org.scilab.modules.ui_data.jar"/>
+ <path value="$SCILAB/modules/javasci/jar/org.scilab.modules.javasci.jar"/>
  
- <!-- TO DO Load only when we need -->
+     <!-- TO DO Load only when we need -->
  <path value="$SCILAB/modules/graph/jar/org.scilab.modules.graph.jar"/>
  
  <path value="$SCILAB/modules/history_browser/jar/org.scilab.modules.history_browser.jar" disableUnderMode="NW"/>
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -162,13 -162,13 +162,13 @@@ DIST_SUBDIRS = prebuildjava fileio mexl
        localization polynomials special_functions time windows_tools \
        sparse completion history_manager output_stream string hdf5 \
        fftw statistics dynamic_link console arnoldi spreadsheet \
 -      tclsci commons jvm action_binding renderer graphic_export gui \
 -      graphics optimization symbolic randlib interpolation sound \
 -      overloading m2sci development_tools compatibility_functions \
 -      helptools umfpack demo_tools genetic_algorithms \
 -      simulated_annealing matio atoms graph xcos scinotes parallel \
 -      modules_manager ui_data history_browser preferences xml types \
 -      scicos_blocks scicos . javasci
 +      tclsci commons jvm action_binding graphic_objects renderer \
 +      graphic_export gui graphics optimization symbolic randlib \
 +      interpolation sound overloading m2sci development_tools \
 +      compatibility_functions helptools umfpack demo_tools \
 +      genetic_algorithms simulated_annealing matio atoms graph xcos \
-       scinotes parallel modules_manager ui_data history_browser xml \
-       types scicos_blocks scicos . javasci
++      scinotes parallel modules_manager ui_data history_browser \
++      preferences xml types scicos_blocks scicos . javasci
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  am__relativize = \
    dir0=`pwd`; \
@@@ -454,13 -453,13 +454,13 @@@ SUBDIRS = prebuildjava fileio mexlib fu
        localization polynomials special_functions time windows_tools \
        sparse completion history_manager output_stream string hdf5 \
        fftw statistics dynamic_link console arnoldi spreadsheet \
 -      tclsci commons jvm action_binding renderer graphic_export gui \
 -      graphics optimization symbolic randlib interpolation sound \
 -      overloading m2sci development_tools compatibility_functions \
 -      helptools umfpack demo_tools genetic_algorithms \
 -      simulated_annealing matio atoms hdf5 graph xcos scinotes \
 -      parallel modules_manager ui_data history_browser preferences \
 -      xml types $(am__append_1) scicos . $(am__append_2)
 +      tclsci commons jvm action_binding graphic_objects renderer \
 +      graphic_export gui graphics optimization symbolic randlib \
 +      interpolation sound overloading m2sci development_tools \
 +      compatibility_functions helptools umfpack demo_tools \
 +      genetic_algorithms simulated_annealing matio atoms hdf5 graph \
 +      xcos scinotes parallel modules_manager ui_data history_browser \
-       xml types $(am__append_1) scicos . $(am__append_2)
++      preferences xml types $(am__append_1) scicos . $(am__append_2)
  
  #### Basic files ####
  libscilab_la_rootdir = $(mydatadir)
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -90,7 -90,7 +90,8 @@@
  /* 66 */                        #include "dynamic_parallel.h" /* parallel */
  /* 67 */                        #include "dynamic_gateways.h" /* ui_data */
  /* 68 */                        #include "dynamic_gateways.h" /* xml */
- /* 69 */                                              #include "dynamic_gateways.h" /* graphic_objects */
+ /* 69 */                        #include "dynamic_gateways.h" /* preferences */
++/* 70 */                        #include "dynamic_gateways.h" /* graphic_objects */
  
  
  
@@@ -34,7 -34,7 +34,7 @@@ jmp_buf jmp_env
   ** Watch out the positions are crutial !!!
   ** @TODO : Make this less crappy...
   **/
--#define INTERFACES_MAX 69
++#define INTERFACES_MAX 70
  static OpTab Interfaces[INTERFACES_MAX] = {
      /* 01  */ {gw_user}, /* free position may be used */
      /* 02  */ {gw_linear_algebra},
      /* 66  */ {gw_dynamic_parallel},
      /* 67  */ {gw_dynamic_ui_data},
      /* 68  */ {gw_dynamic_xml},
-     /* 69  */ {gw_dynamic_graphic_objects}
 -    /* 69  */ {gw_dynamic_preferences}
 -
++    /* 69  */ {gw_dynamic_preferences},
++    /* 70  */ {gw_dynamic_graphic_objects}
  };
  /*--------------------------------------------------------------------------*/
  /**
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -34,188 -37,182 +34,186 @@@ static BOOL isVectorialExport(ExportFil
  /*--------------------------------------------------------------------------*/
  int xs2file(char * fname, ExportFileType fileType )
  {
 -  /* Check input and output sizes */
 -  CheckLhs(0,1);
 -  if (isVectorialExport(fileType) || fileType == JPG_EXPORT)
 +    // FIXME
 +    abort();
 +#if 0
 +    /* Check input and output sizes */
 +    CheckLhs(0,1);
 +    if (isVectorialExport(fileType) || fileType == JPG_EXPORT)
      {
 -      CheckRhs(2,3);
 +        CheckRhs(2,3);
      }
 -  else
 +    else
      {
 -      CheckRhs(2,2);
 +        CheckRhs(2,2);
      }
  
 -  if (GetType(1) != sci_matrix && GetType(1) != sci_handles)
 +    if (GetType(1) != sci_matrix && GetType(1) != sci_handles)
      {
 -      Scierror(999,_("%s: Wrong type for input argument #%d: An integer or a handle expected.\n"),fname, 1);
 -      LhsVar(1) = 0;
 -      PutLhsVar();
 -      return 0;
 +        Scierror(999,_("%s: Wrong type for input argument #%d: An integer or a handle expected.\n"),fname, 1);
 +        LhsVar(1) = 0;
 +        PutLhsVar();
 +        return 0;
      }
  
 -  if ( (GetType(2) == sci_strings) )
 -    { 
 -      char **fileName = NULL;
 -      char *real_filename = NULL;
 -      float jpegCompressionQuality = 0.95f;
 -      ExportOrientation orientation = EXPORT_PORTRAIT; /* default orientation */
 -      int m1 = 0, n1 = 0, l1 = 0;
 -      int figurenum = -1;
 -      sciPointObj* figurePtr = NULL;
 -      char *status = NULL;
 -
 -      /* get handle by figure number */
 -      if(GetType(1) == sci_matrix)
 -      {
 -        GetRhsVar(1,MATRIX_OF_INTEGER_DATATYPE,&m1,&n1,&l1);
 -        if(m1*n1 != 1)
 -          {
 -            Scierror(999,_("%s: Wrong size for input argument #%d: A scalar expected.\n"),fname, 1);        
 -            return 0;
 -          }
 -
 -        figurenum = *istk(l1);
 -        if (!sciIsExistingFigure(figurenum))
 -          {
 -            Scierror(999, "%s: Input argument #%d must be a valid figure_id.\n",fname, 1);
 -            return 0;
 -          }
 -        figurePtr = getFigureFromIndex(figurenum);
 -      }
 -      /* check given handle */
 -      if(GetType(1) == sci_handles)
 -      {
 -        GetRhsVar(1,GRAPHICAL_HANDLE_DATATYPE,&m1,&n1,&l1);
 -        if(m1*n1 != 1)
 -          {
 -            Scierror(999,_("%s: Wrong size for input argument #%d: A graphic handle expected.\n"),fname, 1);        
 -            return 0;
 -          }
 -        figurePtr = sciGetPointerFromHandle(getHandleFromStack(l1));
 -
 -        if(figurePtr == NULL)
 -          {
 -            Scierror(999, "%s: Input argument #%d must be a valid handle.\n",fname, 1);
 -            return 0;        
 -          }
 -        startFigureDataReading(figurePtr);
 -        if(sciGetEntityType(figurePtr)!=SCI_FIGURE)
 -          {
 -            Scierror(999, "%s: Input argument #%d must be a handle on a figure.\n", fname, 1);
 -            return 0;        
 -          }
 -        endFigureDataReading(figurePtr);
 -      }
 -
 -      /* get file name */
 -      GetRhsVar(2,MATRIX_OF_STRING_DATATYPE,&m1,&n1,&fileName);
 -      if (m1*n1 == 1)
 -      {
 -        if (Rhs == 3)
 -          {
 -            int nbCol = 0;
 -            int nbRow = 0;
 -            
 -            if (isVectorialExport(fileType))
 -              {
 -
 -                char **sciOrientation = NULL;
 -                
 -                if (GetType(3) != sci_strings)
 -                  {
 -                    freeArrayOfString(fileName,m1*n1);
 -                    Scierror(999,_("%s: Wrong type for input argument #%d: Single character string expected.\n"),fname, 3);
 -                    return 0;
 -                  }
 -                
 -                GetRhsVar(3,MATRIX_OF_STRING_DATATYPE,&nbRow,&nbCol,&sciOrientation);
 -                if (nbRow*nbCol == 1)
 -                  {
 -                    /* Value should be 'landscape' or 'portrait' but check only the first character */
 -                    /* for compatibility with Scilab 4*/
 -                    if (strcmp(sciOrientation[0], "landscape") == 0 || strcmp(sciOrientation[0], "l") == 0)
 -                      {
 -                        freeArrayOfString(sciOrientation,nbRow*nbCol);
 -                        orientation = EXPORT_LANDSCAPE;
 -                      }
 -                    else if(strcmp(sciOrientation[0], "portrait") == 0 || strcmp(sciOrientation[0], "p") == 0)
 -                      {
 -                        freeArrayOfString(sciOrientation,nbRow*nbCol);
 -                        orientation = EXPORT_PORTRAIT;
 -                      }
 -                    else
 -                      {
 -                        freeArrayOfString(fileName,m1*n1);
 -                        freeArrayOfString(sciOrientation,nbRow*nbCol);
 -                        Scierror(999,_("%s: Wrong value for input argument #%d: '%s' or '%s' expected.\n"),fname, 3, "portrait", "landscape");
 -                        return 0;
 -                      }
 -                  }
 -                else
 -                  {
 -                    freeArrayOfString(fileName,m1*n1);
 -                    freeArrayOfString(sciOrientation,nbRow*nbCol);
 -                    Scierror(999,_("%s: Wrong size for input argument #%d: Single character string expected.\n"),fname, 3);
 -                    return 0;
 -                  }
 -              }
 -            else
 -              {
 -                int quality = 0;
 -                GetRhsVar(3, MATRIX_OF_DOUBLE_DATATYPE, &nbRow, &nbCol, &quality);
 -                if (nbRow != 1 || nbCol != 1 || *stk(quality) < 0 || *stk(quality) > 1)
 -                  {
 -                    freeArrayOfString(fileName, m1 * n1);
 -                    Scierror(999,_("%s: Wrong type for input argument #%d: A real between 0 and 1 expected.\n"),fname, 3);
 -                    return 0;
 -                  }
 -                jpegCompressionQuality = (float) *stk(quality);
 -              }
 -          }
 -
 -        /* Replaces SCI, ~, HOME, TMPDIR by the real path */
 -        real_filename = expandPathVariable(fileName[0]);
 -
 -        /* Call the function for exporting file */
 -        status = exportToFile(figurePtr, real_filename, fileType, jpegCompressionQuality, orientation);
 -        
 -        /* free pointers no more used */
 -        if (real_filename)
 -          {
 -            FREE(real_filename);
 -            real_filename = NULL;
 -          }
 -        freeArrayOfString(fileName,m1*n1);
 -
 -        /* treat errors */
 -        if (strlen(status) != 0)
 -        { 
 -            Scierror(999,_("%s: %s\n"), fname, status);
 -            return 0;
 -        }
 -      }
 -      else
 -      {
 -        freeArrayOfString(fileName,m1*n1);
 -        Scierror(999,_("%s: Wrong size for input argument #%d: Single character string expected.\n"),fname, 2);
 -        return 0;
 -      }
 +    if ( (GetType(2) == sci_strings) )
 +    {
 +        char **fileName = NULL;
 +        char *real_filename = NULL;
 +        float jpegCompressionQuality = 0.95f;
 +        ExportOrientation orientation = EXPORT_PORTRAIT; /* default orientation */
-         long int lout = 0;
-         int out_n = 0;
 +        int m1 = 0, n1 = 0, l1 = 0;
 +        int figurenum = -1;
 +        sciPointObj* figurePtr = NULL;
 +        char *status = NULL;
 +
 +        /* get handle by figure number */
 +        if(GetType(1) == sci_matrix)
 +        {
 +            GetRhsVar(1,MATRIX_OF_INTEGER_DATATYPE,&m1,&n1,&l1);
 +            if(m1*n1 != 1)
 +            {
 +                Scierror(999,_("%s: Wrong size for input argument #%d: A scalar expected.\n"),fname, 1);
 +                return 0;
 +            }
 +
 +            figurenum = *istk(l1);
 +            if (!sciIsExistingFigure(figurenum))
 +            {
 +                Scierror(999, "%s: Input argument #%d must be a valid figure_id.\n",fname, 1);
 +                return 0;
 +            }
 +            figurePtr = getFigureFromIndex(figurenum);
 +        }
 +        /* check given handle */
 +        if(GetType(1) == sci_handles)
 +        {
 +            GetRhsVar(1,GRAPHICAL_HANDLE_DATATYPE,&m1,&n1,&l1);
 +            if(m1*n1 != 1)
 +            {
 +                Scierror(999,_("%s: Wrong size for input argument #%d: A graphic handle expected.\n"),fname, 1);
 +                return 0;
 +            }
 +            figurePtr = sciGetPointerFromHandle(getHandleFromStack(l1));
 +
 +            if(figurePtr == NULL)
 +            {
 +                Scierror(999, "%s: Input argument #%d must be a valid handle.\n",fname, 1);
 +                return 0;
 +            }
 +            startFigureDataReading(figurePtr);
 +            if(sciGetEntityType(figurePtr)!=SCI_FIGURE)
 +            {
 +                Scierror(999, "%s: Input argument #%d must be a handle on a figure.\n", fname, 1);
 +                return 0;
 +            }
 +            endFigureDataReading(figurePtr);
 +        }
 +
 +        /* get file name */
 +        GetRhsVar(2,MATRIX_OF_STRING_DATATYPE,&m1,&n1,&fileName);
 +        if (m1*n1 == 1)
 +        {
 +            if (Rhs == 3)
 +            {
 +                int nbCol = 0;
 +                int nbRow = 0;
 +
 +                if (isVectorialExport(fileType))
 +                {
 +
 +                    char **sciOrientation = NULL;
 +
 +                    if (GetType(3) != sci_strings)
 +                    {
 +                        freeArrayOfString(fileName,m1*n1);
 +                        Scierror(999,_("%s: Wrong type for input argument #%d: Single character string expected.\n"),fname, 3);
 +                        return 0;
 +                    }
 +
 +                    GetRhsVar(3,MATRIX_OF_STRING_DATATYPE,&nbRow,&nbCol,&sciOrientation);
 +                    if (nbRow*nbCol == 1)
 +                    {
 +                        /* Value should be 'landscape' or 'portrait' but check only the first character */
 +                        /* for compatibility with Scilab 4*/
 +                        if (strcmp(sciOrientation[0], "landscape") == 0 || strcmp(sciOrientation[0], "l") == 0)
 +                        {
 +                            freeArrayOfString(sciOrientation,nbRow*nbCol);
 +                            orientation = EXPORT_LANDSCAPE;
 +                        }
 +                        else if(strcmp(sciOrientation[0], "portrait") == 0 || strcmp(sciOrientation[0], "p") == 0)
 +                        {
 +                            freeArrayOfString(sciOrientation,nbRow*nbCol);
 +                            orientation = EXPORT_PORTRAIT;
 +                        }
 +                        else
 +                        {
 +                            freeArrayOfString(fileName,m1*n1);
 +                            freeArrayOfString(sciOrientation,nbRow*nbCol);
 +                            Scierror(999,_("%s: Wrong value for input argument #%d: '%s' or '%s' expected.\n"),fname, 3, "portrait", "landscape");
 +                            return 0;
 +                        }
 +                    }
 +                    else
 +                    {
 +                        freeArrayOfString(fileName,m1*n1);
 +                        freeArrayOfString(sciOrientation,nbRow*nbCol);
 +                        Scierror(999,_("%s: Wrong size for input argument #%d: Single character string expected.\n"),fname, 3);
 +                        return 0;
 +                    }
 +                }
 +                else
 +                {
 +                    int quality = 0;
 +                    GetRhsVar(3, MATRIX_OF_DOUBLE_DATATYPE, &nbRow, &nbCol, &quality);
 +                    if (nbRow != 1 || nbCol != 1 || *stk(quality) < 0 || *stk(quality) > 1)
 +                    {
 +                        freeArrayOfString(fileName, m1 * n1);
 +                        Scierror(999,_("%s: Wrong type for input argument #%d: A real between 0 and 1 expected.\n"),fname, 3);
 +                        return 0;
 +                    }
 +                    jpegCompressionQuality = (float) *stk(quality);
 +                }
 +            }
 +
 +            /* Replaces SCI, ~, HOME, TMPDIR by the real path */
 +            real_filename = expandPathVariable(fileName[0]);
 +
 +            /* Call the function for exporting file */
 +            status = exportToFile(figurePtr, real_filename, fileType, jpegCompressionQuality, orientation);
 +
 +            /* free pointers no more used */
 +            if (real_filename)
 +            {
 +                FREE(real_filename);
 +                real_filename = NULL;
 +            }
 +            freeArrayOfString(fileName,m1*n1);
 +
 +            /* treat errors */
 +            if (strlen(status) != 0)
 +            {
 +                Scierror(999,_("%s: %s\n"), fname, status);
 +                return 0;
 +            }
 +        }
 +        else
 +        {
 +            freeArrayOfString(fileName,m1*n1);
 +            Scierror(999,_("%s: Wrong size for input argument #%d: Single character string expected.\n"),fname, 2);
 +            return 0;
 +        }
      }
 -  else
 +    else
      {
 -      Scierror(999,_("%s: Wrong type for input argument #%d: Single character string expected.\n"),fname, 2);
 -      return 0;
 +        Scierror(999,_("%s: Wrong type for input argument #%d: Single character string expected.\n"),fname, 2);
 +        return 0;
      }
  
 -  LhsVar(1) = 0;
 -  PutLhsVar();
 -  return 0;
 +    LhsVar(1) = 0;
 +    PutLhsVar();
 +#endif
 +    return 0;
  }
  /*--------------------------------------------------------------------------*/
  static BOOL isVectorialExport(ExportFileType fileType)
index c6d6286,0000000..fece914
mode 100644,000000..100644
--- /dev/null
@@@ -1,1590 -1,0 +1,1591 @@@
- # Makefile.in generated by automake 1.11.2 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
 +# @configure_input@
 +
 +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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) DIGITEO - 2010 - Allan CORNET
 +#
 +# This file must be used under the terms of the CeCILL.
 +# This source file is licensed as described in the file COPYING, which
 +# you should have received as part of this distribution.  The terms
 +# are also available at
 +# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
 +#
 +
 +# 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-en.txt
 +#
 +
 +##########
 +### Makefile included stuff
 +### Target, variable, suffixes which are supposed to be usefull in every makefile.am
 +##########
 +
 +
 +VPATH = @srcdir@
 +pkgdatadir = $(datadir)/@PACKAGE@
 +pkgincludedir = $(includedir)/@PACKAGE@
 +pkglibdir = $(libdir)/@PACKAGE@
 +pkglibexecdir = $(libexecdir)/@PACKAGE@
 +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 +install_sh_DATA = $(install_sh) -c -m 644
 +install_sh_PROGRAM = $(install_sh) -c
 +install_sh_SCRIPT = $(install_sh) -c
 +INSTALL_HEADER = $(INSTALL_DATA)
 +transform = $(program_transform_name)
 +NORMAL_INSTALL = :
 +PRE_INSTALL = :
 +POST_INSTALL = :
 +NORMAL_UNINSTALL = :
 +PRE_UNINSTALL = :
 +POST_UNINSTALL = :
 +build_triplet = @build@
 +host_triplet = @host@
 +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 +      $(top_srcdir)/Makefile.incl.am
 +@NEED_JAVA_TRUE@am__append_1 = java
 +@GIWS_TRUE@am__append_2 = giws
 +@GUI_TRUE@am__append_3 = libscigraphic_objects.la
 +@SWIG_TRUE@am__append_4 = swig
 +subdir = modules/graphic_objects
 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 +am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
 +      $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
 +      $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
 +      $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
 +      $(top_srcdir)/m4/intel_compiler.m4 \
 +      $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
 +      $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
 +      $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
 +      $(top_srcdir)/m4/libxml2.m4 $(top_srcdir)/m4/ltoptions.m4 \
 +      $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
 +      $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
 +      $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
 +      $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/relocatable.m4 \
 +      $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
 +      $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
 +      $(top_srcdir)/configure.ac
 +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 +      $(ACLOCAL_M4)
 +mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
 +CONFIG_HEADER = $(top_builddir)/modules/core/includes/machine.h
 +CONFIG_CLEAN_FILES =
 +CONFIG_CLEAN_VPATH_FILES =
 +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)$(libscigraphic_objects_la_etcdir)" \
 +      "$(DESTDIR)$(libscigraphic_objects_la_rootdir)" \
 +      "$(DESTDIR)$(libscigraphic_objects_la_sci_gatewaydir)"
 +LTLIBRARIES = $(pkglib_LTLIBRARIES)
 +libscigraphic_objects_disable_la_LIBADD =
 +am__objects_1 = libscigraphic_objects_disable_la-nographic_objects.lo
 +am_libscigraphic_objects_disable_la_OBJECTS = $(am__objects_1)
 +libscigraphic_objects_disable_la_OBJECTS =  \
 +      $(am_libscigraphic_objects_disable_la_OBJECTS)
 +libscigraphic_objects_disable_la_LINK = $(LIBTOOL) --tag=CC \
 +      $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 +      $(libscigraphic_objects_disable_la_CFLAGS) $(CFLAGS) \
 +      $(libscigraphic_objects_disable_la_LDFLAGS) $(LDFLAGS) -o $@
 +libscigraphic_objects_la_DEPENDENCIES =  \
 +      $(top_builddir)/libs/MALLOC/libscimalloc.la \
 +      $(top_builddir)/modules/output_stream/libscioutput_stream.la
 +am__objects_2 = libscigraphic_objects_la-DataLoader_wrap.lo \
 +      libscigraphic_objects_la-ScilabNativeView_wrap.lo
 +am__objects_3 = libscigraphic_objects_la-CallGraphicController.lo
 +am__objects_4 = libscigraphic_objects_la-gw_graphic_objects.lo
 +am__objects_5 = libscigraphic_objects_la-sci_graphicfunction.lo
 +am__objects_6 = libscigraphic_objects_la-createGraphicObject.lo \
 +      libscigraphic_objects_la-getGraphicObjectProperty.lo \
 +      libscigraphic_objects_la-getConsoleIdentifier.lo \
 +      libscigraphic_objects_la-setGraphicObjectProperty.lo \
 +      libscigraphic_objects_la-deleteGraphicObject.lo \
 +      libscigraphic_objects_la-dataModel.lo \
 +      libscigraphic_objects_la-Data3D.lo \
 +      libscigraphic_objects_la-DataLoader.lo \
 +      libscigraphic_objects_la-NgonData.lo \
 +      libscigraphic_objects_la-NgonGeneralData.lo \
 +      libscigraphic_objects_la-NgonGridData.lo \
 +      libscigraphic_objects_la-NgonGridMatplotData.lo \
 +      libscigraphic_objects_la-NgonPolylineData.lo \
 +      libscigraphic_objects_la-TriangleMeshData.lo \
 +      libscigraphic_objects_la-TriangleMeshFecData.lo \
 +      libscigraphic_objects_la-ColorComputer.lo \
 +      libscigraphic_objects_la-DecompositionUtils.lo \
 +      libscigraphic_objects_la-Fac3DColorComputer.lo \
 +      libscigraphic_objects_la-Fac3DDecomposer.lo \
 +      libscigraphic_objects_la-NgonGridDataDecomposer.lo \
 +      libscigraphic_objects_la-NgonGridGrayplotDataDecomposer.lo \
 +      libscigraphic_objects_la-MatPlotDecomposer.lo \
 +      libscigraphic_objects_la-NgonGridMatplotDataDecomposer.lo \
 +      libscigraphic_objects_la-Plot3DDecomposer.lo \
 +      libscigraphic_objects_la-PolylineDecomposer.lo \
 +      libscigraphic_objects_la-TriangleMeshFecDataDecomposer.lo \
 +      libscigraphic_objects_la-Triangulator.lo \
 +      libscigraphic_objects_la-ScilabView.lo \
 +      libscigraphic_objects_la-FigureList.lo \
 +      libscigraphic_objects_la-HandleManagement.lo \
 +      libscigraphic_objects_la-AxesModel.lo \
 +      libscigraphic_objects_la-FigureModel.lo \
 +      libscigraphic_objects_la-CurrentFigure.lo \
 +      libscigraphic_objects_la-CurrentObject.lo \
 +      libscigraphic_objects_la-CurrentSubwin.lo
 +am_libscigraphic_objects_la_OBJECTS = $(am__objects_2) \
 +      $(am__objects_3) $(am__objects_4) $(am__objects_5) \
 +      $(am__objects_6)
 +libscigraphic_objects_la_OBJECTS =  \
 +      $(am_libscigraphic_objects_la_OBJECTS)
 +libscigraphic_objects_la_LINK = $(LIBTOOL) --tag=CXX \
 +      $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
 +      $(AM_CXXFLAGS) $(CXXFLAGS) $(libscigraphic_objects_la_LDFLAGS) \
 +      $(LDFLAGS) -o $@
 +@GUI_TRUE@am_libscigraphic_objects_la_rpath = -rpath $(pkglibdir)
 +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
 +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 +      $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 +LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 +      --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 +      $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 +CCLD = $(CC)
 +LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 +      --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 +      $(LDFLAGS) -o $@
 +CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 +      $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 +LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 +      --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 +      $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 +CXXLD = $(CXX)
 +CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 +      --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
 +      $(LDFLAGS) -o $@
 +SOURCES = $(libscigraphic_objects_disable_la_SOURCES) \
 +      $(libscigraphic_objects_la_SOURCES)
 +DIST_SOURCES = $(libscigraphic_objects_disable_la_SOURCES) \
 +      $(libscigraphic_objects_la_SOURCES)
 +DATA = $(libscigraphic_objects_la_etc_DATA) \
 +      $(libscigraphic_objects_la_root_DATA) \
 +      $(libscigraphic_objects_la_sci_gateway_DATA)
 +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@
 +ANT = @ANT@
 +ANTLR = @ANTLR@
 +AR = @AR@
 +ARPACK_LIBS = @ARPACK_LIBS@
 +AUTOCONF = @AUTOCONF@
 +AUTOHEADER = @AUTOHEADER@
 +AUTOMAKE = @AUTOMAKE@
 +AVALON_FRAMEWORK = @AVALON_FRAMEWORK@
 +AWK = @AWK@
 +BATIK = @BATIK@
 +BLAS_LIBS = @BLAS_LIBS@
 +BSH = @BSH@
 +CC = @CC@
 +CCACHE = @CCACHE@
 +CCDEPMODE = @CCDEPMODE@
 +CFLAGS = @CFLAGS@
 +CHECKSTYLE = @CHECKSTYLE@
 +COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
 +COMMONS_IO = @COMMONS_IO@
 +COMMONS_LOGGING = @COMMONS_LOGGING@
 +CPP = @CPP@
 +CPPFLAGS = @CPPFLAGS@
 +CXX = @CXX@
 +CXXCPP = @CXXCPP@
 +CXXDEPMODE = @CXXDEPMODE@
 +CXXFLAGS = @CXXFLAGS@
 +CYGPATH_W = @CYGPATH_W@
 +DEFS = @DEFS@
 +DEMOTOOLS_ENABLE = @DEMOTOOLS_ENABLE@
 +DEPDIR = @DEPDIR@
 +DOCBOOK_ROOT = @DOCBOOK_ROOT@
 +DSYMUTIL = @DSYMUTIL@
 +DUMPBIN = @DUMPBIN@
 +ECHO_C = @ECHO_C@
 +ECHO_N = @ECHO_N@
 +ECHO_T = @ECHO_T@
 +EGREP = @EGREP@
 +EXEEXT = @EXEEXT@
 +F77 = @F77@
 +FFLAGS = @FFLAGS@
 +FFTW3_LIB = @FFTW3_LIB@
 +FFTW_ENABLE = @FFTW_ENABLE@
 +FGREP = @FGREP@
 +FLEXDOCK = @FLEXDOCK@
 +FLIBS = @FLIBS@
 +FOP = @FOP@
 +GENHTML = @GENHTML@
 +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 +GIWS_BIN = @GIWS_BIN@
 +GLUEGEN_RT = @GLUEGEN_RT@
 +GMSGFMT = @GMSGFMT@
 +GMSGFMT_015 = @GMSGFMT_015@
 +GRAPHICS_ENABLE = @GRAPHICS_ENABLE@
 +GREP = @GREP@
 +GUI_ENABLE = @GUI_ENABLE@
 +HDF5_CFLAGS = @HDF5_CFLAGS@
 +HDF5_ENABLE = @HDF5_ENABLE@
 +HDF5_LIBS = @HDF5_LIBS@
 +HELP_ENABLE = @HELP_ENABLE@
 +INSTALL = @INSTALL@
 +INSTALL_DATA = @INSTALL_DATA@
 +INSTALL_PROGRAM = @INSTALL_PROGRAM@
 +INSTALL_SCRIPT = @INSTALL_SCRIPT@
 +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 +INTLLIBS = @INTLLIBS@
 +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 +JAR = @JAR@
 +JAVA = @JAVA@
 +JAVAC = @JAVAC@
 +JAVAC_DEBUG = @JAVAC_DEBUG@
 +JAVADOC = @JAVADOC@
 +JAVAH = @JAVAH@
 +JAVASCI_ENABLE = @JAVASCI_ENABLE@
 +JAVA_ENABLE = @JAVA_ENABLE@
 +JAVA_G = @JAVA_G@
 +JAVA_HOME = @JAVA_HOME@
 +JAVA_JNI_INCLUDE = @JAVA_JNI_INCLUDE@
 +JAVA_JNI_LIBS = @JAVA_JNI_LIBS@
 +JCOMMANDER = @JCOMMANDER@
 +JDB = @JDB@
 +JEUCLID_CORE = @JEUCLID_CORE@
 +JGRAPHX = @JGRAPHX@
 +JHALL = @JHALL@
 +JHDF5 = @JHDF5@
 +JLATEXMATH = @JLATEXMATH@
 +JLATEXMATH_FOP = @JLATEXMATH_FOP@
 +JOGL = @JOGL@
 +JROSETTA_API = @JROSETTA_API@
 +JROSETTA_ENGINE = @JROSETTA_ENGINE@
 +JUNIT = @JUNIT@
 +LAPACK_LIBS = @LAPACK_LIBS@
 +LCOV = @LCOV@
 +LD = @LD@
 +LDFLAGS = @LDFLAGS@
 +LIBICONV = @LIBICONV@
 +LIBINTL = @LIBINTL@
 +LIBM = @LIBM@
 +LIBOBJS = @LIBOBJS@
 +LIBS = @LIBS@
 +LIBTOOL = @LIBTOOL@
 +LIPO = @LIPO@
 +LN_S = @LN_S@
 +LOGGING_LEVEL = @LOGGING_LEVEL@
 +LOOKS = @LOOKS@
 +LTLIBICONV = @LTLIBICONV@
 +LTLIBINTL = @LTLIBINTL@
 +LTLIBOBJS = @LTLIBOBJS@
 +MAINT = @MAINT@
 +MAKEINFO = @MAKEINFO@
 +MATIO_CFLAGS = @MATIO_CFLAGS@
 +MATIO_ENABLE = @MATIO_ENABLE@
 +MATIO_LIBS = @MATIO_LIBS@
 +MKDIR_P = @MKDIR_P@
 +MSGCAT = @MSGCAT@
 +MSGFMT = @MSGFMT@
 +MSGFMT_015 = @MSGFMT_015@
 +MSGMERGE = @MSGMERGE@
 +NM = @NM@
 +NMEDIT = @NMEDIT@
 +OBJDUMP = @OBJDUMP@
 +OBJEXT = @OBJEXT@
 +OCAMLC = @OCAMLC@
 +OCAMLDEP = @OCAMLDEP@
 +OCAMLLEX = @OCAMLLEX@
 +OCAMLOPT = @OCAMLOPT@
 +OCAMLYACC = @OCAMLYACC@
 +OPENMP_CFLAGS = @OPENMP_CFLAGS@
 +OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
 +OPENMP_ENABLE = @OPENMP_ENABLE@
 +OPENMP_LIBS = @OPENMP_LIBS@
 +OTOOL = @OTOOL@
 +OTOOL64 = @OTOOL64@
 +PACKAGE = @PACKAGE@
 +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 +PACKAGE_NAME = @PACKAGE_NAME@
 +PACKAGE_STRING = @PACKAGE_STRING@
 +PACKAGE_TARNAME = @PACKAGE_TARNAME@
 +PACKAGE_URL = @PACKAGE_URL@
 +PACKAGE_VERSION = @PACKAGE_VERSION@
 +PATH_SEPARATOR = @PATH_SEPARATOR@
 +PCRE_CFLAGS = @PCRE_CFLAGS@
 +PCRE_CONFIG = @PCRE_CONFIG@
 +PCRE_LIBS = @PCRE_LIBS@
 +PCRE_VERSION = @PCRE_VERSION@
 +PKG_CONFIG = @PKG_CONFIG@
 +POSUB = @POSUB@
 +POW_LIB = @POW_LIB@
 +PYTHON = @PYTHON@
 +QDOX = @QDOX@
 +RANLIB = @RANLIB@
 +RELOCATABLE = @RELOCATABLE@
 +RT_LIB = @RT_LIB@
 +SAXON = @SAXON@
 +SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@
 +SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@
 +SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@
 +SCILAB_VERSION_MAJOR = @SCILAB_VERSION_MAJOR@
 +SCILAB_VERSION_MINOR = @SCILAB_VERSION_MINOR@
 +SCIRENDERER = @SCIRENDERER@
 +SED = @SED@
 +SET_MAKE = @SET_MAKE@
 +SET_RELOCATABLE = @SET_RELOCATABLE@
 +SHELL = @SHELL@
 +SKINLF = @SKINLF@
 +SPLINT = @SPLINT@
 +STRIP = @STRIP@
 +SWIG_BIN = @SWIG_BIN@
 +SWIG_JAVA = @SWIG_JAVA@
 +SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@
 +TCLTK_LIBS = @TCLTK_LIBS@
 +TCL_INC_PATH = @TCL_INC_PATH@
 +TESTNG = @TESTNG@
 +TK_INC_PATH = @TK_INC_PATH@
 +UMFPACK_ENABLE = @UMFPACK_ENABLE@
 +UMFPACK_LIB = @UMFPACK_LIB@
 +USE_NLS = @USE_NLS@
 +VERSION = @VERSION@
 +WITH_OCAML = @WITH_OCAML@
 +WITH_TKSCI = @WITH_TKSCI@
 +XCOS_ENABLE = @XCOS_ENABLE@
 +XGETTEXT = @XGETTEXT@
 +XGETTEXT_015 = @XGETTEXT_015@
 +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 +XMKMF = @XMKMF@
 +XMLGRAPHICS_COMMONS = @XMLGRAPHICS_COMMONS@
 +XML_APIS_EXT = @XML_APIS_EXT@
 +XML_CONFIG = @XML_CONFIG@
 +XML_FLAGS = @XML_FLAGS@
 +XML_LIBS = @XML_LIBS@
 +XML_VERSION = @XML_VERSION@
 +X_CFLAGS = @X_CFLAGS@
 +X_EXTRA_LIBS = @X_EXTRA_LIBS@
 +X_LIBS = @X_LIBS@
 +X_PRE_LIBS = @X_PRE_LIBS@
 +abs_builddir = @abs_builddir@
 +abs_srcdir = @abs_srcdir@
 +abs_top_builddir = @abs_top_builddir@
 +abs_top_srcdir = @abs_top_srcdir@
 +ac_ct_CC = @ac_ct_CC@
 +ac_ct_CXX = @ac_ct_CXX@
 +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 +ac_ct_F77 = @ac_ct_F77@
 +am__include = @am__include@
 +am__leading_dot = @am__leading_dot@
 +am__quote = @am__quote@
 +am__tar = @am__tar@
 +am__untar = @am__untar@
 +bindir = @bindir@
 +build = @build@
 +build_alias = @build_alias@
 +build_cpu = @build_cpu@
 +build_os = @build_os@
 +build_vendor = @build_vendor@
 +builddir = @builddir@
 +cxx_present = @cxx_present@
 +datadir = @datadir@
 +datarootdir = @datarootdir@
 +docdir = @docdir@
 +dvidir = @dvidir@
 +exec_prefix = @exec_prefix@
 +host = @host@
 +host_alias = @host_alias@
 +host_cpu = @host_cpu@
 +host_os = @host_os@
 +host_vendor = @host_vendor@
 +htmldir = @htmldir@
 +includedir = @includedir@
 +infodir = @infodir@
 +install_sh = @install_sh@
 +libdir = @libdir@
 +libexecdir = @libexecdir@
 +localedir = @localedir@
 +localstatedir = @localstatedir@
 +mandir = @mandir@
 +mkdir_p = @mkdir_p@
 +oldincludedir = @oldincludedir@
 +pdfdir = @pdfdir@
 +prefix = @prefix@
 +program_transform_name = @program_transform_name@
 +psdir = @psdir@
 +sbindir = @sbindir@
 +sharedstatedir = @sharedstatedir@
 +srcdir = @srcdir@
 +sysconfdir = @sysconfdir@
 +target_alias = @target_alias@
 +top_build_prefix = @top_build_prefix@
 +top_builddir = @top_builddir@
 +top_srcdir = @top_srcdir@
 +
 +#### Target ######
 +modulename = graphic_objects
 +
 +#### graphic_objects : Conf files ####
 +libscigraphic_objects_la_rootdir = $(mydatadir)
 +libscigraphic_objects_la_root_DATA = changelog.txt license.txt readme.txt version.xml
 +
 +#### graphic_objects : init scripts ####
 +libscigraphic_objects_la_etcdir = $(mydatadir)/etc
 +libscigraphic_objects_la_etc_DATA = etc/graphic_objects.quit \
 +                              etc/graphic_objects.start
 +
 +
 +# Where all the Scilab stuff is installed (macros, help, ...)
 +mydatadir = $(pkgdatadir)/modules/$(modulename)
 +
 +# 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
 +BUILT_SOURCES = includes/graphicObjectsProperties.h $(am__append_2) \
 +      $(am__append_4)
 +#This file is also generated, but can not be listed to prevent GCJ call.
 +#src/java/org/scilab/modules/graphic_objects/graphicObject/GraphicObjectProperties.java
 +GRAPHIC_OBJECTS_JNI_SOURCES = src/jni/CallGraphicController.cpp
 +GRAPHIC_OBJECTS_C_SOURCES = src/jni/DataLoader_wrap.c \
 +                                                      src/jni/ScilabNativeView_wrap.c
 +
 +GRAPHIC_OBJECTS_CPP_SOURCES = src/cpp/createGraphicObject.cpp \
 +                                                              src/cpp/getGraphicObjectProperty.cpp \
 +                                                              src/cpp/getConsoleIdentifier.cpp \
 +                                                              src/cpp/setGraphicObjectProperty.cpp \
 +                                                              src/cpp/deleteGraphicObject.cpp \
 +                                                              src/cpp/dataModel.cpp \
 +                                                              src/cpp/Data3D.cpp \
 +                                                              src/cpp/DataLoader.cpp \
 +                                                              src/cpp/NgonData.cpp \
 +                                                              src/cpp/NgonGeneralData.cpp \
 +                                                              src/cpp/NgonGridData.cpp \
 +                                                              src/cpp/NgonGridMatplotData.cpp \
 +                                                              src/cpp/NgonPolylineData.cpp \
 +                                                              src/cpp/TriangleMeshData.cpp \
 +                                                              src/cpp/TriangleMeshFecData.cpp \
 +                                                              src/cpp/ColorComputer.cpp \
 +                                                              src/cpp/DecompositionUtils.cpp \
 +                                                              src/cpp/Fac3DColorComputer.cpp \
 +                                                              src/cpp/Fac3DDecomposer.cpp \
 +                                                              src/cpp/NgonGridDataDecomposer.cpp \
 +                                                              src/cpp/NgonGridGrayplotDataDecomposer.cpp \
 +                                                              src/cpp/MatPlotDecomposer.cpp \
 +                                                              src/cpp/NgonGridMatplotDataDecomposer.cpp \
 +                                                              src/cpp/Plot3DDecomposer.cpp \
 +                                                              src/cpp/PolylineDecomposer.cpp \
 +                                                              src/cpp/TriangleMeshFecDataDecomposer.cpp \
 +                                                              src/cpp/Triangulator.cpp \
 +                                                              src/cpp/ScilabView.cpp \
 +                                                              src/cpp/FigureList.cpp \
 +                                                              src/cpp/HandleManagement.cpp \
 +                                                              src/cpp/AxesModel.cpp \
 +                                                              src/cpp/FigureModel.cpp \
 +                                                              src/cpp/CurrentFigure.cpp \
 +                                                              src/cpp/CurrentObject.cpp \
 +                                                              src/cpp/CurrentSubwin.cpp
 +
 +GIWS_WRAPPERS = src/jni/graphic_objects.giws.xml
 +GATEWAY_C_SOURCES = sci_gateway/c/gw_graphic_objects.c
 +GATEWAY_CPP_SOURCES = sci_gateway/cpp/sci_graphicfunction.cpp
 +libscigraphic_objects_la_CFLAGS = $(JAVA_JNI_INCLUDE) \
 +                      -I$(top_srcdir)/libs/MALLOC/includes/ \
 +                      -I$(top_srcdir)/modules/jvm/includes/ \
 +                      -I$(top_srcdir)/modules/output_stream/includes \
 +                      -I$(top_srcdir)/modules/localization/includes \
 +                      -I$(top_srcdir)/modules/api_scilab/includes \
 +                      -I$(top_srcdir)/modules/core/includes
 +
 +libscigraphic_objects_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \
 +                      -I$(srcdir)/includes/ \
 +                      -I$(srcdir)/src/cpp/ \
 +                      -I$(srcdir)/src/c/ \
 +                      -I$(srcdir)/src/jni/ \
 +                      -I$(top_srcdir)/modules/jvm/includes/ \
 +                      -I$(top_srcdir)/modules/output_stream/includes \
 +                      -I$(top_srcdir)/modules/localization/includes \
 +                      -I$(top_srcdir)/modules/api_scilab/includes \
 +                      -I$(top_srcdir)/modules/commons/src/jni
 +
 +
 +# Without the graphic_objects module
 +libscigraphic_objects_disable_la_CFLAGS = -Iincludes/ \
 +                      -I$(top_srcdir)/modules/output_stream/includes
 +
 +GRAPHIC_OBJECTS_DISABLE_C_SOURCES = src/nographic_objects/nographic_objects.c
 +libscigraphic_objects_disable_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION) $(LD_FLAGS)
 +libscigraphic_objects_disable_la_SOURCES = $(GRAPHIC_OBJECTS_DISABLE_C_SOURCES)
 +pkglib_LTLIBRARIES = libscigraphic_objects-disable.la $(am__append_3)
 +libscigraphic_objects_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION) $(LD_FLAGS) $(X_LIBS) $(X_EXTRA_LIBS)
 +libscigraphic_objects_la_SOURCES = $(GRAPHIC_OBJECTS_GEN_SOURCES) $(GRAPHIC_OBJECTS_C_SOURCES) $(GRAPHIC_OBJECTS_JNI_SOURCES) $(GATEWAY_C_SOURCES) $(GATEWAY_CPP_SOURCES) $(GRAPHIC_OBJECTS_CPP_SOURCES)
 +
 +# For the code check (splint)
 +CHECK_SRC = $(GRAPHIC_OBJECTS_C_SOURCES) $(GATEWAY_C_SOURCES)
 +INCLUDE_FLAGS = $(libscigraphic_objects_la_CFLAGS)
 +
 +#### SWIG Declaration ####
 +SWIG_WRAPPERS = src/jni/DataLoader.i \
 +                              src/jni/ScilabNativeView.i
 +
 +libscigraphic_objects_la_LIBADD = $(top_builddir)/libs/MALLOC/libscimalloc.la \
 +$(top_builddir)/modules/output_stream/libscioutput_stream.la
 +
 +
 +#### graphic_objects : gateway declaration ####
 +libscigraphic_objects_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 +libscigraphic_objects_la_sci_gateway_DATA = sci_gateway/graphic_objects_gateway.xml
 +@GUI_TRUE@USEANT = 1
 +all: $(BUILT_SOURCES)
 +      $(MAKE) $(AM_MAKEFLAGS) all-am
 +
 +.SUFFIXES:
 +.SUFFIXES: .sci .bin .c .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/graphic_objects/Makefile'; \
 +      $(am__cd) $(top_srcdir) && \
 +        $(AUTOMAKE) --foreign modules/graphic_objects/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)
 +      test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)"
 +      @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
 +      list2=; for p in $$list; do \
 +        if test -f $$p; then \
 +          list2="$$list2 $$p"; \
 +        else :; fi; \
 +      done; \
 +      test -z "$$list2" || { \
 +        echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \
 +        $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \
 +      }
 +
 +uninstall-pkglibLTLIBRARIES:
 +      @$(NORMAL_UNINSTALL)
 +      @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
 +      for p in $$list; do \
 +        $(am__strip_dir) \
 +        echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \
 +        $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \
 +      done
 +
 +clean-pkglibLTLIBRARIES:
 +      -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
 +      @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
 +        dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
 +        test "$$dir" != "$$p" || dir=.; \
 +        echo "rm -f \"$${dir}/so_locations\""; \
 +        rm -f "$${dir}/so_locations"; \
 +      done
- libscigraphic_objects-disable.la: $(libscigraphic_objects_disable_la_OBJECTS) $(libscigraphic_objects_disable_la_DEPENDENCIES) 
++libscigraphic_objects-disable.la: $(libscigraphic_objects_disable_la_OBJECTS) $(libscigraphic_objects_disable_la_DEPENDENCIES) $(EXTRA_libscigraphic_objects_disable_la_DEPENDENCIES) 
 +      $(libscigraphic_objects_disable_la_LINK) -rpath $(pkglibdir) $(libscigraphic_objects_disable_la_OBJECTS) $(libscigraphic_objects_disable_la_LIBADD) $(LIBS)
- libscigraphic_objects.la: $(libscigraphic_objects_la_OBJECTS) $(libscigraphic_objects_la_DEPENDENCIES) 
++libscigraphic_objects.la: $(libscigraphic_objects_la_OBJECTS) $(libscigraphic_objects_la_DEPENDENCIES) $(EXTRA_libscigraphic_objects_la_DEPENDENCIES) 
 +      $(libscigraphic_objects_la_LINK) $(am_libscigraphic_objects_la_rpath) $(libscigraphic_objects_la_OBJECTS) $(libscigraphic_objects_la_LIBADD) $(LIBS)
 +
 +mostlyclean-compile:
 +      -rm -f *.$(OBJEXT)
 +
 +distclean-compile:
 +      -rm -f *.tab.c
 +
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_disable_la-nographic_objects.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-AxesModel.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-CallGraphicController.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-ColorComputer.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-CurrentFigure.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-CurrentObject.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-CurrentSubwin.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-Data3D.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-DataLoader.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-DataLoader_wrap.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-DecompositionUtils.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-Fac3DColorComputer.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-Fac3DDecomposer.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-FigureList.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-FigureModel.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-HandleManagement.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-MatPlotDecomposer.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-NgonData.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-NgonGeneralData.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-NgonGridData.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-NgonGridDataDecomposer.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-NgonGridGrayplotDataDecomposer.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-NgonGridMatplotData.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-NgonGridMatplotDataDecomposer.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-NgonPolylineData.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-Plot3DDecomposer.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-PolylineDecomposer.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-ScilabNativeView_wrap.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-ScilabView.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-TriangleMeshData.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-TriangleMeshFecData.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-TriangleMeshFecDataDecomposer.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-Triangulator.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-createGraphicObject.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-dataModel.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-deleteGraphicObject.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-getConsoleIdentifier.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-getGraphicObjectProperty.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-gw_graphic_objects.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-sci_graphicfunction.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscigraphic_objects_la-setGraphicObjectProperty.Plo@am__quote@
 +
 +.c.o:
 +@am__fastdepCC_TRUE@  $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 +@am__fastdepCC_TRUE@  $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCC_FALSE@ $(COMPILE) -c $<
 +
 +.c.obj:
 +@am__fastdepCC_TRUE@  $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 +@am__fastdepCC_TRUE@  $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
 +
 +.c.lo:
 +@am__fastdepCC_TRUE@  $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 +@am__fastdepCC_TRUE@  $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
 +
 +libscigraphic_objects_disable_la-nographic_objects.lo: src/nographic_objects/nographic_objects.c
 +@am__fastdepCC_TRUE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscigraphic_objects_disable_la_CFLAGS) $(CFLAGS) -MT libscigraphic_objects_disable_la-nographic_objects.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_disable_la-nographic_objects.Tpo -c -o libscigraphic_objects_disable_la-nographic_objects.lo `test -f 'src/nographic_objects/nographic_objects.c' || echo '$(srcdir)/'`src/nographic_objects/nographic_objects.c
 +@am__fastdepCC_TRUE@  $(am__mv) $(DEPDIR)/libscigraphic_objects_disable_la-nographic_objects.Tpo $(DEPDIR)/libscigraphic_objects_disable_la-nographic_objects.Plo
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     source='src/nographic_objects/nographic_objects.c' object='libscigraphic_objects_disable_la-nographic_objects.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCC_FALSE@ $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscigraphic_objects_disable_la_CFLAGS) $(CFLAGS) -c -o libscigraphic_objects_disable_la-nographic_objects.lo `test -f 'src/nographic_objects/nographic_objects.c' || echo '$(srcdir)/'`src/nographic_objects/nographic_objects.c
 +
 +libscigraphic_objects_la-DataLoader_wrap.lo: src/jni/DataLoader_wrap.c
 +@am__fastdepCC_TRUE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(libscigraphic_objects_la_CFLAGS) $(CFLAGS) -MT libscigraphic_objects_la-DataLoader_wrap.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-DataLoader_wrap.Tpo -c -o libscigraphic_objects_la-DataLoader_wrap.lo `test -f 'src/jni/DataLoader_wrap.c' || echo '$(srcdir)/'`src/jni/DataLoader_wrap.c
 +@am__fastdepCC_TRUE@  $(am__mv) $(DEPDIR)/libscigraphic_objects_la-DataLoader_wrap.Tpo $(DEPDIR)/libscigraphic_objects_la-DataLoader_wrap.Plo
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     source='src/jni/DataLoader_wrap.c' object='libscigraphic_objects_la-DataLoader_wrap.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCC_FALSE@ $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(libscigraphic_objects_la_CFLAGS) $(CFLAGS) -c -o libscigraphic_objects_la-DataLoader_wrap.lo `test -f 'src/jni/DataLoader_wrap.c' || echo '$(srcdir)/'`src/jni/DataLoader_wrap.c
 +
 +libscigraphic_objects_la-ScilabNativeView_wrap.lo: src/jni/ScilabNativeView_wrap.c
 +@am__fastdepCC_TRUE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(libscigraphic_objects_la_CFLAGS) $(CFLAGS) -MT libscigraphic_objects_la-ScilabNativeView_wrap.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-ScilabNativeView_wrap.Tpo -c -o libscigraphic_objects_la-ScilabNativeView_wrap.lo `test -f 'src/jni/ScilabNativeView_wrap.c' || echo '$(srcdir)/'`src/jni/ScilabNativeView_wrap.c
 +@am__fastdepCC_TRUE@  $(am__mv) $(DEPDIR)/libscigraphic_objects_la-ScilabNativeView_wrap.Tpo $(DEPDIR)/libscigraphic_objects_la-ScilabNativeView_wrap.Plo
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     source='src/jni/ScilabNativeView_wrap.c' object='libscigraphic_objects_la-ScilabNativeView_wrap.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCC_FALSE@ $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(libscigraphic_objects_la_CFLAGS) $(CFLAGS) -c -o libscigraphic_objects_la-ScilabNativeView_wrap.lo `test -f 'src/jni/ScilabNativeView_wrap.c' || echo '$(srcdir)/'`src/jni/ScilabNativeView_wrap.c
 +
 +libscigraphic_objects_la-gw_graphic_objects.lo: sci_gateway/c/gw_graphic_objects.c
 +@am__fastdepCC_TRUE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(libscigraphic_objects_la_CFLAGS) $(CFLAGS) -MT libscigraphic_objects_la-gw_graphic_objects.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-gw_graphic_objects.Tpo -c -o libscigraphic_objects_la-gw_graphic_objects.lo `test -f 'sci_gateway/c/gw_graphic_objects.c' || echo '$(srcdir)/'`sci_gateway/c/gw_graphic_objects.c
 +@am__fastdepCC_TRUE@  $(am__mv) $(DEPDIR)/libscigraphic_objects_la-gw_graphic_objects.Tpo $(DEPDIR)/libscigraphic_objects_la-gw_graphic_objects.Plo
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     source='sci_gateway/c/gw_graphic_objects.c' object='libscigraphic_objects_la-gw_graphic_objects.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCC_FALSE@ $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(libscigraphic_objects_la_CFLAGS) $(CFLAGS) -c -o libscigraphic_objects_la-gw_graphic_objects.lo `test -f 'sci_gateway/c/gw_graphic_objects.c' || echo '$(srcdir)/'`sci_gateway/c/gw_graphic_objects.c
 +
 +.cpp.o:
 +@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(CXXCOMPILE) -c -o $@ $<
 +
 +.cpp.obj:
 +@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 +
 +.cpp.lo:
 +@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LTCXXCOMPILE) -c -o $@ $<
 +
 +libscigraphic_objects_la-CallGraphicController.lo: src/jni/CallGraphicController.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigraphic_objects_la-CallGraphicController.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-CallGraphicController.Tpo -c -o libscigraphic_objects_la-CallGraphicController.lo `test -f 'src/jni/CallGraphicController.cpp' || echo '$(srcdir)/'`src/jni/CallGraphicController.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscigraphic_objects_la-CallGraphicController.Tpo $(DEPDIR)/libscigraphic_objects_la-CallGraphicController.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/jni/CallGraphicController.cpp' object='libscigraphic_objects_la-CallGraphicController.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigraphic_objects_la-CallGraphicController.lo `test -f 'src/jni/CallGraphicController.cpp' || echo '$(srcdir)/'`src/jni/CallGraphicController.cpp
 +
 +libscigraphic_objects_la-sci_graphicfunction.lo: sci_gateway/cpp/sci_graphicfunction.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigraphic_objects_la-sci_graphicfunction.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-sci_graphicfunction.Tpo -c -o libscigraphic_objects_la-sci_graphicfunction.lo `test -f 'sci_gateway/cpp/sci_graphicfunction.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_graphicfunction.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscigraphic_objects_la-sci_graphicfunction.Tpo $(DEPDIR)/libscigraphic_objects_la-sci_graphicfunction.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='sci_gateway/cpp/sci_graphicfunction.cpp' object='libscigraphic_objects_la-sci_graphicfunction.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigraphic_objects_la-sci_graphicfunction.lo `test -f 'sci_gateway/cpp/sci_graphicfunction.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_graphicfunction.cpp
 +
 +libscigraphic_objects_la-createGraphicObject.lo: src/cpp/createGraphicObject.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigraphic_objects_la-createGraphicObject.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-createGraphicObject.Tpo -c -o libscigraphic_objects_la-createGraphicObject.lo `test -f 'src/cpp/createGraphicObject.cpp' || echo '$(srcdir)/'`src/cpp/createGraphicObject.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscigraphic_objects_la-createGraphicObject.Tpo $(DEPDIR)/libscigraphic_objects_la-createGraphicObject.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/createGraphicObject.cpp' object='libscigraphic_objects_la-createGraphicObject.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigraphic_objects_la-createGraphicObject.lo `test -f 'src/cpp/createGraphicObject.cpp' || echo '$(srcdir)/'`src/cpp/createGraphicObject.cpp
 +
 +libscigraphic_objects_la-getGraphicObjectProperty.lo: src/cpp/getGraphicObjectProperty.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigraphic_objects_la-getGraphicObjectProperty.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-getGraphicObjectProperty.Tpo -c -o libscigraphic_objects_la-getGraphicObjectProperty.lo `test -f 'src/cpp/getGraphicObjectProperty.cpp' || echo '$(srcdir)/'`src/cpp/getGraphicObjectProperty.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscigraphic_objects_la-getGraphicObjectProperty.Tpo $(DEPDIR)/libscigraphic_objects_la-getGraphicObjectProperty.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/getGraphicObjectProperty.cpp' object='libscigraphic_objects_la-getGraphicObjectProperty.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigraphic_objects_la-getGraphicObjectProperty.lo `test -f 'src/cpp/getGraphicObjectProperty.cpp' || echo '$(srcdir)/'`src/cpp/getGraphicObjectProperty.cpp
 +
 +libscigraphic_objects_la-getConsoleIdentifier.lo: src/cpp/getConsoleIdentifier.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigraphic_objects_la-getConsoleIdentifier.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-getConsoleIdentifier.Tpo -c -o libscigraphic_objects_la-getConsoleIdentifier.lo `test -f 'src/cpp/getConsoleIdentifier.cpp' || echo '$(srcdir)/'`src/cpp/getConsoleIdentifier.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscigraphic_objects_la-getConsoleIdentifier.Tpo $(DEPDIR)/libscigraphic_objects_la-getConsoleIdentifier.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/getConsoleIdentifier.cpp' object='libscigraphic_objects_la-getConsoleIdentifier.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigraphic_objects_la-getConsoleIdentifier.lo `test -f 'src/cpp/getConsoleIdentifier.cpp' || echo '$(srcdir)/'`src/cpp/getConsoleIdentifier.cpp
 +
 +libscigraphic_objects_la-setGraphicObjectProperty.lo: src/cpp/setGraphicObjectProperty.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigraphic_objects_la-setGraphicObjectProperty.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-setGraphicObjectProperty.Tpo -c -o libscigraphic_objects_la-setGraphicObjectProperty.lo `test -f 'src/cpp/setGraphicObjectProperty.cpp' || echo '$(srcdir)/'`src/cpp/setGraphicObjectProperty.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscigraphic_objects_la-setGraphicObjectProperty.Tpo $(DEPDIR)/libscigraphic_objects_la-setGraphicObjectProperty.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/setGraphicObjectProperty.cpp' object='libscigraphic_objects_la-setGraphicObjectProperty.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigraphic_objects_la-setGraphicObjectProperty.lo `test -f 'src/cpp/setGraphicObjectProperty.cpp' || echo '$(srcdir)/'`src/cpp/setGraphicObjectProperty.cpp
 +
 +libscigraphic_objects_la-deleteGraphicObject.lo: src/cpp/deleteGraphicObject.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigraphic_objects_la-deleteGraphicObject.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-deleteGraphicObject.Tpo -c -o libscigraphic_objects_la-deleteGraphicObject.lo `test -f 'src/cpp/deleteGraphicObject.cpp' || echo '$(srcdir)/'`src/cpp/deleteGraphicObject.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscigraphic_objects_la-deleteGraphicObject.Tpo $(DEPDIR)/libscigraphic_objects_la-deleteGraphicObject.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/deleteGraphicObject.cpp' object='libscigraphic_objects_la-deleteGraphicObject.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigraphic_objects_la-deleteGraphicObject.lo `test -f 'src/cpp/deleteGraphicObject.cpp' || echo '$(srcdir)/'`src/cpp/deleteGraphicObject.cpp
 +
 +libscigraphic_objects_la-dataModel.lo: src/cpp/dataModel.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigraphic_objects_la-dataModel.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-dataModel.Tpo -c -o libscigraphic_objects_la-dataModel.lo `test -f 'src/cpp/dataModel.cpp' || echo '$(srcdir)/'`src/cpp/dataModel.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscigraphic_objects_la-dataModel.Tpo $(DEPDIR)/libscigraphic_objects_la-dataModel.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/dataModel.cpp' object='libscigraphic_objects_la-dataModel.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigraphic_objects_la-dataModel.lo `test -f 'src/cpp/dataModel.cpp' || echo '$(srcdir)/'`src/cpp/dataModel.cpp
 +
 +libscigraphic_objects_la-Data3D.lo: src/cpp/Data3D.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigraphic_objects_la-Data3D.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-Data3D.Tpo -c -o libscigraphic_objects_la-Data3D.lo `test -f 'src/cpp/Data3D.cpp' || echo '$(srcdir)/'`src/cpp/Data3D.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscigraphic_objects_la-Data3D.Tpo $(DEPDIR)/libscigraphic_objects_la-Data3D.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/Data3D.cpp' object='libscigraphic_objects_la-Data3D.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigraphic_objects_la-Data3D.lo `test -f 'src/cpp/Data3D.cpp' || echo '$(srcdir)/'`src/cpp/Data3D.cpp
 +
 +libscigraphic_objects_la-DataLoader.lo: src/cpp/DataLoader.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigraphic_objects_la-DataLoader.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-DataLoader.Tpo -c -o libscigraphic_objects_la-DataLoader.lo `test -f 'src/cpp/DataLoader.cpp' || echo '$(srcdir)/'`src/cpp/DataLoader.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscigraphic_objects_la-DataLoader.Tpo $(DEPDIR)/libscigraphic_objects_la-DataLoader.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/DataLoader.cpp' object='libscigraphic_objects_la-DataLoader.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigraphic_objects_la-DataLoader.lo `test -f 'src/cpp/DataLoader.cpp' || echo '$(srcdir)/'`src/cpp/DataLoader.cpp
 +
 +libscigraphic_objects_la-NgonData.lo: src/cpp/NgonData.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigraphic_objects_la-NgonData.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-NgonData.Tpo -c -o libscigraphic_objects_la-NgonData.lo `test -f 'src/cpp/NgonData.cpp' || echo '$(srcdir)/'`src/cpp/NgonData.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscigraphic_objects_la-NgonData.Tpo $(DEPDIR)/libscigraphic_objects_la-NgonData.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/NgonData.cpp' object='libscigraphic_objects_la-NgonData.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigraphic_objects_la-NgonData.lo `test -f 'src/cpp/NgonData.cpp' || echo '$(srcdir)/'`src/cpp/NgonData.cpp
 +
 +libscigraphic_objects_la-NgonGeneralData.lo: src/cpp/NgonGeneralData.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigraphic_objects_la-NgonGeneralData.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-NgonGeneralData.Tpo -c -o libscigraphic_objects_la-NgonGeneralData.lo `test -f 'src/cpp/NgonGeneralData.cpp' || echo '$(srcdir)/'`src/cpp/NgonGeneralData.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscigraphic_objects_la-NgonGeneralData.Tpo $(DEPDIR)/libscigraphic_objects_la-NgonGeneralData.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/NgonGeneralData.cpp' object='libscigraphic_objects_la-NgonGeneralData.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigraphic_objects_la-NgonGeneralData.lo `test -f 'src/cpp/NgonGeneralData.cpp' || echo '$(srcdir)/'`src/cpp/NgonGeneralData.cpp
 +
 +libscigraphic_objects_la-NgonGridData.lo: src/cpp/NgonGridData.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigraphic_objects_la-NgonGridData.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-NgonGridData.Tpo -c -o libscigraphic_objects_la-NgonGridData.lo `test -f 'src/cpp/NgonGridData.cpp' || echo '$(srcdir)/'`src/cpp/NgonGridData.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscigraphic_objects_la-NgonGridData.Tpo $(DEPDIR)/libscigraphic_objects_la-NgonGridData.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/NgonGridData.cpp' object='libscigraphic_objects_la-NgonGridData.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigraphic_objects_la-NgonGridData.lo `test -f 'src/cpp/NgonGridData.cpp' || echo '$(srcdir)/'`src/cpp/NgonGridData.cpp
 +
 +libscigraphic_objects_la-NgonGridMatplotData.lo: src/cpp/NgonGridMatplotData.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigraphic_objects_la-NgonGridMatplotData.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-NgonGridMatplotData.Tpo -c -o libscigraphic_objects_la-NgonGridMatplotData.lo `test -f 'src/cpp/NgonGridMatplotData.cpp' || echo '$(srcdir)/'`src/cpp/NgonGridMatplotData.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscigraphic_objects_la-NgonGridMatplotData.Tpo $(DEPDIR)/libscigraphic_objects_la-NgonGridMatplotData.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/NgonGridMatplotData.cpp' object='libscigraphic_objects_la-NgonGridMatplotData.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigraphic_objects_la-NgonGridMatplotData.lo `test -f 'src/cpp/NgonGridMatplotData.cpp' || echo '$(srcdir)/'`src/cpp/NgonGridMatplotData.cpp
 +
 +libscigraphic_objects_la-NgonPolylineData.lo: src/cpp/NgonPolylineData.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigraphic_objects_la-NgonPolylineData.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-NgonPolylineData.Tpo -c -o libscigraphic_objects_la-NgonPolylineData.lo `test -f 'src/cpp/NgonPolylineData.cpp' || echo '$(srcdir)/'`src/cpp/NgonPolylineData.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscigraphic_objects_la-NgonPolylineData.Tpo $(DEPDIR)/libscigraphic_objects_la-NgonPolylineData.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/NgonPolylineData.cpp' object='libscigraphic_objects_la-NgonPolylineData.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigraphic_objects_la-NgonPolylineData.lo `test -f 'src/cpp/NgonPolylineData.cpp' || echo '$(srcdir)/'`src/cpp/NgonPolylineData.cpp
 +
 +libscigraphic_objects_la-TriangleMeshData.lo: src/cpp/TriangleMeshData.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigraphic_objects_la-TriangleMeshData.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-TriangleMeshData.Tpo -c -o libscigraphic_objects_la-TriangleMeshData.lo `test -f 'src/cpp/TriangleMeshData.cpp' || echo '$(srcdir)/'`src/cpp/TriangleMeshData.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscigraphic_objects_la-TriangleMeshData.Tpo $(DEPDIR)/libscigraphic_objects_la-TriangleMeshData.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/TriangleMeshData.cpp' object='libscigraphic_objects_la-TriangleMeshData.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigraphic_objects_la-TriangleMeshData.lo `test -f 'src/cpp/TriangleMeshData.cpp' || echo '$(srcdir)/'`src/cpp/TriangleMeshData.cpp
 +
 +libscigraphic_objects_la-TriangleMeshFecData.lo: src/cpp/TriangleMeshFecData.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigraphic_objects_la-TriangleMeshFecData.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-TriangleMeshFecData.Tpo -c -o libscigraphic_objects_la-TriangleMeshFecData.lo `test -f 'src/cpp/TriangleMeshFecData.cpp' || echo '$(srcdir)/'`src/cpp/TriangleMeshFecData.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscigraphic_objects_la-TriangleMeshFecData.Tpo $(DEPDIR)/libscigraphic_objects_la-TriangleMeshFecData.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/TriangleMeshFecData.cpp' object='libscigraphic_objects_la-TriangleMeshFecData.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigraphic_objects_la-TriangleMeshFecData.lo `test -f 'src/cpp/TriangleMeshFecData.cpp' || echo '$(srcdir)/'`src/cpp/TriangleMeshFecData.cpp
 +
 +libscigraphic_objects_la-ColorComputer.lo: src/cpp/ColorComputer.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigraphic_objects_la-ColorComputer.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-ColorComputer.Tpo -c -o libscigraphic_objects_la-ColorComputer.lo `test -f 'src/cpp/ColorComputer.cpp' || echo '$(srcdir)/'`src/cpp/ColorComputer.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscigraphic_objects_la-ColorComputer.Tpo $(DEPDIR)/libscigraphic_objects_la-ColorComputer.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/ColorComputer.cpp' object='libscigraphic_objects_la-ColorComputer.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigraphic_objects_la-ColorComputer.lo `test -f 'src/cpp/ColorComputer.cpp' || echo '$(srcdir)/'`src/cpp/ColorComputer.cpp
 +
 +libscigraphic_objects_la-DecompositionUtils.lo: src/cpp/DecompositionUtils.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigraphic_objects_la-DecompositionUtils.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-DecompositionUtils.Tpo -c -o libscigraphic_objects_la-DecompositionUtils.lo `test -f 'src/cpp/DecompositionUtils.cpp' || echo '$(srcdir)/'`src/cpp/DecompositionUtils.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscigraphic_objects_la-DecompositionUtils.Tpo $(DEPDIR)/libscigraphic_objects_la-DecompositionUtils.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/DecompositionUtils.cpp' object='libscigraphic_objects_la-DecompositionUtils.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigraphic_objects_la-DecompositionUtils.lo `test -f 'src/cpp/DecompositionUtils.cpp' || echo '$(srcdir)/'`src/cpp/DecompositionUtils.cpp
 +
 +libscigraphic_objects_la-Fac3DColorComputer.lo: src/cpp/Fac3DColorComputer.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigraphic_objects_la-Fac3DColorComputer.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-Fac3DColorComputer.Tpo -c -o libscigraphic_objects_la-Fac3DColorComputer.lo `test -f 'src/cpp/Fac3DColorComputer.cpp' || echo '$(srcdir)/'`src/cpp/Fac3DColorComputer.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscigraphic_objects_la-Fac3DColorComputer.Tpo $(DEPDIR)/libscigraphic_objects_la-Fac3DColorComputer.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/Fac3DColorComputer.cpp' object='libscigraphic_objects_la-Fac3DColorComputer.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigraphic_objects_la-Fac3DColorComputer.lo `test -f 'src/cpp/Fac3DColorComputer.cpp' || echo '$(srcdir)/'`src/cpp/Fac3DColorComputer.cpp
 +
 +libscigraphic_objects_la-Fac3DDecomposer.lo: src/cpp/Fac3DDecomposer.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigraphic_objects_la-Fac3DDecomposer.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-Fac3DDecomposer.Tpo -c -o libscigraphic_objects_la-Fac3DDecomposer.lo `test -f 'src/cpp/Fac3DDecomposer.cpp' || echo '$(srcdir)/'`src/cpp/Fac3DDecomposer.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscigraphic_objects_la-Fac3DDecomposer.Tpo $(DEPDIR)/libscigraphic_objects_la-Fac3DDecomposer.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/Fac3DDecomposer.cpp' object='libscigraphic_objects_la-Fac3DDecomposer.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigraphic_objects_la-Fac3DDecomposer.lo `test -f 'src/cpp/Fac3DDecomposer.cpp' || echo '$(srcdir)/'`src/cpp/Fac3DDecomposer.cpp
 +
 +libscigraphic_objects_la-NgonGridDataDecomposer.lo: src/cpp/NgonGridDataDecomposer.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigraphic_objects_la-NgonGridDataDecomposer.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-NgonGridDataDecomposer.Tpo -c -o libscigraphic_objects_la-NgonGridDataDecomposer.lo `test -f 'src/cpp/NgonGridDataDecomposer.cpp' || echo '$(srcdir)/'`src/cpp/NgonGridDataDecomposer.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscigraphic_objects_la-NgonGridDataDecomposer.Tpo $(DEPDIR)/libscigraphic_objects_la-NgonGridDataDecomposer.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/NgonGridDataDecomposer.cpp' object='libscigraphic_objects_la-NgonGridDataDecomposer.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigraphic_objects_la-NgonGridDataDecomposer.lo `test -f 'src/cpp/NgonGridDataDecomposer.cpp' || echo '$(srcdir)/'`src/cpp/NgonGridDataDecomposer.cpp
 +
 +libscigraphic_objects_la-NgonGridGrayplotDataDecomposer.lo: src/cpp/NgonGridGrayplotDataDecomposer.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigraphic_objects_la-NgonGridGrayplotDataDecomposer.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-NgonGridGrayplotDataDecomposer.Tpo -c -o libscigraphic_objects_la-NgonGridGrayplotDataDecomposer.lo `test -f 'src/cpp/NgonGridGrayplotDataDecomposer.cpp' || echo '$(srcdir)/'`src/cpp/NgonGridGrayplotDataDecomposer.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscigraphic_objects_la-NgonGridGrayplotDataDecomposer.Tpo $(DEPDIR)/libscigraphic_objects_la-NgonGridGrayplotDataDecomposer.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/NgonGridGrayplotDataDecomposer.cpp' object='libscigraphic_objects_la-NgonGridGrayplotDataDecomposer.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigraphic_objects_la-NgonGridGrayplotDataDecomposer.lo `test -f 'src/cpp/NgonGridGrayplotDataDecomposer.cpp' || echo '$(srcdir)/'`src/cpp/NgonGridGrayplotDataDecomposer.cpp
 +
 +libscigraphic_objects_la-MatPlotDecomposer.lo: src/cpp/MatPlotDecomposer.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigraphic_objects_la-MatPlotDecomposer.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-MatPlotDecomposer.Tpo -c -o libscigraphic_objects_la-MatPlotDecomposer.lo `test -f 'src/cpp/MatPlotDecomposer.cpp' || echo '$(srcdir)/'`src/cpp/MatPlotDecomposer.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscigraphic_objects_la-MatPlotDecomposer.Tpo $(DEPDIR)/libscigraphic_objects_la-MatPlotDecomposer.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/MatPlotDecomposer.cpp' object='libscigraphic_objects_la-MatPlotDecomposer.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigraphic_objects_la-MatPlotDecomposer.lo `test -f 'src/cpp/MatPlotDecomposer.cpp' || echo '$(srcdir)/'`src/cpp/MatPlotDecomposer.cpp
 +
 +libscigraphic_objects_la-NgonGridMatplotDataDecomposer.lo: src/cpp/NgonGridMatplotDataDecomposer.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigraphic_objects_la-NgonGridMatplotDataDecomposer.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-NgonGridMatplotDataDecomposer.Tpo -c -o libscigraphic_objects_la-NgonGridMatplotDataDecomposer.lo `test -f 'src/cpp/NgonGridMatplotDataDecomposer.cpp' || echo '$(srcdir)/'`src/cpp/NgonGridMatplotDataDecomposer.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscigraphic_objects_la-NgonGridMatplotDataDecomposer.Tpo $(DEPDIR)/libscigraphic_objects_la-NgonGridMatplotDataDecomposer.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/NgonGridMatplotDataDecomposer.cpp' object='libscigraphic_objects_la-NgonGridMatplotDataDecomposer.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigraphic_objects_la-NgonGridMatplotDataDecomposer.lo `test -f 'src/cpp/NgonGridMatplotDataDecomposer.cpp' || echo '$(srcdir)/'`src/cpp/NgonGridMatplotDataDecomposer.cpp
 +
 +libscigraphic_objects_la-Plot3DDecomposer.lo: src/cpp/Plot3DDecomposer.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigraphic_objects_la-Plot3DDecomposer.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-Plot3DDecomposer.Tpo -c -o libscigraphic_objects_la-Plot3DDecomposer.lo `test -f 'src/cpp/Plot3DDecomposer.cpp' || echo '$(srcdir)/'`src/cpp/Plot3DDecomposer.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscigraphic_objects_la-Plot3DDecomposer.Tpo $(DEPDIR)/libscigraphic_objects_la-Plot3DDecomposer.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/Plot3DDecomposer.cpp' object='libscigraphic_objects_la-Plot3DDecomposer.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigraphic_objects_la-Plot3DDecomposer.lo `test -f 'src/cpp/Plot3DDecomposer.cpp' || echo '$(srcdir)/'`src/cpp/Plot3DDecomposer.cpp
 +
 +libscigraphic_objects_la-PolylineDecomposer.lo: src/cpp/PolylineDecomposer.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigraphic_objects_la-PolylineDecomposer.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-PolylineDecomposer.Tpo -c -o libscigraphic_objects_la-PolylineDecomposer.lo `test -f 'src/cpp/PolylineDecomposer.cpp' || echo '$(srcdir)/'`src/cpp/PolylineDecomposer.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscigraphic_objects_la-PolylineDecomposer.Tpo $(DEPDIR)/libscigraphic_objects_la-PolylineDecomposer.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/PolylineDecomposer.cpp' object='libscigraphic_objects_la-PolylineDecomposer.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigraphic_objects_la-PolylineDecomposer.lo `test -f 'src/cpp/PolylineDecomposer.cpp' || echo '$(srcdir)/'`src/cpp/PolylineDecomposer.cpp
 +
 +libscigraphic_objects_la-TriangleMeshFecDataDecomposer.lo: src/cpp/TriangleMeshFecDataDecomposer.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigraphic_objects_la-TriangleMeshFecDataDecomposer.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-TriangleMeshFecDataDecomposer.Tpo -c -o libscigraphic_objects_la-TriangleMeshFecDataDecomposer.lo `test -f 'src/cpp/TriangleMeshFecDataDecomposer.cpp' || echo '$(srcdir)/'`src/cpp/TriangleMeshFecDataDecomposer.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscigraphic_objects_la-TriangleMeshFecDataDecomposer.Tpo $(DEPDIR)/libscigraphic_objects_la-TriangleMeshFecDataDecomposer.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/TriangleMeshFecDataDecomposer.cpp' object='libscigraphic_objects_la-TriangleMeshFecDataDecomposer.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigraphic_objects_la-TriangleMeshFecDataDecomposer.lo `test -f 'src/cpp/TriangleMeshFecDataDecomposer.cpp' || echo '$(srcdir)/'`src/cpp/TriangleMeshFecDataDecomposer.cpp
 +
 +libscigraphic_objects_la-Triangulator.lo: src/cpp/Triangulator.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigraphic_objects_la-Triangulator.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-Triangulator.Tpo -c -o libscigraphic_objects_la-Triangulator.lo `test -f 'src/cpp/Triangulator.cpp' || echo '$(srcdir)/'`src/cpp/Triangulator.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscigraphic_objects_la-Triangulator.Tpo $(DEPDIR)/libscigraphic_objects_la-Triangulator.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/Triangulator.cpp' object='libscigraphic_objects_la-Triangulator.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigraphic_objects_la-Triangulator.lo `test -f 'src/cpp/Triangulator.cpp' || echo '$(srcdir)/'`src/cpp/Triangulator.cpp
 +
 +libscigraphic_objects_la-ScilabView.lo: src/cpp/ScilabView.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigraphic_objects_la-ScilabView.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-ScilabView.Tpo -c -o libscigraphic_objects_la-ScilabView.lo `test -f 'src/cpp/ScilabView.cpp' || echo '$(srcdir)/'`src/cpp/ScilabView.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscigraphic_objects_la-ScilabView.Tpo $(DEPDIR)/libscigraphic_objects_la-ScilabView.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/ScilabView.cpp' object='libscigraphic_objects_la-ScilabView.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigraphic_objects_la-ScilabView.lo `test -f 'src/cpp/ScilabView.cpp' || echo '$(srcdir)/'`src/cpp/ScilabView.cpp
 +
 +libscigraphic_objects_la-FigureList.lo: src/cpp/FigureList.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigraphic_objects_la-FigureList.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-FigureList.Tpo -c -o libscigraphic_objects_la-FigureList.lo `test -f 'src/cpp/FigureList.cpp' || echo '$(srcdir)/'`src/cpp/FigureList.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscigraphic_objects_la-FigureList.Tpo $(DEPDIR)/libscigraphic_objects_la-FigureList.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/FigureList.cpp' object='libscigraphic_objects_la-FigureList.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigraphic_objects_la-FigureList.lo `test -f 'src/cpp/FigureList.cpp' || echo '$(srcdir)/'`src/cpp/FigureList.cpp
 +
 +libscigraphic_objects_la-HandleManagement.lo: src/cpp/HandleManagement.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigraphic_objects_la-HandleManagement.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-HandleManagement.Tpo -c -o libscigraphic_objects_la-HandleManagement.lo `test -f 'src/cpp/HandleManagement.cpp' || echo '$(srcdir)/'`src/cpp/HandleManagement.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscigraphic_objects_la-HandleManagement.Tpo $(DEPDIR)/libscigraphic_objects_la-HandleManagement.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/HandleManagement.cpp' object='libscigraphic_objects_la-HandleManagement.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigraphic_objects_la-HandleManagement.lo `test -f 'src/cpp/HandleManagement.cpp' || echo '$(srcdir)/'`src/cpp/HandleManagement.cpp
 +
 +libscigraphic_objects_la-AxesModel.lo: src/cpp/AxesModel.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigraphic_objects_la-AxesModel.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-AxesModel.Tpo -c -o libscigraphic_objects_la-AxesModel.lo `test -f 'src/cpp/AxesModel.cpp' || echo '$(srcdir)/'`src/cpp/AxesModel.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscigraphic_objects_la-AxesModel.Tpo $(DEPDIR)/libscigraphic_objects_la-AxesModel.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/AxesModel.cpp' object='libscigraphic_objects_la-AxesModel.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigraphic_objects_la-AxesModel.lo `test -f 'src/cpp/AxesModel.cpp' || echo '$(srcdir)/'`src/cpp/AxesModel.cpp
 +
 +libscigraphic_objects_la-FigureModel.lo: src/cpp/FigureModel.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigraphic_objects_la-FigureModel.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-FigureModel.Tpo -c -o libscigraphic_objects_la-FigureModel.lo `test -f 'src/cpp/FigureModel.cpp' || echo '$(srcdir)/'`src/cpp/FigureModel.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscigraphic_objects_la-FigureModel.Tpo $(DEPDIR)/libscigraphic_objects_la-FigureModel.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/FigureModel.cpp' object='libscigraphic_objects_la-FigureModel.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigraphic_objects_la-FigureModel.lo `test -f 'src/cpp/FigureModel.cpp' || echo '$(srcdir)/'`src/cpp/FigureModel.cpp
 +
 +libscigraphic_objects_la-CurrentFigure.lo: src/cpp/CurrentFigure.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigraphic_objects_la-CurrentFigure.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-CurrentFigure.Tpo -c -o libscigraphic_objects_la-CurrentFigure.lo `test -f 'src/cpp/CurrentFigure.cpp' || echo '$(srcdir)/'`src/cpp/CurrentFigure.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscigraphic_objects_la-CurrentFigure.Tpo $(DEPDIR)/libscigraphic_objects_la-CurrentFigure.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/CurrentFigure.cpp' object='libscigraphic_objects_la-CurrentFigure.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigraphic_objects_la-CurrentFigure.lo `test -f 'src/cpp/CurrentFigure.cpp' || echo '$(srcdir)/'`src/cpp/CurrentFigure.cpp
 +
 +libscigraphic_objects_la-CurrentObject.lo: src/cpp/CurrentObject.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigraphic_objects_la-CurrentObject.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-CurrentObject.Tpo -c -o libscigraphic_objects_la-CurrentObject.lo `test -f 'src/cpp/CurrentObject.cpp' || echo '$(srcdir)/'`src/cpp/CurrentObject.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscigraphic_objects_la-CurrentObject.Tpo $(DEPDIR)/libscigraphic_objects_la-CurrentObject.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/CurrentObject.cpp' object='libscigraphic_objects_la-CurrentObject.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigraphic_objects_la-CurrentObject.lo `test -f 'src/cpp/CurrentObject.cpp' || echo '$(srcdir)/'`src/cpp/CurrentObject.cpp
 +
 +libscigraphic_objects_la-CurrentSubwin.lo: src/cpp/CurrentSubwin.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscigraphic_objects_la-CurrentSubwin.lo -MD -MP -MF $(DEPDIR)/libscigraphic_objects_la-CurrentSubwin.Tpo -c -o libscigraphic_objects_la-CurrentSubwin.lo `test -f 'src/cpp/CurrentSubwin.cpp' || echo '$(srcdir)/'`src/cpp/CurrentSubwin.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libscigraphic_objects_la-CurrentSubwin.Tpo $(DEPDIR)/libscigraphic_objects_la-CurrentSubwin.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/CurrentSubwin.cpp' object='libscigraphic_objects_la-CurrentSubwin.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphic_objects_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscigraphic_objects_la-CurrentSubwin.lo `test -f 'src/cpp/CurrentSubwin.cpp' || echo '$(srcdir)/'`src/cpp/CurrentSubwin.cpp
 +
 +mostlyclean-libtool:
 +      -rm -f *.lo
 +
 +clean-libtool:
 +      -rm -rf .libs _libs
 +install-libscigraphic_objects_la_etcDATA: $(libscigraphic_objects_la_etc_DATA)
 +      @$(NORMAL_INSTALL)
 +      test -z "$(libscigraphic_objects_la_etcdir)" || $(MKDIR_P) "$(DESTDIR)$(libscigraphic_objects_la_etcdir)"
 +      @list='$(libscigraphic_objects_la_etc_DATA)'; test -n "$(libscigraphic_objects_la_etcdir)" || list=; \
 +      for p in $$list; do \
 +        if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 +        echo "$$d$$p"; \
 +      done | $(am__base_list) | \
 +      while read files; do \
 +        echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(libscigraphic_objects_la_etcdir)'"; \
 +        $(INSTALL_DATA) $$files "$(DESTDIR)$(libscigraphic_objects_la_etcdir)" || exit $$?; \
 +      done
 +
 +uninstall-libscigraphic_objects_la_etcDATA:
 +      @$(NORMAL_UNINSTALL)
 +      @list='$(libscigraphic_objects_la_etc_DATA)'; test -n "$(libscigraphic_objects_la_etcdir)" || list=; \
 +      files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 +      dir='$(DESTDIR)$(libscigraphic_objects_la_etcdir)'; $(am__uninstall_files_from_dir)
 +install-libscigraphic_objects_la_rootDATA: $(libscigraphic_objects_la_root_DATA)
 +      @$(NORMAL_INSTALL)
 +      test -z "$(libscigraphic_objects_la_rootdir)" || $(MKDIR_P) "$(DESTDIR)$(libscigraphic_objects_la_rootdir)"
 +      @list='$(libscigraphic_objects_la_root_DATA)'; test -n "$(libscigraphic_objects_la_rootdir)" || list=; \
 +      for p in $$list; do \
 +        if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 +        echo "$$d$$p"; \
 +      done | $(am__base_list) | \
 +      while read files; do \
 +        echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(libscigraphic_objects_la_rootdir)'"; \
 +        $(INSTALL_DATA) $$files "$(DESTDIR)$(libscigraphic_objects_la_rootdir)" || exit $$?; \
 +      done
 +
 +uninstall-libscigraphic_objects_la_rootDATA:
 +      @$(NORMAL_UNINSTALL)
 +      @list='$(libscigraphic_objects_la_root_DATA)'; test -n "$(libscigraphic_objects_la_rootdir)" || list=; \
 +      files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 +      dir='$(DESTDIR)$(libscigraphic_objects_la_rootdir)'; $(am__uninstall_files_from_dir)
 +install-libscigraphic_objects_la_sci_gatewayDATA: $(libscigraphic_objects_la_sci_gateway_DATA)
 +      @$(NORMAL_INSTALL)
 +      test -z "$(libscigraphic_objects_la_sci_gatewaydir)" || $(MKDIR_P) "$(DESTDIR)$(libscigraphic_objects_la_sci_gatewaydir)"
 +      @list='$(libscigraphic_objects_la_sci_gateway_DATA)'; test -n "$(libscigraphic_objects_la_sci_gatewaydir)" || list=; \
 +      for p in $$list; do \
 +        if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 +        echo "$$d$$p"; \
 +      done | $(am__base_list) | \
 +      while read files; do \
 +        echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(libscigraphic_objects_la_sci_gatewaydir)'"; \
 +        $(INSTALL_DATA) $$files "$(DESTDIR)$(libscigraphic_objects_la_sci_gatewaydir)" || exit $$?; \
 +      done
 +
 +uninstall-libscigraphic_objects_la_sci_gatewayDATA:
 +      @$(NORMAL_UNINSTALL)
 +      @list='$(libscigraphic_objects_la_sci_gateway_DATA)'; test -n "$(libscigraphic_objects_la_sci_gatewaydir)" || list=; \
 +      files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 +      dir='$(DESTDIR)$(libscigraphic_objects_la_sci_gatewaydir)'; $(am__uninstall_files_from_dir)
 +
 +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 +      list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 +      unique=`for i in $$list; do \
 +          if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 +        done | \
 +        $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 +            END { if (nonempty) { for (i in files) print i; }; }'`; \
 +      mkid -fID $$unique
 +tags: TAGS
 +
 +TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 +              $(TAGS_FILES) $(LISP)
 +      set x; \
 +      here=`pwd`; \
 +      list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 +      unique=`for i in $$list; do \
 +          if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 +        done | \
 +        $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 +            END { if (nonempty) { for (i in files) print i; }; }'`; \
 +      shift; \
 +      if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 +        test -n "$$unique" || unique=$$empty_fix; \
 +        if test $$# -gt 0; then \
 +          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 +            "$$@" $$unique; \
 +        else \
 +          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 +            $$unique; \
 +        fi; \
 +      fi
 +ctags: CTAGS
 +CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 +              $(TAGS_FILES) $(LISP)
 +      list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 +      unique=`for i in $$list; do \
 +          if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 +        done | \
 +        $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 +            END { if (nonempty) { for (i in files) print i; }; }'`; \
 +      test -z "$(CTAGS_ARGS)$$unique" \
 +        || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 +           $$unique
 +
 +GTAGS:
 +      here=`$(am__cd) $(top_builddir) && pwd` \
 +        && $(am__cd) $(top_srcdir) \
 +        && gtags -i $(GTAGS_ARGS) "$$here"
 +
 +distclean-tags:
 +      -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 +
 +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: $(BUILT_SOURCES)
 +      $(MAKE) $(AM_MAKEFLAGS) check-am
 +all-am: Makefile $(LTLIBRARIES) $(DATA) all-local
 +installdirs:
 +      for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(libscigraphic_objects_la_etcdir)" "$(DESTDIR)$(libscigraphic_objects_la_rootdir)" "$(DESTDIR)$(libscigraphic_objects_la_sci_gatewaydir)"; do \
 +        test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 +      done
 +install: $(BUILT_SOURCES)
 +      $(MAKE) $(AM_MAKEFLAGS) 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)
 +
 +maintainer-clean-generic:
 +      @echo "This command is intended for maintainers to use"
 +      @echo "it deletes files that may require special tools to rebuild."
 +      -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 +clean: clean-am
 +
 +clean-am: clean-generic clean-libtool clean-local \
 +      clean-pkglibLTLIBRARIES mostlyclean-am
 +
 +distclean: distclean-am
 +      -rm -rf ./$(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-libscigraphic_objects_la_etcDATA \
 +      install-libscigraphic_objects_la_rootDATA \
 +      install-libscigraphic_objects_la_sci_gatewayDATA
 +
 +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 ./$(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-libscigraphic_objects_la_etcDATA \
 +      uninstall-libscigraphic_objects_la_rootDATA \
 +      uninstall-libscigraphic_objects_la_sci_gatewayDATA \
 +      uninstall-pkglibLTLIBRARIES
 +
 +.MAKE: all check check-am install install-am install-strip
 +
 +.PHONY: CTAGS GTAGS all all-am all-local check check-am check-local \
 +      clean clean-generic clean-libtool clean-local \
 +      clean-pkglibLTLIBRARIES ctags 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-libscigraphic_objects_la_etcDATA \
 +      install-libscigraphic_objects_la_rootDATA \
 +      install-libscigraphic_objects_la_sci_gatewayDATA install-man \
 +      install-pdf install-pdf-am install-pkglibLTLIBRARIES \
 +      install-ps install-ps-am install-strip installcheck \
 +      installcheck-am installdirs maintainer-clean \
 +      maintainer-clean-generic mostlyclean mostlyclean-compile \
 +      mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 +      tags uninstall uninstall-am \
 +      uninstall-libscigraphic_objects_la_etcDATA \
 +      uninstall-libscigraphic_objects_la_rootDATA \
 +      uninstall-libscigraphic_objects_la_sci_gatewayDATA \
 +      uninstall-pkglibLTLIBRARIES
 +
 +
 +# This target enables tests for Scilab
 +check-local: $(top_builddir)/scilab-bin test
-       @COMMAND="test_run('$(modulename)');quit";\
-       export LANG=C;\
-       $(top_builddir)/bin/scilab -nwni -nb -e "$$COMMAND"
++      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 ..."; \
 +@SWIG_TRUE@                   $(SWIG_BIN) $(SWIG_JAVA) -package $$SWIG_PACKAGENAME  -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@   if test -n "$(GIWS_WRAPPERS)"; then \
 +@GIWS_TRUE@           for file in $(GIWS_WRAPPERS) ; do \
 +@GIWS_TRUE@                   echo "GIWS process of $$file ..."; \
 +@GIWS_TRUE@                   $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
 +@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
 +
 +includes/graphicObjectsProperties.h: Makefile.am src/scripts/propertiesMap.properties
 +      @echo "-- Building includes/graphicObjectProperties.h --"
 +      @$(top_srcdir)/modules/graphic_objects/src/scripts/genPropertiesName.sh --C $(top_srcdir)/modules/graphic_objects/src/scripts/propertiesMap.properties $(top_srcdir)/modules/graphic_objects/includes/graphicObjectProperties.h
 +      @echo "-- Building GraphicObjectProperties.java --"
 +      @$(top_srcdir)/modules/graphic_objects/src/scripts/genPropertiesName.sh --java $(top_srcdir)/modules/graphic_objects/src/scripts/propertiesMap.properties $(top_srcdir)/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/graphicObject/GraphicObjectProperties.java
 +
 +# Tell versions [3.59,3.63) of GNU make to not export all variables.
 +# Otherwise a system limit (for SysV at least) may be exceeded.
 +.NOEXPORT:
index 0546ced,0000000..c28d54e
mode 100644,000000..100644
--- /dev/null
@@@ -1,338 -1,0 +1,341 @@@
 +<?xml version="1.0" encoding="utf-8"?>
 +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 +  <ItemGroup Label="ProjectConfigurations">
 +    <ProjectConfiguration Include="Debug|Win32">
 +      <Configuration>Debug</Configuration>
 +      <Platform>Win32</Platform>
 +    </ProjectConfiguration>
 +    <ProjectConfiguration Include="Debug|x64">
 +      <Configuration>Debug</Configuration>
 +      <Platform>x64</Platform>
 +    </ProjectConfiguration>
 +    <ProjectConfiguration Include="Release|Win32">
 +      <Configuration>Release</Configuration>
 +      <Platform>Win32</Platform>
 +    </ProjectConfiguration>
 +    <ProjectConfiguration Include="Release|x64">
 +      <Configuration>Release</Configuration>
 +      <Platform>x64</Platform>
 +    </ProjectConfiguration>
 +  </ItemGroup>
 +  <PropertyGroup Label="Globals">
 +    <ProjectGuid>{30F9EE41-587B-4618-8DE7-698D3FBA4985}</ProjectGuid>
 +    <RootNamespace>graphic_objects</RootNamespace>
 +    <Keyword>Win32Proj</Keyword>
 +  </PropertyGroup>
 +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>MultiByte</CharacterSet>
 +    <WholeProgramOptimization>false</WholeProgramOptimization>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>MultiByte</CharacterSet>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>MultiByte</CharacterSet>
 +    <WholeProgramOptimization>false</WholeProgramOptimization>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>MultiByte</CharacterSet>
 +  </PropertyGroup>
 +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
 +  <ImportGroup Label="ExtensionSettings">
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +  </ImportGroup>
 +  <PropertyGroup Label="UserMacros" />
 +  <PropertyGroup>
 +    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)bin\</OutDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)bin\</OutDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)$(Configuration)\</IntDir>
 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)bin\</OutDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)bin\</OutDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)$(Configuration)\</IntDir>
 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
 +    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">sci$(ProjectName)</TargetName>
 +    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">sci$(ProjectName)</TargetName>
 +    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">sci$(ProjectName)</TargetName>
 +    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">sci$(ProjectName)</TargetName>
 +  </PropertyGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
 +    <ClCompile>
 +      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
 +      <Optimization>Disabled</Optimization>
 +      <AdditionalIncludeDirectories>.;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl;../../includes;../../../../libs/MALLOC/includes;../../../api_scilab/includes;../../../core/includes;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../cpp;../../../functions/includes;../../../fileio/includes;../../../commons/src/jni;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;GRAPHIC_OBJECTS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <MinimalRebuild>true</MinimalRebuild>
 +      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
 +    </ClCompile>
 +    <PreLinkEvent>
 +      <Message>Make dependencies</Message>
 +      <Command>lib /DEF:"$(ProjectDir)LibScilab_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:"$(ProjectDir)LibScilab.lib" 1&gt;NUL 2&gt;NUL
 +</Command>
 +    </PreLinkEvent>
 +    <Link>
 +      <AdditionalDependencies>..\..\..\..\bin\scilocalization.lib;libscilab.lib;%(AdditionalDependencies)</AdditionalDependencies>
 +      <OutputFile>../../../../bin/sci$(ProjectName).dll</OutputFile>
 +      <ModuleDefinitionFile>
 +      </ModuleDefinitionFile>
 +      <GenerateDebugInformation>true</GenerateDebugInformation>
 +      <SubSystem>Windows</SubSystem>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +      <DataExecutionPrevention>
 +      </DataExecutionPrevention>
 +      <ImportLibrary>../../../../bin/sci$(ProjectName).lib</ImportLibrary>
 +      <TargetMachine>MachineX86</TargetMachine>
 +      <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
 +    </Link>
 +  </ItemDefinitionGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
 +    <Midl>
 +      <TargetEnvironment>X64</TargetEnvironment>
 +    </Midl>
 +    <ClCompile>
 +      <Optimization>Disabled</Optimization>
 +      <AdditionalIncludeDirectories>.;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl;../../includes;../../../../libs/MALLOC/includes;../../../api_scilab/includes;../../../core/includes;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../cpp;../../../functions/includes;../../../fileio/includes;../../../commons/src/jni;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;GRAPHIC_OBJECTS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <MinimalRebuild>true</MinimalRebuild>
 +      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
 +    </ClCompile>
 +    <PreLinkEvent>
 +      <Message>Make dependencies</Message>
 +      <Command>lib /DEF:"$(ProjectDir)LibScilab_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:"$(ProjectDir)LibScilab.lib" 1&gt;NUL 2&gt;NUL
 +
 +</Command>
 +    </PreLinkEvent>
 +    <Link>
 +      <AdditionalDependencies>libscilab.lib;%(AdditionalDependencies)</AdditionalDependencies>
 +      <OutputFile>../../../../bin/sci$(ProjectName).dll</OutputFile>
 +      <ModuleDefinitionFile>
 +      </ModuleDefinitionFile>
 +      <GenerateDebugInformation>true</GenerateDebugInformation>
 +      <SubSystem>Windows</SubSystem>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +      <DataExecutionPrevention>
 +      </DataExecutionPrevention>
 +      <ImportLibrary>../../../../bin/sci$(ProjectName).lib</ImportLibrary>
 +      <TargetMachine>MachineX64</TargetMachine>
 +      <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
 +    </Link>
 +  </ItemDefinitionGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
 +    <ClCompile>
 +      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
 +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
 +      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 +      <WholeProgramOptimization>false</WholeProgramOptimization>
 +      <AdditionalIncludeDirectories>.;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl;../../includes;../../../../libs/MALLOC/includes;../../../api_scilab/includes;../../../core/includes;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../cpp;../../../functions/includes;../../../fileio/includes;../../../commons/src/jni;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;GRAPHIC_OBJECTS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <StringPooling>true</StringPooling>
 +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 +      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
 +    </ClCompile>
 +    <PreLinkEvent>
 +      <Message>Make dependencies</Message>
 +      <Command>lib /DEF:"$(ProjectDir)LibScilab_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:"$(ProjectDir)LibScilab.lib" 1&gt;NUL 2&gt;NUL
 +</Command>
 +    </PreLinkEvent>
 +    <Link>
 +      <AdditionalDependencies>..\..\..\..\bin\scilocalization.lib;libscilab.lib;%(AdditionalDependencies)</AdditionalDependencies>
 +      <OutputFile>../../../../bin/sci$(ProjectName).dll</OutputFile>
 +      <ModuleDefinitionFile>
 +      </ModuleDefinitionFile>
 +      <GenerateDebugInformation>false</GenerateDebugInformation>
 +      <SubSystem>Windows</SubSystem>
 +      <OptimizeReferences>true</OptimizeReferences>
 +      <EnableCOMDATFolding>true</EnableCOMDATFolding>
 +      <LinkTimeCodeGeneration>
 +      </LinkTimeCodeGeneration>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +      <DataExecutionPrevention>
 +      </DataExecutionPrevention>
 +      <ImportLibrary>../../../../bin/sci$(ProjectName).lib</ImportLibrary>
 +      <TargetMachine>MachineX86</TargetMachine>
 +      <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
 +    </Link>
 +  </ItemDefinitionGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
 +    <Midl>
 +      <TargetEnvironment>X64</TargetEnvironment>
 +    </Midl>
 +    <ClCompile>
 +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
 +      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 +      <WholeProgramOptimization>false</WholeProgramOptimization>
 +      <AdditionalIncludeDirectories>.;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl;../../includes;../../../../libs/MALLOC/includes;../../../api_scilab/includes;../../../core/includes;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../cpp;../../../functions/includes;../../../fileio/includes;../../../commons/src/jni;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;GRAPHIC_OBJECTS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <StringPooling>true</StringPooling>
 +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 +      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
 +    </ClCompile>
 +    <PreLinkEvent>
 +      <Message>Make dependencies</Message>
 +      <Command>lib /DEF:"$(ProjectDir)LibScilab_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:"$(ProjectDir)LibScilab.lib" 1&gt;NUL 2&gt;NUL
 +
 +</Command>
 +    </PreLinkEvent>
 +    <Link>
 +      <AdditionalDependencies>libscilab.lib;%(AdditionalDependencies)</AdditionalDependencies>
 +      <OutputFile>../../../../bin/sci$(ProjectName).dll</OutputFile>
 +      <ModuleDefinitionFile>
 +      </ModuleDefinitionFile>
 +      <GenerateDebugInformation>false</GenerateDebugInformation>
 +      <SubSystem>Windows</SubSystem>
 +      <OptimizeReferences>true</OptimizeReferences>
 +      <EnableCOMDATFolding>true</EnableCOMDATFolding>
 +      <LinkTimeCodeGeneration>
 +      </LinkTimeCodeGeneration>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +      <DataExecutionPrevention>
 +      </DataExecutionPrevention>
 +      <ImportLibrary>../../../../bin/sci$(ProjectName).lib</ImportLibrary>
 +      <TargetMachine>MachineX64</TargetMachine>
 +      <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
 +    </Link>
 +  </ItemDefinitionGroup>
 +  <ItemGroup>
 +    <ClCompile Include="..\cpp\AxesModel.cpp" />
 +    <ClCompile Include="..\cpp\CurrentFigure.cpp" />
 +    <ClCompile Include="..\cpp\CurrentObject.cpp" />
 +    <ClCompile Include="..\cpp\CurrentSubwin.cpp" />
 +    <ClCompile Include="..\cpp\Fac3DColorComputer.cpp" />
 +    <ClCompile Include="..\cpp\FigureList.cpp" />
 +    <ClCompile Include="..\cpp\FigureModel.cpp" />
 +    <ClCompile Include="..\cpp\getConsoleIdentifier.cpp" />
 +    <ClCompile Include="..\cpp\HandleManagement.cpp" />
 +    <ClCompile Include="..\cpp\MatPlotDecomposer.cpp" />
 +    <ClCompile Include="..\cpp\NgonGridMatplotDataDecomposer.cpp" />
 +    <ClCompile Include="..\cpp\ScilabView.cpp" />
 +    <ClCompile Include="..\cpp\Triangulator.cpp" />
 +    <ClCompile Include="..\jni\CallGraphicController.cpp" />
 +    <ClCompile Include="..\cpp\ColorComputer.cpp" />
 +    <ClCompile Include="..\cpp\createGraphicObject.cpp" />
 +    <ClCompile Include="..\cpp\Data3D.cpp" />
 +    <ClCompile Include="..\cpp\DataLoader.cpp" />
 +    <ClCompile Include="..\jni\DataLoader_wrap.c" />
 +    <ClCompile Include="..\cpp\dataModel.cpp" />
 +    <ClCompile Include="..\cpp\DecompositionUtils.cpp" />
 +    <ClCompile Include="..\cpp\deleteGraphicObject.cpp" />
 +    <ClCompile Include="..\jni\ScilabNativeView_wrap.c" />
 +    <ClCompile Include="DllmainGraphic_objects.c" />
 +    <ClCompile Include="..\cpp\Fac3DDecomposer.cpp" />
 +    <ClCompile Include="..\cpp\getGraphicObjectProperty.cpp" />
 +    <ClCompile Include="..\..\sci_gateway\c\gw_graphic_objects.c" />
 +    <ClCompile Include="..\cpp\NgonData.cpp" />
 +    <ClCompile Include="..\cpp\NgonGeneralData.cpp" />
 +    <ClCompile Include="..\cpp\NgonGridData.cpp" />
 +    <ClCompile Include="..\cpp\NgonGridDataDecomposer.cpp" />
 +    <ClCompile Include="..\cpp\NgonGridGrayplotDataDecomposer.cpp" />
 +    <ClCompile Include="..\cpp\NgonGridMatplotData.cpp" />
 +    <ClCompile Include="..\cpp\NgonPolylineData.cpp" />
 +    <ClCompile Include="..\cpp\Plot3DDecomposer.cpp" />
 +    <ClCompile Include="..\cpp\PolylineDecomposer.cpp" />
 +    <ClCompile Include="..\..\sci_gateway\cpp\sci_graphicfunction.cpp" />
 +    <ClCompile Include="..\cpp\setGraphicObjectProperty.cpp" />
 +    <ClCompile Include="..\cpp\TriangleMeshData.cpp" />
 +    <ClCompile Include="..\cpp\TriangleMeshFecData.cpp" />
 +    <ClCompile Include="..\cpp\TriangleMeshFecDataDecomposer.cpp" />
 +  </ItemGroup>
 +  <ItemGroup>
 +    <ClInclude Include="..\..\includes\Fac3DColorComputer.hxx" />
 +    <ClInclude Include="..\..\includes\FigureList.h" />
 +    <ClInclude Include="..\..\includes\getConsoleIdentifier.h" />
 +    <ClInclude Include="..\..\includes\getGraphicObjectProperty.h" />
 +    <ClInclude Include="..\..\includes\graphicObjectProperties.h" />
 +    <ClInclude Include="..\..\includes\MatPlotDecomposer.hxx" />
 +    <ClInclude Include="..\..\includes\NgonGridMatplotDataDecomposer.hxx" />
 +    <ClInclude Include="..\..\includes\returnType.h" />
 +    <ClInclude Include="..\..\includes\ScilabView.hxx" />
 +    <ClInclude Include="..\..\includes\setGraphicObjectProperty.h" />
 +    <ClInclude Include="..\..\includes\Triangulator.hxx" />
 +    <ClInclude Include="..\jni\CallGraphicController.hxx" />
 +    <ClInclude Include="..\..\includes\createGraphicObject.h" />
 +    <ClInclude Include="..\..\includes\Data3D.hxx" />
 +    <ClInclude Include="..\..\includes\DataController.hxx" />
 +    <ClInclude Include="..\..\includes\DataProperties.hxx" />
 +    <ClInclude Include="..\..\includes\DecompositionUtils.hxx" />
 +    <ClInclude Include="..\..\includes\deleteGraphicObject.h" />
 +    <ClInclude Include="..\..\includes\dynlib_graphic_objects.h" />
 +    <ClInclude Include="..\..\includes\Fac3DDecomposer.hxx" />
 +    <ClInclude Include="..\..\includes\gw_graphic_objects.h" />
 +    <ClInclude Include="..\..\includes\NgonData.hxx" />
 +    <ClInclude Include="..\..\includes\NgonGeneralData.hxx" />
 +    <ClInclude Include="..\..\includes\NgonGridData.hxx" />
 +    <ClInclude Include="..\..\includes\NgonGridDataDecomposer.hxx" />
 +    <ClInclude Include="..\..\includes\NgonGridGrayplotDataDecomposer.hxx" />
 +    <ClInclude Include="..\..\includes\NgonGridMatplotData.hxx" />
 +    <ClInclude Include="..\..\includes\NgonPolylineData.hxx" />
 +    <ClInclude Include="..\..\includes\Plot3DDecomposer.hxx" />
 +    <ClInclude Include="..\..\includes\PolylineDecomposer.hxx" />
 +    <ClInclude Include="..\..\includes\TriangleMeshData.hxx" />
 +    <ClInclude Include="..\..\includes\TriangleMeshFecDataDecomposer.hxx" />
 +  </ItemGroup>
 +  <ItemGroup>
 +    <None Include="..\..\locales\en_US\messages.pot" />
 +    <None Include="..\jni\ScilabNativeView.i" />
 +    <None Include="LibScilab_Import.def" />
 +    <None Include="..\jni\DataLoader.i" />
 +    <None Include="..\..\graphic_objects.iss" />
 +    <None Include="..\..\sci_gateway\graphic_objects_gateway.xml" />
 +    <None Include="..\..\Makefile.am" />
 +  </ItemGroup>
 +  <ItemGroup>
++    <ProjectReference Include="..\..\..\api_scilab\api_scilab.vcxproj">
++      <Project>{43c5bab1-1dca-4743-a183-77e0d42fe7d0}</Project>
++    </ProjectReference>
 +    <ProjectReference Include="..\..\..\commons\src\c\commons.vcxproj">
 +      <Project>{eca09a1e-6d12-4a47-92e1-a671c181df77}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\jvm\libjvm.vcxproj">
 +      <Project>{8ba2dda8-bd04-4d4d-8ee6-6caa955f7470}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\output_stream\src\c\output_stream.vcxproj">
 +      <Project>{a5911cd7-f8e8-440c-a23e-4843a0636f3a}</Project>
 +    </ProjectReference>
 +  </ItemGroup>
 +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 +  <ImportGroup Label="ExtensionTargets">
 +  </ImportGroup>
 +</Project>
index 6765ad6,0000000..679c9d6
mode 100644,000000..100644
--- /dev/null
@@@ -1,1152 -1,0 +1,1158 @@@
 +#include "CallGraphicController.hxx"
- /* Generated by GIWS (version 1.3.0) */
++/* Generated by GIWS (version 2.0.0) with command:
++giws --disable-return-size-array --output-dir src/jni/ --throws-exception-on-error --description-file src/jni/graphic_objects.giws.xml 
++*/
 +/*
 +
 +Copyright 2007-2008 INRIA
 +Copyright 2008-2011 DIGITEO
++Copyright 2011-2012 Scilab Enterprises
 +
 +Author : Sylvestre Ledru & others
 +
 +This is generated code.
 +
 +This software is a computer program whose purpose is to hide the complexity
 +of accessing Java objects/methods from C++ code.
 +
 +This software is governed by the CeCILL-B license under French law and
 +abiding by the rules of distribution of free software.  You can  use, 
 +modify and/ or redistribute the software under the terms of the CeCILL-B
 +license as circulated by CEA, CNRS and INRIA at the following URL
 +"http://www.cecill.info". 
 +
 +As a counterpart to the access to the source code and  rights to copy,
 +modify and redistribute granted by the license, users are provided only
 +with a limited warranty  and the software's author,  the holder of the
 +economic rights,  and the successive licensors  have only  limited
 +liability. 
 +
 +In this respect, the user's attention is drawn to the risks associated
 +with loading,  using,  modifying and/or developing or reproducing the
 +software by the user in light of its specific status of free software,
 +that may mean  that it is complicated to manipulate,  and  that  also
 +therefore means  that it is reserved for developers  and  experienced
 +professionals having in-depth computer knowledge. Users are therefore
 +encouraged to load and test the software's suitability as regards their
 +requirements in conditions enabling the security of their systems and/or 
 +data to be ensured and,  more generally, to use and operate it in the 
 +same conditions as regards security. 
 +
 +The fact that you are presently reading this means that you have had
 +knowledge of the CeCILL-B license and that you accept its terms.
 +*/
 +
 +namespace org_scilab_modules_graphic_objects {
 +
++                // Static declarations (if any)
++                
 +// Returns the current env
 +
 +JNIEnv * CallGraphicController::getCurrentEnv() {
 +JNIEnv * curEnv = NULL;
 +jint res=this->jvm->AttachCurrentThread(reinterpret_cast<void **>(&curEnv), NULL);
 +if (res != JNI_OK) {
 +throw GiwsException::JniException(getCurrentEnv());
 +}
 +return curEnv;
 +}
 +// Destructor
 +
 +CallGraphicController::~CallGraphicController() {
 +JNIEnv * curEnv = NULL;
 +this->jvm->AttachCurrentThread(reinterpret_cast<void **>(&curEnv), NULL);
 +
 +curEnv->DeleteGlobalRef(this->instance);
 +curEnv->DeleteGlobalRef(this->instanceClass);
 +curEnv->DeleteGlobalRef(this->stringArrayClass);}
 +// Constructors
 +CallGraphicController::CallGraphicController(JavaVM * jvm_) {
 +jmethodID constructObject = NULL ;
 +jobject localInstance ;
 +jclass localClass ;
++
 +const std::string construct="<init>";
 +const std::string param="()V";
 +jvm=jvm_;
 +
 +JNIEnv * curEnv = getCurrentEnv();
 +
 +localClass = curEnv->FindClass( this->className().c_str() ) ;
 +if (localClass == NULL) {
 +  throw GiwsException::JniClassNotFoundException(curEnv, this->className());
 +}
 +
 +this->instanceClass = static_cast<jclass>(curEnv->NewGlobalRef(localClass));
 +
 +/* localClass is not needed anymore */
 +curEnv->DeleteLocalRef(localClass);
 +
 +if (this->instanceClass == NULL) {
 +throw GiwsException::JniObjectCreationException(curEnv, this->className());
 +}
 +
 +
 +constructObject = curEnv->GetMethodID( this->instanceClass, construct.c_str() , param.c_str() ) ;
 +if(constructObject == NULL){
 +throw GiwsException::JniObjectCreationException(curEnv, this->className());
 +}
 +
 +localInstance = curEnv->NewObject( this->instanceClass, constructObject ) ;
 +if(localInstance == NULL){
 +throw GiwsException::JniObjectCreationException(curEnv, this->className());
 +}
 + 
 +this->instance = curEnv->NewGlobalRef(localInstance) ;
 +if(this->instance == NULL){
 +throw GiwsException::JniObjectCreationException(curEnv, this->className());
 +}
 +/* localInstance not needed anymore */
 +curEnv->DeleteLocalRef(localInstance);
 +
 +                /* Methods ID set to NULL */
 +voiddeleteGraphicObjectjstringjava_lang_StringID=NULL;
 +jstringcloneGraphicObjectjstringjava_lang_StringID=NULL;
 +jstringaskGraphicObjectjstringjava_lang_StringID=NULL;
 +voidsetGraphicObjectRelationshipjstringjava_lang_Stringjstringjava_lang_StringID=NULL;
 +voidremoveRelationShipAndDeletejstringjava_lang_StringID=NULL;
 +jstringgetGraphicObjectPropertyAsStringjstringjava_lang_Stringjstringjava_lang_StringID=NULL;
 +jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_Stringjstringjava_lang_StringID=NULL;
 +jobjectArray_getGraphicObjectPropertyAsStringVectorjstringjava_lang_Stringjstringjava_lang_StringID=NULL;
- jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjobjectArray_java_lang_StringID=NULL;
++jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjobjectArray_java_lang_Stringjava_lang_StringID=NULL;
 +jdoublegetGraphicObjectPropertyAsDoublejstringjava_lang_Stringjstringjava_lang_StringID=NULL;
 +jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjdoubledoubleID=NULL;
 +jdoubleArray_getGraphicObjectPropertyAsDoubleVectorjstringjava_lang_Stringjstringjava_lang_StringID=NULL;
- jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjdoubleArray_doubleID=NULL;
++jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjdoubleArray_doubledoubleID=NULL;
 +jintgetGraphicObjectPropertyAsIntegerjstringjava_lang_Stringjstringjava_lang_StringID=NULL;
 +jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjintintID=NULL;
 +jintArray_getGraphicObjectPropertyAsIntegerVectorjstringjava_lang_Stringjstringjava_lang_StringID=NULL;
- jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjintArray_intID=NULL;
++jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjintArray_intintID=NULL;
 +jintgetGraphicObjectPropertyAsBooleanjstringjava_lang_Stringjstringjava_lang_StringID=NULL;
 +jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjbooleanbooleanID=NULL;
 +jintArray_getGraphicObjectPropertyAsBooleanVectorjstringjava_lang_Stringjstringjava_lang_StringID=NULL;
- jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjbooleanArray_booleanID=NULL;
++jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjbooleanArray_booleanbooleanID=NULL;
 +voidregisterScilabViewID=NULL;
 +jstringgetConsoleIdentifierID=NULL;
 +voidbuildFigureMenuBarjstringjava_lang_StringID=NULL;
 +
 +
 +}
 +
 +CallGraphicController::CallGraphicController(JavaVM * jvm_, jobject JObj) {
 +        jvm=jvm_;
 +
 +        JNIEnv * curEnv = getCurrentEnv();
 +
 +jclass localClass = curEnv->GetObjectClass(JObj);
 +        this->instanceClass = static_cast<jclass>(curEnv->NewGlobalRef(localClass));
 +        curEnv->DeleteLocalRef(localClass);
 +
 +        if (this->instanceClass == NULL) {
 +throw GiwsException::JniObjectCreationException(curEnv, this->className());
 +        }
 +
 +        this->instance = curEnv->NewGlobalRef(JObj) ;
 +        if(this->instance == NULL){
 +throw GiwsException::JniObjectCreationException(curEnv, this->className());
 +        }
 +        /* Methods ID set to NULL */
 +        voiddeleteGraphicObjectjstringjava_lang_StringID=NULL;
 +jstringcloneGraphicObjectjstringjava_lang_StringID=NULL;
 +jstringaskGraphicObjectjstringjava_lang_StringID=NULL;
 +voidsetGraphicObjectRelationshipjstringjava_lang_Stringjstringjava_lang_StringID=NULL;
 +voidremoveRelationShipAndDeletejstringjava_lang_StringID=NULL;
 +jstringgetGraphicObjectPropertyAsStringjstringjava_lang_Stringjstringjava_lang_StringID=NULL;
 +jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_Stringjstringjava_lang_StringID=NULL;
 +jobjectArray_getGraphicObjectPropertyAsStringVectorjstringjava_lang_Stringjstringjava_lang_StringID=NULL;
- jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjobjectArray_java_lang_StringID=NULL;
++jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjobjectArray_java_lang_Stringjava_lang_StringID=NULL;
 +jdoublegetGraphicObjectPropertyAsDoublejstringjava_lang_Stringjstringjava_lang_StringID=NULL;
 +jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjdoubledoubleID=NULL;
 +jdoubleArray_getGraphicObjectPropertyAsDoubleVectorjstringjava_lang_Stringjstringjava_lang_StringID=NULL;
- jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjdoubleArray_doubleID=NULL;
++jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjdoubleArray_doubledoubleID=NULL;
 +jintgetGraphicObjectPropertyAsIntegerjstringjava_lang_Stringjstringjava_lang_StringID=NULL;
 +jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjintintID=NULL;
 +jintArray_getGraphicObjectPropertyAsIntegerVectorjstringjava_lang_Stringjstringjava_lang_StringID=NULL;
- jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjintArray_intID=NULL;
++jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjintArray_intintID=NULL;
 +jintgetGraphicObjectPropertyAsBooleanjstringjava_lang_Stringjstringjava_lang_StringID=NULL;
 +jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjbooleanbooleanID=NULL;
 +jintArray_getGraphicObjectPropertyAsBooleanVectorjstringjava_lang_Stringjstringjava_lang_StringID=NULL;
- jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjbooleanArray_booleanID=NULL;
++jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjbooleanArray_booleanbooleanID=NULL;
 +voidregisterScilabViewID=NULL;
 +jstringgetConsoleIdentifierID=NULL;
 +voidbuildFigureMenuBarjstringjava_lang_StringID=NULL;
 +
 +
 +}
 +
 +// Generic methods
 +
 +void CallGraphicController::synchronize() {
 +if (getCurrentEnv()->MonitorEnter(instance) != JNI_OK) {
 +throw GiwsException::JniMonitorException(getCurrentEnv(), "CallGraphicController");
 +}
 +}
 +
 +void CallGraphicController::endSynchronize() {
 +if ( getCurrentEnv()->MonitorExit(instance) != JNI_OK) {
 +throw GiwsException::JniMonitorException(getCurrentEnv(), "CallGraphicController");
 +}
 +}
 +// Method(s)
 +
- void CallGraphicController::deleteGraphicObject (JavaVM * jvm_, char * id){
++void CallGraphicController::deleteGraphicObject (JavaVM * jvm_, char const* id){
 +
 +JNIEnv * curEnv = NULL;
 +jvm_->AttachCurrentThread(reinterpret_cast<void **>(&curEnv), NULL);
 +jclass cls = curEnv->FindClass( className().c_str() );
 +
 +jmethodID voiddeleteGraphicObjectjstringjava_lang_StringID = curEnv->GetStaticMethodID(cls, "deleteGraphicObject", "(Ljava/lang/String;)V" ) ;
 +if (voiddeleteGraphicObjectjstringjava_lang_StringID == NULL) {
 +throw GiwsException::JniMethodNotFoundException(curEnv, "deleteGraphicObject");
 +}
 +
 +jstring id_ = curEnv->NewStringUTF( id );
 +if (id != NULL && id_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +
 +                         curEnv->CallStaticVoidMethod(cls, voiddeleteGraphicObjectjstringjava_lang_StringID ,id_);
 +                        curEnv->DeleteLocalRef(id_);
 +curEnv->DeleteLocalRef(cls);
 +if (curEnv->ExceptionCheck()) {
 +throw GiwsException::JniCallMethodException(curEnv);
 +}
 +}
 +
- char * CallGraphicController::cloneGraphicObject (JavaVM * jvm_, char * id){
++char* CallGraphicController::cloneGraphicObject (JavaVM * jvm_, char const* id){
 +
 +JNIEnv * curEnv = NULL;
 +jvm_->AttachCurrentThread(reinterpret_cast<void **>(&curEnv), NULL);
 +jclass cls = curEnv->FindClass( className().c_str() );
 +
 +jmethodID jstringcloneGraphicObjectjstringjava_lang_StringID = curEnv->GetStaticMethodID(cls, "cloneGraphicObject", "(Ljava/lang/String;)Ljava/lang/String;" ) ;
 +if (jstringcloneGraphicObjectjstringjava_lang_StringID == NULL) {
 +throw GiwsException::JniMethodNotFoundException(curEnv, "cloneGraphicObject");
 +}
 +
 +jstring id_ = curEnv->NewStringUTF( id );
 +if (id != NULL && id_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +
 +                        jstring res =  static_cast<jstring>( curEnv->CallStaticObjectMethod(cls, jstringcloneGraphicObjectjstringjava_lang_StringID ,id_));
 +                        if (curEnv->ExceptionCheck()) {
 +throw GiwsException::JniCallMethodException(curEnv);
 +}
 +
 +const char *tempString = curEnv->GetStringUTFChars(res, 0);
 +char * myStringBuffer = new char[strlen(tempString) + 1];
 +strcpy(myStringBuffer, tempString);
 +curEnv->ReleaseStringUTFChars(res, tempString);
 +curEnv->DeleteLocalRef(res);
 +curEnv->DeleteLocalRef(id_);
 +curEnv->DeleteLocalRef(cls);
 +if (curEnv->ExceptionCheck()) {
 +delete[] myStringBuffer;
 +                                throw GiwsException::JniCallMethodException(curEnv);
 +}
 +return myStringBuffer;
 +
 +}
 +
- char * CallGraphicController::askGraphicObject (JavaVM * jvm_, char * typeName){
++char* CallGraphicController::askGraphicObject (JavaVM * jvm_, char const* typeName){
 +
 +JNIEnv * curEnv = NULL;
 +jvm_->AttachCurrentThread(reinterpret_cast<void **>(&curEnv), NULL);
 +jclass cls = curEnv->FindClass( className().c_str() );
 +
 +jmethodID jstringaskGraphicObjectjstringjava_lang_StringID = curEnv->GetStaticMethodID(cls, "askGraphicObject", "(Ljava/lang/String;)Ljava/lang/String;" ) ;
 +if (jstringaskGraphicObjectjstringjava_lang_StringID == NULL) {
 +throw GiwsException::JniMethodNotFoundException(curEnv, "askGraphicObject");
 +}
 +
 +jstring typeName_ = curEnv->NewStringUTF( typeName );
 +if (typeName != NULL && typeName_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +
 +                        jstring res =  static_cast<jstring>( curEnv->CallStaticObjectMethod(cls, jstringaskGraphicObjectjstringjava_lang_StringID ,typeName_));
 +                        if (curEnv->ExceptionCheck()) {
 +throw GiwsException::JniCallMethodException(curEnv);
 +}
 +
 +const char *tempString = curEnv->GetStringUTFChars(res, 0);
 +char * myStringBuffer = new char[strlen(tempString) + 1];
 +strcpy(myStringBuffer, tempString);
 +curEnv->ReleaseStringUTFChars(res, tempString);
 +curEnv->DeleteLocalRef(res);
 +curEnv->DeleteLocalRef(typeName_);
 +curEnv->DeleteLocalRef(cls);
 +if (curEnv->ExceptionCheck()) {
 +delete[] myStringBuffer;
 +                                throw GiwsException::JniCallMethodException(curEnv);
 +}
 +return myStringBuffer;
 +
 +}
 +
- void CallGraphicController::setGraphicObjectRelationship (JavaVM * jvm_, char * parentId, char * childId){
++void CallGraphicController::setGraphicObjectRelationship (JavaVM * jvm_, char const* parentId, char const* childId){
 +
 +JNIEnv * curEnv = NULL;
 +jvm_->AttachCurrentThread(reinterpret_cast<void **>(&curEnv), NULL);
 +jclass cls = curEnv->FindClass( className().c_str() );
 +
 +jmethodID voidsetGraphicObjectRelationshipjstringjava_lang_Stringjstringjava_lang_StringID = curEnv->GetStaticMethodID(cls, "setGraphicObjectRelationship", "(Ljava/lang/String;Ljava/lang/String;)V" ) ;
 +if (voidsetGraphicObjectRelationshipjstringjava_lang_Stringjstringjava_lang_StringID == NULL) {
 +throw GiwsException::JniMethodNotFoundException(curEnv, "setGraphicObjectRelationship");
 +}
 +
 +jstring parentId_ = curEnv->NewStringUTF( parentId );
 +if (parentId != NULL && parentId_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +
 +jstring childId_ = curEnv->NewStringUTF( childId );
 +if (childId != NULL && childId_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +
 +                         curEnv->CallStaticVoidMethod(cls, voidsetGraphicObjectRelationshipjstringjava_lang_Stringjstringjava_lang_StringID ,parentId_, childId_);
 +                        curEnv->DeleteLocalRef(parentId_);
 +curEnv->DeleteLocalRef(childId_);
 +curEnv->DeleteLocalRef(cls);
 +if (curEnv->ExceptionCheck()) {
 +throw GiwsException::JniCallMethodException(curEnv);
 +}
 +}
 +
- void CallGraphicController::removeRelationShipAndDelete (JavaVM * jvm_, char * id){
++void CallGraphicController::removeRelationShipAndDelete (JavaVM * jvm_, char const* id){
 +
 +JNIEnv * curEnv = NULL;
 +jvm_->AttachCurrentThread(reinterpret_cast<void **>(&curEnv), NULL);
 +jclass cls = curEnv->FindClass( className().c_str() );
 +
 +jmethodID voidremoveRelationShipAndDeletejstringjava_lang_StringID = curEnv->GetStaticMethodID(cls, "removeRelationShipAndDelete", "(Ljava/lang/String;)V" ) ;
 +if (voidremoveRelationShipAndDeletejstringjava_lang_StringID == NULL) {
 +throw GiwsException::JniMethodNotFoundException(curEnv, "removeRelationShipAndDelete");
 +}
 +
 +jstring id_ = curEnv->NewStringUTF( id );
 +if (id != NULL && id_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +
 +                         curEnv->CallStaticVoidMethod(cls, voidremoveRelationShipAndDeletejstringjava_lang_StringID ,id_);
 +                        curEnv->DeleteLocalRef(id_);
 +curEnv->DeleteLocalRef(cls);
 +if (curEnv->ExceptionCheck()) {
 +throw GiwsException::JniCallMethodException(curEnv);
 +}
 +}
 +
- char * CallGraphicController::getGraphicObjectPropertyAsString (JavaVM * jvm_, char * id, char * propertyName){
++char* CallGraphicController::getGraphicObjectPropertyAsString (JavaVM * jvm_, char const* id, char const* propertyName){
 +
 +JNIEnv * curEnv = NULL;
 +jvm_->AttachCurrentThread(reinterpret_cast<void **>(&curEnv), NULL);
 +jclass cls = curEnv->FindClass( className().c_str() );
 +
 +jmethodID jstringgetGraphicObjectPropertyAsStringjstringjava_lang_Stringjstringjava_lang_StringID = curEnv->GetStaticMethodID(cls, "getGraphicObjectPropertyAsString", "(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;" ) ;
 +if (jstringgetGraphicObjectPropertyAsStringjstringjava_lang_Stringjstringjava_lang_StringID == NULL) {
 +throw GiwsException::JniMethodNotFoundException(curEnv, "getGraphicObjectPropertyAsString");
 +}
 +
 +jstring id_ = curEnv->NewStringUTF( id );
 +if (id != NULL && id_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +
 +jstring propertyName_ = curEnv->NewStringUTF( propertyName );
 +if (propertyName != NULL && propertyName_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +
 +                        jstring res =  static_cast<jstring>( curEnv->CallStaticObjectMethod(cls, jstringgetGraphicObjectPropertyAsStringjstringjava_lang_Stringjstringjava_lang_StringID ,id_, propertyName_));
 +                        if (curEnv->ExceptionCheck()) {
 +throw GiwsException::JniCallMethodException(curEnv);
 +}
 +
 +const char *tempString = curEnv->GetStringUTFChars(res, 0);
 +char * myStringBuffer = new char[strlen(tempString) + 1];
 +strcpy(myStringBuffer, tempString);
 +curEnv->ReleaseStringUTFChars(res, tempString);
 +curEnv->DeleteLocalRef(res);
 +curEnv->DeleteLocalRef(id_);
 +curEnv->DeleteLocalRef(propertyName_);
 +curEnv->DeleteLocalRef(cls);
 +if (curEnv->ExceptionCheck()) {
 +delete[] myStringBuffer;
 +                                throw GiwsException::JniCallMethodException(curEnv);
 +}
 +return myStringBuffer;
 +
 +}
 +
- bool CallGraphicController::setGraphicObjectProperty (JavaVM * jvm_, char * id, char * propertyName, char * value){
++bool CallGraphicController::setGraphicObjectProperty (JavaVM * jvm_, char const* id, char const* propertyName, char const* value){
 +
 +JNIEnv * curEnv = NULL;
 +jvm_->AttachCurrentThread(reinterpret_cast<void **>(&curEnv), NULL);
 +jclass cls = curEnv->FindClass( className().c_str() );
 +
 +jmethodID jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_Stringjstringjava_lang_StringID = curEnv->GetStaticMethodID(cls, "setGraphicObjectProperty", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Z" ) ;
 +if (jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_Stringjstringjava_lang_StringID == NULL) {
 +throw GiwsException::JniMethodNotFoundException(curEnv, "setGraphicObjectProperty");
 +}
 +
 +jstring id_ = curEnv->NewStringUTF( id );
 +if (id != NULL && id_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +
 +jstring propertyName_ = curEnv->NewStringUTF( propertyName );
 +if (propertyName != NULL && propertyName_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +
 +jstring value_ = curEnv->NewStringUTF( value );
 +if (value != NULL && value_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +
 +                        jboolean res =  static_cast<jboolean>( curEnv->CallStaticBooleanMethod(cls, jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_Stringjstringjava_lang_StringID ,id_, propertyName_, value_));
 +                        curEnv->DeleteLocalRef(id_);
 +curEnv->DeleteLocalRef(propertyName_);
 +curEnv->DeleteLocalRef(value_);
 +curEnv->DeleteLocalRef(cls);
 +if (curEnv->ExceptionCheck()) {
 +throw GiwsException::JniCallMethodException(curEnv);
 +}
 +return (res == JNI_TRUE);
 +
 +}
 +
- char ** CallGraphicController::getGraphicObjectPropertyAsStringVector (JavaVM * jvm_, char * id, char * propertyName){
++char** CallGraphicController::getGraphicObjectPropertyAsStringVector (JavaVM * jvm_, char const* id, char const* propertyName){
 +
 +JNIEnv * curEnv = NULL;
 +jvm_->AttachCurrentThread(reinterpret_cast<void **>(&curEnv), NULL);
 +jclass cls = curEnv->FindClass( className().c_str() );
 +
 +jmethodID jobjectArray_getGraphicObjectPropertyAsStringVectorjstringjava_lang_Stringjstringjava_lang_StringID = curEnv->GetStaticMethodID(cls, "getGraphicObjectPropertyAsStringVector", "(Ljava/lang/String;Ljava/lang/String;)[Ljava/lang/String;" ) ;
 +if (jobjectArray_getGraphicObjectPropertyAsStringVectorjstringjava_lang_Stringjstringjava_lang_StringID == NULL) {
 +throw GiwsException::JniMethodNotFoundException(curEnv, "getGraphicObjectPropertyAsStringVector");
 +}
 +
 +jstring id_ = curEnv->NewStringUTF( id );
 +if (id != NULL && id_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +
 +jstring propertyName_ = curEnv->NewStringUTF( propertyName );
 +if (propertyName != NULL && propertyName_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +
 +                        jobjectArray res =  static_cast<jobjectArray>( curEnv->CallStaticObjectMethod(cls, jobjectArray_getGraphicObjectPropertyAsStringVectorjstringjava_lang_Stringjstringjava_lang_StringID ,id_, propertyName_));
 +                        if (curEnv->ExceptionCheck()) {
 +throw GiwsException::JniCallMethodException(curEnv);
 +}int lenRow;
 + lenRow = curEnv->GetArrayLength(res);
 +
 +char **arrayOfString;
 +arrayOfString = new char *[lenRow];
 +for (jsize i = 0; i < lenRow; i++){
 +jstring resString = reinterpret_cast<jstring>(curEnv->GetObjectArrayElement(res, i));
 +const char *tempString = curEnv->GetStringUTFChars(resString, 0);
 +arrayOfString[i] = new char[strlen(tempString) + 1];
 +
 +strcpy(arrayOfString[i], tempString);
 +curEnv->ReleaseStringUTFChars(resString, tempString);
 +curEnv->DeleteLocalRef(resString);
 +}
 +curEnv->DeleteLocalRef(id_);
 +curEnv->DeleteLocalRef(propertyName_);
 +curEnv->DeleteLocalRef(cls);
 +if (curEnv->ExceptionCheck()) {
 +delete[] arrayOfString;
 +                                throw GiwsException::JniCallMethodException(curEnv);
 +}
 +curEnv->DeleteLocalRef(res);
 +return arrayOfString;
 +
 +}
 +
- bool CallGraphicController::setGraphicObjectProperty (JavaVM * jvm_, char * id, char * propertyName, char ** value, int valueSize){
++bool CallGraphicController::setGraphicObjectProperty (JavaVM * jvm_, char const* id, char const* propertyName, char const* const* value, int valueSize){
 +
 +JNIEnv * curEnv = NULL;
 +jvm_->AttachCurrentThread(reinterpret_cast<void **>(&curEnv), NULL);
 +jclass cls = curEnv->FindClass( className().c_str() );
 +
- jmethodID jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjobjectArray_java_lang_StringID = curEnv->GetStaticMethodID(cls, "setGraphicObjectProperty", "(Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Z" ) ;
- if (jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjobjectArray_java_lang_StringID == NULL) {
++jmethodID jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjobjectArray_java_lang_Stringjava_lang_StringID = curEnv->GetStaticMethodID(cls, "setGraphicObjectProperty", "(Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Z" ) ;
++if (jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjobjectArray_java_lang_Stringjava_lang_StringID == NULL) {
 +throw GiwsException::JniMethodNotFoundException(curEnv, "setGraphicObjectProperty");
 +}
 +
 +jstring id_ = curEnv->NewStringUTF( id );
 +if (id != NULL && id_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +
 +jstring propertyName_ = curEnv->NewStringUTF( propertyName );
 +if (propertyName != NULL && propertyName_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +jclass stringArrayClass = curEnv->FindClass("java/lang/String");
 +
 +// create java array of strings.
 +jobjectArray value_ = curEnv->NewObjectArray( valueSize, stringArrayClass, NULL);
 +if (value_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +// convert each char * to java strings and fill the java array.
 +for ( int i = 0; i < valueSize; i++)
 +{
 +jstring TempString = curEnv->NewStringUTF( value[i] );
 +if (TempString == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +curEnv->SetObjectArrayElement( value_, i, TempString);
 +
 +// avoid keeping reference on to many strings
 +curEnv->DeleteLocalRef(TempString);
 +}
-                         jboolean res =  static_cast<jboolean>( curEnv->CallStaticBooleanMethod(cls, jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjobjectArray_java_lang_StringID ,id_, propertyName_, value_));
++                        jboolean res =  static_cast<jboolean>( curEnv->CallStaticBooleanMethod(cls, jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjobjectArray_java_lang_Stringjava_lang_StringID ,id_, propertyName_, value_));
 +                        curEnv->DeleteLocalRef(stringArrayClass);
 +curEnv->DeleteLocalRef(id_);
 +curEnv->DeleteLocalRef(propertyName_);
 +curEnv->DeleteLocalRef(value_);
 +curEnv->DeleteLocalRef(cls);
 +if (curEnv->ExceptionCheck()) {
 +throw GiwsException::JniCallMethodException(curEnv);
 +}
 +return (res == JNI_TRUE);
 +
 +}
 +
- double CallGraphicController::getGraphicObjectPropertyAsDouble (JavaVM * jvm_, char * id, char * propertyName){
++double CallGraphicController::getGraphicObjectPropertyAsDouble (JavaVM * jvm_, char const* id, char const* propertyName){
 +
 +JNIEnv * curEnv = NULL;
 +jvm_->AttachCurrentThread(reinterpret_cast<void **>(&curEnv), NULL);
 +jclass cls = curEnv->FindClass( className().c_str() );
 +
 +jmethodID jdoublegetGraphicObjectPropertyAsDoublejstringjava_lang_Stringjstringjava_lang_StringID = curEnv->GetStaticMethodID(cls, "getGraphicObjectPropertyAsDouble", "(Ljava/lang/String;Ljava/lang/String;)D" ) ;
 +if (jdoublegetGraphicObjectPropertyAsDoublejstringjava_lang_Stringjstringjava_lang_StringID == NULL) {
 +throw GiwsException::JniMethodNotFoundException(curEnv, "getGraphicObjectPropertyAsDouble");
 +}
 +
 +jstring id_ = curEnv->NewStringUTF( id );
 +if (id != NULL && id_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +
 +jstring propertyName_ = curEnv->NewStringUTF( propertyName );
 +if (propertyName != NULL && propertyName_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +
 +                        jdouble res =  static_cast<jdouble>( curEnv->CallStaticDoubleMethod(cls, jdoublegetGraphicObjectPropertyAsDoublejstringjava_lang_Stringjstringjava_lang_StringID ,id_, propertyName_));
 +                        curEnv->DeleteLocalRef(id_);
 +curEnv->DeleteLocalRef(propertyName_);
 +curEnv->DeleteLocalRef(cls);
 +if (curEnv->ExceptionCheck()) {
 +throw GiwsException::JniCallMethodException(curEnv);
 +}
 +return res;
 +
 +}
 +
- bool CallGraphicController::setGraphicObjectProperty (JavaVM * jvm_, char * id, char * propertyName, double value){
++bool CallGraphicController::setGraphicObjectProperty (JavaVM * jvm_, char const* id, char const* propertyName, double value){
 +
 +JNIEnv * curEnv = NULL;
 +jvm_->AttachCurrentThread(reinterpret_cast<void **>(&curEnv), NULL);
 +jclass cls = curEnv->FindClass( className().c_str() );
 +
 +jmethodID jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjdoubledoubleID = curEnv->GetStaticMethodID(cls, "setGraphicObjectProperty", "(Ljava/lang/String;Ljava/lang/String;D)Z" ) ;
 +if (jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjdoubledoubleID == NULL) {
 +throw GiwsException::JniMethodNotFoundException(curEnv, "setGraphicObjectProperty");
 +}
 +
 +jstring id_ = curEnv->NewStringUTF( id );
 +if (id != NULL && id_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +
 +jstring propertyName_ = curEnv->NewStringUTF( propertyName );
 +if (propertyName != NULL && propertyName_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +
 +                        jboolean res =  static_cast<jboolean>( curEnv->CallStaticBooleanMethod(cls, jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjdoubledoubleID ,id_, propertyName_, value));
 +                        curEnv->DeleteLocalRef(id_);
 +curEnv->DeleteLocalRef(propertyName_);
 +curEnv->DeleteLocalRef(cls);
 +if (curEnv->ExceptionCheck()) {
 +throw GiwsException::JniCallMethodException(curEnv);
 +}
 +return (res == JNI_TRUE);
 +
 +}
 +
- double* CallGraphicController::getGraphicObjectPropertyAsDoubleVector (JavaVM * jvm_, char * id, char * propertyName){
++double* CallGraphicController::getGraphicObjectPropertyAsDoubleVector (JavaVM * jvm_, char const* id, char const* propertyName){
 +
 +JNIEnv * curEnv = NULL;
 +jvm_->AttachCurrentThread(reinterpret_cast<void **>(&curEnv), NULL);
 +jclass cls = curEnv->FindClass( className().c_str() );
 +
 +jmethodID jdoubleArray_getGraphicObjectPropertyAsDoubleVectorjstringjava_lang_Stringjstringjava_lang_StringID = curEnv->GetStaticMethodID(cls, "getGraphicObjectPropertyAsDoubleVector", "(Ljava/lang/String;Ljava/lang/String;)[D" ) ;
 +if (jdoubleArray_getGraphicObjectPropertyAsDoubleVectorjstringjava_lang_Stringjstringjava_lang_StringID == NULL) {
 +throw GiwsException::JniMethodNotFoundException(curEnv, "getGraphicObjectPropertyAsDoubleVector");
 +}
 +
 +jstring id_ = curEnv->NewStringUTF( id );
 +if (id != NULL && id_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +
 +jstring propertyName_ = curEnv->NewStringUTF( propertyName );
 +if (propertyName != NULL && propertyName_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +
 +                        jdoubleArray res =  static_cast<jdoubleArray>( curEnv->CallStaticObjectMethod(cls, jdoubleArray_getGraphicObjectPropertyAsDoubleVectorjstringjava_lang_Stringjstringjava_lang_StringID ,id_, propertyName_));
 +                        if (res == NULL) { return NULL; }
 +                        if (curEnv->ExceptionCheck()) {
 +throw GiwsException::JniCallMethodException(curEnv);
 +}int lenRow;
 + lenRow = curEnv->GetArrayLength(res);
 +jboolean isCopy = JNI_FALSE;
 +
 +/* GetPrimitiveArrayCritical is faster than getXXXArrayElements */
 +jdouble *resultsArray = static_cast<jdouble *>(curEnv->GetPrimitiveArrayCritical(res, &isCopy));
 +double* myArray= new double[ lenRow];
 +
 +for (jsize i = 0; i <  lenRow; i++){
 +myArray[i]=resultsArray[i];
 +}
 +curEnv->ReleasePrimitiveArrayCritical(res, resultsArray, JNI_ABORT);
 +
 +                        curEnv->DeleteLocalRef(res);
 +curEnv->DeleteLocalRef(id_);
 +curEnv->DeleteLocalRef(propertyName_);
 +curEnv->DeleteLocalRef(cls);
 +if (curEnv->ExceptionCheck()) {
 +delete[] myArray;
 +                                throw GiwsException::JniCallMethodException(curEnv);
 +}
 +return myArray;
 +
 +}
 +
- bool CallGraphicController::setGraphicObjectProperty (JavaVM * jvm_, char * id, char * propertyName, double* value, int valueSize){
++bool CallGraphicController::setGraphicObjectProperty (JavaVM * jvm_, char const* id, char const* propertyName, double const* value, int valueSize){
 +
 +JNIEnv * curEnv = NULL;
 +jvm_->AttachCurrentThread(reinterpret_cast<void **>(&curEnv), NULL);
 +jclass cls = curEnv->FindClass( className().c_str() );
 +
- jmethodID jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjdoubleArray_doubleID = curEnv->GetStaticMethodID(cls, "setGraphicObjectProperty", "(Ljava/lang/String;Ljava/lang/String;[D)Z" ) ;
- if (jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjdoubleArray_doubleID == NULL) {
++jmethodID jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjdoubleArray_doubledoubleID = curEnv->GetStaticMethodID(cls, "setGraphicObjectProperty", "(Ljava/lang/String;Ljava/lang/String;[D)Z" ) ;
++if (jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjdoubleArray_doubledoubleID == NULL) {
 +throw GiwsException::JniMethodNotFoundException(curEnv, "setGraphicObjectProperty");
 +}
 +
 +jstring id_ = curEnv->NewStringUTF( id );
 +if (id != NULL && id_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +
 +jstring propertyName_ = curEnv->NewStringUTF( propertyName );
 +if (propertyName != NULL && propertyName_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +
 +jdoubleArray value_ = curEnv->NewDoubleArray( valueSize ) ;
 +
 +if (value_ == NULL)
 +{
 +// check that allocation succeed
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +curEnv->SetDoubleArrayRegion( value_, 0, valueSize, (jdouble*)(value) ) ;
 +
 +
-                         jboolean res =  static_cast<jboolean>( curEnv->CallStaticBooleanMethod(cls, jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjdoubleArray_doubleID ,id_, propertyName_, value_));
++                        jboolean res =  static_cast<jboolean>( curEnv->CallStaticBooleanMethod(cls, jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjdoubleArray_doubledoubleID ,id_, propertyName_, value_));
 +                        curEnv->DeleteLocalRef(id_);
 +curEnv->DeleteLocalRef(propertyName_);
 +curEnv->DeleteLocalRef(value_);
 +curEnv->DeleteLocalRef(cls);
 +if (curEnv->ExceptionCheck()) {
 +throw GiwsException::JniCallMethodException(curEnv);
 +}
 +return (res == JNI_TRUE);
 +
 +}
 +
- int CallGraphicController::getGraphicObjectPropertyAsInteger (JavaVM * jvm_, char * id, char * propertyName){
++int CallGraphicController::getGraphicObjectPropertyAsInteger (JavaVM * jvm_, char const* id, char const* propertyName){
 +
 +JNIEnv * curEnv = NULL;
 +jvm_->AttachCurrentThread(reinterpret_cast<void **>(&curEnv), NULL);
 +jclass cls = curEnv->FindClass( className().c_str() );
 +
 +jmethodID jintgetGraphicObjectPropertyAsIntegerjstringjava_lang_Stringjstringjava_lang_StringID = curEnv->GetStaticMethodID(cls, "getGraphicObjectPropertyAsInteger", "(Ljava/lang/String;Ljava/lang/String;)I" ) ;
 +if (jintgetGraphicObjectPropertyAsIntegerjstringjava_lang_Stringjstringjava_lang_StringID == NULL) {
 +throw GiwsException::JniMethodNotFoundException(curEnv, "getGraphicObjectPropertyAsInteger");
 +}
 +
 +jstring id_ = curEnv->NewStringUTF( id );
 +if (id != NULL && id_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +
 +jstring propertyName_ = curEnv->NewStringUTF( propertyName );
 +if (propertyName != NULL && propertyName_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +
 +                        jint res =  static_cast<jint>( curEnv->CallStaticIntMethod(cls, jintgetGraphicObjectPropertyAsIntegerjstringjava_lang_Stringjstringjava_lang_StringID ,id_, propertyName_));
 +                        curEnv->DeleteLocalRef(id_);
 +curEnv->DeleteLocalRef(propertyName_);
 +curEnv->DeleteLocalRef(cls);
 +if (curEnv->ExceptionCheck()) {
 +throw GiwsException::JniCallMethodException(curEnv);
 +}
 +return res;
 +
 +}
 +
- bool CallGraphicController::setGraphicObjectProperty (JavaVM * jvm_, char * id, char * propertyName, int value){
++bool CallGraphicController::setGraphicObjectProperty (JavaVM * jvm_, char const* id, char const* propertyName, int value){
 +
 +JNIEnv * curEnv = NULL;
 +jvm_->AttachCurrentThread(reinterpret_cast<void **>(&curEnv), NULL);
 +jclass cls = curEnv->FindClass( className().c_str() );
 +
 +jmethodID jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjintintID = curEnv->GetStaticMethodID(cls, "setGraphicObjectProperty", "(Ljava/lang/String;Ljava/lang/String;I)Z" ) ;
 +if (jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjintintID == NULL) {
 +throw GiwsException::JniMethodNotFoundException(curEnv, "setGraphicObjectProperty");
 +}
 +
 +jstring id_ = curEnv->NewStringUTF( id );
 +if (id != NULL && id_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +
 +jstring propertyName_ = curEnv->NewStringUTF( propertyName );
 +if (propertyName != NULL && propertyName_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +
 +                        jboolean res =  static_cast<jboolean>( curEnv->CallStaticBooleanMethod(cls, jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjintintID ,id_, propertyName_, value));
 +                        curEnv->DeleteLocalRef(id_);
 +curEnv->DeleteLocalRef(propertyName_);
 +curEnv->DeleteLocalRef(cls);
 +if (curEnv->ExceptionCheck()) {
 +throw GiwsException::JniCallMethodException(curEnv);
 +}
 +return (res == JNI_TRUE);
 +
 +}
 +
- int* CallGraphicController::getGraphicObjectPropertyAsIntegerVector (JavaVM * jvm_, char * id, char * propertyName){
++int* CallGraphicController::getGraphicObjectPropertyAsIntegerVector (JavaVM * jvm_, char const* id, char const* propertyName){
 +
 +JNIEnv * curEnv = NULL;
 +jvm_->AttachCurrentThread(reinterpret_cast<void **>(&curEnv), NULL);
 +jclass cls = curEnv->FindClass( className().c_str() );
 +
 +jmethodID jintArray_getGraphicObjectPropertyAsIntegerVectorjstringjava_lang_Stringjstringjava_lang_StringID = curEnv->GetStaticMethodID(cls, "getGraphicObjectPropertyAsIntegerVector", "(Ljava/lang/String;Ljava/lang/String;)[I" ) ;
 +if (jintArray_getGraphicObjectPropertyAsIntegerVectorjstringjava_lang_Stringjstringjava_lang_StringID == NULL) {
 +throw GiwsException::JniMethodNotFoundException(curEnv, "getGraphicObjectPropertyAsIntegerVector");
 +}
 +
 +jstring id_ = curEnv->NewStringUTF( id );
 +if (id != NULL && id_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +
 +jstring propertyName_ = curEnv->NewStringUTF( propertyName );
 +if (propertyName != NULL && propertyName_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +
 +                        jintArray res =  static_cast<jintArray>( curEnv->CallStaticObjectMethod(cls, jintArray_getGraphicObjectPropertyAsIntegerVectorjstringjava_lang_Stringjstringjava_lang_StringID ,id_, propertyName_));
 +                        if (res == NULL) { return NULL; }
 +                        if (curEnv->ExceptionCheck()) {
 +throw GiwsException::JniCallMethodException(curEnv);
 +}int lenRow;
 + lenRow = curEnv->GetArrayLength(res);
 +jboolean isCopy = JNI_FALSE;
 +
 +/* GetPrimitiveArrayCritical is faster than getXXXArrayElements */
 +jint *resultsArray = static_cast<jint *>(curEnv->GetPrimitiveArrayCritical(res, &isCopy));
 +int* myArray= new int[ lenRow];
 +
 +for (jsize i = 0; i <  lenRow; i++){
 +myArray[i]=resultsArray[i];
 +}
 +curEnv->ReleasePrimitiveArrayCritical(res, resultsArray, JNI_ABORT);
 +
 +                        curEnv->DeleteLocalRef(res);
 +curEnv->DeleteLocalRef(id_);
 +curEnv->DeleteLocalRef(propertyName_);
 +curEnv->DeleteLocalRef(cls);
 +if (curEnv->ExceptionCheck()) {
 +delete[] myArray;
 +                                throw GiwsException::JniCallMethodException(curEnv);
 +}
 +return myArray;
 +
 +}
 +
- bool CallGraphicController::setGraphicObjectProperty (JavaVM * jvm_, char * id, char * propertyName, int* value, int valueSize){
++bool CallGraphicController::setGraphicObjectProperty (JavaVM * jvm_, char const* id, char const* propertyName, int const* value, int valueSize){
 +
 +JNIEnv * curEnv = NULL;
 +jvm_->AttachCurrentThread(reinterpret_cast<void **>(&curEnv), NULL);
 +jclass cls = curEnv->FindClass( className().c_str() );
 +
- jmethodID jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjintArray_intID = curEnv->GetStaticMethodID(cls, "setGraphicObjectProperty", "(Ljava/lang/String;Ljava/lang/String;[I)Z" ) ;
- if (jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjintArray_intID == NULL) {
++jmethodID jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjintArray_intintID = curEnv->GetStaticMethodID(cls, "setGraphicObjectProperty", "(Ljava/lang/String;Ljava/lang/String;[I)Z" ) ;
++if (jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjintArray_intintID == NULL) {
 +throw GiwsException::JniMethodNotFoundException(curEnv, "setGraphicObjectProperty");
 +}
 +
 +jstring id_ = curEnv->NewStringUTF( id );
 +if (id != NULL && id_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +
 +jstring propertyName_ = curEnv->NewStringUTF( propertyName );
 +if (propertyName != NULL && propertyName_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +
 +jintArray value_ = curEnv->NewIntArray( valueSize ) ;
 +
 +if (value_ == NULL)
 +{
 +// check that allocation succeed
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +curEnv->SetIntArrayRegion( value_, 0, valueSize, (jint*)(value) ) ;
 +
 +
-                         jboolean res =  static_cast<jboolean>( curEnv->CallStaticBooleanMethod(cls, jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjintArray_intID ,id_, propertyName_, value_));
++                        jboolean res =  static_cast<jboolean>( curEnv->CallStaticBooleanMethod(cls, jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjintArray_intintID ,id_, propertyName_, value_));
 +                        curEnv->DeleteLocalRef(id_);
 +curEnv->DeleteLocalRef(propertyName_);
 +curEnv->DeleteLocalRef(value_);
 +curEnv->DeleteLocalRef(cls);
 +if (curEnv->ExceptionCheck()) {
 +throw GiwsException::JniCallMethodException(curEnv);
 +}
 +return (res == JNI_TRUE);
 +
 +}
 +
- int CallGraphicController::getGraphicObjectPropertyAsBoolean (JavaVM * jvm_, char * id, char * propertyName){
++int CallGraphicController::getGraphicObjectPropertyAsBoolean (JavaVM * jvm_, char const* id, char const* propertyName){
 +
 +JNIEnv * curEnv = NULL;
 +jvm_->AttachCurrentThread(reinterpret_cast<void **>(&curEnv), NULL);
 +jclass cls = curEnv->FindClass( className().c_str() );
 +
 +jmethodID jintgetGraphicObjectPropertyAsBooleanjstringjava_lang_Stringjstringjava_lang_StringID = curEnv->GetStaticMethodID(cls, "getGraphicObjectPropertyAsBoolean", "(Ljava/lang/String;Ljava/lang/String;)I" ) ;
 +if (jintgetGraphicObjectPropertyAsBooleanjstringjava_lang_Stringjstringjava_lang_StringID == NULL) {
 +throw GiwsException::JniMethodNotFoundException(curEnv, "getGraphicObjectPropertyAsBoolean");
 +}
 +
 +jstring id_ = curEnv->NewStringUTF( id );
 +if (id != NULL && id_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +
 +jstring propertyName_ = curEnv->NewStringUTF( propertyName );
 +if (propertyName != NULL && propertyName_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +
 +                        jint res =  static_cast<jint>( curEnv->CallStaticIntMethod(cls, jintgetGraphicObjectPropertyAsBooleanjstringjava_lang_Stringjstringjava_lang_StringID ,id_, propertyName_));
 +                        curEnv->DeleteLocalRef(id_);
 +curEnv->DeleteLocalRef(propertyName_);
 +curEnv->DeleteLocalRef(cls);
 +if (curEnv->ExceptionCheck()) {
 +throw GiwsException::JniCallMethodException(curEnv);
 +}
 +return res;
 +
 +}
 +
- bool CallGraphicController::setGraphicObjectProperty (JavaVM * jvm_, char * id, char * propertyName, bool value){
++bool CallGraphicController::setGraphicObjectProperty (JavaVM * jvm_, char const* id, char const* propertyName, bool value){
 +
 +JNIEnv * curEnv = NULL;
 +jvm_->AttachCurrentThread(reinterpret_cast<void **>(&curEnv), NULL);
 +jclass cls = curEnv->FindClass( className().c_str() );
 +
 +jmethodID jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjbooleanbooleanID = curEnv->GetStaticMethodID(cls, "setGraphicObjectProperty", "(Ljava/lang/String;Ljava/lang/String;Z)Z" ) ;
 +if (jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjbooleanbooleanID == NULL) {
 +throw GiwsException::JniMethodNotFoundException(curEnv, "setGraphicObjectProperty");
 +}
 +
 +jstring id_ = curEnv->NewStringUTF( id );
 +if (id != NULL && id_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +
 +jstring propertyName_ = curEnv->NewStringUTF( propertyName );
 +if (propertyName != NULL && propertyName_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +
 +jboolean value_ = (static_cast<bool>(value) ? JNI_TRUE : JNI_FALSE);
 +
 +                        jboolean res =  static_cast<jboolean>( curEnv->CallStaticBooleanMethod(cls, jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjbooleanbooleanID ,id_, propertyName_, value_));
 +                        curEnv->DeleteLocalRef(id_);
 +curEnv->DeleteLocalRef(propertyName_);
 +curEnv->DeleteLocalRef(cls);
 +if (curEnv->ExceptionCheck()) {
 +throw GiwsException::JniCallMethodException(curEnv);
 +}
 +return (res == JNI_TRUE);
 +
 +}
 +
- int* CallGraphicController::getGraphicObjectPropertyAsBooleanVector (JavaVM * jvm_, char * id, char * propertyName){
++int* CallGraphicController::getGraphicObjectPropertyAsBooleanVector (JavaVM * jvm_, char const* id, char const* propertyName){
 +
 +JNIEnv * curEnv = NULL;
 +jvm_->AttachCurrentThread(reinterpret_cast<void **>(&curEnv), NULL);
 +jclass cls = curEnv->FindClass( className().c_str() );
 +
 +jmethodID jintArray_getGraphicObjectPropertyAsBooleanVectorjstringjava_lang_Stringjstringjava_lang_StringID = curEnv->GetStaticMethodID(cls, "getGraphicObjectPropertyAsBooleanVector", "(Ljava/lang/String;Ljava/lang/String;)[I" ) ;
 +if (jintArray_getGraphicObjectPropertyAsBooleanVectorjstringjava_lang_Stringjstringjava_lang_StringID == NULL) {
 +throw GiwsException::JniMethodNotFoundException(curEnv, "getGraphicObjectPropertyAsBooleanVector");
 +}
 +
 +jstring id_ = curEnv->NewStringUTF( id );
 +if (id != NULL && id_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +
 +jstring propertyName_ = curEnv->NewStringUTF( propertyName );
 +if (propertyName != NULL && propertyName_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +
 +                        jintArray res =  static_cast<jintArray>( curEnv->CallStaticObjectMethod(cls, jintArray_getGraphicObjectPropertyAsBooleanVectorjstringjava_lang_Stringjstringjava_lang_StringID ,id_, propertyName_));
 +                        if (res == NULL) { return NULL; }
 +                        if (curEnv->ExceptionCheck()) {
 +throw GiwsException::JniCallMethodException(curEnv);
 +}int lenRow;
 + lenRow = curEnv->GetArrayLength(res);
 +jboolean isCopy = JNI_FALSE;
 +
 +/* GetPrimitiveArrayCritical is faster than getXXXArrayElements */
 +jint *resultsArray = static_cast<jint *>(curEnv->GetPrimitiveArrayCritical(res, &isCopy));
 +int* myArray= new int[ lenRow];
 +
 +for (jsize i = 0; i <  lenRow; i++){
 +myArray[i]=resultsArray[i];
 +}
 +curEnv->ReleasePrimitiveArrayCritical(res, resultsArray, JNI_ABORT);
 +
 +                        curEnv->DeleteLocalRef(res);
 +curEnv->DeleteLocalRef(id_);
 +curEnv->DeleteLocalRef(propertyName_);
 +curEnv->DeleteLocalRef(cls);
 +if (curEnv->ExceptionCheck()) {
 +delete[] myArray;
 +                                throw GiwsException::JniCallMethodException(curEnv);
 +}
 +return myArray;
 +
 +}
 +
- bool CallGraphicController::setGraphicObjectProperty (JavaVM * jvm_, char * id, char * propertyName, bool* value, int valueSize){
++bool CallGraphicController::setGraphicObjectProperty (JavaVM * jvm_, char const* id, char const* propertyName, bool const* value, int valueSize){
 +
 +JNIEnv * curEnv = NULL;
 +jvm_->AttachCurrentThread(reinterpret_cast<void **>(&curEnv), NULL);
 +jclass cls = curEnv->FindClass( className().c_str() );
 +
- jmethodID jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjbooleanArray_booleanID = curEnv->GetStaticMethodID(cls, "setGraphicObjectProperty", "(Ljava/lang/String;Ljava/lang/String;[Z)Z" ) ;
- if (jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjbooleanArray_booleanID == NULL) {
++jmethodID jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjbooleanArray_booleanbooleanID = curEnv->GetStaticMethodID(cls, "setGraphicObjectProperty", "(Ljava/lang/String;Ljava/lang/String;[Z)Z" ) ;
++if (jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjbooleanArray_booleanbooleanID == NULL) {
 +throw GiwsException::JniMethodNotFoundException(curEnv, "setGraphicObjectProperty");
 +}
 +
 +jstring id_ = curEnv->NewStringUTF( id );
 +if (id != NULL && id_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +
 +jstring propertyName_ = curEnv->NewStringUTF( propertyName );
 +if (propertyName != NULL && propertyName_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +
 +jbooleanArray value_ = curEnv->NewBooleanArray( valueSize ) ;
 +curEnv->SetBooleanArrayRegion( value_, 0, valueSize, (jboolean*)value ) ;
 +
-                         jboolean res =  static_cast<jboolean>( curEnv->CallStaticBooleanMethod(cls, jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjbooleanArray_booleanID ,id_, propertyName_, value_));
++                        jboolean res =  static_cast<jboolean>( curEnv->CallStaticBooleanMethod(cls, jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjbooleanArray_booleanbooleanID ,id_, propertyName_, value_));
 +                        curEnv->DeleteLocalRef(id_);
 +curEnv->DeleteLocalRef(propertyName_);
 +curEnv->DeleteLocalRef(value_);
 +curEnv->DeleteLocalRef(cls);
 +if (curEnv->ExceptionCheck()) {
 +throw GiwsException::JniCallMethodException(curEnv);
 +}
 +return (res == JNI_TRUE);
 +
 +}
 +
 +void CallGraphicController::registerScilabView (JavaVM * jvm_){
 +
 +JNIEnv * curEnv = NULL;
 +jvm_->AttachCurrentThread(reinterpret_cast<void **>(&curEnv), NULL);
 +jclass cls = curEnv->FindClass( className().c_str() );
 +
 +jmethodID voidregisterScilabViewID = curEnv->GetStaticMethodID(cls, "registerScilabView", "()V" ) ;
 +if (voidregisterScilabViewID == NULL) {
 +throw GiwsException::JniMethodNotFoundException(curEnv, "registerScilabView");
 +}
 +
 +                         curEnv->CallStaticVoidMethod(cls, voidregisterScilabViewID );
 +                        curEnv->DeleteLocalRef(cls);
 +if (curEnv->ExceptionCheck()) {
 +throw GiwsException::JniCallMethodException(curEnv);
 +}
 +}
 +
- char * CallGraphicController::getConsoleIdentifier (JavaVM * jvm_){
++char* CallGraphicController::getConsoleIdentifier (JavaVM * jvm_){
 +
 +JNIEnv * curEnv = NULL;
 +jvm_->AttachCurrentThread(reinterpret_cast<void **>(&curEnv), NULL);
 +jclass cls = curEnv->FindClass( className().c_str() );
 +
 +jmethodID jstringgetConsoleIdentifierID = curEnv->GetStaticMethodID(cls, "getConsoleIdentifier", "()Ljava/lang/String;" ) ;
 +if (jstringgetConsoleIdentifierID == NULL) {
 +throw GiwsException::JniMethodNotFoundException(curEnv, "getConsoleIdentifier");
 +}
 +
 +                        jstring res =  static_cast<jstring>( curEnv->CallStaticObjectMethod(cls, jstringgetConsoleIdentifierID ));
 +                        if (curEnv->ExceptionCheck()) {
 +throw GiwsException::JniCallMethodException(curEnv);
 +}
 +
 +const char *tempString = curEnv->GetStringUTFChars(res, 0);
 +char * myStringBuffer = new char[strlen(tempString) + 1];
 +strcpy(myStringBuffer, tempString);
 +curEnv->ReleaseStringUTFChars(res, tempString);
 +curEnv->DeleteLocalRef(res);
 +curEnv->DeleteLocalRef(cls);
 +if (curEnv->ExceptionCheck()) {
 +delete[] myStringBuffer;
 +                                throw GiwsException::JniCallMethodException(curEnv);
 +}
 +return myStringBuffer;
 +
 +}
 +
- void CallGraphicController::buildFigureMenuBar (JavaVM * jvm_, char * figureId){
++void CallGraphicController::buildFigureMenuBar (JavaVM * jvm_, char const* figureId){
 +
 +JNIEnv * curEnv = NULL;
 +jvm_->AttachCurrentThread(reinterpret_cast<void **>(&curEnv), NULL);
 +jclass cls = curEnv->FindClass( className().c_str() );
 +
 +jmethodID voidbuildFigureMenuBarjstringjava_lang_StringID = curEnv->GetStaticMethodID(cls, "buildFigureMenuBar", "(Ljava/lang/String;)V" ) ;
 +if (voidbuildFigureMenuBarjstringjava_lang_StringID == NULL) {
 +throw GiwsException::JniMethodNotFoundException(curEnv, "buildFigureMenuBar");
 +}
 +
 +jstring figureId_ = curEnv->NewStringUTF( figureId );
 +if (figureId != NULL && figureId_ == NULL)
 +{
 +throw GiwsException::JniBadAllocException(curEnv);
 +}
 +
 +
 +                         curEnv->CallStaticVoidMethod(cls, voidbuildFigureMenuBarjstringjava_lang_StringID ,figureId_);
 +                        curEnv->DeleteLocalRef(figureId_);
 +curEnv->DeleteLocalRef(cls);
 +if (curEnv->ExceptionCheck()) {
 +throw GiwsException::JniCallMethodException(curEnv);
 +}
 +}
 +
 +}
index 5fe79fa,0000000..fe05fe7
mode 100644,000000..100644
--- /dev/null
@@@ -1,224 -1,0 +1,232 @@@
- /* Generated by GIWS (version 1.3.0) */
++/* Generated by GIWS (version 2.0.0) with command:
++giws --disable-return-size-array --output-dir src/jni/ --throws-exception-on-error --description-file src/jni/graphic_objects.giws.xml 
++*/
 +/*
 +
 +Copyright 2007-2008 INRIA
 +Copyright 2008-2011 DIGITEO
++Copyright 2011-2012 Scilab Enterprises
 +
 +Author : Sylvestre Ledru & others
 +
 +This is generated code.
 +
 +This software is a computer program whose purpose is to hide the complexity
 +of accessing Java objects/methods from C++ code.
 +
 +This software is governed by the CeCILL-B license under French law and
 +abiding by the rules of distribution of free software.  You can  use, 
 +modify and/ or redistribute the software under the terms of the CeCILL-B
 +license as circulated by CEA, CNRS and INRIA at the following URL
 +"http://www.cecill.info". 
 +
 +As a counterpart to the access to the source code and  rights to copy,
 +modify and redistribute granted by the license, users are provided only
 +with a limited warranty  and the software's author,  the holder of the
 +economic rights,  and the successive licensors  have only  limited
 +liability. 
 +
 +In this respect, the user's attention is drawn to the risks associated
 +with loading,  using,  modifying and/or developing or reproducing the
 +software by the user in light of its specific status of free software,
 +that may mean  that it is complicated to manipulate,  and  that  also
 +therefore means  that it is reserved for developers  and  experienced
 +professionals having in-depth computer knowledge. Users are therefore
 +encouraged to load and test the software's suitability as regards their
 +requirements in conditions enabling the security of their systems and/or 
 +data to be ensured and,  more generally, to use and operate it in the 
 +same conditions as regards security. 
 +
 +The fact that you are presently reading this means that you have had
 +knowledge of the CeCILL-B license and that you accept its terms.
 +*/
 +
 +
 +#ifndef __ORG_SCILAB_MODULES_GRAPHIC_OBJECTS_CALLGRAPHICCONTROLLER__
 +#define __ORG_SCILAB_MODULES_GRAPHIC_OBJECTS_CALLGRAPHICCONTROLLER__
 +#include <iostream>
 +#include <string>
 +#include <string.h>
 +#include <stdlib.h>
 +#include <jni.h>
 +
 +#include "GiwsException.hxx"
 +
- #ifndef _MSC_VER /* Defined anyway with Visual */
- #if !defined(byte)
- typedef signed char byte;
- #else
- #pragma message("Byte has been redefined elsewhere. Some problems can happen")
- #endif
- #endif
++        #if !defined(byte) | !defined(_MSC_VER) /* Defined anyway with Visual */
++                typedef signed char byte;
++        #else
++                #pragma message("Byte has been redefined elsewhere. Some problems can happen")
++        #endif
 +
 +
 +#ifndef GIWSEXPORT
 +# if defined(_MSC_VER) || defined(__WIN32__) || defined(__CYGWIN__)
 +#   if defined(STATIC_LINKED)
 +#     define GIWSEXPORT
 +#   else
 +#     define GIWSEXPORT __declspec(dllexport)
 +#   endif
 +# else
++#   if __GNUC__ >= 4
++#     define GIWSEXPORT __attribute__ ((visibility ("default")))
++#   else
 +#     define GIWSEXPORT
++#   endif
 +# endif
 +#endif
 +
 +namespace org_scilab_modules_graphic_objects {
 +class GIWSEXPORT CallGraphicController {
 +
 +private:
 +JavaVM * jvm;
 +
 +protected:
 +jmethodID voiddeleteGraphicObjectjstringjava_lang_StringID; // cache method id
 +jmethodID jstringcloneGraphicObjectjstringjava_lang_StringID; // cache method id
 +jmethodID jstringaskGraphicObjectjstringjava_lang_StringID; // cache method id
 +jmethodID voidsetGraphicObjectRelationshipjstringjava_lang_Stringjstringjava_lang_StringID; // cache method id
 +jmethodID voidremoveRelationShipAndDeletejstringjava_lang_StringID; // cache method id
 +jmethodID jstringgetGraphicObjectPropertyAsStringjstringjava_lang_Stringjstringjava_lang_StringID; // cache method id
 +jmethodID jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_Stringjstringjava_lang_StringID; // cache method id
 +jmethodID jobjectArray_getGraphicObjectPropertyAsStringVectorjstringjava_lang_Stringjstringjava_lang_StringID; // cache method id
- jmethodID jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjobjectArray_java_lang_StringID; // cache method id
++jmethodID jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjobjectArray_java_lang_Stringjava_lang_StringID; // cache method id
 +jclass stringArrayClass;
 +jmethodID jdoublegetGraphicObjectPropertyAsDoublejstringjava_lang_Stringjstringjava_lang_StringID; // cache method id
 +jmethodID jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjdoubledoubleID; // cache method id
 +jmethodID jdoubleArray_getGraphicObjectPropertyAsDoubleVectorjstringjava_lang_Stringjstringjava_lang_StringID; // cache method id
- jmethodID jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjdoubleArray_doubleID; // cache method id
++jmethodID jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjdoubleArray_doubledoubleID; // cache method id
 +jmethodID jintgetGraphicObjectPropertyAsIntegerjstringjava_lang_Stringjstringjava_lang_StringID; // cache method id
 +jmethodID jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjintintID; // cache method id
 +jmethodID jintArray_getGraphicObjectPropertyAsIntegerVectorjstringjava_lang_Stringjstringjava_lang_StringID; // cache method id
- jmethodID jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjintArray_intID; // cache method id
++jmethodID jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjintArray_intintID; // cache method id
 +jmethodID jintgetGraphicObjectPropertyAsBooleanjstringjava_lang_Stringjstringjava_lang_StringID; // cache method id
 +jmethodID jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjbooleanbooleanID; // cache method id
 +jmethodID jintArray_getGraphicObjectPropertyAsBooleanVectorjstringjava_lang_Stringjstringjava_lang_StringID; // cache method id
- jmethodID jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjbooleanArray_booleanID; // cache method id
++jmethodID jbooleansetGraphicObjectPropertyjstringjava_lang_Stringjstringjava_lang_StringjbooleanArray_booleanbooleanID; // cache method id
 +jmethodID voidregisterScilabViewID; // cache method id
 +jmethodID jstringgetConsoleIdentifierID; // cache method id
 +jmethodID voidbuildFigureMenuBarjstringjava_lang_StringID; // cache method id
 +
 +
 +
 +jobject instance;
 +jclass instanceClass; // cache class
 +
++                       
++// Caching (if any)
++
 +
 +/**
 +* Get the environment matching to the current thread.
 +*/
 +virtual JNIEnv * getCurrentEnv();
 +
 +public:
 +// Constructor
 +/**
 +* Create a wrapping of the object from a JNIEnv.
 +* It will call the default constructor
 +* @param JEnv_ the Java Env
 +*/
 +CallGraphicController(JavaVM * jvm_);
 +
 +/**
 +* Create a wrapping of an already existing object from a JNIEnv.
 +* The object must have already been instantiated
 +* @param JEnv_ the Java Env
 +* @param JObj the object
 +*/
 +CallGraphicController(JavaVM * jvm_, jobject JObj);
 +
 +
 +/** 
 +* This is a fake constructor to avoid the constructor
 +* chaining when dealing with extended giws classes 
 +*/
 +#ifdef FAKEGIWSDATATYPE
 +CallGraphicController(fakeGiwsDataType::fakeGiwsDataType /* unused */) {}
 +#endif
 +
 +// Destructor
 +~CallGraphicController();
 +
 +// Generic method
 +// Synchronization methods
 +/**
 +* Enter monitor associated with the object.
 +* Equivalent of creating a "synchronized(obj)" scope in Java.
 +*/
 +void synchronize();
 +
 +/**
 +* Exit monitor associated with the object.
 +* Equivalent of ending a "synchronized(obj)" scope.
 +*/
 +void endSynchronize();
 +
 +// Methods
- static void deleteGraphicObject(JavaVM * jvm_, char * id);
++static void deleteGraphicObject(JavaVM * jvm_, char const* id);
 +
- static char * cloneGraphicObject(JavaVM * jvm_, char * id);
++static char* cloneGraphicObject(JavaVM * jvm_, char const* id);
 +
- static char * askGraphicObject(JavaVM * jvm_, char * typeName);
++static char* askGraphicObject(JavaVM * jvm_, char const* typeName);
 +
- static void setGraphicObjectRelationship(JavaVM * jvm_, char * parentId, char * childId);
++static void setGraphicObjectRelationship(JavaVM * jvm_, char const* parentId, char const* childId);
 +
- static void removeRelationShipAndDelete(JavaVM * jvm_, char * id);
++static void removeRelationShipAndDelete(JavaVM * jvm_, char const* id);
 +
- static char * getGraphicObjectPropertyAsString(JavaVM * jvm_, char * id, char * propertyName);
++static char* getGraphicObjectPropertyAsString(JavaVM * jvm_, char const* id, char const* propertyName);
 +
- static bool setGraphicObjectProperty(JavaVM * jvm_, char * id, char * propertyName, char * value);
++static bool setGraphicObjectProperty(JavaVM * jvm_, char const* id, char const* propertyName, char const* value);
 +
- static char ** getGraphicObjectPropertyAsStringVector(JavaVM * jvm_, char * id, char * propertyName);
++static char** getGraphicObjectPropertyAsStringVector(JavaVM * jvm_, char const* id, char const* propertyName);
 +
- static bool setGraphicObjectProperty(JavaVM * jvm_, char * id, char * propertyName, char ** value, int valueSize);
++static bool setGraphicObjectProperty(JavaVM * jvm_, char const* id, char const* propertyName, char const* const* value, int valueSize);
 +
- static double getGraphicObjectPropertyAsDouble(JavaVM * jvm_, char * id, char * propertyName);
++static double getGraphicObjectPropertyAsDouble(JavaVM * jvm_, char const* id, char const* propertyName);
 +
- static bool setGraphicObjectProperty(JavaVM * jvm_, char * id, char * propertyName, double value);
++static bool setGraphicObjectProperty(JavaVM * jvm_, char const* id, char const* propertyName, double value);
 +
- static double* getGraphicObjectPropertyAsDoubleVector(JavaVM * jvm_, char * id, char * propertyName);
++static double* getGraphicObjectPropertyAsDoubleVector(JavaVM * jvm_, char const* id, char const* propertyName);
 +
- static bool setGraphicObjectProperty(JavaVM * jvm_, char * id, char * propertyName, double* value, int valueSize);
++static bool setGraphicObjectProperty(JavaVM * jvm_, char const* id, char const* propertyName, double const* value, int valueSize);
 +
- static int getGraphicObjectPropertyAsInteger(JavaVM * jvm_, char * id, char * propertyName);
++static int getGraphicObjectPropertyAsInteger(JavaVM * jvm_, char const* id, char const* propertyName);
 +
- static bool setGraphicObjectProperty(JavaVM * jvm_, char * id, char * propertyName, int value);
++static bool setGraphicObjectProperty(JavaVM * jvm_, char const* id, char const* propertyName, int value);
 +
- static int* getGraphicObjectPropertyAsIntegerVector(JavaVM * jvm_, char * id, char * propertyName);
++static int* getGraphicObjectPropertyAsIntegerVector(JavaVM * jvm_, char const* id, char const* propertyName);
 +
- static bool setGraphicObjectProperty(JavaVM * jvm_, char * id, char * propertyName, int* value, int valueSize);
++static bool setGraphicObjectProperty(JavaVM * jvm_, char const* id, char const* propertyName, int const* value, int valueSize);
 +
- static int getGraphicObjectPropertyAsBoolean(JavaVM * jvm_, char * id, char * propertyName);
++static int getGraphicObjectPropertyAsBoolean(JavaVM * jvm_, char const* id, char const* propertyName);
 +
- static bool setGraphicObjectProperty(JavaVM * jvm_, char * id, char * propertyName, bool value);
++static bool setGraphicObjectProperty(JavaVM * jvm_, char const* id, char const* propertyName, bool value);
 +
- static int* getGraphicObjectPropertyAsBooleanVector(JavaVM * jvm_, char * id, char * propertyName);
++static int* getGraphicObjectPropertyAsBooleanVector(JavaVM * jvm_, char const* id, char const* propertyName);
 +
- static bool setGraphicObjectProperty(JavaVM * jvm_, char * id, char * propertyName, bool* value, int valueSize);
++static bool setGraphicObjectProperty(JavaVM * jvm_, char const* id, char const* propertyName, bool const* value, int valueSize);
 +
 +static void registerScilabView(JavaVM * jvm_);
 +
- static char * getConsoleIdentifier(JavaVM * jvm_);
++static char* getConsoleIdentifier(JavaVM * jvm_);
 +
- static void buildFigureMenuBar(JavaVM * jvm_, char * figureId);
++static void buildFigureMenuBar(JavaVM * jvm_, char const* figureId);
 +
 +
 +                        /**
 +                        * Get class name to use for static methods
 +                        * @return class name to use for static methods
 +                        */
 +                        
 +                static const std::string className()
 +                {
 +                return "org/scilab/modules/graphic_objects/CallGraphicController";
 +                }
 +                
 +};
 +
 +
 +}
 +#endif
index 8a71af5,0000000..00f7c78
mode 100644,000000..100644
--- /dev/null
@@@ -1,254 -1,0 +1,254 @@@
 +/* ----------------------------------------------------------------------------
 + * This file was automatically generated by SWIG (http://www.swig.org).
-  * Version 1.3.40
++ * Version 2.0.4
 + * 
 + * This file is not intended to be easily readable and contains a number of 
 + * coding conventions designed to improve portability and efficiency. Do not make
 + * changes to this file unless you know what you are doing--modify the SWIG 
 + * interface file instead. 
 + * ----------------------------------------------------------------------------- */
 +
 +#define SWIGJAVA
 +
 +/* -----------------------------------------------------------------------------
 + *  This section contains generic SWIG labels for method/variable
 + *  declarations/attributes, and other compiler dependent labels.
 + * ----------------------------------------------------------------------------- */
 +
 +/* template workaround for compilers that cannot correctly implement the C++ standard */
 +#ifndef SWIGTEMPLATEDISAMBIGUATOR
 +# if defined(__SUNPRO_CC) && (__SUNPRO_CC <= 0x560)
 +#  define SWIGTEMPLATEDISAMBIGUATOR template
 +# elif defined(__HP_aCC)
 +/* Needed even with `aCC -AA' when `aCC -V' reports HP ANSI C++ B3910B A.03.55 */
 +/* If we find a maximum version that requires this, the test would be __HP_aCC <= 35500 for A.03.55 */
 +#  define SWIGTEMPLATEDISAMBIGUATOR template
 +# else
 +#  define SWIGTEMPLATEDISAMBIGUATOR
 +# endif
 +#endif
 +
 +/* inline attribute */
 +#ifndef SWIGINLINE
 +# if defined(__cplusplus) || (defined(__GNUC__) && !defined(__STRICT_ANSI__))
 +#   define SWIGINLINE inline
 +# else
 +#   define SWIGINLINE
 +# endif
 +#endif
 +
 +/* attribute recognised by some compilers to avoid 'unused' warnings */
 +#ifndef SWIGUNUSED
 +# if defined(__GNUC__)
 +#   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
 +#     define SWIGUNUSED __attribute__ ((__unused__)) 
 +#   else
 +#     define SWIGUNUSED
 +#   endif
 +# elif defined(__ICC)
 +#   define SWIGUNUSED __attribute__ ((__unused__)) 
 +# else
 +#   define SWIGUNUSED 
 +# endif
 +#endif
 +
 +#ifndef SWIG_MSC_UNSUPPRESS_4505
 +# if defined(_MSC_VER)
 +#   pragma warning(disable : 4505) /* unreferenced local function has been removed */
 +# endif 
 +#endif
 +
 +#ifndef SWIGUNUSEDPARM
 +# ifdef __cplusplus
 +#   define SWIGUNUSEDPARM(p)
 +# else
 +#   define SWIGUNUSEDPARM(p) p SWIGUNUSED 
 +# endif
 +#endif
 +
 +/* internal SWIG method */
 +#ifndef SWIGINTERN
 +# define SWIGINTERN static SWIGUNUSED
 +#endif
 +
 +/* internal inline SWIG method */
 +#ifndef SWIGINTERNINLINE
 +# define SWIGINTERNINLINE SWIGINTERN SWIGINLINE
 +#endif
 +
 +/* exporting methods */
 +#if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
 +#  ifndef GCC_HASCLASSVISIBILITY
 +#    define GCC_HASCLASSVISIBILITY
 +#  endif
 +#endif
 +
 +#ifndef SWIGEXPORT
 +# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
 +#   if defined(STATIC_LINKED)
 +#     define SWIGEXPORT
 +#   else
 +#     define SWIGEXPORT __declspec(dllexport)
 +#   endif
 +# else
 +#   if defined(__GNUC__) && defined(GCC_HASCLASSVISIBILITY)
 +#     define SWIGEXPORT __attribute__ ((visibility("default")))
 +#   else
 +#     define SWIGEXPORT
 +#   endif
 +# endif
 +#endif
 +
 +/* calling conventions for Windows */
 +#ifndef SWIGSTDCALL
 +# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
 +#   define SWIGSTDCALL __stdcall
 +# else
 +#   define SWIGSTDCALL
 +# endif 
 +#endif
 +
 +/* Deal with Microsoft's attempt at deprecating C standard runtime functions */
 +#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_CRT_SECURE_NO_DEPRECATE)
 +# define _CRT_SECURE_NO_DEPRECATE
 +#endif
 +
 +/* Deal with Microsoft's attempt at deprecating methods in the standard C++ library */
 +#if !defined(SWIG_NO_SCL_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_SCL_SECURE_NO_DEPRECATE)
 +# define _SCL_SECURE_NO_DEPRECATE
 +#endif
 +
 +
 +
 +/* Fix for jlong on some versions of gcc on Windows */
 +#if defined(__GNUC__) && !defined(__INTEL_COMPILER)
 +  typedef long long __int64;
 +#endif
 +
 +/* Fix for jlong on 64-bit x86 Solaris */
 +#if defined(__x86_64)
 +# ifdef _LP64
 +#   undef _LP64
 +# endif
 +#endif
 +
 +#include <jni.h>
 +#include <stdlib.h>
 +#include <string.h>
 +
 +
 +/* Support for throwing Java exceptions */
 +typedef enum {
 +  SWIG_JavaOutOfMemoryError = 1, 
 +  SWIG_JavaIOException, 
 +  SWIG_JavaRuntimeException, 
 +  SWIG_JavaIndexOutOfBoundsException,
 +  SWIG_JavaArithmeticException,
 +  SWIG_JavaIllegalArgumentException,
 +  SWIG_JavaNullPointerException,
 +  SWIG_JavaDirectorPureVirtual,
 +  SWIG_JavaUnknownError
 +} SWIG_JavaExceptionCodes;
 +
 +typedef struct {
 +  SWIG_JavaExceptionCodes code;
 +  const char *java_exception;
 +} SWIG_JavaExceptions_t;
 +
 +
 +static void SWIGUNUSED SWIG_JavaThrowException(JNIEnv *jenv, SWIG_JavaExceptionCodes code, const char *msg) {
 +  jclass excep;
 +  static const SWIG_JavaExceptions_t java_exceptions[] = {
 +    { SWIG_JavaOutOfMemoryError, "java/lang/OutOfMemoryError" },
 +    { SWIG_JavaIOException, "java/io/IOException" },
 +    { SWIG_JavaRuntimeException, "java/lang/RuntimeException" },
 +    { SWIG_JavaIndexOutOfBoundsException, "java/lang/IndexOutOfBoundsException" },
 +    { SWIG_JavaArithmeticException, "java/lang/ArithmeticException" },
 +    { SWIG_JavaIllegalArgumentException, "java/lang/IllegalArgumentException" },
 +    { SWIG_JavaNullPointerException, "java/lang/NullPointerException" },
 +    { SWIG_JavaDirectorPureVirtual, "java/lang/RuntimeException" },
 +    { SWIG_JavaUnknownError,  "java/lang/UnknownError" },
 +    { (SWIG_JavaExceptionCodes)0,  "java/lang/UnknownError" }
 +  };
 +  const SWIG_JavaExceptions_t *except_ptr = java_exceptions;
 +
 +  while (except_ptr->code != code && except_ptr->code)
 +    except_ptr++;
 +
 +  (*jenv)->ExceptionClear(jenv);
 +  excep = (*jenv)->FindClass(jenv, except_ptr->java_exception);
 +  if (excep)
 +    (*jenv)->ThrowNew(jenv, excep, msg);
 +}
 +
 +
 +/* Contract support */
 +
 +#define SWIG_contract_assert(nullreturn, expr, msg) if (!(expr)) {SWIG_JavaThrowException(jenv, SWIG_JavaIllegalArgumentException, msg); return nullreturn; } else
 +
 +
 +    extern void ScilabNativeView__createObject(char* pstId);
 +    extern void ScilabNativeView__deleteObject(char* pstId);
 +    extern void ScilabNativeView__updateObject(char* pstId, char* pstProperty);
 +    
 +
 +#ifdef __cplusplus
 +extern "C" {
 +#endif
 +
 +SWIGEXPORT void JNICALL Java_org_scilab_modules_graphic_1objects_ScilabNativeViewJNI_ScilabNativeView_1_1createObject(JNIEnv *jenv, jclass jcls, jstring jarg1) {
 +  char *arg1 = (char *) 0 ;
 +  
 +  (void)jenv;
 +  (void)jcls;
 +  arg1 = 0;
 +  if (jarg1) {
 +    arg1 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg1, 0);
 +    if (!arg1) return ;
 +  }
 +  ScilabNativeView__createObject(arg1);
 +  if (arg1) (*jenv)->ReleaseStringUTFChars(jenv, jarg1, (const char *)arg1);
 +}
 +
 +
 +SWIGEXPORT void JNICALL Java_org_scilab_modules_graphic_1objects_ScilabNativeViewJNI_ScilabNativeView_1_1deleteObject(JNIEnv *jenv, jclass jcls, jstring jarg1) {
 +  char *arg1 = (char *) 0 ;
 +  
 +  (void)jenv;
 +  (void)jcls;
 +  arg1 = 0;
 +  if (jarg1) {
 +    arg1 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg1, 0);
 +    if (!arg1) return ;
 +  }
 +  ScilabNativeView__deleteObject(arg1);
 +  if (arg1) (*jenv)->ReleaseStringUTFChars(jenv, jarg1, (const char *)arg1);
 +}
 +
 +
 +SWIGEXPORT void JNICALL Java_org_scilab_modules_graphic_1objects_ScilabNativeViewJNI_ScilabNativeView_1_1updateObject(JNIEnv *jenv, jclass jcls, jstring jarg1, jstring jarg2) {
 +  char *arg1 = (char *) 0 ;
 +  char *arg2 = (char *) 0 ;
 +  
 +  (void)jenv;
 +  (void)jcls;
 +  arg1 = 0;
 +  if (jarg1) {
 +    arg1 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg1, 0);
 +    if (!arg1) return ;
 +  }
 +  arg2 = 0;
 +  if (jarg2) {
 +    arg2 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg2, 0);
 +    if (!arg2) return ;
 +  }
 +&nb