summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruno JOFRET <bruno.jofret@scilab.org>2009-09-22 12:02:58 +0200
committerBruno JOFRET <bruno.jofret@scilab.org>2009-09-22 12:02:58 +0200
commitf23b2110d698093a959634e19007c8d84d531c5e (patch)
tree9d2f52524635264289e90dcfaa4fa0c44eb147d2
parent6e0ed76a324ba57a846cf16750c297414d32428d (diff)
parent11ad7608e335c7505a00ee05fd2a3d67a5e6842e (diff)
downloadscilab-f23b2110d698093a959634e19007c8d84d531c5e.zip
scilab-f23b2110d698093a959634e19007c8d84d531c5e.tar.gz
Merge commit 'origin/master' into Xcos
Conflicts: scilab/configure
-rw-r--r--SEP/SEP_22_gsort.odtbin21300 -> 23340 bytes
-rw-r--r--SEP/SEP_30_dynamic_link_includes.odtbin26005 -> 0 bytes
-rw-r--r--SEP/SEP_32_dynamic_link_includes.odtbin0 -> 25468 bytes
-rw-r--r--SEP/SEP_33_POO.odtbin0 -> 34843 bytes
-rw-r--r--SEP/SEP_34_call_scilab_header_renamed.odtbin0 -> 18987 bytes
-rw-r--r--scilab/CHANGES_5.1.X14
-rw-r--r--scilab/CHANGES_5.2.X31
-rw-r--r--scilab/Makefile.incl.am14
-rw-r--r--scilab/Scilab.sln2
-rw-r--r--scilab/Scilab_f2c.sln2
-rw-r--r--scilab/bin/.gitignore20
-rw-r--r--scilab/bin/bin.iss1
-rwxr-xr-xscilab/configure342
-rw-r--r--scilab/configure.ac12
-rw-r--r--scilab/libs/MALLOC/Makefile.am2
-rw-r--r--scilab/libs/MALLOC/Makefile.in16
-rw-r--r--scilab/libs/doublylinkedlist/Makefile.am2
-rw-r--r--scilab/libs/doublylinkedlist/Makefile.in16
-rw-r--r--scilab/libs/dynamiclibrary/Makefile.am2
-rw-r--r--scilab/libs/dynamiclibrary/Makefile.in16
-rw-r--r--scilab/libs/hashtable/Makefile.am2
-rw-r--r--scilab/libs/hashtable/Makefile.in16
-rw-r--r--scilab/libs/libst/Makefile.in14
-rw-r--r--scilab/m4/hdf5.m44
-rw-r--r--scilab/m4/java.m42
-rw-r--r--scilab/m4/libtool.m44
-rw-r--r--scilab/modules/action_binding/Makefile.am2
-rw-r--r--scilab/modules/action_binding/Makefile.in16
-rw-r--r--scilab/modules/api_scilab/Makefile.am2
-rw-r--r--scilab/modules/api_scilab/Makefile.in16
-rw-r--r--scilab/modules/api_scilab/help/en_US/list_management/list_boolean_reading_api.xml2
-rw-r--r--scilab/modules/api_scilab/help/en_US/list_management/list_bsparse_reading_api.xml2
-rw-r--r--scilab/modules/api_scilab/help/en_US/list_management/list_double_reading_api.xml2
-rw-r--r--scilab/modules/api_scilab/help/en_US/list_management/list_integer_reading_api.xml2
-rw-r--r--scilab/modules/api_scilab/help/en_US/list_management/list_pointer_reading_api.xml2
-rw-r--r--scilab/modules/api_scilab/help/en_US/list_management/list_poly_reading_api.xml2
-rw-r--r--scilab/modules/api_scilab/help/en_US/list_management/list_sparse_reading_api.xml2
-rw-r--r--scilab/modules/api_scilab/help/en_US/list_management/list_string_reading_api.xml2
-rw-r--r--scilab/modules/api_scilab/help/en_US/pointer_reading_api.xml2
-rw-r--r--scilab/modules/api_scilab/help/en_US/pointer_writing_api.xml2
-rw-r--r--scilab/modules/api_scilab/includes/api_list.h50
-rw-r--r--scilab/modules/api_scilab/src/cpp/api_boolean.cpp2
-rw-r--r--scilab/modules/api_scilab/src/cpp/api_boolean_sparse.cpp2
-rw-r--r--scilab/modules/api_scilab/src/cpp/api_common.cpp2
-rw-r--r--scilab/modules/api_scilab/src/cpp/api_double.cpp2
-rw-r--r--scilab/modules/api_scilab/src/cpp/api_int.cpp2
-rw-r--r--scilab/modules/api_scilab/src/cpp/api_list.cpp70
-rw-r--r--scilab/modules/api_scilab/src/cpp/api_pointer.cpp4
-rw-r--r--scilab/modules/api_scilab/src/cpp/api_poly.cpp2
-rw-r--r--scilab/modules/api_scilab/src/cpp/api_sparse.cpp2
-rw-r--r--scilab/modules/api_scilab/src/cpp/api_string.cpp2
-rw-r--r--scilab/modules/api_scilab/tests/unit_tests/commom_read_api.c2
-rw-r--r--scilab/modules/api_scilab/tests/unit_tests/pointer_reading_api.c2
-rw-r--r--scilab/modules/arnoldi/Makefile.am2
-rw-r--r--scilab/modules/arnoldi/Makefile.in16
-rw-r--r--scilab/modules/arnoldi/src/arnoldi.rc8
-rw-r--r--scilab/modules/atoms/Makefile.in14
-rw-r--r--scilab/modules/boolean/Makefile.am2
-rw-r--r--scilab/modules/boolean/Makefile.in16
-rw-r--r--scilab/modules/cacsd/Makefile.am2
-rw-r--r--scilab/modules/cacsd/Makefile.in16
-rw-r--r--scilab/modules/call_scilab/Makefile.am5
-rw-r--r--scilab/modules/call_scilab/Makefile.in33
-rw-r--r--scilab/modules/call_scilab/call_scilab.vcproj2
-rw-r--r--scilab/modules/call_scilab/examples/call_scilab/NET/C#/.gitignore5
-rw-r--r--scilab/modules/call_scilab/examples/call_scilab/NET/C#/DotNetScilab.sln26
-rw-r--r--scilab/modules/call_scilab/examples/call_scilab/NET/C#/cs_example/Properties/AssemblyInfo.cs (renamed from scilab/modules/call_scilab/examples/call_scilab/c#/dotnetsci/example/Properties/AssemblyInfo.cs)0
-rw-r--r--scilab/modules/call_scilab/examples/call_scilab/NET/C#/cs_example/cs_example.cs (renamed from scilab/modules/call_scilab/examples/call_scilab/c#/dotnetsci/example/example.cs)97
-rw-r--r--scilab/modules/call_scilab/examples/call_scilab/NET/C#/cs_example/cs_example.csproj (renamed from scilab/modules/call_scilab/examples/call_scilab/c#/dotnetsci/example/example.csproj)42
-rw-r--r--scilab/modules/call_scilab/examples/call_scilab/NET/C#/dotnetsci/DotNetScilab.csproj (renamed from scilab/modules/call_scilab/examples/call_scilab/c#/dotnetsci/dotnetsci/DotNetScilab.csproj)43
-rw-r--r--scilab/modules/call_scilab/examples/call_scilab/NET/C#/dotnetsci/Properties/AssemblyInfo.cs (renamed from scilab/modules/call_scilab/examples/call_scilab/c#/dotnetsci/dotnetsci/Properties/AssemblyInfo.cs)6
-rw-r--r--scilab/modules/call_scilab/examples/call_scilab/NET/C#/dotnetsci/Scilab.cs489
-rw-r--r--scilab/modules/call_scilab/examples/call_scilab/NET/C#/dotnetsci/Scilab_cs_wrapper.cs216
-rw-r--r--scilab/modules/call_scilab/examples/call_scilab/NET/VB.NET/.gitignore6
-rw-r--r--scilab/modules/call_scilab/examples/call_scilab/NET/VB.NET/My Project/Application.Designer.vb13
-rw-r--r--scilab/modules/call_scilab/examples/call_scilab/NET/VB.NET/My Project/Application.myapp10
-rw-r--r--scilab/modules/call_scilab/examples/call_scilab/NET/VB.NET/My Project/AssemblyInfo.vb35
-rw-r--r--scilab/modules/call_scilab/examples/call_scilab/NET/VB.NET/My Project/Resources.Designer.vb62
-rw-r--r--scilab/modules/call_scilab/examples/call_scilab/NET/VB.NET/My Project/Resources.resx117
-rw-r--r--scilab/modules/call_scilab/examples/call_scilab/NET/VB.NET/My Project/Settings.Designer.vb73
-rw-r--r--scilab/modules/call_scilab/examples/call_scilab/NET/VB.NET/My Project/Settings.settings7
-rw-r--r--scilab/modules/call_scilab/examples/call_scilab/NET/VB.NET/VB.NET.sln20
-rw-r--r--scilab/modules/call_scilab/examples/call_scilab/NET/VB.NET/VB.NET.vbproj169
-rw-r--r--scilab/modules/call_scilab/examples/call_scilab/NET/VB.NET/vb_example.vb71
-rw-r--r--scilab/modules/call_scilab/examples/call_scilab/c#/dotnetsci/dotnetsci.sln36
-rw-r--r--scilab/modules/call_scilab/examples/call_scilab/c#/dotnetsci/dotnetsci/Scilab.cs677
-rw-r--r--scilab/modules/call_scilab/examples/readme.txt13
-rw-r--r--scilab/modules/call_scilab/includes/CallScilab.h336
-rw-r--r--scilab/modules/call_scilab/includes/call_scilab.h354
-rw-r--r--scilab/modules/call_scilab/src/c/SendScilabJobs.c4
-rw-r--r--scilab/modules/call_scilab/src/c/call_scilab.c (renamed from scilab/modules/call_scilab/src/c/CallScilab.c)2
-rw-r--r--scilab/modules/compatibility_functions/Makefile.in14
-rw-r--r--scilab/modules/completion/Makefile.am2
-rw-r--r--scilab/modules/completion/Makefile.in16
-rw-r--r--scilab/modules/completion/src/c/getfilesdictionary.c33
-rw-r--r--scilab/modules/console/Makefile.am2
-rw-r--r--scilab/modules/console/Makefile.in16
-rw-r--r--scilab/modules/core/Makefile.am2
-rw-r--r--scilab/modules/core/Makefile.in16
-rw-r--r--scilab/modules/core/help/en_US/capi/sci_types.xml5
-rw-r--r--scilab/modules/core/includes/setgetSCIpath.h17
-rw-r--r--scilab/modules/core/includes/tmpdir.h13
-rw-r--r--scilab/modules/core/macros/toolboxes.sci123
-rw-r--r--scilab/modules/core/sci_gateway/c/sci_getmd5.c12
-rw-r--r--scilab/modules/core/src/c/core.vcproj8
-rw-r--r--scilab/modules/core/src/c/getdynamicDebugInfo_Windows.c65
-rw-r--r--scilab/modules/core/src/c/setgetSCIpath.c6
-rw-r--r--scilab/modules/core/src/c/stack1.c4
-rw-r--r--scilab/modules/core/src/c/stack2.c4
-rw-r--r--scilab/modules/core/src/c/stack3.c2
-rw-r--r--scilab/modules/core/src/c/tmpdir.c5
-rw-r--r--scilab/modules/core/src/fortran/promptecho.f35
-rw-r--r--scilab/modules/core/tests/nonreg_tests/bug_4753.tst26
-rw-r--r--scilab/modules/data_structures/Makefile.am2
-rw-r--r--scilab/modules/data_structures/Makefile.in16
-rw-r--r--scilab/modules/demo_tools/Makefile.in14
-rw-r--r--scilab/modules/development_tools/Makefile.in14
-rw-r--r--scilab/modules/differential_equations/Makefile.am2
-rw-r--r--scilab/modules/differential_equations/Makefile.in16
-rw-r--r--scilab/modules/double/Makefile.in14
-rw-r--r--scilab/modules/dynamic_link/Makefile.am2
-rw-r--r--scilab/modules/dynamic_link/Makefile.in16
-rw-r--r--scilab/modules/dynamic_link/help/en_US/ilib_gen_gateway.xml59
-rw-r--r--scilab/modules/dynamic_link/macros/G_make.sci6
-rw-r--r--scilab/modules/dynamic_link/macros/gencompilationflags_unix.sci8
-rw-r--r--scilab/modules/dynamic_link/macros/ilib_build.sci10
-rw-r--r--scilab/modules/dynamic_link/macros/ilib_compile.sci14
-rw-r--r--scilab/modules/dynamic_link/macros/ilib_for_link.sci4
-rw-r--r--scilab/modules/dynamic_link/macros/ilib_gen_Make.sci6
-rw-r--r--scilab/modules/dynamic_link/macros/ilib_gen_Make_unix.sci28
-rw-r--r--scilab/modules/dynamic_link/macros/ilib_gen_gateway.sci6
-rw-r--r--scilab/modules/dynamic_link/macros/ilib_mex_build.sci6
-rw-r--r--scilab/modules/dynamic_link/tests/nonreg_tests/bug_4789.dia.ref30
-rw-r--r--scilab/modules/dynamic_link/tests/nonreg_tests/bug_4789.tst41
-rw-r--r--scilab/modules/elementary_functions/Makefile.am2
-rw-r--r--scilab/modules/elementary_functions/Makefile.in16
-rw-r--r--scilab/modules/fftw/Makefile.am2
-rw-r--r--scilab/modules/fftw/Makefile.in16
-rw-r--r--scilab/modules/fileio/LibScilab_Import.def2
-rw-r--r--scilab/modules/fileio/Makefile.am4
-rw-r--r--scilab/modules/fileio/Makefile.in27
-rw-r--r--scilab/modules/fileio/fileio.vcproj8
-rw-r--r--scilab/modules/fileio/help/en_US/isdir.xml2
-rw-r--r--scilab/modules/fileio/includes/cluni0.h5
-rw-r--r--scilab/modules/fileio/includes/expandPathVariable.h42
-rw-r--r--scilab/modules/fileio/io_Import.def1
-rw-r--r--scilab/modules/fileio/sci_gateway/c/sci_chdir.c20
-rw-r--r--scilab/modules/fileio/sci_gateway/c/sci_createdir.c13
-rw-r--r--scilab/modules/fileio/sci_gateway/c/sci_findfiles.c7
-rw-r--r--scilab/modules/fileio/sci_gateway/c/sci_fscanfMat.c15
-rw-r--r--scilab/modules/fileio/sci_gateway/c/sci_isdir.c135
-rw-r--r--scilab/modules/fileio/sci_gateway/c/sci_isfile.c12
-rw-r--r--scilab/modules/fileio/sci_gateway/c/sci_mopen.c19
-rw-r--r--scilab/modules/fileio/sci_gateway/c/sci_newest.c15
-rw-r--r--scilab/modules/fileio/sci_gateway/c/sci_removedir.c18
-rw-r--r--scilab/modules/fileio/src/c/cluni0.c111
-rw-r--r--scilab/modules/fileio/src/c/copyfile_others.c16
-rw-r--r--scilab/modules/fileio/src/c/expandPathVariable.c177
-rw-r--r--scilab/modules/fileio/src/c/fileinfo.c18
-rw-r--r--scilab/modules/fileio/src/c/splitpath.c2
-rw-r--r--scilab/modules/functions/Makefile.am2
-rw-r--r--scilab/modules/functions/Makefile.in16
-rw-r--r--scilab/modules/functions/src/c/librarieslist.c2
-rw-r--r--scilab/modules/functions/src/c/libraryinfo.c54
-rw-r--r--scilab/modules/genetic_algorithms/Makefile.in14
-rw-r--r--scilab/modules/graphic_export/Makefile.am2
-rw-r--r--scilab/modules/graphic_export/Makefile.in16
-rw-r--r--scilab/modules/graphic_export/src/c/xs2file.c6
-rw-r--r--scilab/modules/graphics/LibScilab_Import.def3
-rw-r--r--scilab/modules/graphics/Makefile.am2
-rw-r--r--scilab/modules/graphics/Makefile.in16
-rw-r--r--scilab/modules/graphics/help/en_US/axes_properties.xml15
-rw-r--r--scilab/modules/graphics/help/en_US/plot2d.xml4
-rw-r--r--scilab/modules/graphics/help/en_US/xsegs.xml51
-rw-r--r--scilab/modules/graphics/includes/BuildObjects.h6
-rw-r--r--scilab/modules/graphics/includes/ObjectStructure.h3
-rw-r--r--scilab/modules/graphics/includes/sciCall.h1
-rw-r--r--scilab/modules/graphics/macros/ResetFigureDDM.sci25
-rw-r--r--scilab/modules/graphics/macros/TitleLabel.sci15
-rw-r--r--scilab/modules/graphics/macros/contourf.sci79
-rw-r--r--scilab/modules/graphics/macros/plot.sci16
-rw-r--r--scilab/modules/graphics/macros/surf.sci10
-rw-r--r--scilab/modules/graphics/sci_gateway/c/sci_xarrows.c2
-rw-r--r--scilab/modules/graphics/sci_gateway/c/sci_xsegs.c80
-rw-r--r--scilab/modules/graphics/src/c/BuildObjects.c59
-rw-r--r--scilab/modules/graphics/src/c/Champ.c4
-rw-r--r--scilab/modules/graphics/src/c/GetCommandArg.c7
-rw-r--r--scilab/modules/graphics/src/c/SetProperty.c2
-rw-r--r--scilab/modules/graphics/src/c/getHandleProperty/get_box_property.c5
-rw-r--r--scilab/modules/graphics/src/c/getHandleProperty/get_x_location_property.c4
-rw-r--r--scilab/modules/graphics/src/c/getHandleProperty/get_y_location_property.c4
-rw-r--r--scilab/modules/graphics/src/c/getHandleProperty/set_box_property.c10
-rw-r--r--scilab/modules/graphics/src/c/getHandleProperty/set_x_location_property.c10
-rw-r--r--scilab/modules/graphics/src/c/getHandleProperty/set_y_location_property.c10
-rw-r--r--scilab/modules/graphics/src/c/get_ticks_utils.c77
-rw-r--r--scilab/modules/graphics/src/c/sciCall.c19
-rw-r--r--scilab/modules/graphics/tcl/ged/Axes.tcl7
-rw-r--r--scilab/modules/gui/Makefile.am2
-rw-r--r--scilab/modules/gui/Makefile.in16
-rw-r--r--scilab/modules/gui/sci_gateway/cpp/sci_uigetdir.cpp20
-rw-r--r--scilab/modules/gui/sci_gateway/cpp/sci_uigetfile.cpp8
-rw-r--r--scilab/modules/gui/sci_gateway/cpp/sci_uiputfile.cpp8
-rw-r--r--scilab/modules/gui/src/java/org/scilab/modules/gui/filechooser/Juigetfile.java2
-rw-r--r--scilab/modules/gui/src/java/org/scilab/modules/gui/utils/SciFileFilter.java10
-rw-r--r--scilab/modules/gui/tests/nonreg_tests/bug_4607.dia.ref22
-rw-r--r--scilab/modules/gui/tests/nonreg_tests/bug_4607.tst24
-rw-r--r--scilab/modules/hdf5/Makefile.am2
-rw-r--r--scilab/modules/hdf5/Makefile.in16
-rw-r--r--scilab/modules/hdf5/sci_gateway/cpp/sci_import_from_hdf5.cpp2
-rw-r--r--scilab/modules/helptools/Makefile.am2
-rw-r--r--scilab/modules/helptools/Makefile.in16
-rw-r--r--scilab/modules/history_manager/Makefile.am2
-rw-r--r--scilab/modules/history_manager/Makefile.in16
-rw-r--r--scilab/modules/history_manager/sci_gateway/c/sci_loadhistory.c20
-rw-r--r--scilab/modules/history_manager/sci_gateway/c/sci_savehistory.c23
-rw-r--r--scilab/modules/history_manager/src/c/fileio_Import.def2
-rw-r--r--scilab/modules/history_manager/src/cpp/HistoryFile.cpp1
-rw-r--r--scilab/modules/history_manager/src/cpp/HistoryManager.cpp1
-rw-r--r--scilab/modules/integer/Makefile.am2
-rw-r--r--scilab/modules/integer/Makefile.in16
-rw-r--r--scilab/modules/interpolation/Makefile.am2
-rw-r--r--scilab/modules/interpolation/Makefile.in16
-rw-r--r--scilab/modules/intersci/Makefile.am2
-rw-r--r--scilab/modules/intersci/Makefile.in16
-rw-r--r--scilab/modules/io/Makefile.am2
-rw-r--r--scilab/modules/io/Makefile.in16
-rw-r--r--scilab/modules/io/includes/setenvc.h12
-rw-r--r--scilab/modules/io/src/c/GetenvB.c29
-rw-r--r--scilab/modules/io/src/c/setenvc.c17
-rw-r--r--scilab/modules/javasci/Makefile.am2
-rw-r--r--scilab/modules/javasci/Makefile.in16
-rw-r--r--scilab/modules/javasci/includes/javasci_globals.h2
-rw-r--r--scilab/modules/javasci/src/c/javasci_SciAbstractArray.c2
-rw-r--r--scilab/modules/javasci/src/c/javasci_Scilab.c2
-rw-r--r--scilab/modules/javasci/src/c/javasci_Scilab2.c2
-rw-r--r--scilab/modules/jvm/Makefile.am2
-rw-r--r--scilab/modules/jvm/Makefile.in16
-rw-r--r--scilab/modules/linear_algebra/Makefile.am2
-rw-r--r--scilab/modules/linear_algebra/Makefile.in16
-rw-r--r--scilab/modules/localization/Makefile.am2
-rw-r--r--scilab/modules/localization/Makefile.in16
-rw-r--r--scilab/modules/m2sci/Makefile.in14
-rw-r--r--scilab/modules/maple2scilab/Makefile.in14
-rw-r--r--scilab/modules/matio/Makefile.am2
-rw-r--r--scilab/modules/matio/Makefile.in16
-rw-r--r--scilab/modules/metanet/Makefile.am2
-rw-r--r--scilab/modules/metanet/Makefile.in16
-rw-r--r--scilab/modules/mexlib/Makefile.am2
-rw-r--r--scilab/modules/mexlib/Makefile.in16
-rw-r--r--scilab/modules/mexlib/src/c/mexlib.c2
-rw-r--r--scilab/modules/optimization/Makefile.am2
-rw-r--r--scilab/modules/optimization/Makefile.in16
-rw-r--r--scilab/modules/optimization/help/en_US/optim.xml163
-rw-r--r--scilab/modules/optimization/macros/optimsimplex/optimsimplex_gradientfv.sci8
-rw-r--r--scilab/modules/output_stream/Makefile.am2
-rw-r--r--scilab/modules/output_stream/Makefile.in16
-rw-r--r--scilab/modules/overloading/Makefile.in14
-rw-r--r--scilab/modules/parameters/Makefile.in14
-rw-r--r--scilab/modules/polynomials/Makefile.am2
-rw-r--r--scilab/modules/polynomials/Makefile.in16
-rw-r--r--scilab/modules/polynomials/tests/nonreg_tests/bug_415.dia.ref208
-rw-r--r--scilab/modules/polynomials/tests/nonreg_tests/bug_415.tst155
-rw-r--r--scilab/modules/pvm/Makefile.am2
-rw-r--r--scilab/modules/pvm/Makefile.in30
-rw-r--r--scilab/modules/randlib/Makefile.am2
-rw-r--r--scilab/modules/randlib/Makefile.in16
-rw-r--r--scilab/modules/renderer/Makefile.am4
-rw-r--r--scilab/modules/renderer/Makefile.in36
-rw-r--r--scilab/modules/renderer/renderer.vcproj8
-rw-r--r--scilab/modules/renderer/src/cpp/subwinDrawing/DrawableSubwinFactory.cpp2
-rw-r--r--scilab/modules/renderer/src/cpp/subwinDrawing/MiddleXAxisPositioner.cpp25
-rw-r--r--scilab/modules/renderer/src/cpp/subwinDrawing/MiddleXAxisPositioner.hxx10
-rw-r--r--scilab/modules/renderer/src/cpp/subwinDrawing/MiddleYAxisPositioner.cpp25
-rw-r--r--scilab/modules/renderer/src/cpp/subwinDrawing/MiddleYAxisPositioner.hxx10
-rw-r--r--scilab/modules/renderer/src/cpp/subwinDrawing/OriginXAxisPositioner.cpp65
-rw-r--r--scilab/modules/renderer/src/cpp/subwinDrawing/OriginXAxisPositioner.hxx52
-rw-r--r--scilab/modules/renderer/src/cpp/subwinDrawing/OriginYAxisPositioner.cpp64
-rw-r--r--scilab/modules/renderer/src/cpp/subwinDrawing/OriginYAxisPositioner.hxx51
-rw-r--r--scilab/modules/renderer/src/cpp/subwinDrawing/TicksDrawerFactory.cpp9
-rw-r--r--scilab/modules/scicos/Makefile.am4
-rw-r--r--scilab/modules/scicos/Makefile.in18
-rw-r--r--scilab/modules/scicos_blocks/Makefile.am2
-rw-r--r--scilab/modules/scicos_blocks/Makefile.in16
-rw-r--r--scilab/modules/scicos_blocks/src/c/scoWindowScope.c4
-rw-r--r--scilab/modules/scipad/Makefile.in28
-rw-r--r--scilab/modules/shell/Makefile.am2
-rw-r--r--scilab/modules/shell/Makefile.in16
-rw-r--r--scilab/modules/shell/src/c/prompt.c16
-rw-r--r--scilab/modules/signal_processing/Makefile.am2
-rw-r--r--scilab/modules/signal_processing/Makefile.in16
-rw-r--r--scilab/modules/simulated_annealing/Makefile.in14
-rw-r--r--scilab/modules/sound/Makefile.am2
-rw-r--r--scilab/modules/sound/Makefile.in16
-rw-r--r--scilab/modules/sound/sci_gateway/c/sci_PlaySound.c22
-rw-r--r--scilab/modules/sparse/Makefile.am2
-rw-r--r--scilab/modules/sparse/Makefile.in16
-rw-r--r--scilab/modules/special_functions/Makefile.am2
-rw-r--r--scilab/modules/special_functions/Makefile.in16
-rw-r--r--scilab/modules/spreadsheet/Makefile.am2
-rw-r--r--scilab/modules/spreadsheet/Makefile.in16
-rw-r--r--scilab/modules/spreadsheet/sci_gateway/c/sci_xls_open.c29
-rw-r--r--scilab/modules/statistics/Makefile.am2
-rw-r--r--scilab/modules/statistics/Makefile.in16
-rw-r--r--scilab/modules/string/Makefile.am2
-rw-r--r--scilab/modules/string/Makefile.in16
-rw-r--r--scilab/modules/string/includes/strsubst.h5
-rw-r--r--scilab/modules/string/sci_gateway/c/sci_strsubst.c318
-rw-r--r--scilab/modules/string/src/c/strsubst.c11
-rw-r--r--scilab/modules/string/tests/nonreg_tests/bug_4807.dia.ref20
-rw-r--r--scilab/modules/string/tests/nonreg_tests/bug_4807.tst21
-rw-r--r--scilab/modules/symbolic/Makefile.am2
-rw-r--r--scilab/modules/symbolic/Makefile.in16
-rw-r--r--scilab/modules/tclsci/Makefile.am2
-rw-r--r--scilab/modules/tclsci/Makefile.in16
-rw-r--r--scilab/modules/texmacs/Makefile.in14
-rw-r--r--scilab/modules/time/Makefile.am2
-rw-r--r--scilab/modules/time/Makefile.in16
-rw-r--r--scilab/modules/umfpack/Makefile.am2
-rw-r--r--scilab/modules/umfpack/Makefile.in16
-rw-r--r--scilab/modules/windows_tools/Makefile.am2
-rw-r--r--scilab/modules/windows_tools/Makefile.in16
-rw-r--r--scilab/modules/windows_tools/sci_gateway/c/sci_dos.c266
-rw-r--r--scilab/modules/windows_tools/src/c/spawncommand.c135
-rw-r--r--scilab/modules/windows_tools/src/c/spawncommand.h2
-rw-r--r--scilab/modules/windows_tools/src/c/winopen.c25
-rw-r--r--scilab/modules/windows_tools/tests/nonreg_tests/bug_4030.tst19
-rw-r--r--scilab/modules/windows_tools/tests/nonreg_tests/bug_4702.dia.ref16
-rw-r--r--scilab/modules/windows_tools/tests/nonreg_tests/bug_4702.tst20
-rw-r--r--scilab/modules/xpad/Makefile.am4
-rw-r--r--scilab/modules/xpad/Makefile.in18
-rw-r--r--scilab/modules/xpad/sci_gateway/cpp/sci_xpad.cpp17
-rw-r--r--scilab/modules/xpad/src/c/LibScilab_Import.def1
-rw-r--r--scilab/modules/xpad/src/c/xpad.vcproj8
-rw-r--r--scilab/modules/xpad/src/cpp/callxpad.cpp16
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/Xpad.java343
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/XpadLineNumberPanel.java29
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/AutoIndentAction.java5
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/ColorizeAction.java10
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/ExitAction.java25
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/FindAction.java42
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/GotoLineAction.java206
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/IndentAction.java23
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/LineNumbersAction.java4
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/LoadIntoScilabAction.java15
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/OpenAction.java26
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/RecentFileAction.java1
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/ResetFontAction.java34
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/SaveAction.java68
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/SaveAsAction.java22
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/SetColorsAction.java82
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/SetFontAction.java37
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/style/ScilabStyleDocument.java619
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/utils/XpadMessages.java10
353 files changed, 6810 insertions, 3532 deletions
diff --git a/SEP/SEP_22_gsort.odt b/SEP/SEP_22_gsort.odt
index eb89dd5..38ef6ce 100644
--- a/SEP/SEP_22_gsort.odt
+++ b/SEP/SEP_22_gsort.odt
Binary files differ
diff --git a/SEP/SEP_30_dynamic_link_includes.odt b/SEP/SEP_30_dynamic_link_includes.odt
deleted file mode 100644
index e98f9f2..0000000
--- a/SEP/SEP_30_dynamic_link_includes.odt
+++ /dev/null
Binary files differ
diff --git a/SEP/SEP_32_dynamic_link_includes.odt b/SEP/SEP_32_dynamic_link_includes.odt
new file mode 100644
index 0000000..8d316f2
--- /dev/null
+++ b/SEP/SEP_32_dynamic_link_includes.odt
Binary files differ
diff --git a/SEP/SEP_33_POO.odt b/SEP/SEP_33_POO.odt
new file mode 100644
index 0000000..d18dc6b
--- /dev/null
+++ b/SEP/SEP_33_POO.odt
Binary files differ
diff --git a/SEP/SEP_34_call_scilab_header_renamed.odt b/SEP/SEP_34_call_scilab_header_renamed.odt
new file mode 100644
index 0000000..094c19c
--- /dev/null
+++ b/SEP/SEP_34_call_scilab_header_renamed.odt
Binary files differ
diff --git a/scilab/CHANGES_5.1.X b/scilab/CHANGES_5.1.X
index 8e6986a..61321f8 100644
--- a/scilab/CHANGES_5.1.X
+++ b/scilab/CHANGES_5.1.X
@@ -26,14 +26,14 @@ Compilation:
26 26
27* --enable-debug-java add two options to the JVM args (-verbose:jni and 27* --enable-debug-java add two options to the JVM args (-verbose:jni and
28 -Xcheck:jni) in order to provide more feedbacks on debug 28 -Xcheck:jni) in order to provide more feedbacks on debug
29 Note that this should be used into a binary since it is expensive 29 Note that this should not be used into a binary since it is expensive
30 30
31* C++ => Java connector updated (using GIWS - 31* C++ => Java connector updated (using GIWS -
32 http://www.scilab.org/giws/ version 1.0.3) 32 http://www.scilab.org/giws/ version 1.0.3)
33 There was a bug in GIWS: 33 There was a bug in GIWS:
34 The use of a static method returning an int wasn't calling the right 34 The use of a static method returning an int wasn't calling the right
35 method. 35 method.
36 It didn't seem to trigger any errors in the past but the latest 36 It did not seem to trigger any errors in the past but the latest
37 version of the JDK is now complaining. 37 version of the JDK is now complaining.
38 38
39 39
@@ -64,7 +64,7 @@ Compilation:
64 - adds missing enable_keypad_mode() 64 - adds missing enable_keypad_mode()
65 - use configure results to protect the inclusion of curses.h, 65 - use configure results to protect the inclusion of curses.h,
66 ncurses.h, term.h, and termcap.h. 66 ncurses.h, term.h, and termcap.h.
67 - Large amounts of cleanup of the PVM configure code 67 - Large amounts of cleanup of the PVM configure code (Closes: #4151)
68 68
69* automake version changed (1.10.1 => 1.10.2) 69* automake version changed (1.10.1 => 1.10.2)
70 70
@@ -260,6 +260,14 @@ Bug fixes:
260 260
261 * bug 4773 fixed - Using "axes_reverse" produce a switch between the front and back color of a figure. 261 * bug 4773 fixed - Using "axes_reverse" produce a switch between the front and back color of a figure.
262 262
263 * bug 4429 fixed - Use hidden_axes instead of hidden_axis
264
265 * bug 4396 fixed - In Plot2d, the nax option can receive -1 for number of ticks, it's mean autoticks
266
267 * bug 4394 fixed - Add 'origin' as position for X and Y axes
268
269 * bug 4431 fixed - xsegs() accept z argument
270
263 271
264 272
265 Changes between version 5.1.0 and 5.1.1 of Scilab 273 Changes between version 5.1.0 and 5.1.1 of Scilab
diff --git a/scilab/CHANGES_5.2.X b/scilab/CHANGES_5.2.X
index b53ac49..cf7620c 100644
--- a/scilab/CHANGES_5.2.X
+++ b/scilab/CHANGES_5.2.X
@@ -123,6 +123,7 @@ fileio functions:
123* Rewrite : 123* Rewrite :
124 + copyfile (primitive) 124 + copyfile (primitive)
125 + fileparts (primitive) 125 + fileparts (primitive)
126 + isdir manages matrix of strings as input argument
126 127
127Dynamic link: 128Dynamic link:
128============= 129=============
@@ -143,6 +144,10 @@ Dynamic link:
143 144
144* addinter : each interface added can manage 999 functions (bug 4675). 145* addinter : each interface added can manage 999 functions (bug 4675).
145 146
147* ilib_gen_gateway can generated gateway without PutLhsVar (Managed by user, in this case)
148 see help of 'ilib_gen_gateway' about this modification and
149 SCI/contrib/toolbox_skeleton/sci_gateway/c/builder_gateway_c.sce (example)
150
146Online Help : 151Online Help :
147============= 152=============
148 153
@@ -156,7 +161,12 @@ call_scilab module :
156==================== 161====================
157 162
158* A example to call scilab from C# added. 163* A example to call scilab from C# added.
159 see SCI/modules/call_scilab/examples/call_scilab/dotnetsci directory 164 see SCI/modules/call_scilab/examples/call_scilab/NET/C# directory
165
166* A example to call scilab from VB.NET added.
167 see SCI/modules/call_scilab/examples/call_scilab/NET/VB.NET directory
168
169* CallScilab.h renamed call_scilab.h
160 170
161tests : 171tests :
162======= 172=======
@@ -224,6 +234,7 @@ Optimization:
224 - Created optimbase component to build optimization algorithms 234 - Created optimbase component to build optimization algorithms
225 - Created optimsimplex component to build direct search algorithms 235 - Created optimsimplex component to build direct search algorithms
226 - Created fminsearch optimization function 236 - Created fminsearch optimization function
237 - Added examples in the help for optim
227 238
228Linear algebra 239Linear algebra
229============= 240=============
@@ -232,6 +243,8 @@ Linear algebra
232Bug fixes: 243Bug fixes:
233========== 244==========
234 245
246* bug 415 fixed - wrong order in the roots of a polynomial
247
235* bug 1412 fixed - A(3,3)=%s,A(:)=%z causes scilab to hang 248* bug 1412 fixed - A(3,3)=%s,A(:)=%z causes scilab to hang
236 249
237* bug 1628 fixed - with long programs (several hours) I get a negative value for 250* bug 1628 fixed - with long programs (several hours) I get a negative value for
@@ -263,6 +276,8 @@ Bug fixes:
263 276
264* bug 3992 fixed - remove some invalid dependencies on external libraries. 277* bug 3992 fixed - remove some invalid dependencies on external libraries.
265 278
279* bug 4030 fixed - unix_w('dir /s') can display strange matrix on windows.
280
266* bug 4090 fixed - draw does not work any more while inside drawlater/drawnow scope. 281* bug 4090 fixed - draw does not work any more while inside drawlater/drawnow scope.
267 282
268* bug 4110 fixed - Demos order differs between Linux and Windows versions 283* bug 4110 fixed - Demos order differs between Linux and Windows versions
@@ -278,7 +293,7 @@ Bug fixes:
278* bug 4267 fixed - A non initilization of a lock under Netbsd was 293* bug 4267 fixed - A non initilization of a lock under Netbsd was
279 causing an error on startup 294 causing an error on startup
280 295
281* bug 4278 fixed - typename() called with a wrong number of input arguments returns incoherent errors. 296* bug 4278 fixed - typename() called with a wrong number of input arguments returns incoherent errors.
282 297
283* bug 4307 fixed - Desactivate (in modules.xml) modules if its functionnalities 298* bug 4307 fixed - Desactivate (in modules.xml) modules if its functionnalities
284 are not available. 299 are not available.
@@ -409,6 +424,8 @@ Bug fixes:
409 424
410* bug 4695 fixed - some help pages + examples where missing in the arnoldi package 425* bug 4695 fixed - some help pages + examples where missing in the arnoldi package
411 426
427* bug 4702 fixed - on some case, dos(cmd) does not return results
428
412* bug 4719 fixed - fsolve may fail on some system of equations. Add an example in the documentation. 429* bug 4719 fixed - fsolve may fail on some system of equations. Add an example in the documentation.
413 430
414* bug 4724 fixed - when the f variation of a data set is too small, plot hangs 431* bug 4724 fixed - when the f variation of a data set is too small, plot hangs
@@ -421,3 +438,13 @@ Bug fixes:
421 438
422* bug 4744 fixed - whereis, librairieslist, libraryinfo primitives should be moved in "functions" modules. 439* bug 4744 fixed - whereis, librairieslist, libraryinfo primitives should be moved in "functions" modules.
423 440
441* bug 4753 fixed - if you have a toolbox and you launch scilab-cli, you have a error message at startup.
442
443* bug 4789 fixed - number of input arguments is not checked in ilib_functions (dynamic_link module)
444
445* bug 4792 fixed - macro name too long
446
447* bug 4795 fixed - CallScilab.h renamed call_scilab.h
448
449* bug 4807 fixed - strsubst does not check if second argument is a valid patter where fourth argument is 'r'.
450
diff --git a/scilab/Makefile.incl.am b/scilab/Makefile.incl.am
index 0b0df21..f946ffd 100644
--- a/scilab/Makefile.incl.am
+++ b/scilab/Makefile.incl.am
@@ -68,7 +68,7 @@ if SWIG
68swig: $(SWIG_WRAPPERS) 68swig: $(SWIG_WRAPPERS)
69 @SWIG_PACKAGENAME=org.scilab.modules.$(modulename); \ 69 @SWIG_PACKAGENAME=org.scilab.modules.$(modulename); \
70 SWIG_OUTDIR=src/java/org/scilab/modules/$(modulename)/; \ 70 SWIG_OUTDIR=src/java/org/scilab/modules/$(modulename)/; \
71 if test ! -z "$(SWIG_WRAPPERS)"; then \ 71 if test -n "$(SWIG_WRAPPERS)"; then \
72 for file in $(SWIG_WRAPPERS) ; do \ 72 for file in $(SWIG_WRAPPERS) ; do \
73 echo "Swig process of $$file ..."; \ 73 echo "Swig process of $$file ..."; \
74 $(SWIG_BIN) $(SWIG_JAVA) -package $$SWIG_PACKAGENAME -outdir $$SWIG_OUTDIR $$file; \ 74 $(SWIG_BIN) $(SWIG_JAVA) -package $$SWIG_PACKAGENAME -outdir $$SWIG_OUTDIR $$file; \
@@ -85,7 +85,7 @@ if GIWS
85## build Swig Java => C wrappers 85## build Swig Java => C wrappers
86giws: $(GIWS_WRAPPERS) 86giws: $(GIWS_WRAPPERS)
87 @GIWS_OUTPUTDIR=src/jni/;\ 87 @GIWS_OUTPUTDIR=src/jni/;\
88 if test ! -z "$(GIWS_WRAPPERS)"; then \ 88 if test -n "$(GIWS_WRAPPERS)"; then \
89 for file in $(GIWS_WRAPPERS) ; do \ 89 for file in $(GIWS_WRAPPERS) ; do \
90 echo "GIWS process of $$file ..."; \ 90 echo "GIWS process of $$file ..."; \
91 $(GIWS_BIN) --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \ 91 $(GIWS_BIN) --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
@@ -249,10 +249,12 @@ install-data-local:
249 $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \ 249 $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
250 if test -d $(srcdir)/$$dir/; then \ 250 if test -d $(srcdir)/$$dir/; then \
251 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 251 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
252 for specialExt in $(MACROSSPECIALEXT); do \ 252 if test -n "$(MACROSSPECIALEXT)"; then \
253 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 253 for specialExt in $(MACROSSPECIALEXT); do \
254 done; \ 254 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
255 FILELIST="$$FILELIST $$specialExtDir"; \ 255 done; \
256 FILELIST="$$FILELIST $$specialExtDir"; \
257 fi; \
256 for file in `ls -1 $$FILELIST 2>/dev/null`; do \ 258 for file in `ls -1 $$FILELIST 2>/dev/null`; do \
257 echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \ 259 echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
258 $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \ 260 $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \
diff --git a/scilab/Scilab.sln b/scilab/Scilab.sln
index 3335fb9..a0ca2d6 100644
--- a/scilab/Scilab.sln
+++ b/scilab/Scilab.sln
@@ -825,6 +825,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "windows_tools", "modules\wi
825 {4FC72D4A-80EE-4B1A-8724-0201C1A35621} = {4FC72D4A-80EE-4B1A-8724-0201C1A35621} 825 {4FC72D4A-80EE-4B1A-8724-0201C1A35621} = {4FC72D4A-80EE-4B1A-8724-0201C1A35621}
826 {982BF37F-42C4-4D37-8D14-60521B141503} = {982BF37F-42C4-4D37-8D14-60521B141503} 826 {982BF37F-42C4-4D37-8D14-60521B141503} = {982BF37F-42C4-4D37-8D14-60521B141503}
827 {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} 827 {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
828 {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0} = {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}
828 {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} 829 {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
829 {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A} 830 {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
830 EndProjectSection 831 EndProjectSection
@@ -1056,6 +1057,7 @@ EndProject
1056Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xpad", "modules\xpad\src\c\xpad.vcproj", "{BAE68B54-2C1A-44D0-A0E9-05156A784E79}" 1057Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xpad", "modules\xpad\src\c\xpad.vcproj", "{BAE68B54-2C1A-44D0-A0E9-05156A784E79}"
1057 ProjectSection(ProjectDependencies) = postProject 1058 ProjectSection(ProjectDependencies) = postProject
1058 {ECFFEB0C-1EDA-45EE-9A10-B18143852E17} = {ECFFEB0C-1EDA-45EE-9A10-B18143852E17} 1059 {ECFFEB0C-1EDA-45EE-9A10-B18143852E17} = {ECFFEB0C-1EDA-45EE-9A10-B18143852E17}
1060 {4FC72D4A-80EE-4B1A-8724-0201C1A35621} = {4FC72D4A-80EE-4B1A-8724-0201C1A35621}
1059 {53A01263-92BE-4C87-AA9A-79297F882310} = {53A01263-92BE-4C87-AA9A-79297F882310} 1061 {53A01263-92BE-4C87-AA9A-79297F882310} = {53A01263-92BE-4C87-AA9A-79297F882310}
1060 {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} 1062 {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
1061 {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470} = {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470} 1063 {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470} = {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470}
diff --git a/scilab/Scilab_f2c.sln b/scilab/Scilab_f2c.sln
index ac408f2..8cc622c 100644
--- a/scilab/Scilab_f2c.sln
+++ b/scilab/Scilab_f2c.sln
@@ -825,6 +825,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "windows_tools", "modules\wi
825 {4FC72D4A-80EE-4B1A-8724-0201C1A35621} = {4FC72D4A-80EE-4B1A-8724-0201C1A35621} 825 {4FC72D4A-80EE-4B1A-8724-0201C1A35621} = {4FC72D4A-80EE-4B1A-8724-0201C1A35621}
826 {982BF37F-42C4-4D37-8D14-60521B141503} = {982BF37F-42C4-4D37-8D14-60521B141503} 826 {982BF37F-42C4-4D37-8D14-60521B141503} = {982BF37F-42C4-4D37-8D14-60521B141503}
827 {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} 827 {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
828 {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0} = {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}
828 {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} 829 {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
829 {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A} 830 {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
830 EndProjectSection 831 EndProjectSection
@@ -1057,6 +1058,7 @@ EndProject
1057Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xpad", "modules\xpad\src\c\xpad.vcproj", "{BAE68B54-2C1A-44D0-A0E9-05156A784E79}" 1058Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xpad", "modules\xpad\src\c\xpad.vcproj", "{BAE68B54-2C1A-44D0-A0E9-05156A784E79}"
1058 ProjectSection(ProjectDependencies) = postProject 1059 ProjectSection(ProjectDependencies) = postProject
1059 {ECFFEB0C-1EDA-45EE-9A10-B18143852E17} = {ECFFEB0C-1EDA-45EE-9A10-B18143852E17} 1060 {ECFFEB0C-1EDA-45EE-9A10-B18143852E17} = {ECFFEB0C-1EDA-45EE-9A10-B18143852E17}
1061 {4FC72D4A-80EE-4B1A-8724-0201C1A35621} = {4FC72D4A-80EE-4B1A-8724-0201C1A35621}
1060 {53A01263-92BE-4C87-AA9A-79297F882310} = {53A01263-92BE-4C87-AA9A-79297F882310} 1062 {53A01263-92BE-4C87-AA9A-79297F882310} = {53A01263-92BE-4C87-AA9A-79297F882310}
1061 {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} 1063 {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
1062 {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470} = {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470} 1064 {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470} = {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470}
diff --git a/scilab/bin/.gitignore b/scilab/bin/.gitignore
index 2b1a53c..09dfe56 100644
--- a/scilab/bin/.gitignore
+++ b/scilab/bin/.gitignore
@@ -1,34 +1,36 @@
1# Windows files (generated)
1*.manifest 2*.manifest
2*.pdb 3*.pdb
3*.ilk 4*.ilk
4*.exp 5*.exp
5*.lib 6*.lib
6*.dll 7*.dll
8*.tlb
7*.def 9*.def
8*.log 10*.log
9WScilex_pure.ini 11WScilex_pure.ini
12Scilex_pure.ini
10*.pgd 13*.pgd
11*.tmp 14*.tmp
12*.suo 15*.suo
13*.res 16*.res
14*.bak 17*.bak
15loader.sce 18*.mak
16Makelib.mak 19*.exe
17my_ode.obj
18lcclib 20lcclib
21mkl
22refblas
23fftw
24
25# linux
26loader.sce
19*.jar 27*.jar
20cachedir 28cachedir
21pref.data 29pref.data
22wScilex_pure.ini
23Scilex_pure.ini
24*.lnk 30*.lnk
25test.bin 31test.bin
26test_macro_exec 32test_macro_exec
27libintertest.c 33libintertest.c
28mkl
29refblas
30fftw
31*.so.* 34*.so.*
32*.so 35*.so
33*.exe
34libmatio* 36libmatio*
diff --git a/scilab/bin/bin.iss b/scilab/bin/bin.iss
index f7a506a..d1e04e3 100644
--- a/scilab/bin/bin.iss
+++ b/scilab/bin/bin.iss
@@ -79,6 +79,7 @@ Source: bin\Dumpexts.exe; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
79Source: bin\f2c.exe; DestDir: {app}\bin; Components: {#COMPN_SCILAB} 79Source: bin\f2c.exe; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
80; 80;
81; hdf5 libraries 81; hdf5 libraries
82Source: bin\jhdf5.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
82Source: bin\szlibdll.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB} 83Source: bin\szlibdll.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
83Source: bin\hdf5dll.dll ; DestDir: {app}\bin; Components: {#COMPN_SCILAB} 84Source: bin\hdf5dll.dll ; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
84Source: bin\hdf5_cppdll.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB} 85Source: bin\hdf5_cppdll.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
diff --git a/scilab/configure b/scilab/configure
index 2dae2dc..7f7bc1b 100755
--- a/scilab/configure
+++ b/scilab/configure
@@ -887,7 +887,6 @@ JOGL
887SKINLF 887SKINLF
888LOOKS 888LOOKS
889FLEXDOCK 889FLEXDOCK
890JGRAPHX
891ANT 890ANT
892JDB 891JDB
893JAR 892JAR
@@ -1030,6 +1029,7 @@ enable_option_checking
1030enable_largefile 1029enable_largefile
1031with_gnu_ld 1030with_gnu_ld
1032enable_relocatable 1031enable_relocatable
1032enable_rpath
1033enable_maintainer_mode 1033enable_maintainer_mode
1034enable_dependency_tracking 1034enable_dependency_tracking
1035enable_debug 1035enable_debug
@@ -1052,7 +1052,6 @@ with_hdf5
1052with_jdk 1052with_jdk
1053with_ant 1053with_ant
1054enable_nls 1054enable_nls
1055enable_rpath
1056with_libiconv_prefix 1055with_libiconv_prefix
1057with_libintl_prefix 1056with_libintl_prefix
1058with_scicos 1057with_scicos
@@ -1732,6 +1731,7 @@ Optional Features:
1732 --enable-FEATURE[=ARG] include FEATURE [ARG=yes] 1731 --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
1733 --disable-largefile omit support for large files 1732 --disable-largefile omit support for large files
1734 --enable-relocatable install a package that can be moved in the filesystem 1733 --enable-relocatable install a package that can be moved in the filesystem
1734 --disable-rpath do not hardcode runtime library paths
1735 --enable-maintainer-mode enable make rules and dependencies not useful 1735 --enable-maintainer-mode enable make rules and dependencies not useful
1736 (and sometimes confusing) to the casual installer 1736 (and sometimes confusing) to the casual installer
1737 --disable-dependency-tracking speeds up one-time build 1737 --disable-dependency-tracking speeds up one-time build
@@ -1755,7 +1755,6 @@ Optional Features:
1755 (A Java Development Kit (JDK) is mandatory for this 1755 (A Java Development Kit (JDK) is mandatory for this
1756 option) 1756 option)
1757 --disable-nls do not use Native Language Support 1757 --disable-nls do not use Native Language Support
1758 --disable-rpath do not hardcode runtime library paths
1759 --disable-build-localization 1758 --disable-build-localization
1760 Disable the localization build 1759 Disable the localization build
1761 1760
@@ -3077,7 +3076,7 @@ SCI_BUILDDIR="`pwd`"
3077SCI_SRCDIR="$srcdir" 3076SCI_SRCDIR="$srcdir"
3078SCI_SRCDIR_FULL="`cd $SCI_SRCDIR && pwd`" 3077SCI_SRCDIR_FULL="`cd $SCI_SRCDIR && pwd`"
3079 3078
3080SCILAB_LIBRARY_VERSION=5:1:0 3079SCILAB_LIBRARY_VERSION=5:2:0
3081 3080
3082 3081
3083#shared library versioning 3082#shared library versioning
@@ -5051,6 +5050,39 @@ _ACEOF
5051 5050
5052 5051
5053 5052
5053 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5
5054$as_echo_n "checking for shared library run path origin... " >&6; }
5055if test "${acl_cv_rpath+set}" = set; then :
5056 $as_echo_n "(cached) " >&6
5057else
5058
5059 CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
5060 ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
5061 . ./conftest.sh
5062 rm -f ./conftest.sh
5063 acl_cv_rpath=done
5064
5065fi
5066{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_rpath" >&5
5067$as_echo "$acl_cv_rpath" >&6; }
5068 wl="$acl_cv_wl"
5069 acl_libext="$acl_cv_libext"
5070 acl_shlibext="$acl_cv_shlibext"
5071 acl_libname_spec="$acl_cv_libname_spec"
5072 acl_library_names_spec="$acl_cv_library_names_spec"
5073 acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
5074 acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
5075 acl_hardcode_direct="$acl_cv_hardcode_direct"
5076 acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
5077 # Check whether --enable-rpath was given.
5078if test "${enable_rpath+set}" = set; then :
5079 enableval=$enable_rpath; :
5080else
5081 enable_rpath=yes
5082fi
5083
5084
5085
5054# If configure detect that timestamp changed, 5086# If configure detect that timestamp changed,
5055# it tries to rebuild configure & makefile which can be a painmaker 5087# it tries to rebuild configure & makefile which can be a painmaker
5056# if the version is different 5088# if the version is different
@@ -9120,7 +9152,7 @@ case "$CXX" in
9120 g++-* | g++ | ccache*g++ | ccache*g++-* ) 9152 g++-* | g++ | ccache*g++ | ccache*g++-* )
9121 ## With GNU C++ Compiler 9153 ## With GNU C++ Compiler
9122 if test "$enable_debug_CXX" = yes; then 9154 if test "$enable_debug_CXX" = yes; then
9123 CXXFLAGS="$CXXFLAGS -pipe -Wshadow -Wpointer-arith -Wcast-align -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings -Wunused -Wno-strict-aliasing -Wextra -Wall -Wold-style-cast -g3 -Weffc++" 9155 CXXFLAGS="$CXXFLAGS -pipe -Wshadow -Wpointer-arith -Wcast-align -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings -Wunused -Wno-strict-aliasing -Wextra -Wall -Wold-style-cast -g3"
9124 case "$host" in 9156 case "$host" in
9125 *-linux-gnu ) 9157 *-linux-gnu )
9126 # Only doing that under Linux 9158 # Only doing that under Linux
@@ -9509,9 +9541,9 @@ fi
9509 9541
9510 9542
9511 9543
9512{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for H5Dopen in -lhdf5" >&5 9544{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for H5Fopen in -lhdf5" >&5
9513$as_echo_n "checking for H5Dopen in -lhdf5... " >&6; } 9545$as_echo_n "checking for H5Fopen in -lhdf5... " >&6; }
9514if test "${ac_cv_lib_hdf5_H5Dopen+set}" = set; then : 9546if test "${ac_cv_lib_hdf5_H5Fopen+set}" = set; then :
9515 $as_echo_n "(cached) " >&6 9547 $as_echo_n "(cached) " >&6
9516else 9548else
9517 ac_check_lib_save_LIBS=$LIBS 9549 ac_check_lib_save_LIBS=$LIBS
@@ -9525,27 +9557,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9525#ifdef __cplusplus 9557#ifdef __cplusplus
9526extern "C" 9558extern "C"
9527#endif 9559#endif
9528char H5Dopen (); 9560char H5Fopen ();
9529int 9561int
9530main () 9562main ()
9531{ 9563{
9532return H5Dopen (); 9564return H5Fopen ();
9533 ; 9565 ;
9534 return 0; 9566 return 0;
9535} 9567}
9536_ACEOF 9568_ACEOF
9537if ac_fn_c_try_link "$LINENO"; then : 9569if ac_fn_c_try_link "$LINENO"; then :
9538 ac_cv_lib_hdf5_H5Dopen=yes 9570 ac_cv_lib_hdf5_H5Fopen=yes
9539else 9571else
9540 ac_cv_lib_hdf5_H5Dopen=no 9572 ac_cv_lib_hdf5_H5Fopen=no
9541fi 9573fi
9542rm -f core conftest.err conftest.$ac_objext \ 9574rm -f core conftest.err conftest.$ac_objext \
9543 conftest$ac_exeext conftest.$ac_ext 9575 conftest$ac_exeext conftest.$ac_ext
9544LIBS=$ac_check_lib_save_LIBS 9576LIBS=$ac_check_lib_save_LIBS
9545fi 9577fi
9546{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_hdf5_H5Dopen" >&5 9578{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_hdf5_H5Fopen" >&5
9547$as_echo "$ac_cv_lib_hdf5_H5Dopen" >&6; } 9579$as_echo "$ac_cv_lib_hdf5_H5Fopen" >&6; }
9548if test "x$ac_cv_lib_hdf5_H5Dopen" = x""yes; then : 9580if test "x$ac_cv_lib_hdf5_H5Fopen" = x""yes; then :
9549 cat >>confdefs.h <<_ACEOF 9581 cat >>confdefs.h <<_ACEOF
9550#define HAVE_LIBHDF5 1 9582#define HAVE_LIBHDF5 1
9551_ACEOF 9583_ACEOF
@@ -9553,7 +9585,7 @@ _ACEOF
9553 LIBS="-lhdf5 $LIBS" 9585 LIBS="-lhdf5 $LIBS"
9554 9586
9555else 9587else
9556 as_fn_error "libhdf5: library missing. (Cannot find symbol H5Dopen). Check if libhdf5 is installed and if the version is correct" "$LINENO" 5 9588 as_fn_error "libhdf5: library missing. (Cannot find symbol H5Fopen). Check if libhdf5 is installed and if the version is correct" "$LINENO" 5
9557 9589
9558fi 9590fi
9559 9591
@@ -9814,7 +9846,7 @@ $as_echo "$ac_java_classpath" >&6; }
9814$as_echo_n "checking to see if the java compiler works... " >&6; } 9846$as_echo_n "checking to see if the java compiler works... " >&6; }
9815 9847
9816 cat << \EOF > conftest.java 9848 cat << \EOF > conftest.java
9817// #line 9817 "configure" 9849// #line 9849 "configure"
9818 9850
9819 9851
9820public class conftest { 9852public class conftest {
@@ -9862,7 +9894,7 @@ $as_echo_n "checking type of jvm... " >&6; }
9862 if test "x$ac_java_jvm_name" = "x" ; then 9894 if test "x$ac_java_jvm_name" = "x" ; then
9863 9895
9864 cat << \EOF > conftest.java 9896 cat << \EOF > conftest.java
9865// #line 9865 "configure" 9897// #line 9897 "configure"
9866import gnu.java.io.EncodingManager; 9898import gnu.java.io.EncodingManager;
9867 9899
9868public class conftest { 9900public class conftest {
@@ -9908,7 +9940,7 @@ $as_echo_n "checking java API version... " >&6; }
9908 9940
9909 9941
9910 cat << \EOF > conftest.java 9942 cat << \EOF > conftest.java
9911// #line 9911 "configure" 9943// #line 9943 "configure"
9912import java.nio.charset.Charset; 9944import java.nio.charset.Charset;
9913 9945
9914public class conftest { 9946public class conftest {
@@ -9935,7 +9967,7 @@ EOF
9935 9967
9936 9968
9937 cat << \EOF > conftest.java 9969 cat << \EOF > conftest.java
9938// #line 9938 "configure" 9970// #line 9970 "configure"
9939import java.lang.StringBuilder; 9971import java.lang.StringBuilder;
9940 9972
9941public class conftest { 9973public class conftest {
@@ -11117,78 +11149,6 @@ fi
11117 11149
11118 if test "$with_gui" != no; then 11150 if test "$with_gui" != no; then
11119 11151
11120 # jgraphx
11121
11122 { $as_echo "$as_me:${as_lineno-$LINENO}: checking jgraphx" >&5
11123$as_echo_n "checking jgraphx... " >&6; }
11124 PACKAGE_JAR_FILE=
11125 found_jar=no
11126 saved_ac_java_classpath=$ac_java_classpath
11127 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"
11128 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
11129 for jar in "$jardir/jgraphx.jar" "$jardir/libjgraphx.jar" "$jardir/libjgraphx-java.jar" "$jardir/jgraphx*.jar"; do
11130# jar=`echo $jar|sed -e 's/ /\\ /'`
11131# echo "protected $jar"
11132# jar_resolved=`ls $jar 2>/dev/null`
11133# echo "looking for $jar_resolved"
11134# TODO check the behaviour when spaces
11135 jar_resolved=`ls $jar 2>/dev/null`
11136 if test -e "$jar_resolved"; then
11137 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11138
11139 cat << \EOF > conftest.java
11140// #line 11140 "configure"
11141import com.mxgraph.model.mxCell;
11142
11143public class conftest {
11144 public static void main(String[] argv) {
11145
11146 }
11147}
11148EOF
11149
11150 CLASSPATH=$ac_java_classpath
11151 export CLASSPATH
11152 cmd="$JAVAC ${JAVAC_FLAGS} conftest.java"
11153 if (echo $cmd >&5 ; eval $cmd >&5 2>&5) ; then
11154 echo "yes" >&5
11155
11156 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
11157$as_echo "$jar_resolved" >&6; }
11158 found_jar=yes
11159 PACKAGE_JAR_FILE=$jar_resolved
11160 break
11161
11162 else
11163 echo "configure: failed program was:" >&5
11164 cat conftest.java >&5
11165 echo "configure: CLASSPATH was $CLASSPATH" >&5
11166
11167 ac_java_classpath=$saved_ac_java_classpath
11168
11169
11170 fi
11171
11172 fi
11173 done
11174 if test "$found_jar" = "yes"; then
11175 break
11176 fi
11177 done
11178 if test "$found_jar" = "no"; then
11179 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
11180$as_echo "no" >&6; }
11181 if test "" = "yes"; then
11182 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar jgraphx used by JGraph X (looking for package com.mxgraph.model.mxCell)" >&5
11183$as_echo "$as_me: WARNING: Could not find or use the Java package/jar jgraphx used by JGraph X (looking for package com.mxgraph.model.mxCell)" >&2;}
11184 else
11185 as_fn_error "Could not find or use the Java package/jar jgraphx used by JGraph X (looking for package com.mxgraph.model.mxCell)" "$LINENO" 5
11186 fi
11187 fi
11188
11189 JGRAPHX=$PACKAGE_JAR_FILE
11190
11191
11192 # Docking system 11152 # Docking system
11193 11153
11194 { $as_echo "$as_me:${as_lineno-$LINENO}: checking flexdock" >&5 11154 { $as_echo "$as_me:${as_lineno-$LINENO}: checking flexdock" >&5
@@ -11196,7 +11156,7 @@ $as_echo_n "checking flexdock... " >&6; }
11196 PACKAGE_JAR_FILE= 11156 PACKAGE_JAR_FILE=
11197 found_jar=no 11157 found_jar=no
11198 saved_ac_java_classpath=$ac_java_classpath 11158 saved_ac_java_classpath=$ac_java_classpath
11199 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" 11159 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)"
11200 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do 11160 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
11201 for jar in "$jardir/flexdock.jar" "$jardir/libflexdock.jar" "$jardir/libflexdock-java.jar" "$jardir/flexdock*.jar"; do 11161 for jar in "$jardir/flexdock.jar" "$jardir/libflexdock.jar" "$jardir/libflexdock-java.jar" "$jardir/flexdock*.jar"; do
11202# jar=`echo $jar|sed -e 's/ /\\ /'` 11162# jar=`echo $jar|sed -e 's/ /\\ /'`
@@ -11209,7 +11169,7 @@ $as_echo_n "checking flexdock... " >&6; }
11209 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11169 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11210 11170
11211 cat << \EOF > conftest.java 11171 cat << \EOF > conftest.java
11212// #line 11212 "configure" 11172// #line 11172 "configure"
11213import org.flexdock.docking.DockingManager; 11173import org.flexdock.docking.DockingManager;
11214 11174
11215public class conftest { 11175public class conftest {
@@ -11268,7 +11228,7 @@ $as_echo_n "checking looks... " >&6; }
11268 PACKAGE_JAR_FILE= 11228 PACKAGE_JAR_FILE=
11269 found_jar=no 11229 found_jar=no
11270 saved_ac_java_classpath=$ac_java_classpath 11230 saved_ac_java_classpath=$ac_java_classpath
11271 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" 11231 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)"
11272 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do 11232 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
11273 for jar in "$jardir/looks.jar" "$jardir/liblooks.jar" "$jardir/liblooks-java.jar" "$jardir/looks*.jar"; do 11233 for jar in "$jardir/looks.jar" "$jardir/liblooks.jar" "$jardir/liblooks-java.jar" "$jardir/looks*.jar"; do
11274# jar=`echo $jar|sed -e 's/ /\\ /'` 11234# jar=`echo $jar|sed -e 's/ /\\ /'`
@@ -11281,7 +11241,7 @@ $as_echo_n "checking looks... " >&6; }
11281 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11241 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11282 11242
11283 cat << \EOF > conftest.java 11243 cat << \EOF > conftest.java
11284// #line 11284 "configure" 11244// #line 11244 "configure"
11285import com.jgoodies.looks.common.RenderingUtils; 11245import com.jgoodies.looks.common.RenderingUtils;
11286 11246
11287public class conftest { 11247public class conftest {
@@ -11332,17 +11292,17 @@ $as_echo "$as_me: WARNING: Could not find or use the Java package/jar looks used
11332 11292
11333 LOOKS=$PACKAGE_JAR_FILE 11293 LOOKS=$PACKAGE_JAR_FILE
11334 11294
11335 # Named differently under Opensuse 11295 # Named differently under ArchLinux
11336 if test -z "$LOOKS"; then 11296 if test -z "$LOOKS"; then
11337 11297
11338 { $as_echo "$as_me:${as_lineno-$LINENO}: checking looks2" >&5 11298 { $as_echo "$as_me:${as_lineno-$LINENO}: checking jgoodies-looks" >&5
11339$as_echo_n "checking looks2... " >&6; } 11299$as_echo_n "checking jgoodies-looks... " >&6; }
11340 PACKAGE_JAR_FILE= 11300 PACKAGE_JAR_FILE=
11341 found_jar=no 11301 found_jar=no
11342 saved_ac_java_classpath=$ac_java_classpath 11302 saved_ac_java_classpath=$ac_java_classpath
11343 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" 11303 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)"
11344 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do 11304 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
11345 for jar in "$jardir/looks2.jar" "$jardir/liblooks2.jar" "$jardir/liblooks2-java.jar" "$jardir/looks2*.jar"; do 11305 for jar in "$jardir/jgoodies-looks.jar" "$jardir/libjgoodies-looks.jar" "$jardir/libjgoodies-looks-java.jar" "$jardir/jgoodies-looks*.jar"; do
11346# jar=`echo $jar|sed -e 's/ /\\ /'` 11306# jar=`echo $jar|sed -e 's/ /\\ /'`
11347# echo "protected $jar" 11307# echo "protected $jar"
11348# jar_resolved=`ls $jar 2>/dev/null` 11308# jar_resolved=`ls $jar 2>/dev/null`
@@ -11353,7 +11313,7 @@ $as_echo_n "checking looks2... " >&6; }
11353 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11313 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11354 11314
11355 cat << \EOF > conftest.java 11315 cat << \EOF > conftest.java
11356// #line 11356 "configure" 11316// #line 11316 "configure"
11357import com.jgoodies.looks.common.RenderingUtils; 11317import com.jgoodies.looks.common.RenderingUtils;
11358 11318
11359public class conftest { 11319public class conftest {
@@ -11395,10 +11355,10 @@ $as_echo "$jar_resolved" >&6; }
11395 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 11355 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
11396$as_echo "no" >&6; } 11356$as_echo "no" >&6; }
11397 if test "" = "yes"; then 11357 if test "" = "yes"; then
11398 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar looks2 used by Scilab Gui - Look and feel (looking for package com.jgoodies.looks.common.RenderingUtils)" >&5 11358 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar jgoodies-looks used by Scilab Gui - Look and feel (looking for package com.jgoodies.looks.common.RenderingUtils)" >&5
11399$as_echo "$as_me: WARNING: Could not find or use the Java package/jar looks2 used by Scilab Gui - Look and feel (looking for package com.jgoodies.looks.common.RenderingUtils)" >&2;} 11359$as_echo "$as_me: WARNING: Could not find or use the Java package/jar jgoodies-looks used by Scilab Gui - Look and feel (looking for package com.jgoodies.looks.common.RenderingUtils)" >&2;}
11400 else 11360 else
11401 as_fn_error "Could not find or use the Java package/jar looks2 used by Scilab Gui - Look and feel (looking for package com.jgoodies.looks.common.RenderingUtils)" "$LINENO" 5 11361 as_fn_error "Could not find or use the Java package/jar jgoodies-looks used by Scilab Gui - Look and feel (looking for package com.jgoodies.looks.common.RenderingUtils)" "$LINENO" 5
11402 fi 11362 fi
11403 fi 11363 fi
11404 11364
@@ -11406,8 +11366,6 @@ $as_echo "$as_me: WARNING: Could not find or use the Java package/jar looks2 use
11406 fi 11366 fi
11407 11367
11408 11368
11409
11410
11411 # Skin Look and Feel 11369 # Skin Look and Feel
11412 11370
11413 { $as_echo "$as_me:${as_lineno-$LINENO}: checking skinlf" >&5 11371 { $as_echo "$as_me:${as_lineno-$LINENO}: checking skinlf" >&5
@@ -11415,7 +11373,7 @@ $as_echo_n "checking skinlf... " >&6; }
11415 PACKAGE_JAR_FILE= 11373 PACKAGE_JAR_FILE=
11416 found_jar=no 11374 found_jar=no
11417 saved_ac_java_classpath=$ac_java_classpath 11375 saved_ac_java_classpath=$ac_java_classpath
11418 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" 11376 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)"
11419 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do 11377 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
11420 for jar in "$jardir/skinlf.jar" "$jardir/libskinlf.jar" "$jardir/libskinlf-java.jar" "$jardir/skinlf*.jar"; do 11378 for jar in "$jardir/skinlf.jar" "$jardir/libskinlf.jar" "$jardir/libskinlf-java.jar" "$jardir/skinlf*.jar"; do
11421# jar=`echo $jar|sed -e 's/ /\\ /'` 11379# jar=`echo $jar|sed -e 's/ /\\ /'`
@@ -11428,7 +11386,7 @@ $as_echo_n "checking skinlf... " >&6; }
11428 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11386 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11429 11387
11430 cat << \EOF > conftest.java 11388 cat << \EOF > conftest.java
11431// #line 11431 "configure" 11389// #line 11389 "configure"
11432import com.l2fprod.util.AccessUtils; 11390import com.l2fprod.util.AccessUtils;
11433 11391
11434public class conftest { 11392public class conftest {
@@ -11487,7 +11445,7 @@ $as_echo_n "checking jogl... " >&6; }
11487 PACKAGE_JAR_FILE= 11445 PACKAGE_JAR_FILE=
11488 found_jar=no 11446 found_jar=no
11489 saved_ac_java_classpath=$ac_java_classpath 11447 saved_ac_java_classpath=$ac_java_classpath
11490 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" 11448 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)"
11491 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do 11449 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
11492 for jar in "$jardir/jogl.jar" "$jardir/libjogl.jar" "$jardir/libjogl-java.jar" "$jardir/jogl*.jar"; do 11450 for jar in "$jardir/jogl.jar" "$jardir/libjogl.jar" "$jardir/libjogl-java.jar" "$jardir/jogl*.jar"; do
11493# jar=`echo $jar|sed -e 's/ /\\ /'` 11451# jar=`echo $jar|sed -e 's/ /\\ /'`
@@ -11500,7 +11458,7 @@ $as_echo_n "checking jogl... " >&6; }
11500 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11458 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11501 11459
11502 cat << \EOF > conftest.java 11460 cat << \EOF > conftest.java
11503// #line 11503 "configure" 11461// #line 11461 "configure"
11504import javax.media.opengl.glu.GLUnurbs; 11462import javax.media.opengl.glu.GLUnurbs;
11505 11463
11506public class conftest { 11464public class conftest {
@@ -11559,7 +11517,7 @@ $as_echo_n "checking jhall... " >&6; }
11559 PACKAGE_JAR_FILE= 11517 PACKAGE_JAR_FILE=
11560 found_jar=no 11518 found_jar=no
11561 saved_ac_java_classpath=$ac_java_classpath 11519 saved_ac_java_classpath=$ac_java_classpath
11562 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" 11520 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)"
11563 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do 11521 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
11564 for jar in "$jardir/jhall.jar" "$jardir/libjhall.jar" "$jardir/libjhall-java.jar" "$jardir/jhall*.jar"; do 11522 for jar in "$jardir/jhall.jar" "$jardir/libjhall.jar" "$jardir/libjhall-java.jar" "$jardir/jhall*.jar"; do
11565# jar=`echo $jar|sed -e 's/ /\\ /'` 11523# jar=`echo $jar|sed -e 's/ /\\ /'`
@@ -11572,7 +11530,7 @@ $as_echo_n "checking jhall... " >&6; }
11572 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11530 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11573 11531
11574 cat << \EOF > conftest.java 11532 cat << \EOF > conftest.java
11575// #line 11575 "configure" 11533// #line 11533 "configure"
11576import javax.help.JHelp; 11534import javax.help.JHelp;
11577 11535
11578public class conftest { 11536public class conftest {
@@ -11631,7 +11589,7 @@ $as_echo_n "checking javahelp2... " >&6; }
11631 PACKAGE_JAR_FILE= 11589 PACKAGE_JAR_FILE=
11632 found_jar=no 11590 found_jar=no
11633 saved_ac_java_classpath=$ac_java_classpath 11591 saved_ac_java_classpath=$ac_java_classpath
11634 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" 11592 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)"
11635 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do 11593 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
11636 for jar in "$jardir/javahelp2.jar" "$jardir/libjavahelp2.jar" "$jardir/libjavahelp2-java.jar" "$jardir/javahelp2*.jar"; do 11594 for jar in "$jardir/javahelp2.jar" "$jardir/libjavahelp2.jar" "$jardir/libjavahelp2-java.jar" "$jardir/javahelp2*.jar"; do
11637# jar=`echo $jar|sed -e 's/ /\\ /'` 11595# jar=`echo $jar|sed -e 's/ /\\ /'`
@@ -11644,7 +11602,7 @@ $as_echo_n "checking javahelp2... " >&6; }
11644 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11602 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11645 11603
11646 cat << \EOF > conftest.java 11604 cat << \EOF > conftest.java
11647// #line 11647 "configure" 11605// #line 11605 "configure"
11648import javax.help.JHelp; 11606import javax.help.JHelp;
11649 11607
11650public class conftest { 11608public class conftest {
@@ -11704,7 +11662,7 @@ $as_echo_n "checking gluegen-rt... " >&6; }
11704 PACKAGE_JAR_FILE= 11662 PACKAGE_JAR_FILE=
11705 found_jar=no 11663 found_jar=no
11706 saved_ac_java_classpath=$ac_java_classpath 11664 saved_ac_java_classpath=$ac_java_classpath
11707 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" 11665 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)"
11708 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do 11666 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
11709 for jar in "$jardir/gluegen-rt.jar" "$jardir/libgluegen-rt.jar" "$jardir/libgluegen-rt-java.jar" "$jardir/gluegen-rt*.jar"; do 11667 for jar in "$jardir/gluegen-rt.jar" "$jardir/libgluegen-rt.jar" "$jardir/libgluegen-rt-java.jar" "$jardir/gluegen-rt*.jar"; do
11710# jar=`echo $jar|sed -e 's/ /\\ /'` 11668# jar=`echo $jar|sed -e 's/ /\\ /'`
@@ -11717,7 +11675,7 @@ $as_echo_n "checking gluegen-rt... " >&6; }
11717 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11675 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11718 11676
11719 cat << \EOF > conftest.java 11677 cat << \EOF > conftest.java
11720// #line 11720 "configure" 11678// #line 11678 "configure"
11721import com.sun.gluegen.runtime.CPU; 11679import com.sun.gluegen.runtime.CPU;
11722 11680
11723public class conftest { 11681public class conftest {
@@ -11776,7 +11734,7 @@ $as_echo_n "checking jrosetta-API... " >&6; }
11776 PACKAGE_JAR_FILE= 11734 PACKAGE_JAR_FILE=
11777 found_jar=no 11735 found_jar=no
11778 saved_ac_java_classpath=$ac_java_classpath 11736 saved_ac_java_classpath=$ac_java_classpath
11779 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" 11737 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)"
11780 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do 11738 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
11781 for jar in "$jardir/jrosetta-API.jar" "$jardir/libjrosetta-API.jar" "$jardir/libjrosetta-API-java.jar" "$jardir/jrosetta-API*.jar"; do 11739 for jar in "$jardir/jrosetta-API.jar" "$jardir/libjrosetta-API.jar" "$jardir/libjrosetta-API-java.jar" "$jardir/jrosetta-API*.jar"; do
11782# jar=`echo $jar|sed -e 's/ /\\ /'` 11740# jar=`echo $jar|sed -e 's/ /\\ /'`
@@ -11789,7 +11747,7 @@ $as_echo_n "checking jrosetta-API... " >&6; }
11789 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11747 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11790 11748
11791 cat << \EOF > conftest.java 11749 cat << \EOF > conftest.java
11792// #line 11792 "configure" 11750// #line 11750 "configure"
11793import com.artenum.rosetta.interfaces.core.ConsoleConfiguration; 11751import com.artenum.rosetta.interfaces.core.ConsoleConfiguration;
11794 11752
11795public class conftest { 11753public class conftest {
@@ -11848,7 +11806,7 @@ $as_echo_n "checking jrosetta-engine... " >&6; }
11848 PACKAGE_JAR_FILE= 11806 PACKAGE_JAR_FILE=
11849 found_jar=no 11807 found_jar=no
11850 saved_ac_java_classpath=$ac_java_classpath 11808 saved_ac_java_classpath=$ac_java_classpath
11851 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" 11809 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)"
11852 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do 11810 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
11853 for jar in "$jardir/jrosetta-engine.jar" "$jardir/libjrosetta-engine.jar" "$jardir/libjrosetta-engine-java.jar" "$jardir/jrosetta-engine*.jar"; do 11811 for jar in "$jardir/jrosetta-engine.jar" "$jardir/libjrosetta-engine.jar" "$jardir/libjrosetta-engine-java.jar" "$jardir/jrosetta-engine*.jar"; do
11854# jar=`echo $jar|sed -e 's/ /\\ /'` 11812# jar=`echo $jar|sed -e 's/ /\\ /'`
@@ -11861,7 +11819,7 @@ $as_echo_n "checking jrosetta-engine... " >&6; }
11861 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11819 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11862 11820
11863 cat << \EOF > conftest.java 11821 cat << \EOF > conftest.java
11864// #line 11864 "configure" 11822// #line 11822 "configure"
11865import com.artenum.rosetta.core.action.AbstractConsoleAction; 11823import com.artenum.rosetta.core.action.AbstractConsoleAction;
11866 11824
11867public class conftest { 11825public class conftest {
@@ -11921,7 +11879,7 @@ $as_echo_n "checking jhdf5... " >&6; }
11921 PACKAGE_JAR_FILE= 11879 PACKAGE_JAR_FILE=
11922 found_jar=no 11880 found_jar=no
11923 saved_ac_java_classpath=$ac_java_classpath 11881 saved_ac_java_classpath=$ac_java_classpath
11924 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" 11882 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)"
11925 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do 11883 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
11926 for jar in "$jardir/jhdf5.jar" "$jardir/libjhdf5.jar" "$jardir/libjhdf5-java.jar" "$jardir/jhdf5*.jar"; do 11884 for jar in "$jardir/jhdf5.jar" "$jardir/libjhdf5.jar" "$jardir/libjhdf5-java.jar" "$jardir/jhdf5*.jar"; do
11927# jar=`echo $jar|sed -e 's/ /\\ /'` 11885# jar=`echo $jar|sed -e 's/ /\\ /'`
@@ -11934,7 +11892,7 @@ $as_echo_n "checking jhdf5... " >&6; }
11934 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11892 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11935 11893
11936 cat << \EOF > conftest.java 11894 cat << \EOF > conftest.java
11937// #line 11937 "configure" 11895// #line 11895 "configure"
11938import ncsa.hdf.hdf5lib.HDF5Constants; 11896import ncsa.hdf.hdf5lib.HDF5Constants;
11939 11897
11940public class conftest { 11898public class conftest {
@@ -11994,7 +11952,7 @@ $as_echo_n "checking commons-logging... " >&6; }
11994 PACKAGE_JAR_FILE= 11952 PACKAGE_JAR_FILE=
11995 found_jar=no 11953 found_jar=no
11996 saved_ac_java_classpath=$ac_java_classpath 11954 saved_ac_java_classpath=$ac_java_classpath
11997 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" 11955 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)"
11998 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do 11956 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
11999 for jar in "$jardir/commons-logging.jar" "$jardir/libcommons-logging.jar" "$jardir/libcommons-logging-java.jar" "$jardir/commons-logging*.jar"; do 11957 for jar in "$jardir/commons-logging.jar" "$jardir/libcommons-logging.jar" "$jardir/libcommons-logging-java.jar" "$jardir/commons-logging*.jar"; do
12000# jar=`echo $jar|sed -e 's/ /\\ /'` 11958# jar=`echo $jar|sed -e 's/ /\\ /'`
@@ -12007,7 +11965,7 @@ $as_echo_n "checking commons-logging... " >&6; }
12007 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11965 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12008 11966
12009 cat << \EOF > conftest.java 11967 cat << \EOF > conftest.java
12010// #line 12010 "configure" 11968// #line 11968 "configure"
12011import org.apache.commons.logging.LogFactory; 11969import org.apache.commons.logging.LogFactory;
12012 11970
12013public class conftest { 11971public class conftest {
@@ -13556,40 +13514,6 @@ fi
13556 prefix="$acl_save_prefix" 13514 prefix="$acl_save_prefix"
13557 13515
13558 13516
13559
13560 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5
13561$as_echo_n "checking for shared library run path origin... " >&6; }
13562if test "${acl_cv_rpath+set}" = set; then :
13563 $as_echo_n "(cached) " >&6
13564else
13565
13566 CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
13567 ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
13568 . ./conftest.sh
13569 rm -f ./conftest.sh
13570 acl_cv_rpath=done
13571
13572fi
13573{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_rpath" >&5
13574$as_echo "$acl_cv_rpath" >&6; }
13575 wl="$acl_cv_wl"
13576 acl_libext="$acl_cv_libext"
13577 acl_shlibext="$acl_cv_shlibext"
13578 acl_libname_spec="$acl_cv_libname_spec"
13579 acl_library_names_spec="$acl_cv_library_names_spec"
13580 acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
13581 acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
13582 acl_hardcode_direct="$acl_cv_hardcode_direct"
13583 acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
13584 # Check whether --enable-rpath was given.
13585if test "${enable_rpath+set}" = set; then :
13586 enableval=$enable_rpath; :
13587else
13588 enable_rpath=yes
13589fi
13590
13591
13592
13593 acl_libdirstem=lib 13517 acl_libdirstem=lib
13594 searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` 13518 searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
13595 if test -n "$searchpath"; then 13519 if test -n "$searchpath"; then
@@ -20094,7 +20018,7 @@ CPPFLAGS="$CPPFLAGS -I$CHK_TCL_INCLUDE_PATH"
20094{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later" >&5 20018{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later" >&5
20095$as_echo_n "checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later... " >&6; } 20019$as_echo_n "checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later... " >&6; }
20096cat > conftest.$ac_ext <<EOF 20020cat > conftest.$ac_ext <<EOF
20097#line 20097 "configure" 20021#line 20021 "configure"
20098#include "confdefs.h" 20022#include "confdefs.h"
20099 20023
20100#include "$CHK_TCL_INCLUDE_PATH/$CHK_TCL_INC_NAME" 20024#include "$CHK_TCL_INCLUDE_PATH/$CHK_TCL_INC_NAME"
@@ -20406,7 +20330,7 @@ CPPFLAGS="$CPPFLAGS $TCL_INC_PATH -I$CHK_TK_INCLUDE_PATH $X_CFLAGS"
20406$as_echo_n "checking if tk is version $CHK_TK_MAJOR.$CHK_TK_MINOR or later... " >&6; } 20330$as_echo_n "checking if tk is version $CHK_TK_MAJOR.$CHK_TK_MINOR or later... " >&6; }
20407 20331
20408cat > conftest.$ac_ext <<EOF 20332cat > conftest.$ac_ext <<EOF
20409#line 20409 "configure" 20333#line 20333 "configure"
20410#include "confdefs.h" 20334#include "confdefs.h"
20411 20335
20412#include "$CHK_TK_INCLUDE_PATH/$CHK_TK_INC_NAME" 20336#include "$CHK_TK_INCLUDE_PATH/$CHK_TK_INC_NAME"
@@ -20974,7 +20898,7 @@ $as_echo_n "checking batik-all... " >&6; }
20974 PACKAGE_JAR_FILE= 20898 PACKAGE_JAR_FILE=
20975 found_jar=no 20899 found_jar=no
20976 saved_ac_java_classpath=$ac_java_classpath 20900 saved_ac_java_classpath=$ac_java_classpath
20977 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" 20901 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)"
20978 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do 20902 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
20979 for jar in "$jardir/batik-all.jar" "$jardir/libbatik-all.jar" "$jardir/libbatik-all-java.jar" "$jardir/batik-all*.jar"; do 20903 for jar in "$jardir/batik-all.jar" "$jardir/libbatik-all.jar" "$jardir/libbatik-all-java.jar" "$jardir/batik-all*.jar"; do
20980# jar=`echo $jar|sed -e 's/ /\\ /'` 20904# jar=`echo $jar|sed -e 's/ /\\ /'`
@@ -20987,7 +20911,7 @@ $as_echo_n "checking batik-all... " >&6; }
20987 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 20911 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
20988 20912
20989 cat << \EOF > conftest.java 20913 cat << \EOF > conftest.java
20990// #line 20990 "configure" 20914// #line 20914 "configure"
20991import org.apache.batik.parser.Parser; 20915import org.apache.batik.parser.Parser;
20992 20916
20993public class conftest { 20917public class conftest {
@@ -21046,7 +20970,7 @@ $as_echo_n "checking batik... " >&6; }
21046 PACKAGE_JAR_FILE= 20970 PACKAGE_JAR_FILE=
21047 found_jar=no 20971 found_jar=no
21048 saved_ac_java_classpath=$ac_java_classpath 20972 saved_ac_java_classpath=$ac_java_classpath
21049 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" 20973 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)"
21050 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do 20974 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
21051 for jar in "$jardir/batik.jar" "$jardir/libbatik.jar" "$jardir/libbatik-java.jar" "$jardir/batik*.jar"; do 20975 for jar in "$jardir/batik.jar" "$jardir/libbatik.jar" "$jardir/libbatik-java.jar" "$jardir/batik*.jar"; do
21052# jar=`echo $jar|sed -e 's/ /\\ /'` 20976# jar=`echo $jar|sed -e 's/ /\\ /'`
@@ -21059,7 +20983,7 @@ $as_echo_n "checking batik... " >&6; }
21059 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 20983 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
21060 20984
21061 cat << \EOF > conftest.java 20985 cat << \EOF > conftest.java
21062// #line 21062 "configure" 20986// #line 20986 "configure"
21063import org.apache.batik.parser.Parser; 20987import org.apache.batik.parser.Parser;
21064 20988
21065public class conftest { 20989public class conftest {
@@ -21120,7 +21044,7 @@ $as_echo_n "checking saxon... " >&6; }
21120 PACKAGE_JAR_FILE= 21044 PACKAGE_JAR_FILE=
21121 found_jar=no 21045 found_jar=no
21122 saved_ac_java_classpath=$ac_java_classpath 21046 saved_ac_java_classpath=$ac_java_classpath
21123 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" 21047 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)"
21124 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do 21048 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
21125 for jar in "$jardir/saxon.jar" "$jardir/libsaxon.jar" "$jardir/libsaxon-java.jar" "$jardir/saxon*.jar"; do 21049 for jar in "$jardir/saxon.jar" "$jardir/libsaxon.jar" "$jardir/libsaxon-java.jar" "$jardir/saxon*.jar"; do
21126# jar=`echo $jar|sed -e 's/ /\\ /'` 21050# jar=`echo $jar|sed -e 's/ /\\ /'`
@@ -21133,7 +21057,7 @@ $as_echo_n "checking saxon... " >&6; }
21133 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 21057 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
21134 21058
21135 cat << \EOF > conftest.java 21059 cat << \EOF > conftest.java
21136// #line 21136 "configure" 21060// #line 21060 "configure"
21137import com.icl.saxon.Loader; 21061import com.icl.saxon.Loader;
21138 21062
21139public class conftest { 21063public class conftest {
@@ -21192,7 +21116,7 @@ $as_echo_n "checking fop... " >&6; }
21192 PACKAGE_JAR_FILE= 21116 PACKAGE_JAR_FILE=
21193 found_jar=no 21117 found_jar=no
21194 saved_ac_java_classpath=$ac_java_classpath 21118 saved_ac_java_classpath=$ac_java_classpath
21195 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" 21119 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)"
21196 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do 21120 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
21197 for jar in "$jardir/fop.jar" "$jardir/libfop.jar" "$jardir/libfop-java.jar" "$jardir/fop*.jar"; do 21121 for jar in "$jardir/fop.jar" "$jardir/libfop.jar" "$jardir/libfop-java.jar" "$jardir/fop*.jar"; do
21198# jar=`echo $jar|sed -e 's/ /\\ /'` 21122# jar=`echo $jar|sed -e 's/ /\\ /'`
@@ -21205,7 +21129,7 @@ $as_echo_n "checking fop... " >&6; }
21205 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 21129 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
21206 21130
21207 cat << \EOF > conftest.java 21131 cat << \EOF > conftest.java
21208// #line 21208 "configure" 21132// #line 21132 "configure"
21209import org.apache.fop.pdf.PDFInfo; 21133import org.apache.fop.pdf.PDFInfo;
21210 21134
21211public class conftest { 21135public class conftest {
@@ -21264,7 +21188,7 @@ $as_echo_n "checking jeuclid-core... " >&6; }
21264 PACKAGE_JAR_FILE= 21188 PACKAGE_JAR_FILE=
21265 found_jar=no 21189 found_jar=no
21266 saved_ac_java_classpath=$ac_java_classpath 21190 saved_ac_java_classpath=$ac_java_classpath
21267 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" 21191 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)"
21268 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do 21192 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
21269 for jar in "$jardir/jeuclid-core.jar" "$jardir/libjeuclid-core.jar" "$jardir/libjeuclid-core-java.jar" "$jardir/jeuclid-core*.jar"; do 21193 for jar in "$jardir/jeuclid-core.jar" "$jardir/libjeuclid-core.jar" "$jardir/libjeuclid-core-java.jar" "$jardir/jeuclid-core*.jar"; do
21270# jar=`echo $jar|sed -e 's/ /\\ /'` 21194# jar=`echo $jar|sed -e 's/ /\\ /'`
@@ -21277,7 +21201,7 @@ $as_echo_n "checking jeuclid-core... " >&6; }
21277 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 21201 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
21278 21202
21279 cat << \EOF > conftest.java 21203 cat << \EOF > conftest.java
21280// #line 21280 "configure" 21204// #line 21204 "configure"
21281import net.sourceforge.jeuclid.LayoutContext; 21205import net.sourceforge.jeuclid.LayoutContext;
21282 21206
21283public class conftest { 21207public class conftest {
@@ -21336,7 +21260,7 @@ $as_echo_n "checking commons-io... " >&6; }
21336 PACKAGE_JAR_FILE= 21260 PACKAGE_JAR_FILE=
21337 found_jar=no 21261 found_jar=no
21338 saved_ac_java_classpath=$ac_java_classpath 21262 saved_ac_java_classpath=$ac_java_classpath
21339 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" 21263 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)"
21340 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do 21264 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
21341 for jar in "$jardir/commons-io.jar" "$jardir/libcommons-io.jar" "$jardir/libcommons-io-java.jar" "$jardir/commons-io*.jar"; do 21265 for jar in "$jardir/commons-io.jar" "$jardir/libcommons-io.jar" "$jardir/libcommons-io-java.jar" "$jardir/commons-io*.jar"; do
21342# jar=`echo $jar|sed -e 's/ /\\ /'` 21266# jar=`echo $jar|sed -e 's/ /\\ /'`
@@ -21349,7 +21273,7 @@ $as_echo_n "checking commons-io... " >&6; }
21349 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 21273 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
21350 21274
21351 cat << \EOF > conftest.java 21275 cat << \EOF > conftest.java
21352// #line 21352 "configure" 21276// #line 21276 "configure"
21353import org.apache.commons.io.output.CountingOutputStream; 21277import org.apache.commons.io.output.CountingOutputStream;
21354 21278
21355public class conftest { 21279public class conftest {
@@ -21408,7 +21332,7 @@ $as_echo_n "checking xmlgraphics-commons... " >&6; }
21408 PACKAGE_JAR_FILE= 21332 PACKAGE_JAR_FILE=
21409 found_jar=no 21333 found_jar=no
21410 saved_ac_java_classpath=$ac_java_classpath 21334 saved_ac_java_classpath=$ac_java_classpath
21411 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" 21335 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)"
21412 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do 21336 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
21413 for jar in "$jardir/xmlgraphics-commons.jar" "$jardir/libxmlgraphics-commons.jar" "$jardir/libxmlgraphics-commons-java.jar" "$jardir/xmlgraphics-commons*.jar"; do 21337 for jar in "$jardir/xmlgraphics-commons.jar" "$jardir/libxmlgraphics-commons.jar" "$jardir/libxmlgraphics-commons-java.jar" "$jardir/xmlgraphics-commons*.jar"; do
21414# jar=`echo $jar|sed -e 's/ /\\ /'` 21338# jar=`echo $jar|sed -e 's/ /\\ /'`
@@ -21421,7 +21345,7 @@ $as_echo_n "checking xmlgraphics-commons... " >&6; }
21421 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 21345 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
21422 21346
21423 cat << \EOF > conftest.java 21347 cat << \EOF > conftest.java
21424// #line 21424 "configure" 21348// #line 21348 "configure"
21425import org.apache.xmlgraphics.util.Service; 21349import org.apache.xmlgraphics.util.Service;
21426 21350
21427public class conftest { 21351public class conftest {
@@ -21480,7 +21404,7 @@ $as_echo_n "checking xml-apis-ext... " >&6; }
21480 PACKAGE_JAR_FILE= 21404 PACKAGE_JAR_FILE=
21481 found_jar=no 21405 found_jar=no
21482 saved_ac_java_classpath=$ac_java_classpath 21406 saved_ac_java_classpath=$ac_java_classpath
21483 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" 21407 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)"
21484 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do 21408 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
21485 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 21409 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
21486# jar=`echo $jar|sed -e 's/ /\\ /'` 21410# jar=`echo $jar|sed -e 's/ /\\ /'`
@@ -21493,7 +21417,7 @@ $as_echo_n "checking xml-apis-ext... " >&6; }
21493 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 21417 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
21494 21418
21495 cat << \EOF > conftest.java 21419 cat << \EOF > conftest.java
21496// #line 21496 "configure" 21420// #line 21420 "configure"
21497import org.w3c.dom.svg.SVGDocument; 21421import org.w3c.dom.svg.SVGDocument;
21498 21422
21499public class conftest { 21423public class conftest {
@@ -21553,7 +21477,7 @@ $as_echo_n "checking avalon-framework... " >&6; }
21553 PACKAGE_JAR_FILE= 21477 PACKAGE_JAR_FILE=
21554 found_jar=no 21478 found_jar=no
21555 saved_ac_java_classpath=$ac_java_classpath 21479 saved_ac_java_classpath=$ac_java_classpath
21556 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" 21480 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)"
21557 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do 21481 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
21558 for jar in "$jardir/avalon-framework.jar" "$jardir/libavalon-framework.jar" "$jardir/libavalon-framework-java.jar" "$jardir/avalon-framework*.jar"; do 21482 for jar in "$jardir/avalon-framework.jar" "$jardir/libavalon-framework.jar" "$jardir/libavalon-framework-java.jar" "$jardir/avalon-framework*.jar"; do
21559# jar=`echo $jar|sed -e 's/ /\\ /'` 21483# jar=`echo $jar|sed -e 's/ /\\ /'`
@@ -21566,7 +21490,7 @@ $as_echo_n "checking avalon-framework... " >&6; }
21566 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 21490 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
21567 21491
21568 cat << \EOF > conftest.java 21492 cat << \EOF > conftest.java
21569// #line 21569 "configure" 21493// #line 21493 "configure"
21570import org.apache.avalon.framework.configuration.ConfigurationException; 21494import org.apache.avalon.framework.configuration.ConfigurationException;
21571 21495
21572public class conftest { 21496public class conftest {
@@ -22224,13 +22148,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :
22224else 22148else
22225 lt_cv_nm_interface="BSD nm" 22149 lt_cv_nm_interface="BSD nm"
22226 echo "int some_variable = 0;" > conftest.$ac_ext 22150 echo "int some_variable = 0;" > conftest.$ac_ext
22227 (eval echo "\"\$as_me:22227: $ac_compile\"" >&5) 22151 (eval echo "\"\$as_me:22151: $ac_compile\"" >&5)
22228 (eval "$ac_compile" 2>conftest.err) 22152 (eval "$ac_compile" 2>conftest.err)
22229 cat conftest.err >&5 22153 cat conftest.err >&5
22230 (eval echo "\"\$as_me:22230: $NM \\\"conftest.$ac_objext\\\"\"" >&5) 22154 (eval echo "\"\$as_me:22154: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
22231 (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) 22155 (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
22232 cat conftest.err >&5 22156 cat conftest.err >&5
22233 (eval echo "\"\$as_me:22233: output\"" >&5) 22157 (eval echo "\"\$as_me:22157: output\"" >&5)
22234 cat conftest.out >&5 22158 cat conftest.out >&5
22235 if $GREP 'External.*some_variable' conftest.out > /dev/null; then 22159 if $GREP 'External.*some_variable' conftest.out > /dev/null; then
22236 lt_cv_nm_interface="MS dumpbin" 22160 lt_cv_nm_interface="MS dumpbin"
@@ -23424,7 +23348,7 @@ ia64-*-hpux*)
23424 ;; 23348 ;;
23425*-*-irix6*) 23349*-*-irix6*)
23426 # Find out which ABI we are using. 23350 # Find out which ABI we are using.
23427 echo '#line 23427 "configure"' > conftest.$ac_ext 23351 echo '#line 23351 "configure"' > conftest.$ac_ext
23428 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 23352 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
23429 (eval $ac_compile) 2>&5 23353 (eval $ac_compile) 2>&5
23430 ac_status=$? 23354 ac_status=$?
@@ -24163,11 +24087,11 @@ $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
24163 # target defaults to 10.4. Don't you love it? 24087 # target defaults to 10.4. Don't you love it?
24164 case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in 24088 case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
24165 10.0,*86*-darwin8*|10.0,*-darwin[91]*) 24089 10.0,*86*-darwin8*|10.0,*-darwin[91]*)
24166 _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; 24090 _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}dynamic_lookup' ;;
24167 10.[012]*) 24091 10.[012]*)
24168 _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; 24092 _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
24169 10.*) 24093 10.*)
24170 _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; 24094 _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}dynamic_lookup' ;;
24171 esac 24095 esac
24172 ;; 24096 ;;
24173 esac 24097 esac
@@ -25447,11 +25371,11 @@ else
25447 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ 25371 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
25448 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 25372 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
25449 -e 's:$: $lt_compiler_flag:'` 25373 -e 's:$: $lt_compiler_flag:'`
25450 (eval echo "\"\$as_me:25450: $lt_compile\"" >&5) 25374 (eval echo "\"\$as_me:25374: $lt_compile\"" >&5)
25451 (eval "$lt_compile" 2>conftest.err) 25375 (eval "$lt_compile" 2>conftest.err)
25452 ac_status=$? 25376 ac_status=$?
25453 cat conftest.err >&5 25377 cat conftest.err >&5
25454 echo "$as_me:25454: \$? = $ac_status" >&5 25378 echo "$as_me:25378: \$? = $ac_status" >&5
25455 if (exit $ac_status) && test -s "$ac_outfile"; then 25379 if (exit $ac_status) && test -s "$ac_outfile"; then
25456 # The compiler can only warn and ignore the option if not recognized 25380 # The compiler can only warn and ignore the option if not recognized
25457 # So say no if there are warnings other than the usual output. 25381 # So say no if there are warnings other than the usual output.
@@ -25786,11 +25710,11 @@ else
25786 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ 25710 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
25787 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 25711 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
25788 -e 's:$: $lt_compiler_flag:'` 25712 -e 's:$: $lt_compiler_flag:'`
25789 (eval echo "\"\$as_me:25789: $lt_compile\"" >&5) 25713 (eval echo "\"\$as_me:25713: $lt_compile\"" >&5)
25790 (eval "$lt_compile" 2>conftest.err) 25714 (eval "$lt_compile" 2>conftest.err)
25791 ac_status=$? 25715 ac_status=$?
25792 cat conftest.err >&5 25716 cat conftest.err >&5
25793 echo "$as_me:25793: \$? = $ac_status" >&5 25717 echo "$as_me:25717: \$? = $ac_status" >&5
25794 if (exit $ac_status) && test -s "$ac_outfile"; then 25718 if (exit $ac_status) && test -s "$ac_outfile"; then
25795 # The compiler can only warn and ignore the option if not recognized 25719 # The compiler can only warn and ignore the option if not recognized
25796 # So say no if there are warnings other than the usual output. 25720 # So say no if there are warnings other than the usual output.
@@ -25891,11 +25815,11 @@ else
25891 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ 25815 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
25892 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 25816 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
25893 -e 's:$: $lt_compiler_flag:'` 25817 -e 's:$: $lt_compiler_flag:'`
25894 (eval echo "\"\$as_me:25894: $lt_compile\"" >&5) 25818 (eval echo "\"\$as_me:25818: $lt_compile\"" >&5)
25895 (eval "$lt_compile" 2>out/conftest.err) 25819 (eval "$lt_compile" 2>out/conftest.err)
25896 ac_status=$? 25820 ac_status=$?
25897 cat out/conftest.err >&5 25821 cat out/conftest.err >&5
25898 echo "$as_me:25898: \$? = $ac_status" >&5 25822 echo "$as_me:25822: \$? = $ac_status" >&5
25899 if (exit $ac_status) && test -s out/conftest2.$ac_objext 25823 if (exit $ac_status) && test -s out/conftest2.$ac_objext
25900 then 25824 then
25901 # The compiler can only warn and ignore the option if not recognized 25825 # The compiler can only warn and ignore the option if not recognized
@@ -25946,11 +25870,11 @@ else
25946 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ 25870 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
25947 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 25871 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
25948 -e 's:$: $lt_compiler_flag:'` 25872 -e 's:$: $lt_compiler_flag:'`
25949 (eval echo "\"\$as_me:25949: $lt_compile\"" >&5) 25873 (eval echo "\"\$as_me:25873: $lt_compile\"" >&5)
25950 (eval "$lt_compile" 2>out/conftest.err) 25874 (eval "$lt_compile" 2>out/conftest.err)
25951 ac_status=$? 25875 ac_status=$?
25952 cat out/conftest.err >&5 25876 cat out/conftest.err >&5
25953 echo "$as_me:25953: \$? = $ac_status" >&5 25877 echo "$as_me:25877: \$? = $ac_status" >&5
25954 if (exit $ac_status) && test -s out/conftest2.$ac_objext 25878 if (exit $ac_status) && test -s out/conftest2.$ac_objext
25955 then 25879 then
25956 # The compiler can only warn and ignore the option if not recognized 25880 # The compiler can only warn and ignore the option if not recognized
@@ -28393,7 +28317,7 @@ else
28393 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 28317 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
28394 lt_status=$lt_dlunknown 28318 lt_status=$lt_dlunknown
28395 cat > conftest.$ac_ext <<_LT_EOF 28319 cat > conftest.$ac_ext <<_LT_EOF
28396#line 28396 "configure" 28320#line 28320 "configure"
28397#include "confdefs.h" 28321#include "confdefs.h"
28398 28322
28399#if HAVE_DLFCN_H 28323#if HAVE_DLFCN_H
@@ -28489,7 +28413,7 @@ else
28489 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 28413 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
28490 lt_status=$lt_dlunknown 28414 lt_status=$lt_dlunknown
28491 cat > conftest.$ac_ext <<_LT_EOF 28415 cat > conftest.$ac_ext <<_LT_EOF
28492#line 28492 "configure" 28416#line 28416 "configure"
28493#include "confdefs.h" 28417#include "confdefs.h"
28494 28418
28495#if HAVE_DLFCN_H 28419#if HAVE_DLFCN_H
@@ -30461,11 +30385,11 @@ else
30461 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ 30385 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
30462 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 30386 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
30463 -e 's:$: $lt_compiler_flag:'` 30387 -e 's:$: $lt_compiler_flag:'`
30464 (eval echo "\"\$as_me:30464: $lt_compile\"" >&5) 30388 (eval echo "\"\$as_me:30388: $lt_compile\"" >&5)
30465 (eval "$lt_compile" 2>conftest.err) 30389 (eval "$lt_compile" 2>conftest.err)
30466 ac_status=$? 30390 ac_status=$?
30467 cat conftest.err >&5 30391 cat conftest.err >&5
30468 echo "$as_me:30468: \$? = $ac_status" >&5 30392 echo "$as_me:30392: \$? = $ac_status" >&5
30469 if (exit $ac_status) && test -s "$ac_outfile"; then 30393 if (exit $ac_status) && test -s "$ac_outfile"; then
30470 # The compiler can only warn and ignore the option if not recognized 30394 # The compiler can only warn and ignore the option if not recognized
30471 # So say no if there are warnings other than the usual output. 30395 # So say no if there are warnings other than the usual output.
@@ -30560,11 +30484,11 @@ else
30560 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ 30484 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
30561 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 30485 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
30562 -e 's:$: $lt_compiler_flag:'` 30486 -e 's:$: $lt_compiler_flag:'`
30563 (eval echo "\"\$as_me:30563: $lt_compile\"" >&5) 30487 (eval echo "\"\$as_me:30487: $lt_compile\"" >&5)
30564 (eval "$lt_compile" 2>out/conftest.err) 30488 (eval "$lt_compile" 2>out/conftest.err)
30565 ac_status=$? 30489 ac_status=$?
30566 cat out/conftest.err >&5 30490 cat out/conftest.err >&5
30567 echo "$as_me:30567: \$? = $ac_status" >&5 30491 echo "$as_me:30491: \$? = $ac_status" >&5
30568 if (exit $ac_status) && test -s out/conftest2.$ac_objext 30492 if (exit $ac_status) && test -s out/conftest2.$ac_objext
30569 then 30493 then
30570 # The compiler can only warn and ignore the option if not recognized 30494 # The compiler can only warn and ignore the option if not recognized
@@ -30612,11 +30536,11 @@ else
30612 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ 30536 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
30613 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 30537 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
30614 -e 's:$: $lt_compiler_flag:'` 30538 -e 's:$: $lt_compiler_flag:'`
30615 (eval echo "\"\$as_me:30615: $lt_compile\"" >&5) 30539 (eval echo "\"\$as_me:30539: $lt_compile\"" >&5)
30616 (eval "$lt_compile" 2>out/conftest.err) 30540 (eval "$lt_compile" 2>out/conftest.err)
30617 ac_status=$? 30541 ac_status=$?
30618 cat out/conftest.err >&5 30542 cat out/conftest.err >&5
30619 echo "$as_me:30619: \$? = $ac_status" >&5 30543 echo "$as_me:30543: \$? = $ac_status" >&5
30620 if (exit $ac_status) && test -s out/conftest2.$ac_objext 30544 if (exit $ac_status) && test -s out/conftest2.$ac_objext
30621 then 30545 then
30622 # The compiler can only warn and ignore the option if not recognized 30546 # The compiler can only warn and ignore the option if not recognized
@@ -32015,11 +31939,11 @@ else
32015 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ 31939 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
32016 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 31940 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
32017 -e 's:$: $lt_compiler_flag:'` 31941 -e 's:$: $lt_compiler_flag:'`
32018 (eval echo "\"\$as_me:32018: $lt_compile\"" >&5) 31942 (eval echo "\"\$as_me:31942: $lt_compile\"" >&5)
32019 (eval "$lt_compile" 2>conftest.err) 31943 (eval "$lt_compile" 2>conftest.err)
32020 ac_status=$? 31944 ac_status=$?
32021 cat conftest.err >&5 31945 cat conftest.err >&5
32022 echo "$as_me:32022: \$? = $ac_status" >&5 31946 echo "$as_me:31946: \$? = $ac_status" >&5
32023 if (exit $ac_status) && test -s "$ac_outfile"; then 31947 if (exit $ac_status) && test -s "$ac_outfile"; then
32024 # The compiler can only warn and ignore the option if not recognized 31948 # The compiler can only warn and ignore the option if not recognized
32025 # So say no if there are warnings other than the usual output. 31949 # So say no if there are warnings other than the usual output.
@@ -32114,11 +32038,11 @@ else
32114 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ 32038 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
32115 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 32039 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
32116 -e 's:$: $lt_compiler_flag:'` 32040 -e 's:$: $lt_compiler_flag:'`
32117 (eval echo "\"\$as_me:32117: $lt_compile\"" >&5) 32041 (eval echo "\"\$as_me:32041: $lt_compile\"" >&5)
32118 (eval "$lt_compile" 2>out/conftest.err) 32042 (eval "$lt_compile" 2>out/conftest.err)
32119 ac_status=$? 32043 ac_status=$?
32120 cat out/conftest.err >&5 32044 cat out/conftest.err >&5
32121 echo "$as_me:32121: \$? = $ac_status" >&5 32045 echo "$as_me:32045: \$? = $ac_status" >&5
32122 if (exit $ac_status) && test -s out/conftest2.$ac_objext 32046 if (exit $ac_status) && test -s out/conftest2.$ac_objext
32123 then 32047 then
32124 # The compiler can only warn and ignore the option if not recognized 32048 # The compiler can only warn and ignore the option if not recognized
@@ -32166,11 +32090,11 @@ else
32166 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ 32090 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
32167 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 32091 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
32168 -e 's:$: $lt_compiler_flag:'` 32092 -e 's:$: $lt_compiler_flag:'`
32169 (eval echo "\"\$as_me:32169: $lt_compile\"" >&5) 32093 (eval echo "\"\$as_me:32093: $lt_compile\"" >&5)
32170 (eval "$lt_compile" 2>out/conftest.err) 32094 (eval "$lt_compile" 2>out/conftest.err)
32171 ac_status=$? 32095 ac_status=$?
32172 cat out/conftest.err >&5 32096 cat out/conftest.err >&5
32173 echo "$as_me:32173: \$? = $ac_status" >&5 32097 echo "$as_me:32097: \$? = $ac_status" >&5
32174 if (exit $ac_status) && test -s out/conftest2.$ac_objext 32098 if (exit $ac_status) && test -s out/conftest2.$ac_objext
32175 then 32099 then
32176 # The compiler can only warn and ignore the option if not recognized 32100 # The compiler can only warn and ignore the option if not recognized
@@ -34261,7 +34185,7 @@ if test "$enable_stop_on_warning" = yes; then
34261 CXXFLAGS="$CXXFLAGS -Werror -O0" 34185 CXXFLAGS="$CXXFLAGS -Werror -O0"
34262fi 34186fi
34263 34187
34264ac_config_files="$ac_config_files libs/MALLOC/Makefile libs/dynamiclibrary/Makefile libs/doublylinkedlist/Makefile libs/hashtable/Makefile libs/libst/Makefile contrib/Makefile modules/helptools/Makefile modules/helptools/macros/xmlfiletohtml.sci modules/data_structures/Makefile modules/differential_equations/Makefile modules/optimization/Makefile modules/elementary_functions/Makefile modules/special_functions/Makefile modules/io/Makefile modules/shell/Makefile modules/completion/Makefile modules/history_manager/Makefile modules/jvm/Makefile modules/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/metanet/Makefile modules/cacsd/Makefile modules/boolean/Makefile modules/integer/Makefile modules/double/Makefile modules/fileio/Makefile modules/spreadsheet/Makefile modules/string/Makefile modules/time/Makefile modules/graphics/Makefile modules/graphic_export/Makefile modules/renderer/Makefile modules/action_binding/Makefile modules/gui/Makefile modules/pvm/Makefile modules/randlib/Makefile modules/tclsci/Makefile modules/windows_tools/Makefile modules/core/Makefile modules/api_scilab/Makefile modules/call_scilab/Makefile modules/hdf5/Makefile modules/fftw/Makefile modules/umfpack/Makefile modules/scicos/Makefile modules/scicos_blocks/Makefile modules/functions/Makefile modules/dynamic_link/Makefile modules/overloading/Makefile modules/javasci/Makefile modules/maple2scilab/Makefile modules/m2sci/Makefile modules/compatibility_functions/Makefile modules/texmacs/Makefile modules/scipad/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/xpad/Makefile modules/Makefile libs/Makefile Makefile scilab.pc etc/modules.xml etc/classpath.xml modules/jvm/etc/jvm_options.xml scilab-lib.properties scilab-lib-doc.properties" 34188ac_config_files="$ac_config_files libs/MALLOC/Makefile libs/dynamiclibrary/Makefile libs/doublylinkedlist/Makefile libs/hashtable/Makefile libs/libst/Makefile contrib/Makefile modules/helptools/Makefile modules/helptools/macros/xmlfiletohtml.sci modules/data_structures/Makefile modules/differential_equations/Makefile modules/optimization/Makefile modules/elementary_functions/Makefile modules/special_functions/Makefile modules/io/Makefile modules/shell/Makefile modules/completion/Makefile modules/history_manager/Makefile modules/jvm/Makefile modules/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/metanet/Makefile modules/cacsd/Makefile modules/boolean/Makefile modules/integer/Makefile modules/double/Makefile modules/fileio/Makefile modules/spreadsheet/Makefile modules/string/Makefile modules/time/Makefile modules/graphics/Makefile modules/graphic_export/Makefile modules/renderer/Makefile modules/action_binding/Makefile modules/gui/Makefile modules/pvm/Makefile modules/randlib/Makefile modules/tclsci/Makefile modules/windows_tools/Makefile modules/core/Makefile modules/api_scilab/Makefile modules/call_scilab/Makefile modules/hdf5/Makefile modules/fftw/Makefile modules/umfpack/Makefile modules/scicos/Makefile modules/scicos_blocks/Makefile modules/functions/Makefile modules/dynamic_link/Makefile modules/overloading/Makefile modules/javasci/Makefile modules/maple2scilab/Makefile modules/m2sci/Makefile modules/compatibility_functions/Makefile modules/texmacs/Makefile modules/scipad/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/xpad/Makefile modules/Makefile libs/Makefile Makefile scilab.pc etc/modules.xml etc/classpath.xml modules/jvm/etc/jvm_options.xml scilab-lib.properties scilab-lib-doc.properties"
34265 34189
34266 34190
34267# Detection of the module for the future version of Scilab 6 34191# Detection of the module for the future version of Scilab 6
@@ -35639,7 +35563,6 @@ do
35639 "modules/parameters/Makefile") CONFIG_FILES="$CONFIG_FILES modules/parameters/Makefile" ;; 35563 "modules/parameters/Makefile") CONFIG_FILES="$CONFIG_FILES modules/parameters/Makefile" ;;
35640 "modules/matio/Makefile") CONFIG_FILES="$CONFIG_FILES modules/matio/Makefile" ;; 35564 "modules/matio/Makefile") CONFIG_FILES="$CONFIG_FILES modules/matio/Makefile" ;;
35641 "modules/atoms/Makefile") CONFIG_FILES="$CONFIG_FILES modules/atoms/Makefile" ;; 35565 "modules/atoms/Makefile") CONFIG_FILES="$CONFIG_FILES modules/atoms/Makefile" ;;
35642 "modules/xcos/Makefile") CONFIG_FILES="$CONFIG_FILES modules/xcos/Makefile" ;;
35643 "modules/xpad/Makefile") CONFIG_FILES="$CONFIG_FILES modules/xpad/Makefile" ;; 35566 "modules/xpad/Makefile") CONFIG_FILES="$CONFIG_FILES modules/xpad/Makefile" ;;
35644 "modules/Makefile") CONFIG_FILES="$CONFIG_FILES modules/Makefile" ;; 35567 "modules/Makefile") CONFIG_FILES="$CONFIG_FILES modules/Makefile" ;;
35645 "libs/Makefile") CONFIG_FILES="$CONFIG_FILES libs/Makefile" ;; 35568 "libs/Makefile") CONFIG_FILES="$CONFIG_FILES libs/Makefile" ;;
@@ -37649,7 +37572,6 @@ echo " Gluegen ............. = $GLUEGEN_RT"
37649echo " Jrosetta (API) ...... = $JROSETTA_API" 37572echo " Jrosetta (API) ...... = $JROSETTA_API"
37650echo " Jrosetta (Engine) ... = $JROSETTA_ENGINE" 37573echo " Jrosetta (Engine) ... = $JROSETTA_ENGINE"
37651echo " Commons Logging ..... = $COMMONS_LOGGING" 37574echo " Commons Logging ..... = $COMMONS_LOGGING"
37652echo " JGraph X ............ = $JGRAPHX"
37653fi 37575fi
37654 37576
37655echo "" 37577echo ""
diff --git a/scilab/configure.ac b/scilab/configure.ac
index af112302..61bdc6b 100644
--- a/scilab/configure.ac
+++ b/scilab/configure.ac
@@ -23,7 +23,7 @@ SCI_BUILDDIR="`pwd`"
23SCI_SRCDIR="$srcdir" 23SCI_SRCDIR="$srcdir"
24SCI_SRCDIR_FULL="`cd $SCI_SRCDIR && pwd`" 24SCI_SRCDIR_FULL="`cd $SCI_SRCDIR && pwd`"
25 25
26SCILAB_LIBRARY_VERSION=5:1:0 26SCILAB_LIBRARY_VERSION=5:2:0
27AC_SUBST(SCILAB_LIBRARY_VERSION) 27AC_SUBST(SCILAB_LIBRARY_VERSION)
28 28
29#shared library versioning 29#shared library versioning
@@ -62,7 +62,7 @@ AC_SYS_LARGEFILE
62# See http://wiki.debian.org/RpathIssue 62# See http://wiki.debian.org/RpathIssue
63AC_RELOCATABLE 63AC_RELOCATABLE
64AC_RELOCATABLE_LIBRARY 64AC_RELOCATABLE_LIBRARY
65 65AC_LIB_RPATH
66 66
67# If configure detect that timestamp changed, 67# If configure detect that timestamp changed,
68# it tries to rebuild configure & makefile which can be a painmaker 68# it tries to rebuild configure & makefile which can be a painmaker
@@ -436,7 +436,7 @@ case "$CXX" in
436 g++-* | g++ | ccache*g++ | ccache*g++-* ) 436 g++-* | g++ | ccache*g++ | ccache*g++-* )
437 ## With GNU C++ Compiler 437 ## With GNU C++ Compiler
438 if test "$enable_debug_CXX" = yes; then 438 if test "$enable_debug_CXX" = yes; then
439 CXXFLAGS="$CXXFLAGS -pipe -Wshadow -Wpointer-arith -Wcast-align -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings -Wunused -Wno-strict-aliasing -Wextra -Wall -Wold-style-cast -g3 -Weffc++" 439 CXXFLAGS="$CXXFLAGS -pipe -Wshadow -Wpointer-arith -Wcast-align -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings -Wunused -Wno-strict-aliasing -Wextra -Wall -Wold-style-cast -g3"
440 case "$host" in 440 case "$host" in
441 *-linux-gnu ) 441 *-linux-gnu )
442 # Only doing that under Linux 442 # Only doing that under Linux
@@ -663,15 +663,13 @@ if test "$with_javasci" != no -o "$with_gui" != no -o "$enable_build_help" != no
663 AC_JAVA_CHECK_PACKAGE([looks],[com.jgoodies.looks.common.RenderingUtils],[Scilab Gui - Look and feel],"yes") 663 AC_JAVA_CHECK_PACKAGE([looks],[com.jgoodies.looks.common.RenderingUtils],[Scilab Gui - Look and feel],"yes")
664 LOOKS=$PACKAGE_JAR_FILE 664 LOOKS=$PACKAGE_JAR_FILE
665 665
666 # Named differently under Opensuse 666 # Named differently under ArchLinux
667 if test -z "$LOOKS"; then 667 if test -z "$LOOKS"; then
668 AC_JAVA_CHECK_PACKAGE([looks2],[com.jgoodies.looks.common.RenderingUtils],[Scilab Gui - Look and feel]) 668 AC_JAVA_CHECK_PACKAGE([jgoodies-looks],[com.jgoodies.looks.common.RenderingUtils],[Scilab Gui - Look and feel])
669 LOOKS=$PACKAGE_JAR_FILE 669 LOOKS=$PACKAGE_JAR_FILE
670 fi 670 fi
671 AC_SUBST(LOOKS) 671 AC_SUBST(LOOKS)
672 672
673 AC_SUBST(LOOKS)
674
675 # Skin Look and Feel 673 # Skin Look and Feel
676 AC_JAVA_CHECK_PACKAGE([skinlf],[com.l2fprod.util.AccessUtils],[Scilab Gui - Skin Look and Feel]) 674 AC_JAVA_CHECK_PACKAGE([skinlf],[com.l2fprod.util.AccessUtils],[Scilab Gui - Skin Look and Feel])
677 SKINLF=$PACKAGE_JAR_FILE 675 SKINLF=$PACKAGE_JAR_FILE
diff --git a/scilab/libs/MALLOC/Makefile.am b/scilab/libs/MALLOC/Makefile.am
index cc74f24..293e578 100644
--- a/scilab/libs/MALLOC/Makefile.am
+++ b/scilab/libs/MALLOC/Makefile.am
@@ -13,7 +13,7 @@ MALLOC_C_SOURCES = src/sci_mem_alloc.c src/getmaxMALLOC.c
13#MALLOC_C_SOURCES += src/malloc.c 13#MALLOC_C_SOURCES += src/malloc.c
14#endif 14#endif
15 15
16libscimalloc_la_includedir=$(pkgincludedir)/malloc 16libscimalloc_la_includedir=$(pkgincludedir)
17 17
18libscimalloc_la_include_HEADERS = includes/sci_mem_alloc.h \ 18libscimalloc_la_include_HEADERS = includes/sci_mem_alloc.h \
19includes/MALLOC.h \ 19includes/MALLOC.h \
diff --git a/scilab/libs/MALLOC/Makefile.in b/scilab/libs/MALLOC/Makefile.in
index faea8d3..d272fed 100644
--- a/scilab/libs/MALLOC/Makefile.in
+++ b/scilab/libs/MALLOC/Makefile.in
@@ -371,7 +371,7 @@ MALLOC_C_SOURCES = src/sci_mem_alloc.c src/getmaxMALLOC.c
371#if IS_64_BITS_CPU 371#if IS_64_BITS_CPU
372#MALLOC_C_SOURCES += src/malloc.c 372#MALLOC_C_SOURCES += src/malloc.c
373#endif 373#endif
374libscimalloc_la_includedir = $(pkgincludedir)/malloc 374libscimalloc_la_includedir = $(pkgincludedir)
375libscimalloc_la_include_HEADERS = includes/sci_mem_alloc.h \ 375libscimalloc_la_include_HEADERS = includes/sci_mem_alloc.h \
376includes/MALLOC.h \ 376includes/MALLOC.h \
377includes/getmaxMALLOC.h \ 377includes/getmaxMALLOC.h \
@@ -831,7 +831,7 @@ check-code:
831@SWIG_TRUE@swig: $(SWIG_WRAPPERS) 831@SWIG_TRUE@swig: $(SWIG_WRAPPERS)
832@SWIG_TRUE@ @SWIG_PACKAGENAME=org.scilab.modules.$(modulename); \ 832@SWIG_TRUE@ @SWIG_PACKAGENAME=org.scilab.modules.$(modulename); \
833@SWIG_TRUE@ SWIG_OUTDIR=src/java/org/scilab/modules/$(modulename)/; \ 833@SWIG_TRUE@ SWIG_OUTDIR=src/java/org/scilab/modules/$(modulename)/; \
834@SWIG_TRUE@ if test ! -z "$(SWIG_WRAPPERS)"; then \ 834@SWIG_TRUE@ if test -n "$(SWIG_WRAPPERS)"; then \
835@SWIG_TRUE@ for file in $(SWIG_WRAPPERS) ; do \ 835@SWIG_TRUE@ for file in $(SWIG_WRAPPERS) ; do \
836@SWIG_TRUE@ echo "Swig process of $$file ..."; \ 836@SWIG_TRUE@ echo "Swig process of $$file ..."; \
837@SWIG_TRUE@ $(SWIG_BIN) $(SWIG_JAVA) -package $$SWIG_PACKAGENAME -outdir $$SWIG_OUTDIR $$file; \ 837@SWIG_TRUE@ $(SWIG_BIN) $(SWIG_JAVA) -package $$SWIG_PACKAGENAME -outdir $$SWIG_OUTDIR $$file; \
@@ -843,7 +843,7 @@ check-code:
843 843
844@GIWS_TRUE@giws: $(GIWS_WRAPPERS) 844@GIWS_TRUE@giws: $(GIWS_WRAPPERS)
845@GIWS_TRUE@ @GIWS_OUTPUTDIR=src/jni/;\ 845@GIWS_TRUE@ @GIWS_OUTPUTDIR=src/jni/;\
846@GIWS_TRUE@ if test ! -z "$(GIWS_WRAPPERS)"; then \ 846@GIWS_TRUE@ if test -n "$(GIWS_WRAPPERS)"; then \
847@GIWS_TRUE@ for file in $(GIWS_WRAPPERS) ; do \ 847@GIWS_TRUE@ for file in $(GIWS_WRAPPERS) ; do \
848@GIWS_TRUE@ echo "GIWS process of $$file ..."; \ 848@GIWS_TRUE@ echo "GIWS process of $$file ..."; \
849@GIWS_TRUE@ $(GIWS_BIN) --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \ 849@GIWS_TRUE@ $(GIWS_BIN) --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
@@ -949,10 +949,12 @@ install-data-local:
949 $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \ 949 $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
950 if test -d $(srcdir)/$$dir/; then \ 950 if test -d $(srcdir)/$$dir/; then \
951 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 951 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
952 for specialExt in $(MACROSSPECIALEXT); do \ 952 if test -n "$(MACROSSPECIALEXT)"; then \
953 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 953 for specialExt in $(MACROSSPECIALEXT); do \
954 done; \ 954 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
955 FILELIST="$$FILELIST $$specialExtDir"; \ 955 done; \
956 FILELIST="$$FILELIST $$specialExtDir"; \
957 fi; \
956 for file in `ls -1 $$FILELIST 2>/dev/null`; do \ 958 for file in `ls -1 $$FILELIST 2>/dev/null`; do \
957 echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \ 959 echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
958 $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \ 960 $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \
diff --git a/scilab/libs/doublylinkedlist/Makefile.am b/scilab/libs/doublylinkedlist/Makefile.am
index 582dda7..a2d6657 100644
--- a/scilab/libs/doublylinkedlist/Makefile.am
+++ b/scilab/libs/doublylinkedlist/Makefile.am
@@ -5,7 +5,7 @@
5 5
6DOUBLYLINKEDLIST_C_SOURCES = src/DoublyLinkedList.c 6DOUBLYLINKEDLIST_C_SOURCES = src/DoublyLinkedList.c
7 7
8libscidoublylinkedlist_la_includedir=$(pkgincludedir)/doublylinkedlist 8libscidoublylinkedlist_la_includedir=$(pkgincludedir)
9 9
10libscidoublylinkedlist_la_include_HEADERS = includes/DoublyLinkedList.h 10libscidoublylinkedlist_la_include_HEADERS = includes/DoublyLinkedList.h
11 11
diff --git a/scilab/libs/doublylinkedlist/Makefile.in b/scilab/libs/doublylinkedlist/Makefile.in
index 501d0b9..6cfc22d 100644
--- a/scilab/libs/doublylinkedlist/Makefile.in
+++ b/scilab/libs/doublylinkedlist/Makefile.in
@@ -365,7 +365,7 @@ top_build_prefix = @top_build_prefix@
365top_builddir = @top_builddir@ 365top_builddir = @top_builddir@
366top_srcdir = @top_srcdir@ 366top_srcdir = @top_srcdir@
367DOUBLYLINKEDLIST_C_SOURCES = src/DoublyLinkedList.c 367DOUBLYLINKEDLIST_C_SOURCES = src/DoublyLinkedList.c
368libscidoublylinkedlist_la_includedir = $(pkgincludedir)/doublylinkedlist 368libscidoublylinkedlist_la_includedir = $(pkgincludedir)
369libscidoublylinkedlist_la_include_HEADERS = includes/DoublyLinkedList.h 369libscidoublylinkedlist_la_include_HEADERS = includes/DoublyLinkedList.h
370libscidoublylinkedlist_la_CFLAGS = -I$(srcdir)/src/ -I$(srcdir)/includes/ 370libscidoublylinkedlist_la_CFLAGS = -I$(srcdir)/src/ -I$(srcdir)/includes/
371pkglib_LTLIBRARIES = libscidoublylinkedlist.la 371pkglib_LTLIBRARIES = libscidoublylinkedlist.la
@@ -814,7 +814,7 @@ check-code:
814@SWIG_TRUE@swig: $(SWIG_WRAPPERS) 814@SWIG_TRUE@swig: $(SWIG_WRAPPERS)
815@SWIG_TRUE@ @SWIG_PACKAGENAME=org.scilab.modules.$(modulename); \ 815@SWIG_TRUE@ @SWIG_PACKAGENAME=org.scilab.modules.$(modulename); \
816@SWIG_TRUE@ SWIG_OUTDIR=src/java/org/scilab/modules/$(modulename)/; \ 816@SWIG_TRUE@ SWIG_OUTDIR=src/java/org/scilab/modules/$(modulename)/; \
817@SWIG_TRUE@ if test ! -z "$(SWIG_WRAPPERS)"; then \ 817@SWIG_TRUE@ if test -n "$(SWIG_WRAPPERS)"; then \
818@SWIG_TRUE@ for file in $(SWIG_WRAPPERS) ; do \ 818@SWIG_TRUE@ for file in $(SWIG_WRAPPERS) ; do \
819@SWIG_TRUE@ echo "Swig process of $$file ..."; \ 819@SWIG_TRUE@ echo "Swig process of $$file ..."; \
820@SWIG_TRUE@ $(SWIG_BIN) $(SWIG_JAVA) -package $$SWIG_PACKAGENAME -outdir $$SWIG_OUTDIR $$file; \ 820@SWIG_TRUE@ $(SWIG_BIN) $(SWIG_JAVA) -package $$SWIG_PACKAGENAME -outdir $$SWIG_OUTDIR $$file; \
@@ -826,7 +826,7 @@ check-code:
826 826
827@GIWS_TRUE@giws: $(GIWS_WRAPPERS) 827@GIWS_TRUE@giws: $(GIWS_WRAPPERS)
828@GIWS_TRUE@ @GIWS_OUTPUTDIR=src/jni/;\ 828@GIWS_TRUE@ @GIWS_OUTPUTDIR=src/jni/;\
829@GIWS_TRUE@ if test ! -z "$(GIWS_WRAPPERS)"; then \ 829@GIWS_TRUE@ if test -n "$(GIWS_WRAPPERS)"; then \
830@GIWS_TRUE@ for file in $(GIWS_WRAPPERS) ; do \ 830@GIWS_TRUE@ for file in $(GIWS_WRAPPERS) ; do \
831@GIWS_TRUE@ echo "GIWS process of $$file ..."; \ 831@GIWS_TRUE@ echo "GIWS process of $$file ..."; \
832@GIWS_TRUE@ $(GIWS_BIN) --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \ 832@GIWS_TRUE@ $(GIWS_BIN) --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
@@ -932,10 +932,12 @@ install-data-local:
932 $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \ 932 $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
933 if test -d $(srcdir)/$$dir/; then \ 933 if test -d $(srcdir)/$$dir/; then \
934 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 934 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
935 for specialExt in $(MACROSSPECIALEXT); do \ 935 if test -n "$(MACROSSPECIALEXT)"; then \
936 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 936 for specialExt in $(MACROSSPECIALEXT); do \
937 done; \ 937 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
938 FILELIST="$$FILELIST $$specialExtDir"; \ 938 done; \
939 FILELIST="$$FILELIST $$specialExtDir"; \
940 fi; \
939 for file in `ls -1 $$FILELIST 2>/dev/null`; do \ 941 for file in `ls -1 $$FILELIST 2>/dev/null`; do \
940 echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \ 942 echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
941 $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \ 943 $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \
diff --git a/scilab/libs/dynamiclibrary/Makefile.am b/scilab/libs/dynamiclibrary/Makefile.am
index cfb6307..d4648f4 100644
--- a/scilab/libs/dynamiclibrary/Makefile.am
+++ b/scilab/libs/dynamiclibrary/Makefile.am
@@ -5,7 +5,7 @@
5 5
6DYNAMICLIBRARY_C_SOURCES = src/dynamiclibrary_others.c 6DYNAMICLIBRARY_C_SOURCES = src/dynamiclibrary_others.c
7 7
8libscidynamiclibrary_la_includedir=$(pkgincludedir)/dynamiclibrary 8libscidynamiclibrary_la_includedir=$(pkgincludedir)
9 9
10libscidynamiclibrary_la_include_HEADERS = includes/dynamiclibrary_others.h \ 10libscidynamiclibrary_la_include_HEADERS = includes/dynamiclibrary_others.h \
11includes/dynamiclibrary.h 11includes/dynamiclibrary.h
diff --git a/scilab/libs/dynamiclibrary/Makefile.in b/scilab/libs/dynamiclibrary/Makefile.in
index f90216c..ad2ae63 100644
--- a/scilab/libs/dynamiclibrary/Makefile.in
+++ b/scilab/libs/dynamiclibrary/Makefile.in
@@ -365,7 +365,7 @@ top_build_prefix = @top_build_prefix@
365top_builddir = @top_builddir@ 365top_builddir = @top_builddir@
366top_srcdir = @top_srcdir@ 366top_srcdir = @top_srcdir@
367DYNAMICLIBRARY_C_SOURCES = src/dynamiclibrary_others.c 367DYNAMICLIBRARY_C_SOURCES = src/dynamiclibrary_others.c
368libscidynamiclibrary_la_includedir = $(pkgincludedir)/dynamiclibrary 368libscidynamiclibrary_la_includedir = $(pkgincludedir)
369libscidynamiclibrary_la_include_HEADERS = includes/dynamiclibrary_others.h \ 369libscidynamiclibrary_la_include_HEADERS = includes/dynamiclibrary_others.h \
370includes/dynamiclibrary.h 370includes/dynamiclibrary.h
371 371
@@ -816,7 +816,7 @@ check-code:
816@SWIG_TRUE@swig: $(SWIG_WRAPPERS) 816@SWIG_TRUE@swig: $(SWIG_WRAPPERS)
817@SWIG_TRUE@ @SWIG_PACKAGENAME=org.scilab.modules.$(modulename); \ 817@SWIG_TRUE@ @SWIG_PACKAGENAME=org.scilab.modules.$(modulename); \
818@SWIG_TRUE@ SWIG_OUTDIR=src/java/org/scilab/modules/$(modulename)/; \ 818@SWIG_TRUE@ SWIG_OUTDIR=src/java/org/scilab/modules/$(modulename)/; \
819@SWIG_TRUE@ if test ! -z "$(SWIG_WRAPPERS)"; then \ 819@SWIG_TRUE@ if test -n "$(SWIG_WRAPPERS)"; then \
820@SWIG_TRUE@ for file in $(SWIG_WRAPPERS) ; do \ 820@SWIG_TRUE@ for file in $(SWIG_WRAPPERS) ; do \
821@SWIG_TRUE@ echo "Swig process of $$file ..."; \ 821@SWIG_TRUE@ echo "Swig process of $$file ..."; \
822@SWIG_TRUE@ $(SWIG_BIN) $(SWIG_JAVA) -package $$SWIG_PACKAGENAME -outdir $$SWIG_OUTDIR $$file; \ 822@SWIG_TRUE@ $(SWIG_BIN) $(SWIG_JAVA) -package $$SWIG_PACKAGENAME -outdir $$SWIG_OUTDIR $$file; \
@@ -828,7 +828,7 @@ check-code:
828 828
829@GIWS_TRUE@giws: $(GIWS_WRAPPERS) 829@GIWS_TRUE@giws: $(GIWS_WRAPPERS)
830@GIWS_TRUE@ @GIWS_OUTPUTDIR=src/jni/;\ 830@GIWS_TRUE@ @GIWS_OUTPUTDIR=src/jni/;\
831@GIWS_TRUE@ if test ! -z "$(GIWS_WRAPPERS)"; then \ 831@GIWS_TRUE@ if test -n "$(GIWS_WRAPPERS)"; then \
832@GIWS_TRUE@ for file in $(GIWS_WRAPPERS) ; do \ 832@GIWS_TRUE@ for file in $(GIWS_WRAPPERS) ; do \
833@GIWS_TRUE@ echo "GIWS process of $$file ..."; \ 833@GIWS_TRUE@ echo "GIWS process of $$file ..."; \
834@GIWS_TRUE@ $(GIWS_BIN) --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \ 834@GIWS_TRUE@ $(GIWS_BIN) --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
@@ -934,10 +934,12 @@ install-data-local:
934 $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \ 934 $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
935 if test -d $(srcdir)/$$dir/; then \ 935 if test -d $(srcdir)/$$dir/; then \
936 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 936 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
937 for specialExt in $(MACROSSPECIALEXT); do \ 937 if test -n "$(MACROSSPECIALEXT)"; then \
938 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 938 for specialExt in $(MACROSSPECIALEXT); do \
939 done; \ 939 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
940 FILELIST="$$FILELIST $$specialExtDir"; \ 940 done; \
941 FILELIST="$$FILELIST $$specialExtDir"; \
942 fi; \
941 for file in `ls -1 $$FILELIST 2>/dev/null`; do \ 943 for file in `ls -1 $$FILELIST 2>/dev/null`; do \
942 echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \ 944 echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
943 $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \ 945 $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \
diff --git a/scilab/libs/hashtable/Makefile.am b/scilab/libs/hashtable/Makefile.am
index 84f0e93..7a2d2c5 100644
--- a/scilab/libs/hashtable/Makefile.am
+++ b/scilab/libs/hashtable/Makefile.am
@@ -7,7 +7,7 @@ HASHTABLE_C_SOURCES = hashtable_utility.c \
7hashtable_itr.c \ 7hashtable_itr.c \
8hashtable.c 8hashtable.c
9 9
10libscihashtable_la_includedir=$(pkgincludedir)/hashtable 10libscihashtable_la_includedir=$(pkgincludedir)
11 11
12libscihashtable_la_include_HEADERS = ./hashtable_itr.h \ 12libscihashtable_la_include_HEADERS = ./hashtable_itr.h \
13./hashtable.h \ 13./hashtable.h \
diff --git a/scilab/libs/hashtable/Makefile.in b/scilab/libs/hashtable/Makefile.in
index 9d39a52..8338989 100644
--- a/scilab/libs/hashtable/Makefile.in
+++ b/scilab/libs/hashtable/Makefile.in
@@ -366,7 +366,7 @@ HASHTABLE_C_SOURCES = hashtable_utility.c \
366hashtable_itr.c \ 366hashtable_itr.c \
367hashtable.c 367hashtable.c
368 368
369libscihashtable_la_includedir = $(pkgincludedir)/hashtable 369libscihashtable_la_includedir = $(pkgincludedir)
370libscihashtable_la_include_HEADERS = ./hashtable_itr.h \ 370libscihashtable_la_include_HEADERS = ./hashtable_itr.h \
371./hashtable.h \ 371./hashtable.h \
372./hashtable_utility.h 372./hashtable_utility.h
@@ -811,7 +811,7 @@ check-code:
811@SWIG_TRUE@swig: $(SWIG_WRAPPERS) 811@SWIG_TRUE@swig: $(SWIG_WRAPPERS)
812@SWIG_TRUE@ @SWIG_PACKAGENAME=org.scilab.modules.$(modulename); \ 812@SWIG_TRUE@ @SWIG_PACKAGENAME=org.scilab.modules.$(modulename); \
813@SWIG_TRUE@ SWIG_OUTDIR=src/java/org/scilab/modules/$(modulename)/; \ 813@SWIG_TRUE@ SWIG_OUTDIR=src/java/org/scilab/modules/$(modulename)/; \
814@SWIG_TRUE@ if test ! -z "$(SWIG_WRAPPERS)"; then \ 814@SWIG_TRUE@ if test -n "$(SWIG_WRAPPERS)"; then \
815@SWIG_TRUE@ for file in $(SWIG_WRAPPERS) ; do \ 815@SWIG_TRUE@ for file in $(SWIG_WRAPPERS) ; do \
816@SWIG_TRUE@ echo "Swig process of $$file ..."; \ 816@SWIG_TRUE@ echo "Swig process of $$file ..."; \
817@SWIG_TRUE@ $(SWIG_BIN) $(SWIG_JAVA) -package $$SWIG_PACKAGENAME -outdir $$SWIG_OUTDIR $$file; \ 817@SWIG_TRUE@ $(SWIG_BIN) $(SWIG_JAVA) -package $$SWIG_PACKAGENAME -outdir $$SWIG_OUTDIR $$file; \
@@ -823,7 +823,7 @@ check-code:
823 823
824@GIWS_TRUE@giws: $(GIWS_WRAPPERS) 824@GIWS_TRUE@giws: $(GIWS_WRAPPERS)
825@GIWS_TRUE@ @GIWS_OUTPUTDIR=src/jni/;\ 825@GIWS_TRUE@ @GIWS_OUTPUTDIR=src/jni/;\
826@GIWS_TRUE@ if test ! -z "$(GIWS_WRAPPERS)"; then \ 826@GIWS_TRUE@ if test -n "$(GIWS_WRAPPERS)"; then \
827@GIWS_TRUE@ for file in $(GIWS_WRAPPERS) ; do \ 827@GIWS_TRUE@ for file in $(GIWS_WRAPPERS) ; do \
828@GIWS_TRUE@ echo "GIWS process of $$file ..."; \ 828@GIWS_TRUE@ echo "GIWS process of $$file ..."; \
829@GIWS_TRUE@ $(GIWS_BIN) --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \ 829@GIWS_TRUE@ $(GIWS_BIN) --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
@@ -929,10 +929,12 @@ install-data-local:
929 $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \ 929 $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
930 if test -d $(srcdir)/$$dir/; then \ 930 if test -d $(srcdir)/$$dir/; then \
931 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 931 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
932 for specialExt in $(MACROSSPECIALEXT); do \ 932 if test -n "$(MACROSSPECIALEXT)"; then \
933 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 933 for specialExt in $(MACROSSPECIALEXT); do \
934 done; \ 934 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
935 FILELIST="$$FILELIST $$specialExtDir"; \ 935 done; \
936 FILELIST="$$FILELIST $$specialExtDir"; \
937 fi; \
936 for file in `ls -1 $$FILELIST 2>/dev/null`; do \ 938 for file in `ls -1 $$FILELIST 2>/dev/null`; do \
937 echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \ 939 echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
938 $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \ 940 $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \
diff --git a/scilab/libs/libst/Makefile.in b/scilab/libs/libst/Makefile.in
index bd6ffe0..167fee6 100644
--- a/scilab/libs/libst/Makefile.in
+++ b/scilab/libs/libst/Makefile.in
@@ -773,7 +773,7 @@ check-code:
773@SWIG_TRUE@swig: $(SWIG_WRAPPERS) 773@SWIG_TRUE@swig: $(SWIG_WRAPPERS)
774@SWIG_TRUE@ @SWIG_PACKAGENAME=org.scilab.modules.$(modulename); \ 774@SWIG_TRUE@ @SWIG_PACKAGENAME=org.scilab.modules.$(modulename); \
775@SWIG_TRUE@ SWIG_OUTDIR=src/java/org/scilab/modules/$(modulename)/; \ 775@SWIG_TRUE@ SWIG_OUTDIR=src/java/org/scilab/modules/$(modulename)/; \
776@SWIG_TRUE@ if test ! -z "$(SWIG_WRAPPERS)"; then \ 776@SWIG_TRUE@ if test -n "$(SWIG_WRAPPERS)"; then \
777@SWIG_TRUE@ for file in $(SWIG_WRAPPERS) ; do \ 777@SWIG_TRUE@ for file in $(SWIG_WRAPPERS) ; do \
778@SWIG_TRUE@ echo "Swig process of $$file ..."; \ 778@SWIG_TRUE@ echo "Swig process of $$file ..."; \
779@SWIG_TRUE@ $(SWIG_BIN) $(SWIG_JAVA) -package $$SWIG_PACKAGENAME -outdir $$SWIG_OUTDIR $$file; \ 779@SWIG_TRUE@ $(SWIG_BIN) $(SWIG_JAVA) -package $$SWIG_PACKAGENAME -outdir $$SWIG_OUTDIR $$file; \
@@ -785,7 +785,7 @@ check-code:
785 785
786@GIWS_TRUE@giws: $(GIWS_WRAPPERS) 786@GIWS_TRUE@giws: $(GIWS_WRAPPERS)
787@GIWS_TRUE@ @GIWS_OUTPUTDIR=src/jni/;\ 787@GIWS_TRUE@ @GIWS_OUTPUTDIR=src/jni/;\
788@GIWS_TRUE@ if test ! -z "$(GIWS_WRAPPERS)"; then \ 788@GIWS_TRUE@ if test -n "$(GIWS_WRAPPERS)"; then \
789@GIWS_TRUE@ for file in $(GIWS_WRAPPERS) ; do \ 789@GIWS_TRUE@ for file in $(GIWS_WRAPPERS) ; do \
790@GIWS_TRUE@ echo "GIWS process of $$file ..."; \ 790@GIWS_TRUE@ echo "GIWS process of $$file ..."; \
791@GIWS_TRUE@ $(GIWS_BIN) --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \ 791@GIWS_TRUE@ $(GIWS_BIN) --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
@@ -891,10 +891,12 @@ install-data-local:
891 $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \ 891 $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
892 if test -d $(srcdir)/$$dir/; then \ 892 if test -d $(srcdir)/$$dir/; then \
893 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 893 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
894 for specialExt in $(MACROSSPECIALEXT); do \ 894 if test -n "$(MACROSSPECIALEXT)"; then \
895 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 895 for specialExt in $(MACROSSPECIALEXT); do \
896 done; \ 896 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
897 FILELIST="$$FILELIST $$specialExtDir"; \ 897 done; \
898 FILELIST="$$FILELIST $$specialExtDir"; \
899 fi; \
898 for file in `ls -1 $$FILELIST 2>/dev/null`; do \ 900 for file in `ls -1 $$FILELIST 2>/dev/null`; do \
899 echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \ 901 echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
900 $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \ 902 $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \
diff --git a/scilab/m4/hdf5.m4 b/scilab/m4/hdf5.m4
index a9e0936..f98c249 100644
--- a/scilab/m4/hdf5.m4
+++ b/scilab/m4/hdf5.m4
@@ -30,9 +30,9 @@ AC_CHECK_HEADER([hdf5.h],
30 [AC_MSG_ERROR([Cannot find headers (hdf5.h) of the library HDF5. Please install the dev package])] 30 [AC_MSG_ERROR([Cannot find headers (hdf5.h) of the library HDF5. Please install the dev package])]
31 ) 31 )
32 32
33AC_CHECK_LIB([hdf5], [H5Dopen], 33AC_CHECK_LIB([hdf5], [H5Fopen],
34 [], 34 [],
35 [AC_MSG_ERROR([libhdf5: library missing. (Cannot find symbol H5Dopen). Check if libhdf5 is installed and if the version is correct])] 35 [AC_MSG_ERROR([libhdf5: library missing. (Cannot find symbol H5Fopen). Check if libhdf5 is installed and if the version is correct])]
36 ) 36 )
37CFLAGS=$saved_cflags 37CFLAGS=$saved_cflags
38LIBS="$saved_LIBS" 38LIBS="$saved_LIBS"
diff --git a/scilab/m4/java.m4 b/scilab/m4/java.m4
index cc2250f..fac9e71 100644
--- a/scilab/m4/java.m4
+++ b/scilab/m4/java.m4
@@ -763,7 +763,7 @@ AC_DEFUN([AC_JAVA_CHECK_PACKAGE], [
763 PACKAGE_JAR_FILE= 763 PACKAGE_JAR_FILE=
764 found_jar=no 764 found_jar=no
765 saved_ac_java_classpath=$ac_java_classpath 765 saved_ac_java_classpath=$ac_java_classpath
766 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" 766 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)"
767 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do 767 for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
768 for jar in "$jardir/$1.jar" "$jardir/lib$1.jar" "$jardir/lib$1-java.jar" "$jardir/$1*.jar"; do 768 for jar in "$jardir/$1.jar" "$jardir/lib$1.jar" "$jardir/lib$1-java.jar" "$jardir/$1*.jar"; do
769# jar=`echo $jar|sed -e 's/ /\\ /'` 769# jar=`echo $jar|sed -e 's/ /\\ /'`
diff --git a/scilab/m4/libtool.m4 b/scilab/m4/libtool.m4
index 1e7ea47..1c93c85 100644
--- a/scilab/m4/libtool.m4
+++ b/scilab/m4/libtool.m4
@@ -951,11 +951,11 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
951 # target defaults to 10.4. Don't you love it? 951 # target defaults to 10.4. Don't you love it?
952 case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in 952 case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
953 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) 953 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
954 _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; 954 _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}dynamic_lookup' ;;
955 10.[[012]]*) 955 10.[[012]]*)
956 _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; 956 _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
957 10.*) 957 10.*)
958 _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; 958 _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}dynamic_lookup' ;;
959 esac 959 esac
960 ;; 960 ;;
961 esac 961 esac
diff --git a/scilab/modules/action_binding/Makefile.am b/scilab/modules/action_binding/Makefile.am
index dcc5c1a..04a0ebf 100644
--- a/scilab/modules/action_binding/Makefile.am
+++ b/scilab/modules/action_binding/Makefile.am
@@ -73,7 +73,7 @@ libsciaction_binding_la_sci_gatewaydir = $(mydatadir)/sci_gateway
73libsciaction_binding_la_sci_gateway_DATA = 73libsciaction_binding_la_sci_gateway_DATA =
74 74
75####�action_binding : include files #### 75####�action_binding : include files ####
76libsciaction_binding_la_includedir=$(pkgincludedir)/action_binding 76libsciaction_binding_la_includedir=$(pkgincludedir)
77libsciaction_binding_la_include_HEADERS = includes/dynamic_menus.h \ 77libsciaction_binding_la_include_HEADERS = includes/dynamic_menus.h \
78includes/dynlib_action_binding.h 78includes/dynlib_action_binding.h
79 79
diff --git a/scilab/modules/action_binding/Makefile.in b/scilab/modules/action_binding/Makefile.in
index d052d37..edea450 100644
--- a/scilab/modules/action_binding/Makefile.in
+++ b/scilab/modules/action_binding/Makefile.in
@@ -445,7 +445,7 @@ libsciaction_binding_la_sci_gatewaydir = $(mydatadir)/sci_gateway
445libsciaction_binding_la_sci_gateway_DATA = 445libsciaction_binding_la_sci_gateway_DATA =
446 446
447####�action_binding : include files #### 447####�action_binding : include files ####
448libsciaction_binding_la_includedir = $(pkgincludedir)/action_binding 448libsciaction_binding_la_includedir = $(pkgincludedir)
449libsciaction_binding_la_include_HEADERS = includes/dynamic_menus.h \ 449libsciaction_binding_la_include_HEADERS = includes/dynamic_menus.h \
450includes/dynlib_action_binding.h 450includes/dynlib_action_binding.h
451 451
@@ -984,7 +984,7 @@ check-code:
984@SWIG_TRUE@swig: $(SWIG_WRAPPERS) 984@SWIG_TRUE@swig: $(SWIG_WRAPPERS)
985@SWIG_TRUE@ @SWIG_PACKAGENAME=org.scilab.modules.$(modulename); \ 985@SWIG_TRUE@ @SWIG_PACKAGENAME=org.scilab.modules.$(modulename); \
986@SWIG_TRUE@ SWIG_OUTDIR=src/java/org/scilab/modules/$(modulename)/; \ 986@SWIG_TRUE@ SWIG_OUTDIR=src/java/org/scilab/modules/$(modulename)/; \
987@SWIG_TRUE@ if test ! -z "$(SWIG_WRAPPERS)"; then \ 987@SWIG_TRUE@ if test -n "$(SWIG_WRAPPERS)"; then \
988@SWIG_TRUE@ for file in $(SWIG_WRAPPERS) ; do \ 988@SWIG_TRUE@ for file in $(SWIG_WRAPPERS) ; do \
989@SWIG_TRUE@ echo "Swig process of $$file ..."; \ 989@SWIG_TRUE@ echo "Swig process of $$file ..."; \
990@SWIG_TRUE@ $(SWIG_BIN) $(SWIG_JAVA) -package $$SWIG_PACKAGENAME -outdir $$SWIG_OUTDIR $$file; \ 990@SWIG_TRUE@ $(SWIG_BIN) $(SWIG_JAVA) -package $$SWIG_PACKAGENAME -outdir $$SWIG_OUTDIR $$file; \
@@ -996,7 +996,7 @@ check-code:
996 996
997@GIWS_TRUE@giws: $(GIWS_WRAPPERS) 997@GIWS_TRUE@giws: $(GIWS_WRAPPERS)
998@GIWS_TRUE@ @GIWS_OUTPUTDIR=src/jni/;\ 998@GIWS_TRUE@ @GIWS_OUTPUTDIR=src/jni/;\
999@GIWS_TRUE@ if test ! -z "$(GIWS_WRAPPERS)"; then \ 999@GIWS_TRUE@ if test -n "$(GIWS_WRAPPERS)"; then \
1000@GIWS_TRUE@ for file in $(GIWS_WRAPPERS) ; do \ 1000@GIWS_TRUE@ for file in $(GIWS_WRAPPERS) ; do \
1001@GIWS_TRUE@ echo "GIWS process of $$file ..."; \ 1001@GIWS_TRUE@ echo "GIWS process of $$file ..."; \
1002@GIWS_TRUE@ $(GIWS_BIN) --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \ 1002@GIWS_TRUE@ $(GIWS_BIN) --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
@@ -1102,10 +1102,12 @@ install-data-local:
1102 $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \ 1102 $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
1103 if test -d $(srcdir)/$$dir/; then \ 1103 if test -d $(srcdir)/$$dir/; then \
1104 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 1104 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
1105 for specialExt in $(MACROSSPECIALEXT); do \ 1105 if test -n "$(MACROSSPECIALEXT)"; then \
1106 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 1106 for specialExt in $(MACROSSPECIALEXT); do \
1107 done; \ 1107 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
1108 FILELIST="$$FILELIST $$specialExtDir"; \ 1108 done; \
1109 FILELIST="$$FILELIST $$specialExtDir"; \
1110 fi; \
1109 for file in `ls -1 $$FILELIST 2>/dev/null`; do \ 1111 for file in `ls -1 $$FILELIST 2>/dev/null`; do \
1110 echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \ 1112 echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
1111 $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \ 1113 $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \
diff --git a/scilab/modules/api_scilab/Makefile.am b/scilab/modules/api_scilab/Makefile.am
index a242d0f..fd10822 100644
--- a/scilab/modules/api_scilab/Makefile.am
+++ b/scilab/modules/api_scilab/Makefile.am
@@ -65,7 +65,7 @@ libsciapi_scilab_la_etc_DATA = etc/api_scilab.quit etc/api_scilab.start
65 65
66 66
67#### api_scilab : include files #### 67#### api_scilab : include files ####
68libsciapi_scilab_la_includedir=$(pkgincludedir)/api_scilab 68libsciapi_scilab_la_includedir=$(pkgincludedir)
69libsciapi_scilab_la_include_HEADERS = includes/api_boolean.h \ 69libsciapi_scilab_la_include_HEADERS = includes/api_boolean.h \
70includes/api_boolean_sparse.h \ 70includes/api_boolean_sparse.h \
71includes/api_common.h \ 71includes/api_common.h \
diff --git a/scilab/modules/api_scilab/Makefile.in b/scilab/modules/api_scilab/Makefile.in
index c7e401d..ac81c88 100644
--- a/scilab/modules/api_scilab/Makefile.in
+++ b/scilab/modules/api_scilab/Makefile.in
@@ -428,7 +428,7 @@ libsciapi_scilab_la_etcdir = $(mydatadir)/etc
428libsciapi_scilab_la_etc_DATA = etc/api_scilab.quit etc/api_scilab.start 428libsciapi_scilab_la_etc_DATA = etc/api_scilab.quit etc/api_scilab.start
429 429
430#### api_scilab : include files #### 430#### api_scilab : include files ####
431libsciapi_scilab_la_includedir = $(pkgincludedir)/api_scilab 431libsciapi_scilab_la_includedir = $(pkgincludedir)
432libsciapi_scilab_la_include_HEADERS = includes/api_boolean.h \ 432libsciapi_scilab_la_include_HEADERS = includes/api_boolean.h \
433includes/api_boolean_sparse.h \ 433includes/api_boolean_sparse.h \
434includes/api_common.h \ 434includes/api_common.h \
@@ -996,7 +996,7 @@ check-code:
996@SWIG_TRUE@swig: $(SWIG_WRAPPERS) 996@SWIG_TRUE@swig: $(SWIG_WRAPPERS)
997@SWIG_TRUE@ @SWIG_PACKAGENAME=org.scilab.modules.$(modulename); \ 997@SWIG_TRUE@ @SWIG_PACKAGENAME=org.scilab.modules.$(modulename); \
998@SWIG_TRUE@ SWIG_OUTDIR=src/java/org/scilab/modules/$(modulename)/; \ 998@SWIG_TRUE@ SWIG_OUTDIR=src/java/org/scilab/modules/$(modulename)/; \
999@SWIG_TRUE@ if test ! -z "$(SWIG_WRAPPERS)"; then \ 999@SWIG_TRUE@ if test -n "$(SWIG_WRAPPERS)"; then \
1000@SWIG_TRUE@ for file in $(SWIG_WRAPPERS) ; do \ 1000@SWIG_TRUE@ for file in $(SWIG_WRAPPERS) ; do \
1001@SWIG_TRUE@ echo "Swig process of $$file ..."; \ 1001@SWIG_TRUE@ echo "Swig process of $$file ..."; \
1002@SWIG_TRUE@ $(SWIG_BIN) $(SWIG_JAVA) -package $$SWIG_PACKAGENAME -outdir $$SWIG_OUTDIR $$file; \ 1002@SWIG_TRUE@ $(SWIG_BIN) $(SWIG_JAVA) -package $$SWIG_PACKAGENAME -outdir $$SWIG_OUTDIR $$file; \
@@ -1008,7 +1008,7 @@ check-code:
1008 1008
1009@GIWS_TRUE@giws: $(GIWS_WRAPPERS) 1009@GIWS_TRUE@giws: $(GIWS_WRAPPERS)
1010@GIWS_TRUE@ @GIWS_OUTPUTDIR=src/jni/;\ 1010@GIWS_TRUE@ @GIWS_OUTPUTDIR=src/jni/;\
1011@GIWS_TRUE@ if test ! -z "$(GIWS_WRAPPERS)"; then \ 1011@GIWS_TRUE@ if test -n "$(GIWS_WRAPPERS)"; then \
1012@GIWS_TRUE@ for file in $(GIWS_WRAPPERS) ; do \ 1012@GIWS_TRUE@ for file in $(GIWS_WRAPPERS) ; do \
1013@GIWS_TRUE@ echo "GIWS process of $$file ..."; \ 1013@GIWS_TRUE@ echo "GIWS process of $$file ..."; \
1014@GIWS_TRUE@ $(GIWS_BIN) --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \ 1014@GIWS_TRUE@ $(GIWS_BIN) --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
@@ -1114,10 +1114,12 @@ install-data-local:
1114 $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \ 1114 $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
1115 if test -d $(srcdir)/$$dir/; then \ 1115 if test -d $(srcdir)/$$dir/; then \
1116 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 1116 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
1117 for specialExt in $(MACROSSPECIALEXT); do \ 1117 if test -n "$(MACROSSPECIALEXT)"; then \
1118 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 1118 for specialExt in $(MACROSSPECIALEXT); do \
1119 done; \ 1119 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
1120 FILELIST="$$FILELIST $$specialExtDir"; \ 1120 done; \
1121 FILELIST="$$FILELIST $$specialExtDir"; \
1122 fi; \
1121 for file in `ls -1 $$FILELIST 2>/dev/null`; do \ 1123 for file in `ls -1 $$FILELIST 2>/dev/null`; do \
1122 echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \ 1124 echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
1123 $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \ 1125 $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \
diff --git a/scilab/modules/api_scilab/help/en_US/list_management/list_boolean_reading_api.xml b/scilab/modules/api_scilab/help/en_US/list_management/list_boolean_reading_api.xml
index 9340533..62adc12 100644
--- a/scilab/modules/api_scilab/help/en_US/list_management/list_boolean_reading_api.xml
+++ b/scilab/modules/api_scilab/help/en_US/list_management/list_boolean_reading_api.xml
@@ -190,7 +190,7 @@ int get_info(int _iRhs, int* _piParent, int *_piAddr, int _iItemPos)
190 sciprint("MList "); 190 sciprint("MList ");
191 iRet = get_list_info(_iRhs, _piParent, _piAddr, _iItemPos); 191 iRet = get_list_info(_iRhs, _piParent, _piAddr, _iItemPos);
192 break; 192 break;
193 case sci_lufact_pointer : 193 case sci_pointer :
194 iRet = get_pointer_info(_iRhs, _piParent, _piAddr, _iItemPos); 194 iRet = get_pointer_info(_iRhs, _piParent, _piAddr, _iItemPos);
195 break; 195 break;
196 default : 196 default :
diff --git a/scilab/modules/api_scilab/help/en_US/list_management/list_bsparse_reading_api.xml b/scilab/modules/api_scilab/help/en_US/list_management/list_bsparse_reading_api.xml
index ed270be..a19c9f8 100644
--- a/scilab/modules/api_scilab/help/en_US/list_management/list_bsparse_reading_api.xml
+++ b/scilab/modules/api_scilab/help/en_US/list_management/list_bsparse_reading_api.xml
@@ -206,7 +206,7 @@ int get_info(int _iRhs, int* _piParent, int *_piAddr, int _iItemPos)
206 sciprint("MList "); 206 sciprint("MList ");
207 iRet = get_list_info(_iRhs, _piParent, _piAddr, _iItemPos); 207 iRet = get_list_info(_iRhs, _piParent, _piAddr, _iItemPos);
208 break; 208 break;
209 case sci_lufact_pointer : 209 case sci_pointer :
210 iRet = get_pointer_info(_iRhs, _piParent, _piAddr, _iItemPos); 210 iRet = get_pointer_info(_iRhs, _piParent, _piAddr, _iItemPos);
211 break; 211 break;
212 default : 212 default :
diff --git a/scilab/modules/api_scilab/help/en_US/list_management/list_double_reading_api.xml b/scilab/modules/api_scilab/help/en_US/list_management/list_double_reading_api.xml
index 97f77a7..17e0856 100644
--- a/scilab/modules/api_scilab/help/en_US/list_management/list_double_reading_api.xml
+++ b/scilab/modules/api_scilab/help/en_US/list_management/list_double_reading_api.xml
@@ -201,7 +201,7 @@ int get_info(int _iRhs, int* _piParent, int *_piAddr, int _iItemPos)
201 sciprint("MList "); 201 sciprint("MList ");
202 iRet = get_list_info(_iRhs, _piParent, _piAddr, _iItemPos); 202 iRet = get_list_info(_iRhs, _piParent, _piAddr, _iItemPos);
203 break; 203 break;
204 case sci_lufact_pointer : 204 case sci_pointer :
205 iRet = get_pointer_info(_iRhs, _piParent, _piAddr, _iItemPos); 205 iRet = get_pointer_info(_iRhs, _piParent, _piAddr, _iItemPos);
206 break; 206 break;
207 default : 207 default :
diff --git a/scilab/modules/api_scilab/help/en_US/list_management/list_integer_reading_api.xml b/scilab/modules/api_scilab/help/en_US/list_management/list_integer_reading_api.xml
index 1c03385..01c6275 100644
--- a/scilab/modules/api_scilab/help/en_US/list_management/list_integer_reading_api.xml
+++ b/scilab/modules/api_scilab/help/en_US/list_management/list_integer_reading_api.xml
@@ -197,7 +197,7 @@ int get_info(int _iRhs, int* _piParent, int *_piAddr, int _iItemPos)
197 sciprint("MList "); 197 sciprint("MList ");
198 iRet = get_list_info(_iRhs, _piParent, _piAddr, _iItemPos); 198 iRet = get_list_info(_iRhs, _piParent, _piAddr, _iItemPos);
199 break; 199 break;
200 case sci_lufact_pointer : 200 case sci_pointer :
201 iRet = get_pointer_info(_iRhs, _piParent, _piAddr, _iItemPos); 201 iRet = get_pointer_info(_iRhs, _piParent, _piAddr, _iItemPos);
202 break; 202 break;
203 default : 203 default :
diff --git a/scilab/modules/api_scilab/help/en_US/list_management/list_pointer_reading_api.xml b/scilab/modules/api_scilab/help/en_US/list_management/list_pointer_reading_api.xml
index 6951459..c755a9c 100644
--- a/scilab/modules/api_scilab/help/en_US/list_management/list_pointer_reading_api.xml
+++ b/scilab/modules/api_scilab/help/en_US/list_management/list_pointer_reading_api.xml
@@ -174,7 +174,7 @@ int get_info(int _iRhs, int* _piParent, int *_piAddr, int _iItemPos)
174 sciprint("MList "); 174 sciprint("MList ");
175 iRet = get_list_info(_iRhs, _piParent, _piAddr, _iItemPos); 175 iRet = get_list_info(_iRhs, _piParent, _piAddr, _iItemPos);
176 break; 176 break;
177 case sci_lufact_pointer : 177 case sci_pointer :
178 iRet = get_pointer_info(_iRhs, _piParent, _piAddr, _iItemPos); 178 iRet = get_pointer_info(_iRhs, _piParent, _piAddr, _iItemPos);
179 break; 179 break;
180 default : 180 default :
diff --git a/scilab/modules/api_scilab/help/en_US/list_management/list_poly_reading_api.xml b/scilab/modules/api_scilab/help/en_US/list_management/list_poly_reading_api.xml
index bd47d0f..d843ac7 100644
--- a/scilab/modules/api_scilab/help/en_US/list_management/list_poly_reading_api.xml
+++ b/scilab/modules/api_scilab/help/en_US/list_management/list_poly_reading_api.xml
@@ -209,7 +209,7 @@ int get_info(int _iRhs, int* _piParent, int *_piAddr, int _iItemPos)
209 sciprint("MList "); 209 sciprint("MList ");
210 iRet = get_list_info(_iRhs, _piParent, _piAddr, _iItemPos); 210 iRet = get_list_info(_iRhs, _piParent, _piAddr, _iItemPos);
211 break; 211 break;
212 case sci_lufact_pointer : 212 case sci_pointer :
213 iRet = get_pointer_info(_iRhs, _piParent, _piAddr, _iItemPos); 213 iRet = get_pointer_info(_iRhs, _piParent, _piAddr, _iItemPos);
214 break; 214 break;
215 default : 215 default :
diff --git a/scilab/modules/api_scilab/help/en_US/list_management/list_sparse_reading_api.xml b/scilab/modules/api_scilab/help/en_US/list_management/list_sparse_reading_api.xml
index 847d811..dde2ac8 100644
--- a/scilab/modules/api_scilab/help/en_US/list_management/list_sparse_reading_api.xml
+++ b/scilab/modules/api_scilab/help/en_US/list_management/list_sparse_reading_api.xml
@@ -225,7 +225,7 @@ int get_info(int _iRhs, int* _piParent, int *_piAddr, int _iItemPos)
225 sciprint("MList "); 225 sciprint("MList ");
226 iRet = get_list_info(_iRhs, _piParent, _piAddr, _iItemPos); 226 iRet = get_list_info(_iRhs, _piParent, _piAddr, _iItemPos);
227 break; 227 break;
228 case sci_lufact_pointer : 228 case sci_pointer :
229 iRet = get_pointer_info(_iRhs, _piParent, _piAddr, _iItemPos); 229 iRet = get_pointer_info(_iRhs, _piParent, _piAddr, _iItemPos);
230 break; 230 break;
231 default : 231 default :
diff --git a/scilab/modules/api_scilab/help/en_US/list_management/list_string_reading_api.xml b/scilab/modules/api_scilab/help/en_US/list_management/list_string_reading_api.xml
index 06e7bcb..2e39bee2 100644
--- a/scilab/modules/api_scilab/help/en_US/list_management/list_string_reading_api.xml
+++ b/scilab/modules/api_scilab/help/en_US/list_management/list_string_reading_api.xml
@@ -198,7 +198,7 @@ int get_info(int _iRhs, int* _piParent, int *_piAddr, int _iItemPos)
198 sciprint("MList "); 198 sciprint("MList ");
199 iRet = get_list_info(_iRhs, _piParent, _piAddr, _iItemPos); 199 iRet = get_list_info(_iRhs, _piParent, _piAddr, _iItemPos);
200 break; 200 break;
201 case sci_lufact_pointer : 201 case sci_pointer :
202 iRet = get_pointer_info(_iRhs, _piParent, _piAddr, _iItemPos); 202 iRet = get_pointer_info(_iRhs, _piParent, _piAddr, _iItemPos);
203 break; 203 break;
204 default : 204 default :
diff --git a/scilab/modules/api_scilab/help/en_US/pointer_reading_api.xml b/scilab/modules/api_scilab/help/en_US/pointer_reading_api.xml
index 5595418..c329be9 100644
--- a/scilab/modules/api_scilab/help/en_US/pointer_reading_api.xml
+++ b/scilab/modules/api_scilab/help/en_US/pointer_reading_api.xml
@@ -89,7 +89,7 @@ int read_pointer(char *fname,unsigned long fname_len)
89 return 1; 89 return 1;
90 } 90 }
91 91
92 if(getVarType(piAddr) != sci_lufact_pointer) 92 if(getVarType(piAddr) != sci_pointer)
93 { 93 {
94 return 1; 94 return 1;
95 } 95 }
diff --git a/scilab/modules/api_scilab/help/en_US/pointer_writing_api.xml b/scilab/modules/api_scilab/help/en_US/pointer_writing_api.xml
index 77c89fb..0ed34cf 100644
--- a/scilab/modules/api_scilab/help/en_US/pointer_writing_api.xml
+++ b/scilab/modules/api_scilab/help/en_US/pointer_writing_api.xml
@@ -119,7 +119,7 @@ int read_pointer(char *fname,unsigned long fname_len)
119 return 1; 119 return 1;
120 } 120 }
121 121
122 if(getVarType(piAddr) != sci_lufact_pointer) 122 if(getVarType(piAddr) != sci_pointer)
123 { 123 {
124 return 1; 124 return 1;
125 } 125 }
diff --git a/scilab/modules/api_scilab/includes/api_list.h b/scilab/modules/api_scilab/includes/api_list.h
index f769adb..68cdc1c 100644
--- a/scilab/modules/api_scilab/includes/api_list.h
+++ b/scilab/modules/api_scilab/includes/api_list.h
@@ -250,27 +250,25 @@ API_SCILAB_IMPEXP int createMListInNamedList(char* _pstName, int* _piParent, int
250 250
251/** 251/**
252 * Get double variable data 252 * Get double variable data
253 * @param[in] _iVar variable number
254 * @param[in] _piParent pointer on the parent 253 * @param[in] _piParent pointer on the parent
255 * @param[in] _iItemPos position of the new list in the parent 254 * @param[in] _iItemPos itme position in the list
256 * @param[out] _piRows return number of row 255 * @param[out] _piRows return number of row
257 * @param[out] _piCols return number of column 256 * @param[out] _piCols return number of column
258 * @param[out] _pdblReal return pointer on real data 257 * @param[out] _pdblReal return pointer on real data
259 * @return if the operation successed (0) or not ( !0 ) 258 * @return if the operation successed (0) or not ( !0 )
260 */ 259 */
261API_SCILAB_IMPEXP int getMatrixOfDoubleInList(int _iVar, int* _piParent, int _iItemPos, int* _piRows, int* _piCols, double** _pdblReal); 260API_SCILAB_IMPEXP int getMatrixOfDoubleInList(int* _piParent, int _iItemPos, int* _piRows, int* _piCols, double** _pdblReal);
262 261
263/** 262/**
264 * Get double variable data 263 * Get double variable data
265 * @param[in] _iVar variable number
266 * @param[in] _piParent pointer on the parent 264 * @param[in] _piParent pointer on the parent
267 * @param[in] _iItemPos position of the new list in the parent 265 * @param[in] _iItemPos itme position in the list
268 * @param[out] _piRows return number of row 266 * @param[out] _piRows return number of row
269 * @param[out] _piCols return number of column 267 * @param[out] _piCols return number of column
270 * @param[out] _pdblReal return pointer on real data 268 * @param[out] _pdblReal return pointer on real data
271 * @return if the operation successed (0) or not ( !0 ) 269 * @return if the operation successed (0) or not ( !0 )
272 */ 270 */
273API_SCILAB_IMPEXP int getComplexMatrixOfDoubleInList(int _iVar, int* _piParent, int _iItemPos, int* _piRows, int* _piCols, double** _pdblReal, double** _pdblImg); 271API_SCILAB_IMPEXP int getComplexMatrixOfDoubleInList(int* _piParent, int _iItemPos, int* _piRows, int* _piCols, double** _pdblReal, double** _pdblImg);
274 272
275/** 273/**
276 * Alloc double variable in a list 274 * Alloc double variable in a list
@@ -402,7 +400,6 @@ API_SCILAB_IMPEXP int readComplexMatrixOfDoubleInNamedList(char* _pstName, int*
402 400
403/** 401/**
404 * Get string variable in a list 402 * Get string variable in a list
405 * @param[in] _iVar variable number
406 * @param[in] _piParent address of parent node 403 * @param[in] _piParent address of parent node
407 * @param[in] _iItemPos item postion in the list 404 * @param[in] _iItemPos item postion in the list
408 * @param[out] _piRows return number of row 405 * @param[out] _piRows return number of row
@@ -411,7 +408,7 @@ API_SCILAB_IMPEXP int readComplexMatrixOfDoubleInNamedList(char* _pstName, int*
411 * @param[out] _pstStrings return array of char 408 * @param[out] _pstStrings return array of char
412 * @return if the operation successed (0) or not ( !0 ) 409 * @return if the operation successed (0) or not ( !0 )
413 */ 410 */
414API_SCILAB_IMPEXP int getMatrixOfStringInList(int _iVar, int* _piParent, int _iItemPos, int* _piRows, int* _piCols, int* _piLength, char** _pstStrings); 411API_SCILAB_IMPEXP int getMatrixOfStringInList(int* _piParent, int _iItemPos, int* _piRows, int* _piCols, int* _piLength, char** _pstStrings);
415 412
416/** 413/**
417 * Create string variable in a list 414 * Create string variable in a list
@@ -456,7 +453,6 @@ API_SCILAB_IMPEXP int readMatrixOfStringInNamedList(char* _pstName, int* _piPare
456 453
457/** 454/**
458 * Get boolean variable data from a list 455 * Get boolean variable data from a list
459 * @param[in] _iVar variable number
460 * @param[in] _piParent pointer on the parent 456 * @param[in] _piParent pointer on the parent
461 * @param[in] _iItemPos position of the new list in the parent 457 * @param[in] _iItemPos position of the new list in the parent
462 * @param[out] _piRows return number of row 458 * @param[out] _piRows return number of row
@@ -464,7 +460,7 @@ API_SCILAB_IMPEXP int readMatrixOfStringInNamedList(char* _pstName, int* _piPare
464 * @param[out] _piBool return pointer on data 460 * @param[out] _piBool return pointer on data
465 * @return if the operation successed (0) or not ( !0 ) 461 * @return if the operation successed (0) or not ( !0 )
466 */ 462 */
467API_SCILAB_IMPEXP int getMatrixOfBooleanInList(int _iVar, int* _piParent, int _iItemPos, int* _piRows, int* _piCols, int** _piBool); 463API_SCILAB_IMPEXP int getMatrixOfBooleanInList(int* _piParent, int _iItemPos, int* _piRows, int* _piCols, int** _piBool);
468 464
469/** 465/**
470 * Alloc boolean variable in a list 466 * Alloc boolean variable in a list
@@ -520,7 +516,6 @@ API_SCILAB_IMPEXP int readMatrixOfBooleanInNamedList(char* _pstName, int* _piPar
520 516
521/** 517/**
522 * Get polynomial variable in list 518 * Get polynomial variable in list
523 * @param[in] _iVar variable number
524 * @param[in] _piParent address of parent node 519 * @param[in] _piParent address of parent node
525 * @param[in] _iItemPos item postion in the list 520 * @param[in] _iItemPos item postion in the list
526 * @param[out] _piRows return number of row 521 * @param[out] _piRows return number of row
@@ -529,11 +524,10 @@ API_SCILAB_IMPEXP int readMatrixOfBooleanInNamedList(char* _pstName, int* _piPar
529 * @param[out] _pdblReal return polynomials coefficients 524 * @param[out] _pdblReal return polynomials coefficients
530 * @return if the operation successed (0) or not ( !0 ) 525 * @return if the operation successed (0) or not ( !0 )
531 */ 526 */
532API_SCILAB_IMPEXP int getMatrixOfPolyInList(int _iVar, int* _piParent, int _iItemPos, int* _piRows, int* _piCols, int* _piNbCoef, double** _pdblReal); 527API_SCILAB_IMPEXP int getMatrixOfPolyInList(int* _piParent, int _iItemPos, int* _piRows, int* _piCols, int* _piNbCoef, double** _pdblReal);
533 528
534/** 529/**
535 * Get complex polynomial variable in list 530 * Get complex polynomial variable in list
536 * @param[in] _iVar variable number
537 * @param[in] _piParent address of parent node 531 * @param[in] _piParent address of parent node
538 * @param[in] _iItemPos item postion in the list 532 * @param[in] _iItemPos item postion in the list
539 * @param[out] _piRows return number of row 533 * @param[out] _piRows return number of row
@@ -543,7 +537,7 @@ API_SCILAB_IMPEXP int getMatrixOfPolyInList(int _iVar, int* _piParent, int _iIte
543 * @param[out] _pdblImg return polynomials coefficients 537 * @param[out] _pdblImg return polynomials coefficients
544 * @return if the operation successed (0) or not ( !0 ) 538 * @return if the operation successed (0) or not ( !0 )
545 */ 539 */
546API_SCILAB_IMPEXP int getComplexMatrixOfPolyInList(int _iVar, int* _piParent, int _iItemPos, int* _piRows, int* _piCols, int* _piNbCoef, double** _pdblReal, double** _pdblImg); 540API_SCILAB_IMPEXP int getComplexMatrixOfPolyInList(int* _piParent, int _iItemPos, int* _piRows, int* _piCols, int* _piNbCoef, double** _pdblReal, double** _pdblImg);
547 541
548/** 542/**
549 * Create polynomial variable in list 543 * Create polynomial variable in list
@@ -739,7 +733,6 @@ API_SCILAB_IMPEXP int allocMatrixOfUnsignedInteger64InList(int _iVar, int* _piPa
739#endif 733#endif
740/** 734/**
741 * read integer 8 variable in a list 735 * read integer 8 variable in a list
742 * @param[in] _iVar variable number
743 * @param[in] _piParent address of parent node 736 * @param[in] _piParent address of parent node
744 * @param[in] _iItemPos item postion in the list 737 * @param[in] _iItemPos item postion in the list
745 * @param[out] _iRows Number of row 738 * @param[out] _iRows Number of row
@@ -747,12 +740,11 @@ API_SCILAB_IMPEXP int allocMatrixOfUnsignedInteger64InList(int _iVar, int* _piPa
747 * @param[out] _pcData return pointer on data 740 * @param[out] _pcData return pointer on data
748 * @return if the operation successed (0) or not ( !0 ) 741 * @return if the operation successed (0) or not ( !0 )
749 */ 742 */
750API_SCILAB_IMPEXP int getMatrixOfInteger8InList(int _iVar, int* _piParent, int _iItemPos, int* _piRows, int* _piCols, char** _pcData); 743API_SCILAB_IMPEXP int getMatrixOfInteger8InList(int* _piParent, int _iItemPos, int* _piRows, int* _piCols, char** _pcData);
751API_SCILAB_IMPEXP int getMatrixOfUnsignedInteger8InList(int _iVar, int* _piParent, int _iItemPos, int* _piRows, int* _piCols, unsigned char** _pucData); 744API_SCILAB_IMPEXP int getMatrixOfUnsignedInteger8InList(int* _piParent, int _iItemPos, int* _piRows, int* _piCols, unsigned char** _pucData);
752 745
753/** 746/**
754 * read integer 16 variable in a list 747 * read integer 16 variable in a list
755 * @param[in] _iVar variable number
756 * @param[in] _piParent address of parent node 748 * @param[in] _piParent address of parent node
757 * @param[in] _iItemPos item postion in the list 749 * @param[in] _iItemPos item postion in the list
758 * @param[out] _iRows Number of row 750 * @param[out] _iRows Number of row
@@ -760,12 +752,11 @@ API_SCILAB_IMPEXP int getMatrixOfUnsignedInteger8InList(int _iVar, int* _piParen
760 * @param[out] _psData return pointer on data 752 * @param[out] _psData return pointer on data
761 * @return if the operation successed (0) or not ( !0 ) 753 * @return if the operation successed (0) or not ( !0 )
762 */ 754 */
763API_SCILAB_IMPEXP int getMatrixOfInteger16InList(int _iVar, int* _piParent, int _iItemPos, int* _piRows, int* _piCols, short** _psData); 755API_SCILAB_IMPEXP int getMatrixOfInteger16InList(int* _piParent, int _iItemPos, int* _piRows, int* _piCols, short** _psData);
764API_SCILAB_IMPEXP int getMatrixOfUnsignedInteger16InList(int _iVar, int* _piParent, int _iItemPos, int* _piRows, int* _piCols, unsigned short** _pusData); 756API_SCILAB_IMPEXP int getMatrixOfUnsignedInteger16InList(int* _piParent, int _iItemPos, int* _piRows, int* _piCols, unsigned short** _pusData);
765 757
766/** 758/**
767 * read integer 32 variable in a list 759 * read integer 32 variable in a list
768 * @param[in] _iVar variable number
769 * @param[in] _piParent address of parent node 760 * @param[in] _piParent address of parent node
770 * @param[in] _iItemPos item postion in the list 761 * @param[in] _iItemPos item postion in the list
771 * @param[out] _iRows Number of row 762 * @param[out] _iRows Number of row
@@ -773,12 +764,11 @@ API_SCILAB_IMPEXP int getMatrixOfUnsignedInteger16InList(int _iVar, int* _piPare
773 * @param[out] _piData return pointer on data 764 * @param[out] _piData return pointer on data
774 * @return if the operation successed (0) or not ( !0 ) 765 * @return if the operation successed (0) or not ( !0 )
775 */ 766 */
776API_SCILAB_IMPEXP int getMatrixOfInteger32InList(int _iVar, int* _piParent, int _iItemPos, int* _piRows, int* _piCols, int** _piData); 767API_SCILAB_IMPEXP int getMatrixOfInteger32InList(int* _piParent, int _iItemPos, int* _piRows, int* _piCols, int** _piData);
777API_SCILAB_IMPEXP int getMatrixOfUnsignedInteger32InList(int _iVar, int* _piParent, int _iItemPos, int* _piRows, int* _piCols, unsigned int** _puiData); 768API_SCILAB_IMPEXP int getMatrixOfUnsignedInteger32InList(int* _piParent, int _iItemPos, int* _piRows, int* _piCols, unsigned int** _puiData);
778 769
779/** 770/**
780 * read integer 64 variable in a list 771 * read integer 64 variable in a list
781 * @param[in] _iVar variable number
782 * @param[in] _piParent address of parent node 772 * @param[in] _piParent address of parent node
783 * @param[in] _iItemPos item postion in the list 773 * @param[in] _iItemPos item postion in the list
784 * @param[out] _iRows Number of row 774 * @param[out] _iRows Number of row
@@ -787,8 +777,8 @@ API_SCILAB_IMPEXP int getMatrixOfUnsignedInteger32InList(int _iVar, int* _piPare
787 * @return if the operation successed (0) or not ( !0 ) 777 * @return if the operation successed (0) or not ( !0 )
788 */ 778 */
789#ifdef __SCILAB_INT64__ 779#ifdef __SCILAB_INT64__
790API_SCILAB_IMPEXP int getMatrixOfInteger64InList(int _iVar, int* _piParent, int _iItemPos, int* _piRows, int* _piCols, long long** _pllData); 780API_SCILAB_IMPEXP int getMatrixOfInteger64InList(int* _piParent, int _iItemPos, int* _piRows, int* _piCols, long long** _pllData);
791API_SCILAB_IMPEXP int getMatrixOfUnsignedInteger64InList(int _iVar, int* _piParent, int _iItemPos, int* _piRows, int* _piCols, unsigned long long** _pullData); 781API_SCILAB_IMPEXP int getMatrixOfUnsignedInteger64InList(int* _piParent, int _iItemPos, int* _piRows, int* _piCols, unsigned long long** _pullData);
792#endif 782#endif
793 783
794/** 784/**
@@ -978,7 +968,7 @@ API_SCILAB_IMPEXP int createComplexSparseMatrixInNamedList(char* _pstName, int*
978 * @param[out] _pdblReal pointer on data 968 * @param[out] _pdblReal pointer on data
979 * @return if the operation successed (0) or not ( !0 ) 969 * @return if the operation successed (0) or not ( !0 )
980 */ 970 */
981API_SCILAB_IMPEXP int getSparseMatrixInList(int _iVar, int* _piParent, int _iItemPos, int* _piRows, int* _piCols, int* _piNbItem, int** _piNbItemRow, int** _piColPos, double** _pdblReal); 971API_SCILAB_IMPEXP int getSparseMatrixInList(int* _piParent, int _iItemPos, int* _piRows, int* _piCols, int* _piNbItem, int** _piNbItemRow, int** _piColPos, double** _pdblReal);
982 972
983/** 973/**
984 * get complex sparse variable in a list 974 * get complex sparse variable in a list
@@ -994,7 +984,7 @@ API_SCILAB_IMPEXP int getSparseMatrixInList(int _iVar, int* _piParent, int _iIte
994 * @param[out] _pdblImg pointer on img data 984 * @param[out] _pdblImg pointer on img data
995 * @return if the operation successed (0) or not ( !0 ) 985 * @return if the operation successed (0) or not ( !0 )
996 */ 986 */
997API_SCILAB_IMPEXP int getComplexSparseMatrixInList(int _iVar, int* _piParent, int _iItemPos, int* _piRows, int* _piCols, int* _piNbItem, int** _piNbItemRow, int** _piColPos, double** _pdblReal, double** _pdblImg); 987API_SCILAB_IMPEXP int getComplexSparseMatrixInList(int* _piParent, int _iItemPos, int* _piRows, int* _piCols, int* _piNbItem, int** _piNbItemRow, int** _piColPos, double** _pdblReal, double** _pdblImg);
998 988
999/** 989/**
1000 * read sparse variable in a named list 990 * read sparse variable in a named list
@@ -1072,7 +1062,7 @@ API_SCILAB_IMPEXP int createBooleanSparseMatrixInNamedList(char* _pstName, int*
1072 * @param[out] _piColPos array of item column position ( 1 indexed ) 1062 * @param[out] _piColPos array of item column position ( 1 indexed )
1073 * @return if the operation successed (0) or not ( !0 ) 1063 * @return if the operation successed (0) or not ( !0 )
1074 */ 1064 */
1075API_SCILAB_IMPEXP int getBooleanSparseMatrixInList(int _iVar, int* _piParent, int _iItemPos, int* _piRows, int* _piCols, int* _piNbItem, int** _piNbItemRow, int** _piColPos); 1065API_SCILAB_IMPEXP int getBooleanSparseMatrixInList(int* _piParent, int _iItemPos, int* _piRows, int* _piCols, int* _piNbItem, int** _piNbItemRow, int** _piColPos);
1076 1066
1077/** 1067/**
1078 * read sparse variable in a named list 1068 * read sparse variable in a named list
@@ -1101,7 +1091,7 @@ API_SCILAB_IMPEXP int readBooleanSparseMatrixInNamedList(char* _pstName, int* _p
1101 * @param[out] _pvPtr return pointer value 1091 * @param[out] _pvPtr return pointer value
1102 * @return if the operation successed (0) or not ( !0 ) 1092 * @return if the operation successed (0) or not ( !0 )
1103 */ 1093 */
1104API_SCILAB_IMPEXP int getPointerInList(int _iVar, int* _piParent, int _iItemPos, void** _pvPtr); 1094API_SCILAB_IMPEXP int getPointerInList(int* _piParent, int _iItemPos, void** _pvPtr);
1105 1095
1106/** 1096/**
1107 * Create pointer in a list 1097 * Create pointer in a list
diff --git a/scilab/modules/api_scilab/src/cpp/api_boolean.cpp b/scilab/modules/api_scilab/src/cpp/api_boolean.cpp
index 25cc4fd..43463d2 100644
--- a/scilab/modules/api_scilab/src/cpp/api_boolean.cpp
+++ b/scilab/modules/api_scilab/src/cpp/api_boolean.cpp
@@ -19,7 +19,7 @@
19#include "api_internal_common.h" 19#include "api_internal_common.h"
20#include "api_internal_boolean.h" 20#include "api_internal_boolean.h"
21 21
22#include "CallScilab.h" 22#include "call_scilab.h"
23#include "stack-c.h" 23#include "stack-c.h"
24 24
25 25
diff --git a/scilab/modules/api_scilab/src/cpp/api_boolean_sparse.cpp b/scilab/modules/api_scilab/src/cpp/api_boolean_sparse.cpp
index 3972539..1c7fcc3 100644
--- a/scilab/modules/api_scilab/src/cpp/api_boolean_sparse.cpp
+++ b/scilab/modules/api_scilab/src/cpp/api_boolean_sparse.cpp
@@ -19,7 +19,7 @@
19#include "api_internal_boolean_sparse.h" 19#include "api_internal_boolean_sparse.h"
20 20
21 21
22#include "CallScilab.h" 22#include "call_scilab.h"
23#include "stack-c.h" 23#include "stack-c.h"
24 24
25 25
diff --git a/scilab/modules/api_scilab/src/cpp/api_common.cpp b/scilab/modules/api_scilab/src/cpp/api_common.cpp
index 3d23dda..cb4e5a4 100644
--- a/scilab/modules/api_scilab/src/cpp/api_common.cpp
+++ b/scilab/modules/api_scilab/src/cpp/api_common.cpp
@@ -16,7 +16,7 @@
16#include <string.h> 16#include <string.h>
17#include <stdlib.h> 17#include <stdlib.h>
18#include "machine.h" 18#include "machine.h"
19#include "CallScilab.h" 19#include "call_scilab.h"
20#include "api_common.h" 20#include "api_common.h"
21#include "api_internal_common.h" 21#include "api_internal_common.h"
22#include "api_double.h" 22#include "api_double.h"
diff --git a/scilab/modules/api_scilab/src/cpp/api_double.cpp b/scilab/modules/api_scilab/src/cpp/api_double.cpp
index 6278bf5..d249eb8 100644
--- a/scilab/modules/api_scilab/src/cpp/api_double.cpp
+++ b/scilab/modules/api_scilab/src/cpp/api_double.cpp
@@ -19,7 +19,7 @@
19#include "api_internal_double.h" 19#include "api_internal_double.h"
20 20
21 21
22#include "CallScilab.h" 22#include "call_scilab.h"
23#include "stack-c.h" 23#include "stack-c.h"
24 24
25/*******************************/ 25/*******************************/
diff --git a/scilab/modules/api_scilab/src/cpp/api_int.cpp b/scilab/modules/api_scilab/src/cpp/api_int.cpp
index 52ab730..c1aa9dc 100644
--- a/scilab/modules/api_scilab/src/cpp/api_int.cpp
+++ b/scilab/modules/api_scilab/src/cpp/api_int.cpp
@@ -18,7 +18,7 @@
18#include "api_internal_int.h" 18#include "api_internal_int.h"
19#include "api_int.h" 19#include "api_int.h"
20 20
21#include "CallScilab.h" 21#include "call_scilab.h"
22#include "stack-c.h" 22#include "stack-c.h"
23 23
24int getMatrixOfIntegerPrecision(int* _piAddress, int* _piPrecision) 24int getMatrixOfIntegerPrecision(int* _piAddress, int* _piPrecision)
diff --git a/scilab/modules/api_scilab/src/cpp/api_list.cpp b/scilab/modules/api_scilab/src/cpp/api_list.cpp
index 81ae85d..afebbc3 100644
--- a/scilab/modules/api_scilab/src/cpp/api_list.cpp
+++ b/scilab/modules/api_scilab/src/cpp/api_list.cpp
@@ -15,7 +15,7 @@
15 15
16#include "MALLOC.h" 16#include "MALLOC.h"
17#include "stack-c.h" 17#include "stack-c.h"
18#include "CallScilab.h" 18#include "call_scilab.h"
19 19
20#include "api_common.h" 20#include "api_common.h"
21#include "api_internal_common.h" 21#include "api_internal_common.h"
@@ -51,14 +51,14 @@ static void updateNamedListOffset(int _iVar, int *_piCurrentNode, int _iItemPos,
51static void updateCommunListOffset(int _iVar, int *_piCurrentNode, int _iItemPos, int *_piEnd); 51static void updateCommunListOffset(int _iVar, int *_piCurrentNode, int _iItemPos, int *_piEnd);
52 52
53static int allocCommonMatrixOfDoubleInList(int _iVar, int* _piParent, int _iItemPos, int _iComplex, int _iRows, int _iCols, double **_pdblReal, double **_pdblImg); 53static int allocCommonMatrixOfDoubleInList(int _iVar, int* _piParent, int _iItemPos, int _iComplex, int _iRows, int _iCols, double **_pdblReal, double **_pdblImg);
54static int getCommonMatrixOfDoubleInList(int _iVar, int* _piParent, int _iItemPos, int _iComplex, int* _piRows, int* _piCols, double** _pdblReal, double** _pdblImg); 54static int getCommonMatrixOfDoubleInList(int* _piParent, int _iItemPos, int _iComplex, int* _piRows, int* _piCols, double** _pdblReal, double** _pdblImg);
55static int createCommonMatrixOfDoubleInList(int _iVar, int* _piParent, int _iItemPos, int _iComplex, int _iRows, int _iCols, double* _pdblReal, double* _pdblImg); 55static int createCommonMatrixOfDoubleInList(int _iVar, int* _piParent, int _iItemPos, int _iComplex, int _iRows, int _iCols, double* _pdblReal, double* _pdblImg);
56static int fillCommonMatrixOfDoubleInList(int _iVar, int* _piParent, int _iItemPos, int _iComplex, int _iRows, int _iCols, double** _pdblReal, double** _pdblImg); 56static int fillCommonMatrixOfDoubleInList(int _iVar, int* _piParent, int _iItemPos, int _iComplex, int _iRows, int _iCols, double** _pdblReal, double** _pdblImg);
57static int createCommomMatrixOfDoubleInNamedList(char* _pstName, int* _piParent, int _iItemPos, int _iComplex, int _iRows, int _iCols, double* _pdblReal, double* _pdblImg); 57static int createCommomMatrixOfDoubleInNamedList(char* _pstName, int* _piParent, int _iItemPos, int _iComplex, int _iRows, int _iCols, double* _pdblReal, double* _pdblImg);
58static int readCommonMatrixOfDoubleInNamedList(char* _pstName, int* _piParent, int _iItemPos, int _iComplex, int* _piRows, int* _piCols, double* _pdblReal, double* _pdblImg); 58static int readCommonMatrixOfDoubleInNamedList(char* _pstName, int* _piParent, int _iItemPos, int _iComplex, int* _piRows, int* _piCols, double* _pdblReal, double* _pdblImg);
59static int allocCommonItemInList(int* _piParent, int _iItemPos, int** _piChildAddr); 59static int allocCommonItemInList(int* _piParent, int _iItemPos, int** _piChildAddr);
60static int fillMatrixOfBoolInList(int _iVar, int* _piParent, int _iItemPos, int _iRows, int _iCols, int** _piBool); 60static int fillMatrixOfBoolInList(int _iVar, int* _piParent, int _iItemPos, int _iRows, int _iCols, int** _piBool);
61static int getCommonxMatrixOfPolyInList(int _iVar, int* _piParent, int _iItemPos, int _iComplex, int* _piRows, int* _piCols, int* _piNbCoef, double** _pdblReal, double** _pdblImg); 61static int getCommonxMatrixOfPolyInList(int* _piParent, int _iItemPos, int _iComplex, int* _piRows, int* _piCols, int* _piNbCoef, double** _pdblReal, double** _pdblImg);
62static int createCommonMatrixOfPolyInList(int _iVar, int* _piParent, int _iItemPos, char* _pstVarName, int _iComplex, int _iRows, int _iCols, int* _piNbCoef, double** _pdblReal, double** _pdblImg); 62static int createCommonMatrixOfPolyInList(int _iVar, int* _piParent, int _iItemPos, char* _pstVarName, int _iComplex, int _iRows, int _iCols, int* _piNbCoef, double** _pdblReal, double** _pdblImg);
63static int fillCommonMatrixOfPolyInList(int _iVar, int* _piParent, int _iItemPos, char* _pstVarName, int _iComplex, int _iRows, int _iCols, int* _piNbCoef, double** _pdblReal, double** _pdblImg, int* _piTotalLen); 63static int fillCommonMatrixOfPolyInList(int _iVar, int* _piParent, int _iItemPos, char* _pstVarName, int _iComplex, int _iRows, int _iCols, int* _piNbCoef, double** _pdblReal, double** _pdblImg, int* _piTotalLen);
64static int fillCommonMatrixOfStringInList(int _iVar, int* _piParent, int _iItemPos, int _iRows, int _iCols, char** _pstStrings, int* _piTotalLen); 64static int fillCommonMatrixOfStringInList(int _iVar, int* _piParent, int _iItemPos, int _iRows, int _iCols, char** _pstStrings, int* _piTotalLen);
@@ -319,17 +319,17 @@ int getCommomListInNamedList(char* _pstName, int* _piParent, int _iItemPos, int
319 * Double functions * 319 * Double functions *
320 *********************/ 320 *********************/
321 321
322int getMatrixOfDoubleInList(int _iVar, int* _piParent, int _iItemPos, int* _piRows, int* _piCols, double** _pdblReal) 322int getMatrixOfDoubleInList(int* _piParent, int _iItemPos, int* _piRows, int* _piCols, double** _pdblReal)
323{ 323{
324 return getCommonMatrixOfDoubleInList(_iVar, _piParent,_iItemPos, 0, _piRows, _piCols, _pdblReal, NULL); 324 return getCommonMatrixOfDoubleInList(_piParent,_iItemPos, 0, _piRows, _piCols, _pdblReal, NULL);
325} 325}
326 326
327int getComplexMatrixOfDoubleInList(int _iVar, int* _piParent, int _iItemPos, int* _piRows, int* _piCols, double** _pdblReal, double** _pdblImg) 327int getComplexMatrixOfDoubleInList(int* _piParent, int _iItemPos, int* _piRows, int* _piCols, double** _pdblReal, double** _pdblImg)
328{ 328{
329 return getCommonMatrixOfDoubleInList(_iVar, _piParent,_iItemPos, 1, _piRows, _piCols, _pdblReal, _pdblImg); 329 return getCommonMatrixOfDoubleInList(_piParent,_iItemPos, 1, _piRows, _piCols, _pdblReal, _pdblImg);
330} 330}
331 331
332static int getCommonMatrixOfDoubleInList(int _iVar, int* _piParent, int _iItemPos, int _iComplex, int* _piRows, int* _piCols, double** _pdblReal, double** _pdblImg) 332static int getCommonMatrixOfDoubleInList(int* _piParent, int _iItemPos, int _iComplex, int* _piRows, int* _piCols, double** _pdblReal, double** _pdblImg)
333{ 333{
334 int iRet = 0; 334 int iRet = 0;
335 int* piAddr = NULL; 335 int* piAddr = NULL;
@@ -767,7 +767,7 @@ static int readCommonMatrixOfDoubleInNamedList(char* _pstName, int* _piParent, i
767 * Strings functions * 767 * Strings functions *
768 *********************/ 768 *********************/
769 769
770int getMatrixOfStringInList(int _iVar, int* _piParent, int _iItemPos, int* _piRows, int* _piCols, int* _piLength, char** _pstStrings) 770int getMatrixOfStringInList(int* _piParent, int _iItemPos, int* _piRows, int* _piCols, int* _piLength, char** _pstStrings)
771{ 771{
772 int iRet = 0; 772 int iRet = 0;
773 int* piAddr = NULL; 773 int* piAddr = NULL;
@@ -940,7 +940,7 @@ int readMatrixOfStringInNamedList(char* _pstName, int* _piParent, int _iItemPos,
940 * boolean functions * 940 * boolean functions *
941 *********************/ 941 *********************/
942 942
943int getMatrixOfBooleanInList(int _iVar, int* _piParent, int _iItemPos, int* _piRows, int* _piCols, int** _piBool) 943int getMatrixOfBooleanInList(int* _piParent, int _iItemPos, int* _piRows, int* _piCols, int** _piBool)
944{ 944{
945 int iRet = 0; 945 int iRet = 0;
946 int* piAddr = NULL; 946 int* piAddr = NULL;
@@ -1130,17 +1130,17 @@ int readMatrixOfBooleanInNamedList(char* _pstName, int* _piParent, int _iItemPos
1130 * polynomials functions * 1130 * polynomials functions *
1131 *************************/ 1131 *************************/
1132 1132
1133int getMatrixOfPolyInList(int _iVar, int* _piParent, int _iItemPos, int* _piRows, int* _piCols, int* _piNbCoef, double** _pdblReal) 1133int getMatrixOfPolyInList(int* _piParent, int _iItemPos, int* _piRows, int* _piCols, int* _piNbCoef, double** _pdblReal)
1134{ 1134{
1135 return getCommonxMatrixOfPolyInList(_iVar, _piParent, _iItemPos, 0, _piRows, _piCols, _piNbCoef, _pdblReal, NULL); 1135 return getCommonxMatrixOfPolyInList(_piParent, _iItemPos, 0, _piRows, _piCols, _piNbCoef, _pdblReal, NULL);
1136} 1136}
1137 1137
1138int getComplexMatrixOfPolyInList(int _iVar, int* _piParent, int _iItemPos, int* _piRows, int* _piCols, int* _piNbCoef, double** _pdblReal, double** _pdblImg) 1138int getComplexMatrixOfPolyInList(int* _piParent, int _iItemPos, int* _piRows, int* _piCols, int* _piNbCoef, double** _pdblReal, double** _pdblImg)
1139{ 1139{
1140 return getCommonxMatrixOfPolyInList(_iVar, _piParent, _iItemPos, 1, _piRows, _piCols, _piNbCoef, _pdblReal, _pdblImg); 1140 return getCommonxMatrixOfPolyInList(_piParent, _iItemPos, 1, _piRows, _piCols, _piNbCoef, _pdblReal, _pdblImg);
1141} 1141}
1142 1142
1143int getCommonxMatrixOfPolyInList(int _iVar, int* _piParent, int _iItemPos, int _iComplex, int* _piRows, int* _piCols, int* _piNbCoef, double** _pdblReal, double** _pdblImg) 1143int getCommonxMatrixOfPolyInList(int* _piParent, int _iItemPos, int _iComplex, int* _piRows, int* _piCols, int* _piNbCoef, double** _pdblReal, double** _pdblImg)
1144{ 1144{
1145 int iRet = 0; 1145 int iRet = 0;
1146 int* piAddr = NULL; 1146 int* piAddr = NULL;
@@ -1491,7 +1491,7 @@ int createMatrixOfInteger32InList(int _iVar, int* _piParent, int _iItemPos, int
1491 return createCommomMatrixOfIntegerInList(_iVar, _piParent, _iItemPos, SCI_INT32, _iRows, _iCols, _piData); 1491 return createCommomMatrixOfIntegerInList(_iVar, _piParent, _iItemPos, SCI_INT32, _iRows, _iCols, _piData);
1492} 1492}
1493 1493
1494static int getCommonMatrixOfIntegerInList(int _iVar, int* _piParent, int _iItemPos, int _iPrecision, int* _piRows, int* _piCols, void** _pvData) 1494static int getCommonMatrixOfIntegerInList(int* _piParent, int _iItemPos, int _iPrecision, int* _piRows, int* _piCols, void** _pvData)
1495{ 1495{
1496 int iRet = 0; 1496 int iRet = 0;
1497 int* piAddr = NULL; 1497 int* piAddr = NULL;
@@ -1511,34 +1511,34 @@ static int getCommonMatrixOfIntegerInList(int _iVar, int* _piParent, int _iItemP
1511 return 0; 1511 return 0;
1512} 1512}
1513 1513
1514int getMatrixOfUnsignedInteger8InList(int _iVar, int* _piParent, int _iItemPos, int* _piRows, int* _piCols, unsigned char** _pucData) 1514int getMatrixOfUnsignedInteger8InList(int* _piParent, int _iItemPos, int* _piRows, int* _piCols, unsigned char** _pucData)
1515{ 1515{
1516 return getCommonMatrixOfIntegerInList(_iVar, _piParent, _iItemPos, SCI_UINT8, _piRows, _piCols, (void**)_pucData); 1516 return getCommonMatrixOfIntegerInList(_piParent, _iItemPos, SCI_UINT8, _piRows, _piCols, (void**)_pucData);
1517} 1517}
1518 1518
1519int getMatrixOfUnsignedInteger16InList(int _iVar, int* _piParent, int _iItemPos, int* _piRows, int* _piCols, unsigned short** _pusData) 1519int getMatrixOfUnsignedInteger16InList(int* _piParent, int _iItemPos, int* _piRows, int* _piCols, unsigned short** _pusData)
1520{ 1520{
1521 return getCommonMatrixOfIntegerInList(_iVar, _piParent, _iItemPos, SCI_UINT16, _piRows, _piCols, (void**)_pusData); 1521 return getCommonMatrixOfIntegerInList(_piParent, _iItemPos, SCI_UINT16, _piRows, _piCols, (void**)_pusData);
1522} 1522}
1523 1523
1524int getMatrixOfUnsignedInteger32InList(int _iVar, int* _piParent, int _iItemPos, int* _piRows, int* _piCols, unsigned int** _puiData) 1524int getMatrixOfUnsignedInteger32InList(int* _piParent, int _iItemPos, int* _piRows, int* _piCols, unsigned int** _puiData)
1525{ 1525{
1526 return getCommonMatrixOfIntegerInList(_iVar, _piParent, _iItemPos, SCI_UINT32, _piRows, _piCols, (void**)_puiData); 1526 return getCommonMatrixOfIntegerInList(_piParent, _iItemPos, SCI_UINT32, _piRows, _piCols, (void**)_puiData);
1527} 1527}
1528 1528
1529int getMatrixOfInteger8InList(int _iVar, int* _piParent, int _iItemPos, int* _piRows, int* _piCols, char** _pcData) 1529int getMatrixOfInteger8InList(int* _piParent, int _iItemPos, int* _piRows, int* _piCols, char** _pcData)
1530{ 1530{
1531 return getCommonMatrixOfIntegerInList(_iVar, _piParent, _iItemPos, SCI_INT8, _piRows, _piCols, (void**)_pcData); 1531 return getCommonMatrixOfIntegerInList(_piParent, _iItemPos, SCI_INT8, _piRows, _piCols, (void**)_pcData);
1532} 1532}
1533 1533
1534int getMatrixOfInteger16InList(int _iVar, int* _piParent, int _iItemPos, int* _piRows, int* _piCols, short** _psData) 1534int getMatrixOfInteger16InList(int* _piParent, int _iItemPos, int* _piRows, int* _piCols, short** _psData)
1535{ 1535{
1536 return getCommonMatrixOfIntegerInList(_iVar, _piParent, _iItemPos, SCI_INT16, _piRows, _piCols, (void**)_psData); 1536 return getCommonMatrixOfIntegerInList(_piParent, _iItemPos, SCI_INT16, _piRows, _piCols, (void**)_psData);
1537} 1537}
1538 1538
1539int getMatrixOfInteger32InList(int _iVar, int* _piParent, int _iItemPos, int* _piRows, int* _piCols, int** _piData) 1539int getMatrixOfInteger32InList(int* _piParent, int _iItemPos, int* _piRows, int* _piCols, int** _piData)
1540{ 1540{
1541 return getCommonMatrixOfIntegerInList(_iVar, _piParent, _iItemPos, SCI_INT32, _piRows, _piCols, (void**)_piData); 1541 return getCommonMatrixOfIntegerInList(_piParent, _iItemPos, SCI_INT32, _piRows, _piCols, (void**)_piData);
1542} 1542}
1543 1543
1544static int createCommonMatrixOfIntegerInNamedList(char* _pstName, int* _piParent, int _iItemPos, int _iPrecision, int _iRows, int _iCols, void* _pvData) 1544static int createCommonMatrixOfIntegerInNamedList(char* _pstName, int* _piParent, int _iItemPos, int _iPrecision, int _iRows, int _iCols, void* _pvData)
@@ -1852,7 +1852,7 @@ int createComplexSparseMatrixInNamedList(char* _pstName, int* _piParent, int _iI
1852 return createCommonSparseMatrixInNamedList(_pstName, _piParent, _iItemPos, 1, _iRows, _iCols, _iNbItem, _piNbItemRow, _piColPos, _pdblReal, _pdblImg); 1852 return createCommonSparseMatrixInNamedList(_pstName, _piParent, _iItemPos, 1, _iRows, _iCols, _iNbItem, _piNbItemRow, _piColPos, _pdblReal, _pdblImg);
1853} 1853}
1854 1854
1855static int getCommonSparseMatrixInList(int _iVar, int* _piParent, int _iItemPos, int _iComplex, int* _piRows, int* _piCols, int* _piNbItem, int** _piNbItemRow, int** _piColPos, double** _pdblReal, double** _pdblImg) 1855static int getCommonSparseMatrixInList(int* _piParent, int _iItemPos, int _iComplex, int* _piRows, int* _piCols, int* _piNbItem, int** _piNbItemRow, int** _piColPos, double** _pdblReal, double** _pdblImg)
1856{ 1856{
1857 int iRet = 0; 1857 int iRet = 0;
1858 int* piAddr = NULL; 1858 int* piAddr = NULL;
@@ -1872,14 +1872,14 @@ static int getCommonSparseMatrixInList(int _iVar, int* _piParent, int _iItemPos,
1872 return 0; 1872 return 0;
1873} 1873}
1874 1874
1875int getSparseMatrixInList(int _iVar, int* _piParent, int _iItemPos, int* _piRows, int* _piCols, int* _piNbItem, int** _piNbItemRow, int** _piColPos, double** _pdblReal) 1875int getSparseMatrixInList(int* _piParent, int _iItemPos, int* _piRows, int* _piCols, int* _piNbItem, int** _piNbItemRow, int** _piColPos, double** _pdblReal)
1876{ 1876{
1877 return getCommonSparseMatrixInList(_iVar, _piParent, _iItemPos, 0, _piRows, _piCols, _piNbItem, _piNbItemRow, _piColPos, _pdblReal, NULL); 1877 return getCommonSparseMatrixInList(_piParent, _iItemPos, 0, _piRows, _piCols, _piNbItem, _piNbItemRow, _piColPos, _pdblReal, NULL);
1878} 1878}
1879 1879
1880int getComplexSparseMatrixInList(int _iVar, int* _piParent, int _iItemPos, int* _piRows, int* _piCols, int* _piNbItem, int** _piNbItemRow, int** _piColPos, double** _pdblReal, double** _pdblImg) 1880int getComplexSparseMatrixInList(int* _piParent, int _iItemPos, int* _piRows, int* _piCols, int* _piNbItem, int** _piNbItemRow, int** _piColPos, double** _pdblReal, double** _pdblImg)
1881{ 1881{
1882 return getCommonSparseMatrixInList(_iVar, _piParent, _iItemPos, 1, _piRows, _piCols, _piNbItem, _piNbItemRow, _piColPos, _pdblReal, _pdblImg); 1882 return getCommonSparseMatrixInList(_piParent, _iItemPos, 1, _piRows, _piCols, _piNbItem, _piNbItemRow, _piColPos, _pdblReal, _pdblImg);
1883} 1883}
1884 1884
1885static int readCommonSparseMatrixInNamedList(char* _pstName, int* _piParent, int _iItemPos, int _iComplex, int* _piRows, int* _piCols, int* _piNbItem, int* _piNbItemRow, int* _piColPos, double* _pdblReal, double* _pdblImg) 1885static int readCommonSparseMatrixInNamedList(char* _pstName, int* _piParent, int _iItemPos, int _iComplex, int* _piRows, int* _piCols, int* _piNbItem, int* _piNbItemRow, int* _piColPos, double* _pdblReal, double* _pdblImg)
@@ -2078,7 +2078,7 @@ int createBooleanSparseMatrixInNamedList(char* _pstName, int* _piParent, int _iI
2078 return 0; 2078 return 0;
2079} 2079}
2080 2080
2081int getBooleanSparseMatrixInList(int _iVar, int* _piParent, int _iItemPos, int* _piRows, int* _piCols, int* _piNbItem, int** _piNbItemRow, int** _piColPos) 2081int getBooleanSparseMatrixInList(int* _piParent, int _iItemPos, int* _piRows, int* _piCols, int* _piNbItem, int** _piNbItemRow, int** _piColPos)
2082{ 2082{
2083 int iRet = 0; 2083 int iRet = 0;
2084 int* piAddr = NULL; 2084 int* piAddr = NULL;
@@ -2151,7 +2151,7 @@ int readBooleanSparseMatrixInNamedList(char* _pstName, int* _piParent, int _iIte
2151/********************* 2151/*********************
2152 * Pointer functions * 2152 * Pointer functions *
2153 *********************/ 2153 *********************/
2154int getPointerInList(int _iVar, int* _piParent, int _iItemPos, void** _pvPtr) 2154int getPointerInList(int* _piParent, int _iItemPos, void** _pvPtr)
2155{ 2155{
2156 int iRet = 0; 2156 int iRet = 0;
2157 int* piAddr = NULL; 2157 int* piAddr = NULL;
diff --git a/scilab/modules/api_scilab/src/cpp/api_pointer.cpp b/scilab/modules/api_scilab/src/cpp/api_pointer.cpp
index 40154e4..e6ad6c3 100644
--- a/scilab/modules/api_scilab/src/cpp/api_pointer.cpp
+++ b/scilab/modules/api_scilab/src/cpp/api_pointer.cpp
@@ -24,7 +24,7 @@ int getPointer(int* _piAddress, void** _pvPtr)
24{ 24{
25 int *piTmp = NULL; 25 int *piTmp = NULL;
26 26
27 if( _piAddress == NULL || getVarType(_piAddress) != sci_lufact_pointer) 27 if( _piAddress == NULL || getVarType(_piAddress) != sci_pointer)
28 { 28 {
29 return 1; 29 return 1;
30 } 30 }
@@ -42,7 +42,7 @@ int fillPointer(int *_piAddress, void** _pvPtr)
42 return 1; 42 return 1;
43 } 43 }
44 44
45 _piAddress[0] = sci_lufact_pointer; 45 _piAddress[0] = sci_pointer;
46 _piAddress[1] = 1; 46 _piAddress[1] = 1;
47 _piAddress[2] = 1; 47 _piAddress[2] = 1;
48 _piAddress[3] = 0; 48 _piAddress[3] = 0;
diff --git a/scilab/modules/api_scilab/src/cpp/api_poly.cpp b/scilab/modules/api_scilab/src/cpp/api_poly.cpp
index 0e388c9..f53a65a 100644
--- a/scilab/modules/api_scilab/src/cpp/api_poly.cpp
+++ b/scilab/modules/api_scilab/src/cpp/api_poly.cpp
@@ -19,7 +19,7 @@
19#include "api_poly.h" 19#include "api_poly.h"
20 20
21#include "MALLOC.h" 21#include "MALLOC.h"
22#include "CallScilab.h" 22#include "call_scilab.h"
23#include "stack-c.h" 23#include "stack-c.h"
24extern "C" { 24extern "C" {
25#include "code2str.h" 25#include "code2str.h"
diff --git a/scilab/modules/api_scilab/src/cpp/api_sparse.cpp b/scilab/modules/api_scilab/src/cpp/api_sparse.cpp
index bf81b28..96f6bdb 100644
--- a/scilab/modules/api_scilab/src/cpp/api_sparse.cpp
+++ b/scilab/modules/api_scilab/src/cpp/api_sparse.cpp
@@ -19,7 +19,7 @@
19#include "api_sparse.h" 19#include "api_sparse.h"
20 20
21#include "MALLOC.h" 21#include "MALLOC.h"
22#include "CallScilab.h" 22#include "call_scilab.h"
23#include "stack-c.h" 23#include "stack-c.h"
24 24
25//internal sparse functions 25//internal sparse functions
diff --git a/scilab/modules/api_scilab/src/cpp/api_string.cpp b/scilab/modules/api_scilab/src/cpp/api_string.cpp
index 436f3ec..a80c829 100644
--- a/scilab/modules/api_scilab/src/cpp/api_string.cpp
+++ b/scilab/modules/api_scilab/src/cpp/api_string.cpp
@@ -23,7 +23,7 @@
23#include "api_internal_common.h" 23#include "api_internal_common.h"
24#include "api_string.h" 24#include "api_string.h"
25#include "api_internal_string.h" 25#include "api_internal_string.h"
26#include "CallScilab.h" 26#include "call_scilab.h"
27#include "stack-c.h" 27#include "stack-c.h"
28extern "C" 28extern "C"
29{ 29{
diff --git a/scilab/modules/api_scilab/tests/unit_tests/commom_read_api.c b/scilab/modules/api_scilab/tests/unit_tests/commom_read_api.c
index 2248fcd..40585f5 100644
--- a/scilab/modules/api_scilab/tests/unit_tests/commom_read_api.c
+++ b/scilab/modules/api_scilab/tests/unit_tests/commom_read_api.c
@@ -114,7 +114,7 @@ int get_info(int _iRhs, int* _piParent, int *_piAddr, int _iItemPos)
114 sciprint("MList "); 114 sciprint("MList ");
115 iRet = get_list_info(_iRhs, _piParent, _piAddr, _iItemPos); 115 iRet = get_list_info(_iRhs, _piParent, _piAddr, _iItemPos);
116 break; 116 break;
117 case sci_lufact_pointer : 117 case sci_pointer :
118 iRet = get_pointer_info(_iRhs, _piParent, _piAddr, _iItemPos); 118 iRet = get_pointer_info(_iRhs, _piParent, _piAddr, _iItemPos);
119 break; 119 break;
120 default : 120 default :
diff --git a/scilab/modules/api_scilab/tests/unit_tests/pointer_reading_api.c b/scilab/modules/api_scilab/tests/unit_tests/pointer_reading_api.c
index b8a9153..571bcca 100644
--- a/scilab/modules/api_scilab/tests/unit_tests/pointer_reading_api.c
+++ b/scilab/modules/api_scilab/tests/unit_tests/pointer_reading_api.c
@@ -46,7 +46,7 @@ int read_pointer(char *fname,unsigned long fname_len)
46 return 1; 46 return 1;
47 } 47 }
48 48
49 if(getVarType(piAddr) != sci_lufact_pointer) 49 if(getVarType(piAddr) != sci_pointer)
50 { 50 {
51 return 1; 51 return 1;
52 } 52 }
diff --git a/scilab/modules/arnoldi/Makefile.am b/scilab/modules/arnoldi/Makefile.am
index 683cdce..18927cc 100644
--- a/scilab/modules/arnoldi/Makefile.am
+++ b/scilab/modules/arnoldi/Makefile.am
@@ -101,7 +101,7 @@ libsciarnoldi_la_sci_gatewaydir = $(mydatadir)/sci_gateway
101libsciarnoldi_la_sci_gateway_DATA = sci_gateway/arnoldi_gateway.xml 101libsciarnoldi_la_sci_gateway_DATA = sci_gateway/arnoldi_gateway.xml
102 102
103#### arnoldi : include files #### 103#### arnoldi : include files ####
104libsciarnoldi_la_includedir=$(pkgincludedir)/arnoldi 104libsciarnoldi_la_includedir=$(pkgincludedir)
105libsciarnoldi_la_include_HEADERS = includes/gw_arnoldi.h \ 105libsciarnoldi_la_include_HEADERS = includes/gw_arnoldi.h \
106 includes/dynlib_arnoldi.h 106 includes/dynlib_arnoldi.h
107 107
diff --git a/scilab/modules/arnoldi/Makefile.in b/scilab/modules/arnoldi/Makefile.in
index 273ea73..f4dba95 100644
--- a/scilab/modules/arnoldi/Makefile.in
+++ b/scilab/modules/arnoldi/Makefile.in
@@ -496,7 +496,7 @@ libsciarnoldi_la_sci_gatewaydir = $(mydatadir)/sci_gateway
496libsciarnoldi_la_sci_gateway_DATA = sci_gateway/arnoldi_gateway.xml 496libsciarnoldi_la_sci_gateway_DATA = sci_gateway/arnoldi_gateway.xml
497 497
498#### arnoldi : include files #### 498#### arnoldi : include files ####
499libsciarnoldi_la_includedir = $(pkgincludedir)/arnoldi 499libsciarnoldi_la_includedir = $(pkgincludedir)
500libsciarnoldi_la_include_HEADERS = includes/gw_arnoldi.h \ 500libsciarnoldi_la_include_HEADERS = includes/gw_arnoldi.h \
501 includes/dynlib_arnoldi.h 501 includes/dynlib_arnoldi.h
502 502
@@ -1212,7 +1212,7 @@ check-code:
1212@SWIG_TRUE@swig: $(SWIG_WRAPPERS) 1212@SWIG_TRUE@swig: $(SWIG_WRAPPERS)
1213@SWIG_TRUE@ @SWIG_PACKAGENAME=org.scilab.modules.$(modulename); \ 1213@SWIG_TRUE@ @SWIG_PACKAGENAME=org.scilab.modules.$(modulename); \
1214@SWIG_TRUE@ SWIG_OUTDIR=src/java/org/scilab/modules/$(modulename)/; \ 1214@SWIG_TRUE@ SWIG_OUTDIR=src/java/org/scilab/modules/$(modulename)/; \
1215@SWIG_TRUE@ if test ! -z "$(SWIG_WRAPPERS)"; then \ 1215@SWIG_TRUE@ if test -n "$(SWIG_WRAPPERS)"; then \
1216@SWIG_TRUE@ for file in $(SWIG_WRAPPERS) ; do \ 1216@SWIG_TRUE@ for file in $(SWIG_WRAPPERS) ; do \
1217@SWIG_TRUE@ echo "Swig process of $$file ..."; \ 1217@SWIG_TRUE@ echo "Swig process of $$file ..."; \
1218@SWIG_TRUE@ $(SWIG_BIN) $(SWIG_JAVA) -package $$SWIG_PACKAGENAME -outdir $$SWIG_OUTDIR $$file; \ 1218@SWIG_TRUE@ $(SWIG_BIN) $(SWIG_JAVA) -package $$SWIG_PACKAGENAME -outdir $$SWIG_OUTDIR $$file; \
@@ -1224,7 +1224,7 @@ check-code:
1224 1224
1225@GIWS_TRUE@giws: $(GIWS_WRAPPERS) 1225@GIWS_TRUE@giws: $(GIWS_WRAPPERS)
1226@GIWS_TRUE@ @GIWS_OUTPUTDIR=src/jni/;\ 1226@GIWS_TRUE@ @GIWS_OUTPUTDIR=src/jni/;\
1227@GIWS_TRUE@ if test ! -z "$(GIWS_WRAPPERS)"; then \ 1227@GIWS_TRUE@ if test -n "$(GIWS_WRAPPERS)"; then \
1228@GIWS_TRUE@ for file in $(GIWS_WRAPPERS) ; do \ 1228@GIWS_TRUE@ for file in $(GIWS_WRAPPERS) ; do \
1229@GIWS_TRUE@ echo "GIWS process of $$file ..."; \ 1229@GIWS_TRUE@ echo "GIWS process of $$file ..."; \
1230@GIWS_TRUE@ $(GIWS_BIN) --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \ 1230@GIWS_TRUE@ $(GIWS_BIN) --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
@@ -1330,10 +1330,12 @@ install-data-local:
1330 $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \ 1330 $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
1331 if test -d $(srcdir)/$$dir/; then \ 1331 if test -d $(srcdir)/$$dir/; then \
1332 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 1332 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
1333 for specialExt in $(MACROSSPECIALEXT); do \ 1333 if test -n "$(MACROSSPECIALEXT)"; then \
1334 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 1334 for specialExt in $(MACROSSPECIALEXT); do \
1335 done; \ 1335 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
1336 FILELIST="$$FILELIST $$specialExtDir"; \ 1336 done; \
1337 FILELIST="$$FILELIST $$specialExtDir"; \
1338 fi; \
1337 for file in `ls -1 $$FILELIST 2>/dev/null`; do \ 1339 for file in `ls -1 $$FILELIST 2>/dev/null`; do \
1338 echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \ 1340 echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
1339 $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \ 1341 $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \
diff --git a/scilab/modules/arnoldi/src/arnoldi.rc b/scilab/modules/arnoldi/src/arnoldi.rc
index 5c18885..717cb7f 100644
--- a/scilab/modules/arnoldi/src/arnoldi.rc
+++ b/scilab/modules/arnoldi/src/arnoldi.rc
@@ -7,7 +7,6 @@
7// 7//
8// Generated from the TEXTINCLUDE 2 resource. 8// Generated from the TEXTINCLUDE 2 resource.
9// 9//
10//#include "afxres.h"
11#define APSTUDIO_HIDDEN_SYMBOLS 10#define APSTUDIO_HIDDEN_SYMBOLS
12#include "windows.h" 11#include "windows.h"
13///////////////////////////////////////////////////////////////////////////// 12/////////////////////////////////////////////////////////////////////////////
@@ -33,6 +32,7 @@ BEGIN
33 "resource.h\0" 32 "resource.h\0"
34END 33END
35 34
35
363 TEXTINCLUDE 363 TEXTINCLUDE
37BEGIN 37BEGIN
38 "\r\n" 38 "\r\n"
@@ -57,7 +57,7 @@ VS_VERSION_INFO VERSIONINFO
57 FILEFLAGS 0x0L 57 FILEFLAGS 0x0L
58#endif 58#endif
59 FILEOS 0x4L 59 FILEOS 0x4L
60 FILETYPE 0x2L 60 FILETYPE 0x0L
61 FILESUBTYPE 0x0L 61 FILESUBTYPE 0x0L
62BEGIN 62BEGIN
63 BLOCK "StringFileInfo" 63 BLOCK "StringFileInfo"
@@ -66,10 +66,10 @@ BEGIN
66 BEGIN 66 BEGIN
67 VALUE "FileDescription", "arnoldi module" 67 VALUE "FileDescription", "arnoldi module"
68 VALUE "FileVersion", "5, 2, 0, 0" 68 VALUE "FileVersion", "5, 2, 0, 0"
69 VALUE "InternalName", "arnoldi" 69 VALUE "InternalName", "arnoldi module"
70 VALUE "LegalCopyright", "Copyright (C) 2009" 70 VALUE "LegalCopyright", "Copyright (C) 2009"
71 VALUE "OriginalFilename", "arnoldi.dll" 71 VALUE "OriginalFilename", "arnoldi.dll"
72 VALUE "ProductName", "arnoldi module" 72 VALUE "ProductName", " arnoldi"
73 VALUE "ProductVersion", "5, 2, 0, 0" 73 VALUE "ProductVersion", "5, 2, 0, 0"
74 END 74 END
75 END 75 END
diff --git a/scilab/modules/atoms/Makefile.in b/scilab/modules/atoms/Makefile.in
index c73cdbc..9ae235b 100644
--- a/scilab/modules/atoms/Makefile.in
+++ b/scilab/modules/atoms/Makefile.in
@@ -685,7 +685,7 @@ check-code:
685@SWIG_TRUE@swig: $(SWIG_WRAPPERS) 685@SWIG_TRUE@swig: $(SWIG_WRAPPERS)
686@SWIG_TRUE@ @SWIG_PACKAGENAME=org.scilab.modules.$(modulename); \ 686@SWIG_TRUE@ @SWIG_PACKAGENAME=org.scilab.modules.$(modulename); \
687@SWIG_TRUE@ SWIG_OUTDIR=src/java/org/scilab/modules/$(modulename)/; \ 687@SWIG_TRUE@ SWIG_OUTDIR=src/java/org/scilab/modules/$(modulename)/; \
688@SWIG_TRUE@ if test ! -z "$(SWIG_WRAPPERS)"; then \ 688@SWIG_TRUE@ if test -n "$(SWIG_WRAPPERS)"; then \
689@SWIG_TRUE@ for file in $(SWIG_WRAPPERS) ; do \ 689@SWIG_TRUE@ for file in $(SWIG_WRAPPERS) ; do \
690@SWIG_TRUE@ echo "Swig process of $$file ..."; \ 690@SWIG_TRUE@ echo "Swig process of $$file ..."; \
691@SWIG_TRUE@ $(SWIG_BIN) $(SWIG_JAVA) -package $$SWIG_PACKAGENAME -outdir $$SWIG_OUTDIR $$file; \ 691@SWIG_TRUE@ $(SWIG_BIN) $(SWIG_JAVA) -package $$SWIG_PACKAGENAME -outdir $$SWIG_OUTDIR $$file; \
@@ -697,7 +697,7 @@ check-code:
697 697
698@GIWS_TRUE@giws: $(GIWS_WRAPPERS) 698@GIWS_TRUE@giws: $(GIWS_WRAPPERS)
699@GIWS_TRUE@ @GIWS_OUTPUTDIR=src/jni/;\ 699@GIWS_TRUE@ @GIWS_OUTPUTDIR=src/jni/;\
700@GIWS_TRUE@ if test ! -z "$(GIWS_WRAPPERS)"; then \ 700@GIWS_TRUE@ if test -n "$(GIWS_WRAPPERS)"; then \
701@GIWS_TRUE@ for file in $(GIWS_WRAPPERS) ; do \ 701@GIWS_TRUE@ for file in $(GIWS_WRAPPERS) ; do \
702@GIWS_TRUE@ echo "GIWS process of $$file ..."; \ 702@GIWS_TRUE@ echo "GIWS process of $$file ..."; \
703@GIWS_TRUE@ $(GIWS_BIN) --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \ 703@GIWS_TRUE@ $(GIWS_BIN) --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
@@ -803,10 +803,12 @@ install-data-local:
803 $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \ 803 $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
804 if test -d $(srcdir)/$$dir/; then \ 804 if test -d $(srcdir)/$$dir/; then \
805 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 805 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
806 for specialExt in $(MACROSSPECIALEXT); do \ 806 if test -n "$(MACROSSPECIALEXT)"; then \
807 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 807 for specialExt in $(MACROSSPECIALEXT); do \
808 done; \ 808 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
809 FILELIST="$$FILELIST $$specialExtDir"; \ 809 done; \
810 FILELIST="$$FILELIST $$specialExtDir"; \
811 fi; \
810 for file in `ls -1 $$FILELIST 2>/dev/null`; do \ 812 for file in `ls -1 $$FILELIST 2>/dev/null`; do \
811 echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \ 813 echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
812 $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \ 814 $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \
diff --git a/scilab/modules/boolean/Makefile.am b/scilab/modules/boolean/Makefile.am
index 1cc8e0c..d480357 100644
--- a/scilab/modules/boolean/Makefile.am
+++ b/scilab/modules/boolean/Makefile.am
@@ -54,7 +54,7 @@ libsciboolean_la_sci_gatewaydir = $(mydatadir)/sci_gateway
54libsciboolean_la_sci_gateway_DATA = sci_gateway/boolean_gateway.xml 54libsciboolean_la_sci_gateway_DATA = sci_gateway/boolean_gateway.xml
55 55
56####�boolean : include files #### 56####�boolean : include files ####
57libsciboolean_la_includedir=$(pkgincludedir)/boolean 57libsciboolean_la_includedir=$(pkgincludedir)
58libsciboolean_la_include_HEADERS = includes/gw_boolean.h \ 58libsciboolean_la_include_HEADERS = includes/gw_boolean.h \
59includes/matboolean.h 59includes/matboolean.h
60 60
diff --git a/scilab/modules/boolean/Makefile.in b/scilab/modules/boolean/Makefile.in
index 1feeb1b..1223c37 100644
--- a/scilab/modules/boolean/Makefile.in
+++ b/scilab/modules/boolean/Makefile.in
@@ -431,7 +431,7 @@ libsciboolean_la_sci_gatewaydir = $(mydatadir)/sci_gateway
431libsciboolean_la_sci_gateway_DATA = sci_gateway/boolean_gateway.xml 431libsciboolean_la_sci_gateway_DATA = sci_gateway/boolean_gateway.xml
432 432
433####�boolean : include files #### 433####�boolean : include files ####
434libsciboolean_la_includedir = $(pkgincludedir)/boolean 434libsciboolean_la_includedir = $(pkgincludedir)
435libsciboolean_la_include_HEADERS = includes/gw_boolean.h \ 435libsciboolean_la_include_HEADERS = includes/gw_boolean.h \
436includes/matboolean.h 436includes/matboolean.h
437 437
@@ -1017,7 +1017,7 @@ check-code:
1017@SWIG_TRUE@swig: $(SWIG_WRAPPERS) 1017@SWIG_TRUE@swig: $(SWIG_WRAPPERS)
1018@SWIG_TRUE@ @SWIG_PACKAGENAME=org.scilab.modules.$(modulename); \ 1018@SWIG_TRUE@ @SWIG_PACKAGENAME=org.scilab.modules.$(modulename); \
1019@SWIG_TRUE@ SWIG_OUTDIR=src/java/org/scilab/modules/$(modulename)/; \ 1019@SWIG_TRUE@ SWIG_OUTDIR=src/java/org/scilab/modules/$(modulename)/; \
1020@SWIG_TRUE@ if test ! -z "$(SWIG_WRAPPERS)"; then \ 1020@SWIG_TRUE@ if test -n "$(SWIG_WRAPPERS)"; then \
1021@SWIG_TRUE@ for file in $(SWIG_WRAPPERS) ; do \ 1021@SWIG_TRUE@ for file in $(SWIG_WRAPPERS) ; do \
1022@SWIG_TRUE@ echo "Swig process of $$file ..."; \ 1022@SWIG_TRUE@ echo "Swig process of $$file ..."; \
1023@SWIG_TRUE@ $(SWIG_BIN) $(SWIG_JAVA) -package $$SWIG_PACKAGENAME -outdir $$SWIG_OUTDIR $$file; \ 1023@SWIG_TRUE@ $(SWIG_BIN) $(SWIG_JAVA) -package $$SWIG_PACKAGENAME -outdir $$SWIG_OUTDIR $$file; \
@@ -1029,7 +1029,7 @@ check-code:
1029 1029
1030@GIWS_TRUE@giws: $(GIWS_WRAPPERS) 1030@GIWS_TRUE@giws: $(GIWS_WRAPPERS)
1031@GIWS_TRUE@ @GIWS_OUTPUTDIR=src/jni/;\ 1031@GIWS_TRUE@ @GIWS_OUTPUTDIR=src/jni/;\
1032@GIWS_TRUE@ if test ! -z "$(GIWS_WRAPPERS)"; then \ 1032@GIWS_TRUE@ if test -n "$(GIWS_WRAPPERS)"; then \
1033@GIWS_TRUE@ for file in $(GIWS_WRAPPERS) ; do \ 1033@GIWS_TRUE@ for file in $(GIWS_WRAPPERS) ; do \
1034@GIWS_TRUE@ echo "GIWS process of $$file ..."; \ 1034@GIWS_TRUE@ echo "GIWS process of $$file ..."; \
1035@GIWS_TRUE@ $(GIWS_BIN) --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \ 1035@GIWS_TRUE@ $(GIWS_BIN) --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
@@ -1135,10 +1135,12 @@ install-data-local:
1135 $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \ 1135 $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
1136 if test -d $(srcdir)/$$dir/; then \ 1136 if test -d $(srcdir)/$$dir/; then \
1137 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 1137 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILD