summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClément DAVID <clement.david@scilab.org>2011-03-21 11:33:25 +0100
committerClément DAVID <clement.david@scilab.org>2011-03-21 11:36:15 +0100
commit9af43a0b6f18cf675322538deef041c0a0f820c9 (patch)
tree03ff183a9f77b47c993a1a73c4b7ee228686ca33
parent884e6420b468a9fb49098588ccae22708b07da29 (diff)
parent43663db066140c59935691f43f4ba95199a45543 (diff)
downloadscilab-9af43a0b6f18cf675322538deef041c0a0f820c9.zip
scilab-9af43a0b6f18cf675322538deef041c0a0f820c9.tar.gz
Merge remote-tracking branch 'origin/5.3' into simulinkimport
Conflicts: scilab/configure scilab/modules/xcos/build.xml Change-Id: I946b2a2cae1525e123268ce3db5a561a88f99645
-rw-r--r--SEP/INDEX3
-rw-r--r--SEP/SEP_54_jpg_quality.odtbin0 -> 18786 bytes
-rw-r--r--scilab/CHANGES_5.3.X133
-rw-r--r--scilab/Makemex.in175
-rw-r--r--scilab/README_Unix54
-rw-r--r--scilab/README_Windows.txt97
-rwxr-xr-xscilab/bin/scilab76
-rw-r--r--scilab/build.incl.xml5
-rwxr-xr-xscilab/configure472
-rw-r--r--scilab/configure.ac23
-rw-r--r--scilab/etc/Info.plist2
-rw-r--r--scilab/libs/GetWindowsVersion/GetWindowsVersion.rc8
-rw-r--r--scilab/libs/LibScilab/libscilab.rc8
-rw-r--r--scilab/libs/LibScilab/libscilab_f2c.rc8
-rw-r--r--scilab/libs/MALLOC/MALLOC.rc8
-rw-r--r--scilab/libs/doublylinkedlist/doublylinkedlist.rc8
-rw-r--r--scilab/libs/dynamiclibrary/dynamiclibrary.rc8
-rw-r--r--scilab/libs/hashtable/hashtable.rc8
-rw-r--r--scilab/libs/libst/libst.rc8
-rw-r--r--scilab/modules/action_binding/locales/action_binding.pot14
-rw-r--r--scilab/modules/action_binding/src/c/action_binding.rc8
-rw-r--r--scilab/modules/action_binding/src/jni/Signal.cpp2
-rw-r--r--scilab/modules/action_binding/src/jni/Signal.hxx2
-rw-r--r--scilab/modules/action_binding/src/noaction_binding/noaction_binding.rc8
-rw-r--r--scilab/modules/api_scilab/locales/api_scilab.pot632
-rw-r--r--scilab/modules/api_scilab/src/c/api_scilab.rc8
-rw-r--r--scilab/modules/arnoldi/locales/arnoldi.pot14
-rw-r--r--scilab/modules/arnoldi/src/c/arnoldi.rc8
-rw-r--r--scilab/modules/atoms/locales/atoms.pot18
-rw-r--r--scilab/modules/boolean/locales/boolean.pot14
-rw-r--r--scilab/modules/boolean/src/c/boolean.rc8
-rw-r--r--scilab/modules/boolean/src/fortran/boolean_f.rc8
-rw-r--r--scilab/modules/cacsd/locales/cacsd.pot14
-rw-r--r--scilab/modules/cacsd/src/c/cacsd.rc8
-rw-r--r--scilab/modules/cacsd/src/fortran/cacsd_f.rc8
-rw-r--r--scilab/modules/cacsd/src/slicot/slicot_f/slicot_f.rc8
-rw-r--r--scilab/modules/call_scilab/call_scilab_export.def1
-rw-r--r--scilab/modules/call_scilab/locales/call_scilab.pot18
-rw-r--r--scilab/modules/call_scilab/src/c/call_scilab.rc8
-rw-r--r--scilab/modules/commons/locales/commons.pot18
-rw-r--r--scilab/modules/commons/src/c/commons.rc8
-rw-r--r--scilab/modules/commons/src/fortran/commons_f.rc8
-rw-r--r--scilab/modules/commons/src/java/org/scilab/modules/commons/OS.java68
-rw-r--r--scilab/modules/commons/src/java/org/scilab/modules/commons/ScilabConstants.java32
-rw-r--r--scilab/modules/commons/src/java/org/scilab/modules/commons/getOS.java43
-rw-r--r--scilab/modules/commons/src/java/org/scilab/modules/commons/xml/ScilabTransformerFactory.java59
-rw-r--r--scilab/modules/commons/tests/java/org/scilab/tests/modules/commons/Constants.java63
-rw-r--r--scilab/modules/compatibility_functions/locales/compatibility_functions.pot14
-rw-r--r--scilab/modules/completion/locales/completion.pot14
-rw-r--r--scilab/modules/completion/src/c/completion.rc8
-rw-r--r--scilab/modules/completion/src/nocompletion/nocompletion.rc8
-rw-r--r--scilab/modules/console/locales/console.pot20
-rw-r--r--scilab/modules/console/src/c/console.rc8
-rw-r--r--scilab/modules/console/src/cpp/ConsoleRead.cpp3
-rw-r--r--scilab/modules/console/src/java/org/scilab/modules/console/AbstractSciCompletionWindow.java14
-rw-r--r--scilab/modules/console/src/java/org/scilab/modules/console/SciCompletionWindow.java27
-rw-r--r--scilab/modules/console/src/java/org/scilab/modules/console/SciInputCommandView.java65
-rw-r--r--scilab/modules/console/src/jni/CallScilabBridge.cpp12
-rw-r--r--scilab/modules/console/src/jni/CallScilabBridge.giws.xml33
-rw-r--r--scilab/modules/console/src/jni/CallScilabBridge.hxx2
-rw-r--r--scilab/modules/console/src/noconsole/noconsole.rc8
-rw-r--r--scilab/modules/console/tests/nonreg_tests/bug_9082.tst22
-rw-r--r--scilab/modules/console/tests/nonreg_tests/bug_9168.tst21
-rw-r--r--scilab/modules/core/includes/version.h2
-rw-r--r--scilab/modules/core/locales/core.pot77
-rw-r--r--scilab/modules/core/macros/perl.sci69
-rw-r--r--scilab/modules/core/tests/benchmarks/empty_for.tst19
-rw-r--r--scilab/modules/core/tests/benchmarks/for_addition.tst20
-rw-r--r--scilab/modules/core/tests/benchmarks/for_assign.tst21
-rw-r--r--scilab/modules/core/tests/benchmarks/for_assign_same.tst21
-rw-r--r--scilab/modules/core/tests/benchmarks/for_increment.tst21
-rw-r--r--scilab/modules/core/tests/benchmarks/for_j.tst21
-rw-r--r--scilab/modules/core/tests/nonreg_tests/bug_9200.tst22
-rw-r--r--scilab/modules/data_structures/locales/data_structures.pot14
-rw-r--r--scilab/modules/data_structures/src/c/data_structures.rc8
-rw-r--r--scilab/modules/data_structures/src/fortran/data_structures_f.rc8
-rw-r--r--scilab/modules/demo_tools/locales/demo_tools.pot21
-rw-r--r--scilab/modules/demo_tools/macros/demo_gui.sci327
-rw-r--r--scilab/modules/development_tools/help/en_US/test_run.xml206
-rw-r--r--scilab/modules/development_tools/locales/development_tools.pot22
-rw-r--r--scilab/modules/differential_equations/demos/wheel/wheel.dem.gateway.sce4
-rw-r--r--scilab/modules/differential_equations/demos/wheel/wheel_show.sci2
-rw-r--r--scilab/modules/differential_equations/locales/differential_equations.pot14
-rw-r--r--scilab/modules/differential_equations/src/c/differential_equations.rc8
-rw-r--r--scilab/modules/differential_equations/src/fortran/differential_equations_f.rc8
-rw-r--r--scilab/modules/double/locales/double.pot14
-rw-r--r--scilab/modules/double/src/c/double.rc8
-rw-r--r--scilab/modules/double/src/fortran/double_f.rc8
-rw-r--r--scilab/modules/dynamic_link/locales/dynamic_link.pot120
-rw-r--r--scilab/modules/dynamic_link/macros/detectmsifort64tools.sci2
-rw-r--r--scilab/modules/dynamic_link/macros/ilib_compile.sci15
-rw-r--r--scilab/modules/dynamic_link/macros/ilib_gen_Make_unix.sci5
-rw-r--r--scilab/modules/dynamic_link/src/c/dynamic_link.rc8
-rw-r--r--scilab/modules/dynamic_link/src/fortran/dynamic_link_f.rc8
-rw-r--r--scilab/modules/dynamic_link/src/scripts/aclocal.m44
-rwxr-xr-xscilab/modules/dynamic_link/src/scripts/configure417
-rw-r--r--scilab/modules/dynamic_link/src/scripts/configure.ac2
-rw-r--r--scilab/modules/elementary_functions/locales/elementary_functions.pot102
-rw-r--r--scilab/modules/elementary_functions/src/c/elementary_functions.rc8
-rw-r--r--scilab/modules/elementary_functions/src/fortran/eispack/eispack_f.rc8
-rw-r--r--scilab/modules/elementary_functions/src/fortran/elementary_functions_f.rc8
-rw-r--r--scilab/modules/elementary_functions/src/fortran/linpack/linpack_f.rc8
-rw-r--r--scilab/modules/elementary_functions/src/fortran/slatec/slatec_f.rc8
-rw-r--r--scilab/modules/fftw/locales/fftw.pot14
-rw-r--r--scilab/modules/fftw/src/c/fftw.rc8
-rw-r--r--scilab/modules/fftw/src/nofftw/nofftw.rc8
-rw-r--r--scilab/modules/fileio/locales/fileio.pot170
-rw-r--r--scilab/modules/fileio/src/c/fileio.rc8
-rw-r--r--scilab/modules/functions/locales/functions.pot25
-rw-r--r--scilab/modules/functions/src/c/functions.rc8
-rw-r--r--scilab/modules/functions/src/fortran/functions_f.rc8
-rw-r--r--scilab/modules/genetic_algorithms/locales/genetic_algorithms.pot14
-rw-r--r--scilab/modules/graph/locales/graph.pot69
-rw-r--r--scilab/modules/graph/src/java/org/scilab/modules/graph/actions/ZoomInAction.java50
-rw-r--r--scilab/modules/graph/src/java/org/scilab/modules/graph/actions/ZoomOutAction.java51
-rw-r--r--scilab/modules/graphic_export/graphic_export.rc8
-rw-r--r--scilab/modules/graphic_export/help/en_US/xs2bmp.xml81
-rw-r--r--scilab/modules/graphic_export/help/en_US/xs2emf.xml86
-rw-r--r--scilab/modules/graphic_export/help/en_US/xs2eps.xml91
-rw-r--r--scilab/modules/graphic_export/help/en_US/xs2fig.xml85
-rw-r--r--scilab/modules/graphic_export/help/en_US/xs2gif.xml85
-rw-r--r--scilab/modules/graphic_export/help/en_US/xs2jpg.xml94
-rw-r--r--scilab/modules/graphic_export/help/en_US/xs2pdf.xml99
-rw-r--r--scilab/modules/graphic_export/help/en_US/xs2png.xml82
-rw-r--r--scilab/modules/graphic_export/help/en_US/xs2ppm.xml80
-rw-r--r--scilab/modules/graphic_export/help/en_US/xs2ps.xml94
-rw-r--r--scilab/modules/graphic_export/help/en_US/xs2svg.xml91
-rw-r--r--scilab/modules/graphic_export/locales/graphic_export.pot174
-rw-r--r--scilab/modules/graphic_export/src/c/xs2file.c387
-rw-r--r--scilab/modules/graphic_export/src/cpp/exportToFile.cpp3
-rw-r--r--scilab/modules/graphic_export/src/cpp/exportToFile.hxx1
-rw-r--r--scilab/modules/graphic_export/src/java/org/scilab/modules/graphic_export/BitmapRenderer.java7
-rw-r--r--scilab/modules/graphic_export/src/java/org/scilab/modules/graphic_export/ConvertSVG.java2
-rw-r--r--scilab/modules/graphic_export/src/java/org/scilab/modules/graphic_export/ExportBitmap.java264
-rw-r--r--scilab/modules/graphic_export/src/java/org/scilab/modules/graphic_export/ExportRenderer.java4
-rw-r--r--scilab/modules/graphic_export/src/java/org/scilab/modules/graphic_export/ExportToFile.java6
-rw-r--r--scilab/modules/graphic_export/src/java/org/scilab/modules/graphic_export/FileExporter.java4
-rw-r--r--scilab/modules/graphic_export/src/java/org/scilab/modules/graphic_export/GL2PSRenderer.java22
-rw-r--r--scilab/modules/graphic_export/src/java/org/scilab/modules/graphic_export/Utils.java38
-rw-r--r--scilab/modules/graphic_export/src/jni/FileExporter.cpp12
-rw-r--r--scilab/modules/graphic_export/src/jni/FileExporter.giws.xml3
-rw-r--r--scilab/modules/graphic_export/src/jni/FileExporter.hxx4
-rw-r--r--scilab/modules/graphic_export/src/jni/GL2PSToJOGL.cpp2
-rw-r--r--scilab/modules/graphic_export/src/jni/GL2PSToJOGL.hxx2
-rw-r--r--scilab/modules/graphic_export/src/jni/JOGLConstant.cpp2
-rw-r--r--scilab/modules/graphic_export/src/jni/JOGLConstant.hxx2
-rw-r--r--scilab/modules/graphic_export/src/nographic_export/nographic_export.rc8
-rw-r--r--scilab/modules/graphics/graphic.rc8
-rw-r--r--scilab/modules/graphics/help/en_US/2d_plot/Matplot1.xml7
-rw-r--r--scilab/modules/graphics/help/en_US/addchapter.sce2
-rw-r--r--scilab/modules/graphics/help/fr_FR/addchapter.sce2
-rw-r--r--scilab/modules/graphics/help/ja_JP/2d_plot/Matplot1.xml5
-rwxr-xr-xscilab/modules/graphics/help/ja_JP/addchapter.sce2
-rw-r--r--scilab/modules/graphics/help/pt_BR/2d_plot/Matplot1.xml57
-rw-r--r--scilab/modules/graphics/locales/graphics.pot265
-rw-r--r--scilab/modules/graphics/sci_gateway/c/sci_set.c435
-rw-r--r--scilab/modules/graphics/src/nographics/nographics.rc8
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_4325.dia.ref (renamed from scilab/modules/graphics/tests/nonreg_tests/bug_4235.dia.ref)8
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_4325.tst (renamed from scilab/modules/graphics/tests/nonreg_tests/bug_4235.tst)6
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_9211.dia.ref25
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_9211.tst29
-rw-r--r--scilab/modules/gui/locales/gui.pot372
-rw-r--r--scilab/modules/gui/src/c/gui.rc8
-rw-r--r--scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/CallScilabBridge.java4
-rw-r--r--scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/console/SwingScilabConsole.java9
-rw-r--r--scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/helpbrowser/SwingScilabHelpBrowser.java16
-rw-r--r--scilab/modules/gui/src/java/org/scilab/modules/gui/utils/ConfigManager.java3
-rw-r--r--scilab/modules/gui/src/jni/CallScilabBridge.cpp2
-rw-r--r--scilab/modules/gui/src/jni/CallScilabBridge.hxx2
-rw-r--r--scilab/modules/gui/src/jni/Juigetfile.cpp2
-rw-r--r--scilab/modules/gui/src/jni/Juigetfile.hxx2
-rw-r--r--scilab/modules/gui/src/jni/Jxclick.cpp2
-rw-r--r--scilab/modules/gui/src/jni/Jxclick.hxx2
-rw-r--r--scilab/modules/gui/src/jni/Jxgetmouse.cpp2
-rw-r--r--scilab/modules/gui/src/jni/Jxgetmouse.hxx2
-rw-r--r--scilab/modules/gui/src/jni/LookAndFeelManager.cpp2
-rw-r--r--scilab/modules/gui/src/jni/LookAndFeelManager.hxx2
-rw-r--r--scilab/modules/gui/src/jni/ScilabDisplayTree.cpp2
-rw-r--r--scilab/modules/gui/src/jni/ScilabDisplayTree.hxx2
-rw-r--r--scilab/modules/gui/src/jni/UIElementMapper.cpp2
-rw-r--r--scilab/modules/gui/src/jni/UIElementMapper.hxx2
-rw-r--r--scilab/modules/gui/src/nogui/nogui.rc8
-rw-r--r--scilab/modules/gui/tests/nonreg_tests/bug_9141.tst27
-rw-r--r--scilab/modules/hdf5/locales/hdf5.pot69
-rw-r--r--scilab/modules/hdf5/src/c/h5_writeDataToFile.c2
-rw-r--r--scilab/modules/hdf5/src/c/hdf5.rc8
-rw-r--r--scilab/modules/hdf5/src/jni/jhdf5load.cpp2
-rw-r--r--scilab/modules/hdf5/src/jni/jhdf5load.hxx2
-rw-r--r--scilab/modules/hdf5/tests/java/org/scilab/tests/modules/hdf5/testScilabDouble.java17
-rw-r--r--scilab/modules/helptools/data/pages/homepage-en_US.html13
-rw-r--r--scilab/modules/helptools/data/pages/homepage-fr_FR.html12
-rw-r--r--scilab/modules/helptools/etc/SciDocConf.xml20
-rw-r--r--scilab/modules/helptools/locales/helptools.pot174
-rw-r--r--scilab/modules/helptools/src/c/helptools.rc8
-rw-r--r--scilab/modules/helptools/src/java/org/scilab/modules/helptools/BuildPDF.java12
-rw-r--r--scilab/modules/helptools/src/java/org/scilab/modules/helptools/enter.gifbin76 -> 0 bytes
-rw-r--r--scilab/modules/helptools/src/java/org/scilab/modules/helptools/enter.xpm17
-rw-r--r--scilab/modules/helptools/src/jni/BuildDocObject.cpp2
-rw-r--r--scilab/modules/helptools/src/jni/BuildDocObject.hxx2
-rw-r--r--scilab/modules/helptools/src/jni/SciDocMain.cpp2
-rw-r--r--scilab/modules/helptools/src/jni/SciDocMain.hxx2
-rw-r--r--scilab/modules/helptools/src/script/8859_to_utf8.pl (renamed from scilab/modules/helptools/src/perl/8859_to_utf8.pl)0
-rw-r--r--scilab/modules/helptools/src/script/check_xml.pl (renamed from scilab/modules/helptools/src/perl/check_xml.pl)0
-rw-r--r--scilab/modules/helptools/src/script/check_xml_dir.pl (renamed from scilab/modules/helptools/src/perl/check_xml_dir.pl)0
-rw-r--r--scilab/modules/helptools/src/script/dispatchHelp.sh45
-rw-r--r--scilab/modules/helptools/tests/nonreg_tests/bug_4938.tst2
-rw-r--r--scilab/modules/history_browser/locales/history_browser.pot73
-rw-r--r--scilab/modules/history_browser/src/c/history_browser.rc8
-rw-r--r--scilab/modules/history_browser/src/cpp/CommandHistory_Wrap.cpp7
-rw-r--r--scilab/modules/history_browser/src/jni/CommandHistory.cpp2
-rw-r--r--scilab/modules/history_browser/src/jni/CommandHistory.hxx2
-rw-r--r--scilab/modules/history_browser/src/nohistory_browser/nohistory_browser.rc8
-rw-r--r--scilab/modules/history_browser/tests/nonreg_tests/bug_9195.tst20
-rw-r--r--scilab/modules/history_manager/locales/history_manager.pot14
-rw-r--r--scilab/modules/history_manager/src/c/history_manager.rc8
-rw-r--r--scilab/modules/integer/locales/integer.pot14
-rw-r--r--scilab/modules/integer/src/c/integer.rc8
-rw-r--r--scilab/modules/integer/src/fortran/integer_f.rc8
-rw-r--r--scilab/modules/interpolation/locales/interpolation.pot22
-rw-r--r--scilab/modules/interpolation/src/c/interpolation.rc8
-rw-r--r--scilab/modules/interpolation/src/fortran/interpolation_f.rc8
-rw-r--r--scilab/modules/intersci/locales/intersci.pot14
-rw-r--r--scilab/modules/intersci/src/lib/intersci.rc8
-rw-r--r--scilab/modules/io/locales/io.pot14
-rw-r--r--scilab/modules/io/src/c/io.rc8
-rw-r--r--scilab/modules/io/src/fortran/io_f.rc8
-rw-r--r--scilab/modules/javasci/help/en_US/javasci_faq.xml70
-rw-r--r--scilab/modules/javasci/javasci.rc8
-rw-r--r--scilab/modules/javasci/src/c/javasci_SciAbstractArray.c980
-rw-r--r--scilab/modules/javasci/src/c/javasci_Scilab.c193
-rw-r--r--scilab/modules/javasci/src/java/javasci/SciStringArray.java4
-rw-r--r--scilab/modules/jvm/locales/jvm.pot21
-rw-r--r--scilab/modules/jvm/src/c/JVM.c2
-rw-r--r--scilab/modules/jvm/src/c/libjvm.rc8
-rw-r--r--scilab/modules/jvm/src/nojvm/nojvm.rc8
-rw-r--r--scilab/modules/linear_algebra/locales/linear_algebra.pot16
-rw-r--r--scilab/modules/linear_algebra/src/c/linear_algebra.rc8
-rw-r--r--scilab/modules/linear_algebra/src/fortran/linear_algebra_f.rc8
-rw-r--r--scilab/modules/localization/locales/header.pot10
-rw-r--r--scilab/modules/localization/locales/localization.pot14
-rw-r--r--scilab/modules/localization/src/localization.rc8
-rw-r--r--scilab/modules/m2sci/locales/m2sci.pot14
-rw-r--r--scilab/modules/maple2scilab/locales/maple2scilab.pot14
-rw-r--r--scilab/modules/matio/locales/matio.pot318
-rw-r--r--scilab/modules/matio/src/c/matio.rc8
-rw-r--r--scilab/modules/matio/src/nomatio/nomatio.rc8
-rw-r--r--scilab/modules/mexlib/locales/mexlib.pot62
-rw-r--r--scilab/modules/mexlib/src/libmat/libmat.rc8
-rw-r--r--scilab/modules/mexlib/src/libmex/libmex.rc8
-rw-r--r--scilab/modules/mexlib/src/libmx/libmx.rc8
-rw-r--r--scilab/modules/modules_manager/locales/modules_manager.pot223
-rw-r--r--scilab/modules/modules_manager/macros/tbx_build_cleaner.sci38
-rw-r--r--scilab/modules/optimization/locales/optimization.pot134
-rw-r--r--scilab/modules/optimization/macros/karmarkar.sci2
-rw-r--r--scilab/modules/optimization/src/c/optimization.rc8
-rw-r--r--scilab/modules/optimization/src/fortran/n1qn1a.f2
-rw-r--r--scilab/modules/optimization/src/fortran/optimization_f.rc8
-rw-r--r--scilab/modules/output_stream/locales/output_stream.pot197
-rw-r--r--scilab/modules/output_stream/macros/prettyprint.sci33
-rw-r--r--scilab/modules/output_stream/src/c/output_stream.rc8
-rw-r--r--scilab/modules/output_stream/src/fortran/output_stream_f.rc8
-rw-r--r--scilab/modules/overloading/locales/overloading.pot29
-rw-r--r--scilab/modules/parallel/locales/parallel.pot43
-rw-r--r--scilab/modules/parallel/src/c/parallel.rc4
-rw-r--r--scilab/modules/parameters/locales/parameters.pot14
-rw-r--r--scilab/modules/parameters/src/c/parameters.rc8
-rw-r--r--scilab/modules/polynomials/locales/polynomials.pot14
-rw-r--r--scilab/modules/polynomials/src/fortran/polynomials_f.rc8
-rw-r--r--scilab/modules/pvm/locales/pvm.pot14
-rw-r--r--scilab/modules/pvm/src/c/pvm.rc8
-rw-r--r--scilab/modules/randlib/locales/randlib.pot40
-rw-r--r--scilab/modules/randlib/src/c/randlib.rc8
-rw-r--r--scilab/modules/randlib/src/fortran/randlib_f.rc8
-rw-r--r--scilab/modules/randlib/src/norandlib/norandlib.rc8
-rw-r--r--scilab/modules/renderer/locales/renderer.pot14
-rw-r--r--scilab/modules/renderer/renderer.rc8
-rw-r--r--scilab/modules/renderer/src/jni/ArcFillDrawerGL.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/ArcFillDrawerGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/ArcLineDrawerGL.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/ArcLineDrawerGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/BackTrihedronDrawerGL.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/BackTrihedronDrawerGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/CenteredTextDrawerGL.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/CenteredTextDrawerGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/DrawableArcGL.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/DrawableArcGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/DrawableAxesGL.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/DrawableAxesGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/DrawableFecGL.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/DrawableFecGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/DrawableFigureGL.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/DrawableFigureGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/DrawableGrayplotGL.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/DrawableGrayplotGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/DrawablePolylineGL.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/DrawablePolylineGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/DrawableRectangleGL.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/DrawableRectangleGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/DrawableSegsGL.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/DrawableSegsGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/DrawableSubwinGL.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/DrawableSubwinGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/DrawableSurfaceGL.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/DrawableSurfaceGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/DrawableTextGL.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/DrawableTextGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/FecFacetDrawerGL.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/FecFacetDrawerGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/FecLineDrawerGL.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/FecLineDrawerGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/FilledTextDrawerGL.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/FilledTextDrawerGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/FullBoxDrawerGL.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/FullBoxDrawerGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/GraphicSynchronizerJava.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/GraphicSynchronizerJava.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/GridDrawerGL.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/GridDrawerGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/HalfBoxDrawerGL.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/HalfBoxDrawerGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/IsoViewCameraGL.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/IsoViewCameraGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/IsometricCameraGL.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/IsometricCameraGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/PolylineArrowDrawerGL.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/PolylineArrowDrawerGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/PolylineBarDrawerGL.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/PolylineBarDrawerGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/PolylineFillDrawerGL.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/PolylineFillDrawerGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/PolylineInterpColorDrawerGL.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/PolylineInterpColorDrawerGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/PolylineLineDrawerGL.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/PolylineLineDrawerGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/PolylineMarkDrawerGL.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/PolylineMarkDrawerGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/RectangleFillDrawerGL.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/RectangleFillDrawerGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/RectangleLineDrawerGL.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/RectangleLineDrawerGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/RectangleMarkDrawerGL.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/RectangleMarkDrawerGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/RenderingChecker.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/RenderingChecker.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/SegsArrowDrawerGL.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/SegsArrowDrawerGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/SegsLineDrawerGL.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/SegsLineDrawerGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/SegsMarkDrawerGL.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/SegsMarkDrawerGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/StandardTextDrawerGL.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/StandardTextDrawerGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/SubwinBackgroundDrawerGL.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/SubwinBackgroundDrawerGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/SurfaceFacetDrawerGL.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/SurfaceFacetDrawerGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/SurfaceLineDrawerGL.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/SurfaceLineDrawerGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/SurfaceMarkDrawerGL.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/SurfaceMarkDrawerGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/TicksDrawerGL.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/TicksDrawerGL.hxx2
-rw-r--r--scilab/modules/renderer/src/jni/XlFontManager.cpp2
-rw-r--r--scilab/modules/renderer/src/jni/XlFontManager.hxx2
-rw-r--r--scilab/modules/renderer/src/norenderer/norenderer.rc8
-rw-r--r--scilab/modules/scicos/locales/ca_ES.po2
-rw-r--r--scilab/modules/scicos/locales/de_DE.po2
-rw-r--r--scilab/modules/scicos/locales/es_ES.po2
-rw-r--r--scilab/modules/scicos/locales/fr_FR.po2
-rw-r--r--scilab/modules/scicos/locales/it_IT.po2
-rw-r--r--scilab/modules/scicos/locales/ja_JP.po2
-rw-r--r--scilab/modules/scicos/locales/pl_PL.po2
-rw-r--r--scilab/modules/scicos/locales/pt_BR.po2
-rw-r--r--scilab/modules/scicos/locales/ru_RU.po2
-rw-r--r--scilab/modules/scicos/locales/scicos.pot407
-rw-r--r--scilab/modules/scicos/locales/uk_UA.po2
-rw-r--r--scilab/modules/scicos/locales/zh_CN.po2
-rw-r--r--scilab/modules/scicos/locales/zh_TW.po2
-rw-r--r--scilab/modules/scicos/macros/scicos_menus/set_initial_xcos_menus.sci2
-rw-r--r--scilab/modules/scicos/src/c/noscicos/noscicos.rc8
-rw-r--r--scilab/modules/scicos/src/c/scicos.rc8
-rw-r--r--scilab/modules/scicos/src/fortran/scicos_f.rc8
-rw-r--r--scilab/modules/scicos/src/scicos_sundials/scicos_sundials.rc8
-rw-r--r--scilab/modules/scicos_blocks/Makefile.am7
-rw-r--r--scilab/modules/scicos_blocks/Makefile.in6
-rw-r--r--scilab/modules/scicos_blocks/locales/scicos_blocks.pot277
-rw-r--r--scilab/modules/scicos_blocks/macros/Misc/TEXT_f.sci301
-rw-r--r--scilab/modules/scicos_blocks/macros/Sources/CURVE_c.sci29
-rw-r--r--scilab/modules/scicos_blocks/macros/Sources/GENSIN_f.sci20
-rw-r--r--scilab/modules/scicos_blocks/macros/Sources/RAMP.sci21
-rw-r--r--scilab/modules/scicos_blocks/macros/Sources/STEP.sci21
-rw-r--r--scilab/modules/scicos_blocks/src/c/scicos_blocks.rc8
-rw-r--r--scilab/modules/scicos_blocks/src/c/scoWindowScope.c2
-rw-r--r--scilab/modules/scicos_blocks/src/fortran/scicos_blocks_f.rc8
-rw-r--r--scilab/modules/scicos_blocks/src/jni/AfficheBlock.cpp13
-rw-r--r--scilab/modules/scicos_blocks/src/jni/AfficheBlock.hxx26
-rw-r--r--scilab/modules/scinotes/etc/scinotesConfiguration.xml136
-rw-r--r--scilab/modules/scinotes/etc/scinotesGUIConfiguration.xml20
-rw-r--r--scilab/modules/scinotes/locales/scinotes.pot599
-rw-r--r--scilab/modules/scinotes/src/c/scinotes.rc8
-rw-r--r--scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/SciNotes.java17
-rw-r--r--scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/ScilabEditorPane.java112
-rw-r--r--scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/ScilabLexerConstants.java5
-rw-r--r--scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/ScilabPlainView.java19
-rw-r--r--scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/ScilabView.java8
-rw-r--r--scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/FindNextAction.java11
-rw-r--r--scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/FindPreviousAction.java11
-rw-r--r--scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/IncrementalSearchAction.java47
-rw-r--r--scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/OpenSourceFileOnKeywordAction.java1
-rw-r--r--scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/actions/SuppressCommentsAction.java77
-rw-r--r--scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/utils/CodeExporter.java3
-rw-r--r--scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/utils/ConfigSciNotesManager.java77
-rw-r--r--scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/utils/NavigatorWindow.java21
-rw-r--r--scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/utils/SciNotesMessages.java5
-rw-r--r--scilab/modules/scinotes/src/jni/SciNotes.cpp79
-rw-r--r--scilab/modules/scinotes/src/jni/SciNotes.hxx4
-rw-r--r--scilab/modules/scinotes/tests/nonreg_tests/bug_9132.tst25
-rw-r--r--scilab/modules/scinotes/tests/nonreg_tests/bug_9171.tst22
-rw-r--r--scilab/modules/scinotes/tests/nonreg_tests/bug_9183.tst22
-rw-r--r--scilab/modules/scinotes/tests/nonreg_tests/bug_9186.tst21
-rw-r--r--scilab/modules/scinotes/tests/nonreg_tests/bug_9189.tst22
-rw-r--r--scilab/modules/shell/locales/shell.pot14
-rw-r--r--scilab/modules/shell/src/c/others/mainscic.c2
-rw-r--r--scilab/modules/shell/src/c/shell.rc6
-rw-r--r--scilab/modules/signal_processing/locales/signal_processing.pot18
-rw-r--r--scilab/modules/signal_processing/src/c/signal_processing.rc8
-rw-r--r--scilab/modules/signal_processing/src/fortran/signal_processing_f.rc8
-rw-r--r--scilab/modules/simulated_annealing/locales/simulated_annealing.pot18
-rw-r--r--scilab/modules/sound/locales/sound.pot14
-rw-r--r--scilab/modules/sound/src/c/sound.rc8
-rw-r--r--scilab/modules/sound/src/nosound/nosound.rc8
-rw-r--r--scilab/modules/sparse/locales/sparse.pot61
-rw-r--r--scilab/modules/sparse/src/c/sparse.rc8
-rw-r--r--scilab/modules/sparse/src/fortran/sparse_f.rc8
-rw-r--r--scilab/modules/special_functions/locales/special_functions.pot53
-rw-r--r--scilab/modules/special_functions/src/c/special_functions.rc8
-rw-r--r--scilab/modules/special_functions/src/fortran/special_functions_f.rc8
-rw-r--r--scilab/modules/spreadsheet/locales/spreadsheet.pot22
-rw-r--r--scilab/modules/spreadsheet/src/c/spreadsheet.rc8
-rw-r--r--scilab/modules/spreadsheet/src/nospreadsheet/nospreadsheet.rc8
-rw-r--r--scilab/modules/statistics/locales/statistics.pot16
-rw-r--r--scilab/modules/statistics/src/c/statistics.rc8
-rw-r--r--scilab/modules/statistics/src/dcdflib/dcd_f/dcd_f.rc8
-rw-r--r--scilab/modules/string/locales/string.pot49
-rw-r--r--scilab/modules/string/src/c/pcre_private.h4
-rw-r--r--scilab/modules/string/src/c/string.rc8
-rw-r--r--scilab/modules/string/src/fortran/string_f.rc8
-rw-r--r--scilab/modules/symbolic/locales/symbolic.pot14
-rw-r--r--scilab/modules/symbolic/src/c/symbolic.rc8
-rw-r--r--scilab/modules/symbolic/src/fortran/symbolic_f.rc8
-rw-r--r--scilab/modules/tclsci/locales/tclsci.pot32
-rw-r--r--scilab/modules/tclsci/src/c/InitTclTk.c16
-rw-r--r--scilab/modules/tclsci/src/c/TCL_Command.c9
-rw-r--r--scilab/modules/tclsci/src/c/TCL_Command.h7
-rw-r--r--scilab/modules/tclsci/src/c/tclsci.rc8
-rw-r--r--scilab/modules/tclsci/tests/nonreg_tests/bug_7954.tst23
-rw-r--r--scilab/modules/texmacs/locales/texmacs.pot14
-rw-r--r--scilab/modules/time/locales/time.pot14
-rw-r--r--scilab/modules/time/src/c/time.rc8
-rw-r--r--scilab/modules/types/locales/types.pot18
-rw-r--r--scilab/modules/ui_data/Makefile.am4
-rw-r--r--scilab/modules/ui_data/Makefile.in5
-rw-r--r--scilab/modules/ui_data/locales/ui_data.pot243
-rw-r--r--scilab/modules/ui_data/src/jni/BrowseVar.cpp175
-rw-r--r--scilab/modules/ui_data/src/jni/BrowseVar.hxx37
-rw-r--r--scilab/modules/ui_data/src/jni/EditVar.cpp43
-rw-r--r--scilab/modules/ui_data/src/jni/EditVar.hxx26
-rw-r--r--scilab/modules/ui_data/src/jni/ui_data.giws.xml0
-rw-r--r--scilab/modules/umfpack/locales/umfpack.pot22
-rw-r--r--scilab/modules/umfpack/src/c/umfpack.rc8
-rw-r--r--scilab/modules/umfpack/src/noumfpack/noumfpack.rc8
-rw-r--r--scilab/modules/windows_tools/locales/windows_tools.pot14
-rw-r--r--scilab/modules/windows_tools/src/c/CScilex/CScilex.rc8
-rw-r--r--scilab/modules/windows_tools/src/c/WScilex/WScilex.rc8
-rw-r--r--scilab/modules/windows_tools/src/c/scilab_windows/scilab_windows.rc8
-rw-r--r--scilab/modules/windows_tools/src/c/windows_tools.rc8
-rw-r--r--scilab/modules/windows_tools/src/nowindows_tools/nowindows_tools.rc8
-rw-r--r--scilab/modules/xcos/build.xml20
-rw-r--r--scilab/modules/xcos/demos/susp.xcos16351
-rw-r--r--scilab/modules/xcos/etc/XcosFile.xsd1
-rw-r--r--scilab/modules/xcos/examples/sources_pal/en_US/GENSQR_f_diagram_en_US.xcos2307
-rw-r--r--scilab/modules/xcos/examples/sources_pal/en_US/gensin_f_en_US.xcos794
-rw-r--r--scilab/modules/xcos/examples/sources_pal/en_US/ramp_en_US.xcos931
-rw-r--r--scilab/modules/xcos/examples/sources_pal/en_US/sawtooth_f_en_US.xcos182
-rw-r--r--scilab/modules/xcos/examples/sources_pal/en_US/step_function_1_en_US.xcos1406
-rw-r--r--scilab/modules/xcos/examples/sources_pal/en_US/step_function_2_en_US.xcos1282
-rw-r--r--scilab/modules/xcos/help/en_US/palettes/Sources_pal/AA_Sources_pal.xml369
-rw-r--r--scilab/modules/xcos/help/en_US/palettes/Sources_pal/GENSIN_f.xml118
-rw-r--r--scilab/modules/xcos/help/en_US/palettes/Sources_pal/GENSQR_f.xml56
-rw-r--r--scilab/modules/xcos/help/en_US/palettes/Sources_pal/RAMP.xml102
-rw-r--r--scilab/modules/xcos/help/en_US/palettes/Sources_pal/SAWTOOTH_f.xml93
-rw-r--r--scilab/modules/xcos/help/en_US/palettes/Sources_pal/STEP_FUNCTION.xml236
-rw-r--r--scilab/modules/xcos/help/examples/sources_pal/en_US/GENSQR_f_diagram_en_US.pngbin0 -> 14651 bytes
-rw-r--r--scilab/modules/xcos/help/examples/sources_pal/en_US/GENSQR_f_plot_en_US.pngbin0 -> 6879 bytes
-rw-r--r--scilab/modules/xcos/help/examples/sources_pal/en_US/gensin_f_diagram_en_US.pngbin0 -> 18014 bytes
-rw-r--r--scilab/modules/xcos/help/examples/sources_pal/en_US/ramp_diagram_en_US.pngbin0 -> 17252 bytes
-rw-r--r--scilab/modules/xcos/help/examples/sources_pal/en_US/sawtooth_f_diagram_en_US.pngbin0 -> 14527 bytes
-rw-r--r--scilab/modules/xcos/help/examples/sources_pal/en_US/step_function_diagram_1_en_US.pngbin0 -> 17051 bytes
-rw-r--r--scilab/modules/xcos/help/examples/sources_pal/en_US/step_function_diagram_2_en_US.pngbin0 -> 10910 bytes
-rw-r--r--scilab/modules/xcos/help/fr_FR/palettes/Sources_pal/AA_Sources_pal.xml266
-rw-r--r--scilab/modules/xcos/help/fr_FR/palettes/Sources_pal/CHAPTER2
-rw-r--r--scilab/modules/xcos/help/gui/sources_pal/en_US/GENSIN_f_gui.pngbin0 -> 13594 bytes
-rw-r--r--scilab/modules/xcos/help/gui/sources_pal/en_US/GENSQR_f_gui.pngbin0 -> 12303 bytes
-rw-r--r--scilab/modules/xcos/help/gui/sources_pal/en_US/RAMP_gui.pngbin0 -> 12515 bytes
-rw-r--r--scilab/modules/xcos/help/gui/sources_pal/en_US/STEP_FUNCTION_gui.pngbin0 -> 13030 bytes
-rw-r--r--scilab/modules/xcos/help/images/GENSIN_f_gui.gifbin1649 -> 0 bytes
-rw-r--r--scilab/modules/xcos/help/images/GENSIN_f_img2_eng.gifbin636 -> 0 bytes
-rw-r--r--scilab/modules/xcos/help/images/GENSIN_f_img2_fr.gifbin636 -> 0 bytes
-rw-r--r--scilab/modules/xcos/help/images/GENSIN_f_img4_fr.gifbin181 -> 0 bytes
-rw-r--r--scilab/modules/xcos/help/images/GENSIN_f_img5_fr.gifbin144 -> 0 bytes
-rw-r--r--scilab/modules/xcos/help/images/GENSIN_f_img6_fr.gifbin145 -> 0 bytes
-rw-r--r--scilab/modules/xcos/help/images/RAMP_gui.gifbin1570 -> 0 bytes
-rw-r--r--scilab/modules/xcos/help/images/SAWTOOTH_f_img2_eng.gifbin294 -> 0 bytes
-rw-r--r--scilab/modules/xcos/help/images/SAWTOOTH_f_img2_fr.gifbin294 -> 0 bytes
-rw-r--r--scilab/modules/xcos/help/images/SAWTOOTH_f_img3_eng.gifbin155 -> 0 bytes
-rw-r--r--scilab/modules/xcos/help/images/SAWTOOTH_f_img3_fr.gifbin155 -> 0 bytes
-rw-r--r--scilab/modules/xcos/help/images/SAWTOOTH_f_img4_eng.gifbin197 -> 0 bytes
-rw-r--r--scilab/modules/xcos/help/images/SAWTOOTH_f_img4_fr.gifbin197 -> 0 bytes
-rw-r--r--scilab/modules/xcos/help/images/STEP_FUNCTION_gui.gifbin1693 -> 0 bytes
-rw-r--r--scilab/modules/xcos/help/images/STEP_FUNCTION_img3_eng.gifbin1852 -> 0 bytes
-rw-r--r--scilab/modules/xcos/help/images/STEP_FUNCTION_img3_fr.gifbin1852 -> 0 bytes
-rw-r--r--scilab/modules/xcos/help/images/STEP_gui.gifbin1693 -> 0 bytes
-rw-r--r--scilab/modules/xcos/images/gui/GENSIN_f_gui.gifbin1649 -> 0 bytes
-rw-r--r--scilab/modules/xcos/images/gui/GENSQR_f_gui.gifbin1276 -> 0 bytes
-rw-r--r--scilab/modules/xcos/images/gui/RAMP_gui.gifbin1570 -> 0 bytes
-rw-r--r--scilab/modules/xcos/images/gui/STEP_FUNCTION_gui.gifbin1693 -> 0 bytes
-rw-r--r--scilab/modules/xcos/images/gui/STEP_gui.gifbin1693 -> 0 bytes
-rw-r--r--scilab/modules/xcos/locales/xcos.pot358
-rw-r--r--scilab/modules/xcos/src/c/xcos.rc8
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/Xcos.java17
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/graph/XcosDiagram.java99
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/scicos/BlockModelElement.java45
-rw-r--r--scilab/modules/xcos/src/jni/Modelica.cpp2
-rw-r--r--scilab/modules/xcos/src/jni/Modelica.hxx2
-rw-r--r--scilab/modules/xcos/src/jni/Palette.cpp2
-rw-r--r--scilab/modules/xcos/src/jni/Palette.hxx2
-rw-r--r--scilab/modules/xcos/src/jni/Xcos.cpp2
-rw-r--r--scilab/modules/xcos/src/jni/Xcos.hxx2
-rw-r--r--scilab/modules/xcos/tests/java/org/scilab/tests/modules/xcos/XcosTest.java43
-rw-r--r--scilab/modules/xcos/tests/nonreg_tests/bug_8692.dia.ref18
-rw-r--r--scilab/modules/xcos/tests/nonreg_tests/bug_8692.tst21
-rw-r--r--scilab/modules/xcos/tests/nonreg_tests/bug_8692.xcos35
-rw-r--r--scilab/modules/xcos/tests/nonreg_tests/bug_9024.tst25
-rw-r--r--scilab/modules/xcos/tests/unit_tests/blocks_set.dia.ref81
-rw-r--r--scilab/modules/xcos/tests/unit_tests/blocks_set.tst4
-rw-r--r--scilab/modules/xcos/tests/unit_tests/xcos_open.dia.ref6
-rw-r--r--scilab/modules/xcos/tests/unit_tests/xcos_saxon.dia.ref14
-rw-r--r--scilab/modules/xcos/tests/unit_tests/xcos_saxon.tst19
-rw-r--r--scilab/tools/localization/updateLocalizationModule.sh8
549 files changed, 25393 insertions, 15126 deletions
diff --git a/SEP/INDEX b/SEP/INDEX
index fb6f149..2e37ef0 100644
--- a/SEP/INDEX
+++ b/SEP/INDEX
@@ -47,4 +47,5 @@ SEP #47 : Scilab Desktop
47SEP #48 : Scilab Preferences 47SEP #48 : Scilab Preferences
48SEP #49 : repmat function 48SEP #49 : repmat function
49SEP #50 : Xcos Help Folders 49SEP #50 : Xcos Help Folders
50SEP #51 : Linear Programming \ No newline at end of file 50SEP #51 : Linear Programming
51SEP #54 : Quality argument added to xs2jpg
diff --git a/SEP/SEP_54_jpg_quality.odt b/SEP/SEP_54_jpg_quality.odt
new file mode 100644
index 0000000..8e22cb3
--- /dev/null
+++ b/SEP/SEP_54_jpg_quality.odt
Binary files differ
diff --git a/scilab/CHANGES_5.3.X b/scilab/CHANGES_5.3.X
index 0179ada..58ba298 100644
--- a/scilab/CHANGES_5.3.X
+++ b/scilab/CHANGES_5.3.X
@@ -5,25 +5,97 @@
5Scinotes: 5Scinotes:
6========= 6=========
7 7
8* Add the possibility to remove the comments when executing the code in the
9 console.
10
11* The selection is now highlighted in yellow in all the document.
12
8* bug 9047 fixed - edit('foo',12) now opens the function foo 12 lines after the 13* bug 9047 fixed - edit('foo',12) now opens the function foo 12 lines after the
9 definition of foo. 14 definition of foo.
10 15
16* bug 9132 fixed - When s = "abc // def" is evaluated WITH ECHO, only s="abc was
17 executed.
18
19* bug 9171 fixed - Problem to enter Japanese chars under Windows with IME.
20
21* bug 9183 fixed - Bad display of selected text when horizontal wrapping was
22 disabled.
23
24* bug 9186 fixed - An exception was thrown when textfield got the focus in code
25 navigator.
26
27* bug 9189 fixed - Certains keywords were not helpable.
28
29
11Xcos: 30Xcos:
12===== 31=====
13 32
14* Update the documentation with examples of the blocks and their translations to 33* Update the documentation with examples of the blocks and their translations to
15French: 34 French:
16- OUT_f - Regular Output Port 35 - OUT_f - Regular Output Port
17- IN_f - Regular Input Port 36 - IN_f - Regular Input Port
18- Modulo_Count - Modulo counter (0 to N counter) 37 - Modulo_Count - Modulo counter (0 to N counter)
19- OUTIMPL_f - Output implicit port 38 - OUTIMPL_f - Output implicit port
20- CLKINV_f - Input activation port 39 - CLKINV_f - Input activation port
21- CLKOUTV_f - Output activation port 40 - CLKOUTV_f - Output activation port
22- INIMPL_f - Implicit Input port 41 - INIMPL_f - Implicit Input port
23- Counter 42 - GENSIM_f - Sine wave generator
43 - STEP_FUNCTION - Step Function
44 - SAWTOOTH_f - Sawtooth generator
45 - Counter
46 - RAMP
47
48* bug 6416 fixed - GENSQR_f block documentation was not complete.
49
50* bug 8692 fixed - Null block parameters was not checked before encoding.
51
52* bug 9024 fixed - Opening a non existing file lead to palette closing issues.
53
54* bug 9077 fixed - Automotive Suspension demo was modified on loading.
55
56* bug 9111 fixed - Zoom In/Zoom Out keyboard shortcuts did not work on Apple
57 machines.
58
59* bug 9116 fixed - Saving a diagram with the default name produce an exception.
24 60
25* bug 9122 fixed - Java check failed on diagram validation. 61* bug 9122 fixed - Java check failed on diagram validation.
26 62
63* bug 9175 fixed - Xcos: Sigbuilder, modify "Data bounds" in curve editor fails
64
65Javasci:
66========
67
68* Javasci v2 FAQ updated.
69
70* bug 6823 fixed - In Javasci v1, the constructor
71 SciStringArray(String name, int r, int c) did not work.
72 Thanks to F. Legrand for providing the fix.
73
74* bug 9147 fixed - Javasci v1 was broken since the introduction of the
75 version 2.
76
77
78Dynamic link:
79=============
80
81* Under GNU/Linux and Mac OS X, the dynamic link is now creating a subdirectory
82 of TMPDIR instead of doing everything in the same directory. This could have
83 lead to unexpected side effects.
84
85
86Graphics:
87=========
88
89* It was not possible to set the compression quality when exporting into jpeg.
90 See bug 5573 and SEP 52.
91
92
93Localization:
94=============
95
96* bug 8994 fixed - Some localization templates were not included and
97 translated.
98
27Compilation: 99Compilation:
28============ 100============
29 101
@@ -31,7 +103,9 @@ Compilation:
31 103
32* Option --without-ocaml renamed to --without-modelica 104* Option --without-ocaml renamed to --without-modelica
33 105
34* Update the detection of Jgoodies / looks. 106* Update the detection of Jgoodies / looks under GNU/Linux and Mac OS X.
107
108* g77 is no longer supported. gfortran is replacing it.
35 109
36* Bug 7049 fixed - jgraphx version was checked even if the --without-xcos 110* Bug 7049 fixed - jgraphx version was checked even if the --without-xcos
37 flag is set. 111 flag is set.
@@ -46,18 +120,57 @@ Bug fixes:
46* bug 5687 fixed - The window title of a figure was not immediately updated when 120* bug 5687 fixed - The window title of a figure was not immediately updated when
47 figure_name was changed. 121 figure_name was changed.
48 122
123* bug 7954 fixed - Using TCL_EvalStr randomly froze Scilab.
124
125* bug 7976 fixed - help/cleaner_help.sce was not called when cleaning a toolbox.
126
127* bug 8317 fixed - Confusing examples updated.
128
129* bug 8371 fixed - Each thread used to get the command line was not detached
130 from the JVM.
131
49* Bug 8423 fixed - With certain options of the configure, the build process 132* Bug 8423 fixed - With certain options of the configure, the build process
50 failed. 133 failed.
51 134
135* bug 9070 fixed - The demonstration "Simulation/Wheel Simulation/Simulation with
136 ode" displayed a warning about an obsolete use of ilib_for_link.
137
138* bug 9082 fixed - It was not possible to preview LaTeX when it was a second
139 LaTeX string.
140
141* Bug 9083 fixed - Bad output with prettyprint and syslin.
142
52* bug 9113 fixed - setlookandfeel could lead to an exception. 143* bug 9113 fixed - setlookandfeel could lead to an exception.
53 144
54* bug 9121 fixed - Doc generation did not fail when an invalid image was met. 145* bug 9121 fixed - Doc generation did not fail when an invalid image was met.
55 146
147* bug 9125 fixed - Scilab could not start when called through a symbolic link.
148
56* bug 9126 fixed - Some new files of the module/toolbox skeleton introduced in 149* bug 9126 fixed - Some new files of the module/toolbox skeleton introduced in
57 Scilab 5.3.1 were not installed. 150 Scilab 5.3.1 were not installed.
58 151
59* bug 9128 fixed - In help page of dir(), infos about bytes field were missing. 152* bug 9128 fixed - In help page of dir(), infos about bytes field were missing.
60 153
154* bug 9139 fixed - Scilab 5.3.1 had an unexpected dependency on GLIBC_2.7
155 causing Scilab to crash under old RHEL / CentOS.
156
157* bug 9141 fixed - An extra empty line was present in the console.
158
159* bug 9147 fixed - Javasci v1 was broken since the introduction of the
160 version 2.
161
162* bug 9168 fixed - Bad command line width when completion window was shew at
163 the console bottom.
164
165* bug 9170 fixed - 'help clink' threw an exception.
166
167* bug 9195 fixed - Empty lines entered in Scilab console were displayed in
168 the history browser.
169
170* bug 9200 fixed - perl.sci script crashed on Windows with a wrong error message.
171
172* bug 9211 fixed - set("userdata", list()) crashed Scilab.
173
61 174
62 Changes between version 5.3.0 and 5.3.1 of Scilab 175 Changes between version 5.3.0 and 5.3.1 of Scilab
63 ================================================= 176 =================================================
diff --git a/scilab/Makemex.in b/scilab/Makemex.in
deleted file mode 100644
index 9056b1e..0000000
--- a/scilab/Makemex.in
+++ /dev/null
@@ -1,175 +0,0 @@
1# see examples/mex-examples/mex-with-so/Makefile
2# for an example of Makemex use
3# some variables are defined here and other are defined in Makefile.incl
4# @TODO: probably dead code
5
6SHELL = @SHELL@
7top_builddir = $(SCIDIR)
8
9DLLTOOL = @DLLTOOL@
10LIBM = @LIBM@
11LIBTOOL = @LIBTOOL@
12CXX=@CXX@
13LIBTOOL_DEPS = @LIBTOOL_DEPS@
14LN_S = @LN_S@
15NM = @NM@
16
17OBJDUMP = @OBJDUMP@
18STATIC = @STATIC@
19
20CPPFLAGS = @CPPFLAGS@
21LDFLAGS = @LDFLAGS@
22LIBS = @LIBS@
23FLIBS = @FLIBS@
24
25INCLUDES= -I$(SCIDIR)/routines
26CFLAGS = $(CC_OPTIONS)
27FFLAGS = $(FC_OPTIONS)
28COMPILE = $(CC) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
29FCOMPILE = $(FC) $(FFLAGS)
30
31QUIET=--quiet
32
33LTCOMPILE = $(LIBTOOL) --mode=compile $(QUIET) $(CC) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
34FLTCOMPILE = $(LIBTOOL) --mode=compile $(QUIET) $(FC) $(FFLAGS)
35
36LINK = $(LIBTOOL) --mode=link $(QUIET) $(CC) $(CFLAGS) $(LDFLAGS) $(FLIBS) -o $@
37
38OBJECTS = $(LIBRARY)_gateway.lo $(OTHEROBJECTS:.o=.lo)
39FCTMEXLO = $(FCTMEX:.c=.lo) $(FORTRANFCTMEX:.F=.lo)
40#*******************************************************************
41
42all:: all_nomes message
43
44all_nomes : CLEAROLD GATEWAYS $(OTHEROBJECTS) $(LIBRARY)_gateway.lo $(LIBRARY).la $(LIBRARY).sce
45
46.SUFFIXES:
47.SUFFIXES: .c .lo .o .F
48
49$(LIBRARY).la : $(OBJECTS)
50 @MEXOBJECTS=`echo $(FCTMEXLO) | sed -e "s+[a-zA-Z0-9_%$#]*/++g"`; \
51 $(LINK) -rpath `pwd` -module -avoid-version -export-dynamic $$MEXOBJECTS $(OBJECTS)
52 @$(LIBTOOL) --mode=install $(QUIET) cp $(LIBRARY).la `pwd`/$(LIBRARY).la
53
54$(LIBRARY)_gateway.c: Makefile
55 @echo "-- Generating the C function $(LIBRARY)_gateway.c";
56 @echo $(FCTMEX) > tmp_sce; echo $(FORTRANFCTMEX) >> tmp_sce;
57 @echo $(LIBRARY) > tmp2_sce;
58 @$(SCIDIR)/macros/Gensomex Xtmp_sce Xtmp2_sce;
59 @$(RM) tmp_sce;
60 @$(RM) tmp2_sce;
61 @echo "int C2F($(LIBRARY)_gateway)()" >> $(LIBRARY)_gateway.c;
62 @echo "{ Rhs = Max(0, Rhs); " >> $(LIBRARY)_gateway.c;
63 @echo "(*(Tab[Fin-1].f))(Tab[Fin-1].name,Tab[Fin-1].F);" >> $(LIBRARY)_gateway.c;
64 @echo " return 0;" >> $(LIBRARY)_gateway.c;
65 @echo "}" >> $(LIBRARY)_gateway.c;
66 @echo " /* */ " >> $(LIBRARY)_gateway.c;
67
68$(LIBRARY).sce: Makefile
69 @echo "-- Generating the Scilab script $(LIBRARY).sce";
70 @echo $(FCTMEX) > tmp_sce; echo $(FORTRANFCTMEX) >> tmp_sce;
71 @echo $(LIBRARY) > tmp2_sce;
72 @$(SCIDIR)/macros/Gensosce Xtmp_sce Xtmp2_sce;
73 @$(RM) tmp_sce;
74 @$(RM) tmp2_sce;
75 @echo "LIBPATH=\"$(LIBPATH)\";" >> $(LIBRARY).sce;
76 @echo "addinter(LIBPATH+\"$(LIBRARY).so\",\"$(LIBRARY)_gateway\",scilab_functions)" >> $(LIBRARY).sce;
77 @if test "$(LIBPATH)" = ""; then \
78 echo "------------------------------------------"; \
79 echo "Check LD_LIBRARY_PATH environment variable: "; \
80 echo "LD_LIBRARY_PATH=`pwd`; export LD_LIBRARY_PATH"; \
81 echo "or"; \
82 echo "setenv LD_LIBRARY_PATH `pwd`"; \
83 echo "------------------------------------------"; \
84 fi
85
86message:
87 @echo "------------------------------------------";
88 @echo "To load the function(s): ";
89 @if test "X$(FCTMEX)" != "X"; then for i in $(FCTMEX) ;\
90 do (\
91 name=`dirname $$i`; \
92 echo " $$name; " \
93 ); \
94 done ; fi
95 @if test "X$(FORTRANFCTMEX)" != "X"; then for i in $(FORTRANFCTMEX) ;\
96 do (\
97 name=`dirname $$i`; \
98 echo " $$name; " \
99 ); \
100 done ; fi
101 @echo " at Scilab prompt, enter:";
102 @echo "-->exec $(LIBRARY).sce";
103 @echo "------------------------------------------";
104
105clean ::
106 $(RM) *.o *.lo
107 $(RM) $(LIBRARY).sce
108 $(RM) $(LIBRARY)_gateway.c
109 $(RM) $(LIBRARY).la
110 $(RM) $(LIBRARY).so
111 $(RM) -r .libs
112
113distclean:: clean
114 $(RM) -f -r .libs $(LIBRARY).*
115 $(RM) $(LIBRARY).sce
116 $(RM) $(LIBRARY)_gateway.c
117
118$(LIBRARY)_gateway.lo: $(LIBRARY)_gateway.c
119 @$(LTCOMPILE) -c $(LIBRARY)_gateway.c
120
121GATEWAYS:
122 @if test "X$(FCTMEX)" != "X"; then for f in $(FCTMEX); \
123 do \
124 obj=`basename $$f .c`; \
125 mex=`dirname $$f`; \
126 make $$obj.o MEX=mex_$$mex ; \
127 make $$obj.lo MEX=mex_$$mex ; \
128 done; fi
129 @if test "X$(FORTRANFCTMEX)" != "X"; then for f in $(FORTRANFCTMEX); \
130 do \
131 obj=`basename $$f .F`; \
132 mex=`dirname $$f`; \
133 make $$obj.o MEX=mex$$mex ; \
134 make $$obj.lo MEX=mex$$mex ; \
135 done; fi
136
137.c.o:
138 @$(COMPILE) -DmexFunction=$(MEX) -c $<
139
140.c.lo :
141 @$(LTCOMPILE) -DmexFunction=$(MEX) -c $<
142
143.F.o:
144 @$(FCOMPILE) -Dmexfunction=$(MEX) -c $<
145
146.F.lo :
147 @$(FLTCOMPILE) -Dmexfunction=$(MEX) -c $<
148
149.f.o:
150 @$(FCOMPILE) -Dmexfunction=$(MEX) -c $<
151
152.f.lo :
153 @$(FLTCOMPILE) -Dmexfunction=$(MEX) -c $<
154
155CLEAROLD:
156 $(RM) $(LIBRARY).sce
157 $(RM) $(LIBRARY)_gateway.c
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
diff --git a/scilab/README_Unix b/scilab/README_Unix
index cf297d6..17fcd9f 100644
--- a/scilab/README_Unix
+++ b/scilab/README_Unix
@@ -1,53 +1,65 @@
1 Scilab 5.0 1 Scilab
2 ********** 2 ******
3 3
4 ****************************************************************************** 4 ******************************************************************************
5 INSTALLATION GUIDE 5 INSTALLATION GUIDE
6 ****************************************************************************** 6 ******************************************************************************
7 7
8 0 - COPYRIGHT NOTICE 8 0 - COPYRIGHT NOTICE
9 ******************** 9 ********************
10 10
11 Scilab is a free software released under the terms of the CeCILL license. 11 Scilab is a free software released under the terms of the CeCILL license.
12 This license is compatibility with the GNU General Public License (GPL). 12 This license is compatibility with the GNU General Public License (GPL).
13 See the included license: "COPYING" in English 13 See the included license: "COPYING" in English
14 "COPYING-FR" in French 14 "COPYING-FR" in French
15 15
16 Scilab is also using some codes with other licenses. Please see
17 SCI/modules/*/license.txt for details.
18
16 ****************************************************************************** 19 ******************************************************************************
17 20
18 I - TO INSTALL SCILAB 21 I - TO INSTALL SCILAB
19 ********************* 22 *********************
20 23
21 24
22 IF YOU HAVE A BINARY VERSION 25 IF YOU HAVE A BINARY VERSION
23 ---------------------------- 26 ----------------------------
24 Unpack Scilab and call the execution script: 27 Unpack Scilab and call the execution script:
25 # ./bin/scilab 28 # ./bin/scilab
26 29
30 Advanced command line interpreter (GUI, help browser, Tcl/Tk...)
31 # ./bin/scilab-adv-cli
32
33 Command line interpreter:
34 # ./bin/scilab-cli
35
27 For futher information: http://wiki.scilab.org/howto/install/linux 36 For futher information: http://wiki.scilab.org/howto/install/linux
28 37
29 38
30 IF YOU HAVE A SOURCE VERSION 39 IF YOU HAVE A SOURCE VERSION
31 ---------------------------- 40 ----------------------------
32 Please see on our wiki: 41 Please see on our wiki:
33 http://wiki.scilab.org/Compiling_Scilab_5.x_under_GNU-Linux_Unix 42 http://wiki.scilab.org/Compiling_Scilab_5.x_under_GNU-Linux_Unix
34 43
35 44
36 45
37 ****************************************************************************** 46 ******************************************************************************
38 II - REMARKS 47 II - OTHER RESOURCES
39 ******************************* 48 *******************************
40 49
41 1 - If you have any problem or suggestion to improve Scilab 50 1 - If you have any problem or suggestion to improve Scilab
42 http://bugzilla.scilab.org/index.cgi 51 http://bugzilla.scilab.org/
52
53 Don't hesitate to browse other the bug reports to see workarounds.
43 54
44 Don't hesitate to browse other the bug reports to see workarounds. 55 2 - User and development mailing lists are available:
45
46 2 - User and development mailing lists are available:
47 56
48 http://www.scilab.org/contactus/index_contactus.php?page=mailing_lists 57 http://www.scilab.org/communities/developer_zone/tools/mailing_list
58 Archives of these mailing lists are available:
59 http://mailinglists.scilab.org/
49 60
50 Archives of these mailing lists are available. 61 3 - Exchange files, script, data, experiences, etc:
62 http://fileexchange.scilab.org/
51 63
52 3 - The newsgroup is still available here: 64 4 - Browse our packages available through ATOMS:
53 comp.soft-sys.math.scilab 65 http://atoms.scilab.org/
diff --git a/scilab/README_Windows.txt b/scilab/README_Windows.txt
index b8430fc..3ff2d81 100644
--- a/scilab/README_Windows.txt
+++ b/scilab/README_Windows.txt
@@ -1,82 +1,109 @@
1 Scilab for Windows (XP/Vista/Seven) 1 Scilab for Windows (XP/Vista/Seven)
2 ******************************* 2 *******************************
3 3
4****************************************************************************** 4******************************************************************************
50 - COPYRIGHT NOTICE 50 - COPYRIGHT NOTICE
6****************************************************************************** 6******************************************************************************
7 7
8 Scilab is free software. 8 Scilab is a free software released under the terms of the CeCILL license.
9 See the included license: "license.txt" in English 9 This license is compatibility with the GNU General Public License (GPL).
10 "licence.txt" in French 10 See the included license: "COPYING" in English
11 11 "COPYING-FR" in French
12
13 Scilab is also using some codes with other licenses. Please see
14 SCI/modules/*/license.txt for details.
15
12****************************************************************************** 16******************************************************************************
13I - TO RUN SCILAB (BINARY VERSION) 17I - TO RUN SCILAB (BINARY VERSION)
14****************************************************************************** 18******************************************************************************
15 19
16 1 - You have already installed Scilab by executing "scilab-5.3.exe". 20 1 - You have already installed Scilab by executing "scilab-5.3.exe".
17 By default Scilab is in "C:\Program Files\scilab-5.3" directory. 21 By default Scilab is in "C:\Program Files\scilab-5.3" directory.
18 22
19 2 - Run Scilab by executing "Scilab 5.3" from the startup menu. 23 2 - Run Scilab by executing "Scilab 5.3" from the startup menu.
20 In fact, it is a link to "wscilex.exe" in Scilab subdirectory "bin", 24 In fact, it is a link to "wscilex.exe" in Scilab subdirectory "bin",
21 so you can run Scilab by executing directly "wscilex.exe". 25 so you can run Scilab by executing directly "wscilex.exe".
22 26
23 3 - Scilab has been compiled with Visual C++ .NET 2008 Pro 27 3 - Scilab has been compiled with Visual C++ .NET 2008 Pro
24 (Intel C 11.1 & Fortran 11.1, see III below). 28 (Intel C 2011 XE & Fortran 2011 XE, see III below).
25 All examples of dynamic link given with Scilab are prepared 29 All examples of dynamic link given with Scilab are prepared
26 for Visual C++. 30 for Visual C++.
27 31
28 4 - If you want use Microsoft Visual C++ 2008 Express with Scilab 5.3 32 4 - If you want use Microsoft Visual C++ 2008 Express with Scilab 5.3
29 http://www.microsoft.com/express/vc/ 33 http://www.microsoft.com/express/vc/
30 34
31 5 - If you have any problems or suggestions concerning Scilab, 35 5 - If you have any problems or suggestions concerning Scilab,
32 http://bugzilla.scilab.org/index.cgi 36 http://bugzilla.scilab.org/index.cgi
33 37
34 38
35****************************************************************************** 39******************************************************************************
36II - TO UNINSTALL SCILAB (BINARY VERSION) 40II - TO UNINSTALL SCILAB (BINARY VERSION)
37****************************************************************************** 41******************************************************************************
38 42
39 To uninstall Scilab you can use the unintaller. You will find it in the 43 To uninstall Scilab you can use the unintaller. You will find it in the
40 "Scilab 5.3" item of the Program Group. 44 "Scilab 5.3" item of the Program Group.
41 You can also use the Add/Remove Programs of the Control Panel. 45 You can also use the Add/Remove Programs of the Control Panel.
42 46
43 47
44****************************************************************************** 48******************************************************************************
45III - TO COMPILE SCILAB FROM A SOURCE VERSION 49III - TO COMPILE SCILAB FROM A SOURCE VERSION
46****************************************************************************** 50******************************************************************************
47
48 We have compiled this distribution with Visual Studio 2008 (Intel C 11.1 &
49 Fortran 11.1).
50 51
51 To compile with Visual C++ .NET 2008, see Readme_visual.txt 52 We have compiled this distribution with Visual Studio 2008 (Intel C 2011 XE &
52 53 Fortran 2011 XE).
54
55 To compile with Visual C++ .NET 2008, see Readme_visual.txt
56
53****************************************************************************** 57******************************************************************************
54IV - DOCUMENTATION 58IV - DOCUMENTATION
55****************************************************************************** 59******************************************************************************
56 60
57 In addition to Scilab online documentation (obtained by typing "help item" or 61 In addition to Scilab online documentation (obtained by typing "help item" or
58 clicking on the help button), you will find scilab wiki : 62 clicking on the help button).
63
64 An online help is also available:
65 http://help.scilab.org/
66
67 You will find scilab wiki :
59 http://wiki.scilab.org/ 68 http://wiki.scilab.org/
60 69
61****************************************************************************** 70******************************************************************************
62V - SOME IMPORTANT FILES AND DIRECTORIES 71V - SOME IMPORTANT FILES AND DIRECTORIES
63****************************************************************************** 72******************************************************************************
64 73
65 etc/scilab.start : startup file for Scilab instructions in this file 74 etc/scilab.start : startup file for Scilab instructions in this file
66 are executed when Scilab is executed. Note that 75 are executed when Scilab is executed. Note that
67 you can also have your own startup file "scilab.ini" 76 you can also have your own startup file "scilab.ini"
68 in your SCIHOME directory. 77 in your SCIHOME directory.
69 78
70 79
71 Scilab.sln : Visual Studio 2008 Scilab Solution with Intel Fortran. 80 Scilab.sln : Visual Studio 2008 Scilab Solution with Intel Fortran.
72 81
73 Scilab_f2c.sln : Visual Studio 2008 Scilab Solution without Intel Fortran. 82 Scilab_f2c.sln : Visual Studio 2008 Scilab Solution without Intel Fortran.
74 83
75 bin/ : executable code and scripts. 84 bin/ : executable code and scripts.
76 85
77 scilex : executable code of Scilab (Console version). 86 scilex : executable code of Scilab (Console version).
78 wscilex : executable code of Scilab (Windows version). 87 wscilex : executable code of Scilab (Windows version).
79 88
80****************************************************************************** 89******************************************************************************
90VI - OTHER RESOURCES
91******************************************************************************
92
93 1 - If you have any problem or suggestion to improve Scilab
94 http://bugzilla.scilab.org/
95
96 Don't hesitate to browse other the bug reports to see workarounds.
97
98 2 - User and development mailing lists are available:
81 99
82 \ No newline at end of file 100 http://www.scilab.org/communities/developer_zone/tools/mailing_list
101 Archives of these mailing lists are available:
102 http://mailinglists.scilab.org/
103
104 3 - Exchange files, script, data, experiences, etc:
105 http://fileexchange.scilab.org/
106
107 4 - Browse our packages available through ATOMS:
108 http://atoms.scilab.org/
109******************************************************************************
diff --git a/scilab/bin/scilab b/scilab/bin/scilab
index f222a81..4425df1 100755
--- a/scilab/bin/scilab
+++ b/scilab/bin/scilab
@@ -3,7 +3,7 @@
3# Scilab ( http://www.scilab.org/ ) - This file is part of Scilab 3# Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
4# Copyright (C) INRIA - 2006-2008 - Sylvestre Ledru 4# Copyright (C) INRIA - 2006-2008 - Sylvestre Ledru
5# Copyright (C) INRIA - 2008 - Simon Lipp 5# Copyright (C) INRIA - 2008 - Simon Lipp
6# Copyright (C) DIGITEO - 2009 - Sylvestre Ledru 6# Copyright (C) DIGITEO - 2009-2011 - Sylvestre Ledru
7# Copyright (C) DIGITEO - 2010 - Bruno JOFRET 7# Copyright (C) DIGITEO - 2010 - Bruno JOFRET
8# This file must be used under the terms of the CeCILL. 8# This file must be used under the terms of the CeCILL.
9# This source file is licensed as described in the file COPYING, which 9# This source file is licensed as described in the file COPYING, which
@@ -151,10 +151,10 @@ detect_type_of_scilab(){
151detect_os() { 151detect_os() {
152 152
153 if test "${OS}" = ""; then 153 if test "${OS}" = ""; then
154 OS=`uname -s` # Retrieve the Operating System 154 OS=$(uname -s) # Retrieve the Operating System
155 fi 155 fi
156 if test "${MODEL}" = ""; then 156 if test "${MODEL}" = ""; then
157 MODEL=`uname -m` # Retrieve the model 157 MODEL=$(uname -m) # Retrieve the model
158 fi 158 fi
159 159
160 if test $SCIVERBOSE -ne 0; then 160 if test $SCIVERBOSE -ne 0; then
@@ -169,10 +169,29 @@ detect_os
169 169
170detect_scilab_path() { 170detect_scilab_path() {
171 171
172 LOCALOLDPWD=`pwd` 172 LOCALOLDPWD=$(pwd)
173 173
174 # If we are running Scilab binary, it is trivial to set paths. 174 # If we are running Scilab binary, it is trivial to set paths.
175 curdir=`dirname "$progname"` 175 curdir=$(dirname "$progname")
176
177 # If the script is a symlink, it might be a symlink to the Scilab binary
178 # We could run into the bug #9125
179 if test -h $progname; then
180 while test -h "$progname"; do
181 bn=$(basename "$progname")
182 cd $(dirname "$progname")
183
184 # Browse the symlink to the real one
185 progname=$(/bin/ls -l "$bn" | sed -e 's/^.* -> //' )
186
187 if test ! -x "$progname"; then
188 break
189 fi
190 done
191 cd $(dirname "$progname")
192 curdir=$(pwd)
193 fi
194
176 if test -d $curdir/../thirdparty/ -a -d $curdir/../share/scilab; then 195 if test -d $curdir/../thirdparty/ -a -d $curdir/../share/scilab; then
177 # We are in the Scilab binary 196 # We are in the Scilab binary
178 IS_SCILAB_BINARY=1 197 IS_SCILAB_BINARY=1
@@ -188,15 +207,14 @@ detect_scilab_path() {
188 # Use scilab-bin in the current dir if it exists 207 # Use scilab-bin in the current dir if it exists
189 # If not, then start resolving symlinks until we find scilab-bin 208 # If not, then start resolving symlinks until we find scilab-bin
190 found=0 209 found=0
191 progname="$0" 210 curdir=$(dirname "$progname")
192 curdir=`dirname "$progname"`
193 PATH="$curdir:$PATH" 211 PATH="$curdir:$PATH"
194 212
195 progbase=`basename "$progname"` 213 progbase=$(basename "$progname")
196 run_sci="$curdir/$SCILABBIN" 214 run_sci="$curdir/$SCILABBIN"
197 if test -x "$run_sci"; then # scilab-bin is in the /bin/ directory 215 if test -x "$run_sci"; then # scilab-bin is in the /bin/ directory
198 cd "$curdir/../" 216 cd "$curdir/../"
199 SCI=`pwd` 217 SCI=$(pwd)
200 SCIBIN=$run_sci 218 SCIBIN=$run_sci
201 found=1 219 found=1
202 else 220 else
@@ -204,25 +222,26 @@ detect_scilab_path() {
204 if test -x "$run_sci"; then # scilab-bin is in the / directory 222 if test -x "$run_sci"; then # scilab-bin is in the / directory
205 # which is the case in a dev env 223 # which is the case in a dev env
206 cd "$curdir/../" 224 cd "$curdir/../"
207 SCI=`pwd` 225 SCI=$(pwd)
208 SCIBIN=$run_sci 226 SCIBIN=$run_sci
209 found=1 227 found=1
210 else 228 else
211 here=`/bin/pwd` 229 here=$(/bin/pwd)
212 while test -h "$progname"; do 230 while test -h "$progname"; do
213 bn=`basename "$progname"` 231 bn=$(basename "$progname")
214 cd `dirname "$progname"` 232 cd $(dirname "$progname")
215 # Browse the symlink to the real one 233 # Browse the symlink to the real one
216 progname=`/bin/ls -l "$bn" | sed -e 's/^.* -> //' ` 234 progname=$(/bin/ls -l "$bn" | sed -e 's/^.* -> //' )
217 if test ! -x "$progname"; then 235 if test ! -x "$progname"; then
218 break 236 break
219 fi 237 fi
220 curdir=`dirname "$progname"` 238 curdir=$(dirname "$progname")
221 if test -x "$curdir"; then 239 if test -x "$curdir"; then
222 cd "$curdir/../" 240 cd "$curdir/../"
223 SCI=`pwd` 241 SCI=$(pwd)
224 SCIBIN="$curdir/$SCILABBIN" 242 SCIBIN="$curdir/$SCILABBIN"
225 found=1 243 found=1
244
226 break 245 break
227 fi 246 fi
228 # The current file ($0), probably scilab is a symlink to the 247 # The current file ($0), probably scilab is a symlink to the
@@ -230,7 +249,7 @@ detect_scilab_path() {
230 run_sci="$curdir/../$SCILABBIN" 249 run_sci="$curdir/../$SCILABBIN"
231 if test -x "$run_sci"; then 250 if test -x "$run_sci"; then
232 cd "$curdir/../" 251 cd "$curdir/../"
233 SCI=`pwd` 252 SCI=$(pwd)
234 SCIBIN=$run_sci 253 SCIBIN=$run_sci
235 found=1 254 found=1
236 break 255 break
@@ -392,13 +411,13 @@ detect_java_vm() {
392 # resolve symlink 411 # resolve symlink
393 # Will probably bug if a file contains -> in the name 412 # Will probably bug if a file contains -> in the name
394 while ls -ld "$_cur" 2>/dev/null | grep " -> " >/dev/null; do 413 while ls -ld "$_cur" 2>/dev/null | grep " -> " >/dev/null; do
395 _cur=`ls -ld "$_cur" | sed 's/.* -> //'` 414 _cur=$(ls -ld "$_cur" | sed 's/.* -> //')
396 done 415 done
397 # symlink resolved to the real file 416 # symlink resolved to the real file
398 417
399 # Now, create JAVA_HOME 418 # Now, create JAVA_HOME
400 TMP=`dirname $_cur` 419 TMP=$(dirname $_cur)
401 JAVA_HOME=`dirname $TMP` 420 JAVA_HOME=$(dirname $TMP)
402 if test ! -z "$JAVA_HOME"; then 421 if test ! -z "$JAVA_HOME"; then
403 break; 422 break;
404 fi 423 fi
@@ -428,8 +447,8 @@ detect_java_vm() {
428 ;; 447 ;;
429 i?86) 448 i?86)
430 449
431 if test -d ${JRE_HOME}/lib/`uname -m` ; then 450 if test -d ${JRE_HOME}/lib/$(uname -m) ; then
432 proc=`uname -m` 451 proc=$(uname -m)
433 else 452 else
434 proc="i386" 453 proc="i386"
435 fi 454 fi
@@ -532,6 +551,9 @@ detect_java_vm() {
532} 551}
533 552
534detect_scilab_path 553detect_scilab_path
554if test $SCIVERBOSE -ne 0; then
555 echo "IS_SCILAB_BINARY : $IS_SCILAB_BINARY"
556fi
535 557
536# If we are calling scilab-cli, no need to detect java. 558# If we are calling scilab-cli, no need to detect java.
537if test $DISABLE_JAVA_DETECTION -ne 1; then 559if test $DISABLE_JAVA_DETECTION -ne 1; then
@@ -572,7 +594,7 @@ fi
572# desactivate bug-buddy. 594# desactivate bug-buddy.
573# See also https://bugzilla.novell.com/show_bug.cgi?id=331618 595# See also https://bugzilla.novell.com/show_bug.cgi?id=331618
574# and: http://bugzilla.gnome.org/show_bug.cgi?id=479929 596# and: http://bugzilla.gnome.org/show_bug.cgi?id=479929
575GTK_MODULES=`echo $GTK_MODULES | sed s/gnomebreakpad//g` 597GTK_MODULES=$(echo $GTK_MODULES | sed s/gnomebreakpad//g)
576export GTK_MODULES 598export GTK_MODULES
577 599
578if test $SCIVERBOSE -ne 0; then 600if test $SCIVERBOSE -ne 0; then
@@ -596,7 +618,7 @@ cd "$LOCALOLDPWD"
596#export PVM_ROOT 618#export PVM_ROOT
597 619
598#if test "$PVM_ARCH" = ""; then 620#if test "$PVM_ARCH" = ""; then
599# PVM_ARCH=`$PVM_ROOT/lib/pvmgetarch` 621# PVM_ARCH=$($PVM_ROOT/lib/pvmgetarch)
600#fi 622#fi
601#export PVM_ARCH 623#export PVM_ARCH
602 624
@@ -694,13 +716,13 @@ do_compile()
694{ 716{
695 umask 002 717 umask 002
696 rm -f report 718 rm -f report
697 name=`basename $1 .sci` 719 name=$(basename $1 .sci)
698 echo generating $name.bin 720 echo generating $name.bin
699 echo "predef();exec('$name.sci');save('$name.bin');quit"\ 721 echo "predef();exec('$name.sci');save('$name.bin');quit"\
700 | $SCILABBIN -ns -nwni | sed 1,8d 1>report 2>&1 722 | $SCILABBIN -ns -nwni | sed 1,8d 1>report 2>&1
701 if (grep error report 1> /dev/null 2>&1); 723 if (grep error report 1> /dev/null 2>&1);
702 then cat report;echo " " 724 then cat report;echo " "
703 echo see `pwd`/report for more information 725 echo see $(pwd)/report for more information
704 grep libok report>/dev/null; 726 grep libok report>/dev/null;
705 else rm -f report; 727 else rm -f report;
706 fi 728 fi
@@ -716,7 +738,7 @@ do_lib()
716 | $SCILABBIN -ns -nwni |sed 1,/--\>/d 1>report 2>&1 738 | $SCILABBIN -ns -nwni |sed 1,/--\>/d 1>report 2>&1
717 if (grep error report 1> /dev/null 2>&1); 739 if (grep error report 1> /dev/null 2>&1);
718 then cat report;echo " " 740 then cat report;echo " "
719 echo see `pwd`/report for more information 741 echo see $(pwd)/report for more information
720 grep libok report>/dev/null; 742 grep libok report>/dev/null;
721 else rm -f report; 743 else rm -f report;
722 fi 744 fi
diff --git a/scilab/build.incl.xml b/scilab/build.incl.xml
index a787179..5fc4dcd 100644
--- a/scilab/build.incl.xml
+++ b/scilab/build.incl.xml
@@ -121,9 +121,10 @@
121 <pathelement location="${classes.test.dir}"/> 121 <pathelement location="${classes.test.dir}"/>
122 </classpath> 122 </classpath>
123 <classfileset dir="${build.test.dir}" includes="**/*.class"/> 123 <classfileset dir="${build.test.dir}" includes="**/*.class"/>
124 <!-- Where ${basedir} is the module base directory -->
125 <env key="SCI" value="${basedir}/../.."/>
124 <jvmarg value="-DtestngTests=1"/> 126 <jvmarg value="-DtestngTests=1"/>
125 <jvmarg value="-DSCI=${base.dir}"/> 127 <jvmarg value="-Djava.library.path=${base.dir}/modules/.libs/:${base.dir}/modules/javasci/.libs/:${base.dir}/modules/localization/.libs/:${base.dir}/modules/commons/.libs/:${base.dir}/modules/action_binding/.libs/:${base.dir}/thirdparty/:${base.dir}/bin/:/usr/lib/jni/:/usr/lib64/jni:"/>
126 <jvmarg value="-Djava.library.path=${base.dir}/modules/.libs/:${base.dir}/modules/javasci/.libs/:${base.dir}/modules/localization/.libs/:${base.dir}/thirdparty/:${base.dir}/bin/:/usr/lib/jni/:/usr/lib64/jni:"/>
127 </testng> 128 </testng>
128 </target> 129 </target>
129 <target name="validate"> 130 <target name="validate">
diff --git a/scilab/configure b/scilab/configure
index e1d570c..0b4460d 100755
--- a/scilab/configure
+++ b/scilab/configure
@@ -1,7 +1,7 @@
1#! /bin/sh 1#! /bin/sh
2# From configure.ac Revision. 2# From configure.ac Revision.
3# Guess values for system-dependent variables and create Makefiles. 3# Guess values for system-dependent variables and create Makefiles.
4# Generated by GNU Autoconf 2.67 for Scilab 5. 4# Generated by GNU Autoconf 2.66 for Scilab 5.
5# 5#
6# Report bugs to <http://bugzilla.scilab.org/>. 6# Report bugs to <http://bugzilla.scilab.org/>.
7# 7#
@@ -935,7 +935,6 @@ enable_debug_linker
935enable_code_coverage 935enable_code_coverage
936enable_stopOnWarning 936enable_stopOnWarning
937with_gcc 937with_gcc
938with_g77
939with_gfortran 938with_gfortran
940with_intelcompilers 939with_intelcompilers
941with_tk 940with_tk
@@ -1070,9 +1069,8 @@ do
1070 fi 1069 fi
1071 1070
1072 case $ac_option in 1071 case $ac_option in
1073 *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; 1072 *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
1074 *=) ac_optarg= ;; 1073 *) ac_optarg=yes ;;
1075 *) ac_optarg=yes ;;
1076 esac 1074 esac
1077 1075
1078 # Accept the important Cygnus configure options, so we can diagnose typos. 1076 # Accept the important Cygnus configure options, so we can diagnose typos.
@@ -1677,7 +1675,6 @@ Optional Packages:
1677 --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) 1675 --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
1678 --with-gnu-ld assume the C compiler uses GNU ld default=no 1676 --with-gnu-ld assume the C compiler uses GNU ld default=no
1679 --with-gcc Use gcc C compiler 1677 --with-gcc Use gcc C compiler
1680 --with-g77 Use g77, GNU Fortran 77 compiler
1681 --with-gfortran Use gfortran, GNU Fortran 95 compiler 1678 --with-gfortran Use gfortran, GNU Fortran 95 compiler
1682 --with-intelcompilers Use Intel C (icc) and Fortran (ifort) proprietary 1679 --with-intelcompilers Use Intel C (icc) and Fortran (ifort) proprietary
1683 compilers (GNU/Linux only) 1680 compilers (GNU/Linux only)
@@ -1824,7 +1821,7 @@ test -n "$ac_init_help" && exit $ac_status
1824if $ac_init_version; then 1821if $ac_init_version; then
1825 cat <<\_ACEOF 1822 cat <<\_ACEOF
1826Scilab configure 5 1823Scilab configure 5
1827generated by GNU Autoconf 2.67 1824generated by GNU Autoconf 2.66
1828 1825
1829Copyright (C) 2010 Free Software Foundation, Inc. 1826Copyright (C) 2010 Free Software Foundation, Inc.
1830This configure script is free software; the Free Software Foundation 1827This configure script is free software; the Free Software Foundation
@@ -1896,7 +1893,7 @@ $as_echo "$ac_try_echo"; } >&5
1896 mv -f conftest.er1 conftest.err 1893 mv -f conftest.er1 conftest.err
1897 fi 1894 fi
1898 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 1895 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1899 test $ac_status = 0; } > conftest.i && { 1896 test $ac_status = 0; } >/dev/null && {
1900 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || 1897 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
1901 test ! -s conftest.err 1898 test ! -s conftest.err
1902 }; then : 1899 }; then :
@@ -1959,7 +1956,7 @@ if ac_fn_c_try_cpp "$LINENO"; then :
1959else 1956else
1960 ac_header_preproc=no 1957 ac_header_preproc=no
1961fi 1958fi
1962rm -f conftest.err conftest.i conftest.$ac_ext 1959rm -f conftest.err conftest.$ac_ext
1963{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 1960{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
1964$as_echo "$ac_header_preproc" >&6; } 1961$as_echo "$ac_header_preproc" >&6; }
1965 1962
@@ -2521,7 +2518,7 @@ $as_echo "$ac_try_echo"; } >&5
2521 mv -f conftest.er1 conftest.err 2518 mv -f conftest.er1 conftest.err
2522 fi 2519 fi
2523 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 2520 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2524 test $ac_status = 0; } > conftest.i && { 2521 test $ac_status = 0; } >/dev/null && {
2525 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || 2522 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
2526 test ! -s conftest.err 2523 test ! -s conftest.err
2527 }; then : 2524 }; then :
@@ -2633,7 +2630,7 @@ This file contains any messages produced by compilers while
2633running configure, to aid debugging if configure makes a mistake. 2630running configure, to aid debugging if configure makes a mistake.
2634 2631
2635It was created by Scilab $as_me 5, which was 2632It was created by Scilab $as_me 5, which was
2636generated by GNU Autoconf 2.67. Invocation command line was 2633generated by GNU Autoconf 2.66. Invocation command line was
2637 2634
2638 $ $0 $@ 2635 $ $0 $@
2639 2636
@@ -2891,7 +2888,7 @@ $as_echo "$as_me: loading site script $ac_site_file" >&6;}
2891 || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 2888 || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
2892$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 2889$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
2893as_fn_error $? "failed to load site script $ac_site_file 2890as_fn_error $? "failed to load site script $ac_site_file
2894See \`config.log' for more details" "$LINENO" 5 ; } 2891See \`config.log' for more details" "$LINENO" 5; }
2895 fi 2892 fi
2896done 2893done
2897 2894
@@ -2990,7 +2987,7 @@ SCI_SRCDIR_FULL="`cd $SCI_SRCDIR && pwd`"
2990 2987
2991SCILAB_VERSION_MAJOR=5 2988SCILAB_VERSION_MAJOR=5
2992SCILAB_VERSION_MINOR=3 2989SCILAB_VERSION_MINOR=3
2993SCILAB_VERSION_MAINTENANCE=1 2990SCILAB_VERSION_MAINTENANCE=2
2994 2991
2995 2992
2996 2993
@@ -3486,7 +3483,7 @@ fi
3486test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 3483test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
3487$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 3484$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
3488as_fn_error $? "no acceptable C compiler found in \$PATH 3485as_fn_error $? "no acceptable C compiler found in \$PATH
3489See \`config.log' for more details" "$LINENO" 5 ; } 3486See \`config.log' for more details" "$LINENO" 5; }
3490 3487
3491# Provide some information about the compiler. 3488# Provide some information about the compiler.
3492$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 3489$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -3601,7 +3598,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
3601{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 3598{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
3602$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 3599$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
3603as_fn_error 77 "C compiler cannot create executables 3600as_fn_error 77 "C compiler cannot create executables
3604See \`config.log' for more details" "$LINENO" 5 ; } 3601See \`config.log' for more details" "$LINENO" 5; }
3605else 3602else
3606 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 3603 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
3607$as_echo "yes" >&6; } 3604$as_echo "yes" >&6; }
@@ -3644,7 +3641,7 @@ else
3644 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 3641 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
3645$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 3642$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
3646as_fn_error $? "cannot compute suffix of executables: cannot compile and link 3643as_fn_error $? "cannot compute suffix of executables: cannot compile and link
3647See \`config.log' for more details" "$LINENO" 5 ; } 3644See \`config.log' for more details" "$LINENO" 5; }
3648fi 3645fi
3649rm -f conftest conftest$ac_cv_exeext 3646rm -f conftest conftest$ac_cv_exeext
3650{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 3647{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
@@ -3703,7 +3700,7 @@ $as_echo "$ac_try_echo"; } >&5
3703$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 3700$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
3704as_fn_error $? "cannot run C compiled programs. 3701as_fn_error $? "cannot run C compiled programs.
3705If you meant to cross compile, use \`--host'. 3702If you meant to cross compile, use \`--host'.
3706See \`config.log' for more details" "$LINENO" 5 ; } 3703See \`config.log' for more details" "$LINENO" 5; }
3707 fi 3704 fi
3708 fi 3705 fi
3709fi 3706fi
@@ -3755,7 +3752,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
3755{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 3752{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
3756$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 3753$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
3757as_fn_error $? "cannot compute suffix of object files: cannot compile 3754as_fn_error $? "cannot compute suffix of object files: cannot compile
3758See \`config.log' for more details" "$LINENO" 5 ; } 3755See \`config.log' for more details" "$LINENO" 5; }
3759fi 3756fi
3760rm -f conftest.$ac_cv_objext conftest.$ac_ext 3757rm -f conftest.$ac_cv_objext conftest.$ac_ext
3761fi 3758fi
@@ -4379,7 +4376,7 @@ fi
4379$as_echo "$ac_cv_build" >&6; } 4376$as_echo "$ac_cv_build" >&6; }
4380case $ac_cv_build in 4377case $ac_cv_build in
4381*-*-*) ;; 4378*-*-*) ;;
4382*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;; 4379*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
4383esac 4380esac
4384build=$ac_cv_build 4381build=$ac_cv_build
4385ac_save_IFS=$IFS; IFS='-' 4382ac_save_IFS=$IFS; IFS='-'
@@ -4412,7 +4409,7 @@ fi
4412$as_echo "$ac_cv_host" >&6; } 4409$as_echo "$ac_cv_host" >&6; }
4413case $ac_cv_host in 4410case $ac_cv_host in
4414*-*-*) ;; 4411*-*-*) ;;
4415*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;; 4412*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
4416esac 4413esac
4417host=$ac_cv_host 4414host=$ac_cv_host
4418ac_save_IFS=$IFS; IFS='-' 4415ac_save_IFS=$IFS; IFS='-'
@@ -4634,7 +4631,7 @@ else
4634 # Broken: fails on valid input. 4631 # Broken: fails on valid input.
4635continue 4632continue
4636fi 4633fi
4637rm -f conftest.err conftest.i conftest.$ac_ext 4634rm -f conftest.err conftest.$ac_ext
4638 4635
4639 # OK, works on sane cases. Now check whether nonexistent headers 4636 # OK, works on sane cases. Now check whether nonexistent headers
4640 # can be detected and how. 4637 # can be detected and how.
@@ -4650,11 +4647,11 @@ else
4650ac_preproc_ok=: 4647ac_preproc_ok=:
4651break 4648break
4652fi 4649fi
4653rm -f conftest.err conftest.i conftest.$ac_ext 4650rm -f conftest.err conftest.$ac_ext
4654 4651
4655done 4652done
4656# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. 4653# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
4657rm -f conftest.i conftest.err conftest.$ac_ext 4654rm -f conftest.err conftest.$ac_ext
4658if $ac_preproc_ok; then : 4655if $ac_preproc_ok; then :
4659 break 4656 break
4660fi 4657fi
@@ -4693,7 +4690,7 @@ else
4693 # Broken: fails on valid input. 4690 # Broken: fails on valid input.
4694continue 4691continue
4695fi 4692fi
4696rm -f conftest.err conftest.i conftest.$ac_ext 4693rm -f conftest.err conftest.$ac_ext
4697 4694
4698 # OK, works on sane cases. Now check whether nonexistent headers 4695 # OK, works on sane cases. Now check whether nonexistent headers
4699 # can be detected and how. 4696 # can be detected and how.
@@ -4709,18 +4706,18 @@ else
4709ac_preproc_ok=: 4706ac_preproc_ok=:
4710break 4707break
4711fi 4708fi
4712rm -f conftest.err conftest.i conftest.$ac_ext 4709rm -f conftest.err conftest.$ac_ext
4713 4710
4714done 4711done
4715# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. 4712# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
4716rm -f conftest.i conftest.err conftest.$ac_ext 4713rm -f conftest.err conftest.$ac_ext
4717if $ac_preproc_ok; then : 4714if $ac_preproc_ok; then :
4718 4715
4719else 4716else
4720 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 4717 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
4721$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 4718$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
4722as_fn_error $? "C preprocessor \"$CPP\" fails sanity check 4719as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
4723See \`config.log' for more details" "$LINENO" 5 ; } 4720See \`config.log' for more details" "$LINENO" 5; }
4724fi 4721fi
4725 4722
4726ac_ext=c 4723ac_ext=c
@@ -5160,11 +5157,11 @@ am_lf='
5160' 5157'
5161case `pwd` in 5158case `pwd` in
5162 *[\\\"\#\$\&\'\`$am_lf]*) 5159 *[\\\"\#\$\&\'\`$am_lf]*)
5163 as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;; 5160 as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
5164esac 5161esac
5165case $srcdir in 5162case $srcdir in
5166 *[\\\"\#\$\&\'\`$am_lf\ \ ]*) 5163 *[\\\"\#\$\&\'\`$am_lf\ \ ]*)
5167 as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;; 5164 as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
5168esac 5165esac
5169 5166
5170# Do `set' in a subshell so we don't clobber the current shell's 5167# Do `set' in a subshell so we don't clobber the current shell's
@@ -5673,13 +5670,6 @@ fi
5673 5670
5674 5671
5675 5672
5676# Check whether --with-g77 was given.
5677if test "${with_g77+set}" = set; then :
5678 withval=$with_g77;
5679fi
5680
5681
5682
5683# Check whether --with-gfortran was given. 5673# Check whether --with-gfortran was given.
5684if test "${with_gfortran+set}" = set; then : 5674if test "${with_gfortran+set}" = set; then :
5685 withval=$with_gfortran; 5675 withval=$with_gfortran;
@@ -5779,7 +5769,7 @@ else
5779 # Broken: fails on valid input. 5769 # Broken: fails on valid input.
5780continue 5770continue
5781fi 5771fi
5782rm -f conftest.err conftest.i conftest.$ac_ext 5772rm -f conftest.err conftest.$ac_ext
5783 5773
5784 # OK, works on sane cases. Now check whether nonexistent headers 5774 # OK, works on sane cases. Now check whether nonexistent headers
5785 # can be detected and how. 5775 # can be detected and how.
@@ -5795,11 +5785,11 @@ else
5795ac_preproc_ok=: 5785ac_preproc_ok=:
5796break 5786break
5797fi 5787fi
5798rm -f conftest.err conftest.i conftest.$ac_ext 5788rm -f conftest.err conftest.$ac_ext
5799 5789
5800done 5790done
5801# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. 5791# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
5802rm -f conftest.i conftest.err conftest.$ac_ext 5792rm -f conftest.err conftest.$ac_ext
5803if $ac_preproc_ok; then : 5793if $ac_preproc_ok; then :
5804 break 5794 break
5805fi 5795fi
@@ -5838,7 +5828,7 @@ else
5838 # Broken: fails on valid input. 5828 # Broken: fails on valid input.
5839continue 5829continue
5840fi 5830fi
5841rm -f conftest.err conftest.i conftest.$ac_ext 5831rm -f conftest.err conftest.$ac_ext
5842 5832
5843 # OK, works on sane cases. Now check whether nonexistent headers 5833 # OK, works on sane cases. Now check whether nonexistent headers
5844 # can be detected and how. 5834 # can be detected and how.
@@ -5854,18 +5844,18 @@ else
5854ac_preproc_ok=: 5844ac_preproc_ok=:
5855break 5845break
5856fi 5846fi
5857rm -f conftest.err conftest.i conftest.$ac_ext 5847rm -f conftest.err conftest.$ac_ext
5858 5848
5859done 5849done
5860# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. 5850# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
5861rm -f conftest.i conftest.err conftest.$ac_ext 5851rm -f conftest.err conftest.$ac_ext
5862if $ac_preproc_ok; then : 5852if $ac_preproc_ok; then :
5863 5853
5864else 5854else
5865 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 5855 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
5866$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 5856$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
5867as_fn_error $? "C preprocessor \"$CPP\" fails sanity check 5857as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
5868See \`config.log' for more details" "$LINENO" 5 ; } 5858See \`config.log' for more details" "$LINENO" 5; }
5869fi 5859fi
5870 5860
5871ac_ext=c 5861ac_ext=c
@@ -6095,231 +6085,11 @@ fi
6095## check if options are correct (or not) 6085## check if options are correct (or not)
6096##################################################### 6086#####################################################
6097 6087
6098if test "$with_g77" = yes -a "$with_gfortran" = yes; then
6099 as_fn_error $? "Conflicting options : you specified two fortran compilers" "$LINENO" 5
6100fi
6101
6102if test "$with_intelcompilers" = yes -a "$with_gcc" = yes; then 6088if test "$with_intelcompilers" = yes -a "$with_gcc" = yes; then
6103 as_fn_error $? "Conflicting options : you specified two compiler series" "$LINENO" 5 6089 as_fn_error $? "Conflicting options : you specified two compiler series" "$LINENO" 5
6104fi 6090fi
6105 6091
6106######## fortran ######## 6092######## fortran ########
6107if test "$with_g77" = yes; then
6108 ac_ext=f
6109ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
6110ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
6111ac_compiler_gnu=$ac_cv_f77_compiler_gnu
6112if test -n "$ac_tool_prefix"; then
6113 for ac_prog in g77
6114 do
6115 # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
6116set dummy $ac_tool_prefix$ac_prog; ac_word=$2
6117{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6118$as_echo_n "checking for $ac_word... " >&6; }
6119if test "${ac_cv_prog_F77+set}" = set; then :
6120 $as_echo_n "(cached) " >&6
6121else
6122 if test -n "$F77"; then
6123 ac_cv_prog_F77="$F77" # Let the user override the test.
6124else
6125as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
6126for as_dir in $PATH
6127do
6128 IFS=$as_save_IFS
6129 test -z "$as_dir" && as_dir=.
6130 for ac_exec_ext in '' $ac_executable_extensions; do
6131 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6132 ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
6133 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6134 break 2
6135 fi
6136done
6137 done
6138IFS=$as_save_IFS
6139
6140fi
6141fi
6142F77=$ac_cv_prog_F77
6143if test -n "$F77"; then
6144 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $F77" >&5
6145$as_echo "$F77" >&6; }
6146else
6147 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6148$as_echo "no" >&6; }
6149fi
6150
6151
6152 test -n "$F77" && break
6153 done
6154fi
6155if test -z "$F77"; then
6156 ac_ct_F77=$F77
6157 for ac_prog in g77
6158do
6159 # Extract the first word of "$ac_prog", so it can be a program name with args.
6160set dummy $ac_prog; ac_word=$2
6161{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6162$as_echo_n "checking for $ac_word... " >&6; }
6163if test "${ac_cv_prog_ac_ct_F77+set}" = set; then :
6164 $as_echo_n "(cached) " >&6
6165else
6166 if test -n "$ac_ct_F77"; then
6167 ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test.
6168else
6169as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
6170for as_dir in $PATH
6171do
6172 IFS=$as_save_IFS
6173 test -z "$as_dir" && as_dir=.
6174 for ac_exec_ext in '' $ac_executable_extensions; do
6175 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6176 ac_cv_prog_ac_ct_F77="$ac_prog"
6177 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6178 break 2
6179 fi
6180done
6181 done
6182IFS=$as_save_IFS
6183
6184fi
6185fi
6186ac_ct_F77=$ac_cv_prog_ac_ct_F77
6187if test -n "$ac_ct_F77"; then
6188 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_F77" >&5
6189$as_echo "$ac_ct_F77" >&6; }
6190else
6191 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6192$as_echo "no" >&6; }
6193fi
6194
6195
6196 test -n "$ac_ct_F77" && break
6197done
6198
6199 if test "x$ac_ct_F77" = x; then
6200 F77=""
6201 else
6202 case $cross_compiling:$ac_tool_warned in
6203yes:)
6204{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
6205$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
6206ac_tool_warned=yes ;;
6207esac
6208 F77=$ac_ct_F77
6209 fi
6210fi
6211
6212
6213# Provide some information about the compiler.
6214$as_echo "$as_me:${as_lineno-$LINENO}: checking for Fortran 77 compiler version" >&5
6215set X $ac_compile
6216ac_compiler=$2
6217for ac_option in --version -v -V -qversion; do
6218 { { ac_try="$ac_compiler $ac_option >&5"
6219case "(($ac_try" in
6220 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6221 *) ac_try_echo=$ac_try;;
6222esac
6223eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
6224$as_echo "$ac_try_echo"; } >&5
6225 (eval "$ac_compiler $ac_option >&5") 2>conftest.err
6226 ac_status=$?
6227 if test -s conftest.err; then
6228 sed '10a\
6229... rest of stderr output deleted ...
6230 10q' conftest.err >conftest.er1
6231 cat conftest.er1 >&5
6232 fi
6233 rm -f conftest.er1 conftest.err
6234 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
6235 test $ac_status = 0; }
6236done
6237rm -f a.out
6238
6239# If we don't use `.F' as extension, the preprocessor is not run on the
6240# input file. (Note that this only needs to work for GNU compilers.)
6241ac_save_ext=$ac_ext
6242ac_ext=F
6243{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU Fortran 77 compiler" >&5
6244$as_echo_n "checking whether we are using the GNU Fortran 77 compiler... " >&6; }
6245if test "${ac_cv_f77_compiler_gnu+set}" = set; then :
6246 $as_echo_n "(cached) " >&6
6247else
6248 cat > conftest.$ac_ext <<_ACEOF
6249 program main
6250#ifndef __GNUC__
6251 choke me
6252#endif
6253
6254 end
6255_ACEOF
6256if ac_fn_f77_try_compile "$LINENO"; then :
6257 ac_compiler_gnu=yes
6258else
6259 ac_compiler_gnu=no
6260fi
6261rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
6262ac_cv_f77_compiler_gnu=$ac_compiler_gnu
6263
6264fi
6265{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_f77_compiler_gnu" >&5
6266$as_echo "$ac_cv_f77_compiler_gnu" >&6; }
6267ac_ext=$ac_save_ext
6268ac_test_FFLAGS=${FFLAGS+set}
6269ac_save_FFLAGS=$FFLAGS
6270FFLAGS=
6271{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $F77 accepts -g" >&5
6272$as_echo_n "checking whether $F77 accepts -g... " >&6; }
6273if test "${ac_cv_prog_f77_g+set}" = set; then :
6274 $as_echo_n "(cached) " >&6
6275else
6276 FFLAGS=-g
6277cat > conftest.$ac_ext <<_ACEOF
6278 program main
6279
6280 end
6281_ACEOF
6282if ac_fn_f77_try_compile "$LINENO"; then :
6283 ac_cv_prog_f77_g=yes
6284else
6285 ac_cv_prog_f77_g=no
6286fi
6287rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
6288
6289fi
6290{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_f77_g" >&5
6291$as_echo "$ac_cv_prog_f77_g" >&6; }
6292if test "$ac_test_FFLAGS" = set; then
6293 FFLAGS=$ac_save_FFLAGS
6294elif test $ac_cv_prog_f77_g = yes; then
6295 if test "x$ac_cv_f77_compiler_gnu" = xyes; then
6296 FFLAGS="-g -O2"
6297 else
6298 FFLAGS="-g"
6299 fi
6300else
6301 if test "x$ac_cv_f77_compiler_gnu" = xyes; then
6302 FFLAGS="-O2"
6303 else
6304 FFLAGS=
6305 fi
6306fi
6307
6308if test $ac_compiler_gnu = yes; then
6309 G77=yes
6310else
6311 G77=
6312fi
6313ac_ext=c
6314ac_cpp='$CPP $CPPFLAGS'
6315ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
6316ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
6317ac_compiler_gnu=$ac_cv_c_compiler_gnu
6318
6319 if test -z "$F77"; then
6320 as_fn_error $? "You asked me to use g77 but i haven't been able to find it" "$LINENO" 5
6321 fi
6322fi
6323 6093
6324if test "$with_gfortran" = yes; then 6094if test "$with_gfortran" = yes; then
6325 ac_ext=f 6095 ac_ext=f
@@ -7137,7 +6907,7 @@ fi
7137test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 6907test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
7138$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 6908$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
7139as_fn_error $? "no acceptable C compiler found in \$PATH 6909as_fn_error $? "no acceptable C compiler found in \$PATH
7140See \`config.log' for more details" "$LINENO" 5 ; } 6910See \`config.log' for more details" "$LINENO" 5; }
7141 6911
7142# Provide some information about the compiler. 6912# Provide some information about the compiler.
7143$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 6913$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -7491,7 +7261,7 @@ fi
7491test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 7261test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
7492$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 7262$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
7493as_fn_error $? "no acceptable C compiler found in \$PATH 7263as_fn_error $? "no acceptable C compiler found in \$PATH
7494See \`config.log' for more details" "$LINENO" 5 ; } 7264See \`config.log' for more details" "$LINENO" 5; }
7495 7265
7496# Provide some information about the compiler. 7266# Provide some information about the compiler.
7497$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 7267$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -8038,7 +7808,7 @@ fi
8038test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 7808test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
8039$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 7809$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
8040as_fn_error $? "no acceptable C compiler found in \$PATH 7810as_fn_error $? "no acceptable C compiler found in \$PATH
8041See \`config.log' for more details" "$LINENO" 5 ; } 7811See \`config.log' for more details" "$LINENO" 5; }
8042 7812
8043# Provide some information about the compiler. 7813# Provide some information about the compiler.
8044$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 7814$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -8299,7 +8069,7 @@ else
8299 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 8069 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
8300$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 8070$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
8301as_fn_error 77 "cannot compute sizeof (int) 8071as_fn_error 77 "cannot compute sizeof (int)
8302See \`config.log' for more details" "$LINENO" 5 ; } 8072See \`config.log' for more details" "$LINENO" 5; }
8303 else 8073 else
8304 ac_cv_sizeof_int=0 8074 ac_cv_sizeof_int=0
8305 fi 8075 fi
@@ -8332,7 +8102,7 @@ else
8332 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 8102 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
8333$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 8103$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
8334as_fn_error 77 "cannot compute sizeof (long) 8104as_fn_error 77 "cannot compute sizeof (long)
8335See \`config.log' for more details" "$LINENO" 5 ; } 8105See \`config.log' for more details" "$LINENO" 5; }
8336 else 8106 else
8337 ac_cv_sizeof_long=0 8107 ac_cv_sizeof_long=0
8338 fi 8108 fi
@@ -9070,7 +8840,7 @@ fi
9070 8840
9071 8841
9072###################### 8842######################
9073######## With F77 / G77 / GFortran ... 8843######## With gfortran ...
9074###################### 8844######################
9075if test -n "$F77"; then 8845if test -n "$F77"; then
9076 case "$F77" in 8846 case "$F77" in
@@ -9080,6 +8850,9 @@ if test -n "$F77"; then
9080 FFLAGS="$FFLAGS -fprofile-arcs -ftest-coverage" 8850 FFLAGS="$FFLAGS -fprofile-arcs -ftest-coverage"
9081 fi 8851 fi
9082 ;; 8852 ;;
8853 g77*)
8854 as_fn_error $? "g77 is no longer supported. Please consider switching to gfortran" "$LINENO" 5
8855 ;;
9083 esac 8856 esac
9084 8857
9085 if test "$enable_debug_fortran" = yes; then 8858 if test "$enable_debug_fortran" = yes; then
@@ -10497,7 +10270,7 @@ $as_echo "$ac_java_classpath" >&6; }
10497$as_echo_n "checking to see if the java compiler works... " >&6; } 10270$as_echo_n "checking to see if the java compiler works... " >&6; }
10498 10271
10499 cat << \EOF > conftest.java 10272 cat << \EOF > conftest.java
10500// #line 10500 "configure" 10273// #line 10273 "configure"
10501 10274
10502 10275
10503public class conftest { 10276public class conftest {
@@ -10563,7 +10336,7 @@ $as_echo_n "checking type of jvm... " >&6; }
10563 if test "x$ac_java_jvm_name" = "x" ; then 10336 if test "x$ac_java_jvm_name" = "x" ; then
10564 10337
10565 cat << \EOF > conftest.java 10338 cat << \EOF > conftest.java
10566// #line 10566 "configure" 10339// #line 10339 "configure"
10567import gnu.java.io.EncodingManager; 10340import gnu.java.io.EncodingManager;
10568 10341
10569public class conftest { 10342public class conftest {
@@ -10615,7 +10388,7 @@ $as_echo "$ac_java_jvm_name" >&6; }
10615 case "$ac_java_jvm_name" in 10388 case "$ac_java_jvm_name" in
10616 gcj) DO=nothing ;; 10389 gcj) DO=nothing ;;
10617 jdk) DO=nothing ;; 10390 jdk) DO=nothing ;;
10618 *) as_fn_error $? "'$ac_java_jvm_name' is not a supported JVM" "$LINENO" 5 ;; 10391 *) as_fn_error $? "'$ac_java_jvm_name' is not a supported JVM" "$LINENO" 5 ;;
10619 esac 10392 esac
10620 10393
10621 # Try to detect the version of java that is installed 10394 # Try to detect the version of java that is installed
@@ -10627,7 +10400,7 @@ $as_echo_n "checking java API version... " >&6; }
10627 10400
10628 10401
10629 cat << \EOF > conftest.java 10402 cat << \EOF > conftest.java
10630// #line 10630 "configure" 10403// #line 10403 "configure"
10631import java.nio.charset.Charset; 10404import java.nio.charset.Charset;
10632 10405
10633public class conftest { 10406public class conftest {
@@ -10672,7 +10445,7 @@ EOF
10672 10445
10673 10446
10674 cat << \EOF > conftest.java 10447 cat << \EOF > conftest.java
10675// #line 10675 "configure" 10448// #line 10448 "configure"
10676import java.lang.StringBuilder; 10449import java.lang.StringBuilder;
10677 10450
10678public class conftest { 10451public class conftest {
@@ -12043,7 +11816,7 @@ $as_echo_n "checking jgraphx... " >&6; }
12043 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11816 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12044 11817
12045 cat << \EOF > conftest.java 11818 cat << \EOF > conftest.java
12046// #line 12046 "configure" 11819// #line 11819 "configure"
12047import com.mxgraph.model.mxCell; 11820import com.mxgraph.model.mxCell;
12048 11821
12049public class conftest { 11822public class conftest {
@@ -12137,7 +11910,7 @@ $as_echo_n "checking minimal version (1.4.1.0) of jgraphx... " >&6; }
12137 if test "x=" == "x"; then 11910 if test "x=" == "x"; then
12138 11911
12139 cat << \EOF > conftest.java 11912 cat << \EOF > conftest.java
12140// #line 12140 "configure" 11913// #line 11913 "configure"
12141import com.mxgraph.view.mxGraph; 11914import com.mxgraph.view.mxGraph;
12142 11915
12143public class conftest { 11916public class conftest {
@@ -12188,7 +11961,7 @@ EOF
12188 else 11961 else
12189 11962
12190 cat << \EOF > conftest.java 11963 cat << \EOF > conftest.java
12191// #line 12191 "configure" 11964// #line 11964 "configure"
12192import com.mxgraph.view.mxGraph; 11965import com.mxgraph.view.mxGraph;
12193 11966
12194public class conftest { 11967public class conftest {
@@ -12265,7 +12038,7 @@ $as_echo_n "checking jhdf5... " >&6; }
12265 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12038 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12266 12039
12267 cat << \EOF > conftest.java 12040 cat << \EOF > conftest.java
12268// #line 12268 "configure" 12041// #line 12041 "configure"
12269import ncsa.hdf.hdf5lib.HDF5Constants; 12042import ncsa.hdf.hdf5lib.HDF5Constants;
12270 12043
12271public class conftest { 12044public class conftest {
@@ -12414,7 +12187,7 @@ $as_echo_n "checking minimal version (1.8.4) of hdf5... " >&6; }
12414 if test "x" == "x"; then 12187 if test "x" == "x"; then
12415 12188
12416 cat << \EOF > conftest.java 12189 cat << \EOF > conftest.java
12417// #line 12417 "configure" 12190// #line 12190 "configure"
12418import ncsa.hdf.hdf5lib.H5; 12191import ncsa.hdf.hdf5lib.H5;
12419 12192
12420public class conftest { 12193public class conftest {
@@ -12469,7 +12242,7 @@ EOF
12469 else 12242 else
12470 12243
12471 cat << \EOF > conftest.java 12244 cat << \EOF > conftest.java
12472// #line 12472 "configure" 12245// #line 12245 "configure"
12473import ncsa.hdf.hdf5lib.H5; 12246import ncsa.hdf.hdf5lib.H5;
12474 12247
12475public class conftest { 12248public class conftest {
@@ -12553,7 +12326,7 @@ $as_echo_n "checking flexdock... " >&6; }
12553 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12326 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12554 12327
12555 cat << \EOF > conftest.java 12328 cat << \EOF > conftest.java
12556// #line 12556 "configure" 12329// #line 12329 "configure"
12557import org.flexdock.docking.DockingManager; 12330import org.flexdock.docking.DockingManager;
12558 12331
12559public class conftest { 12332public class conftest {
@@ -12647,7 +12420,7 @@ $as_echo_n "checking minimal version (0.5.2) of flexdock... " >&6; }
12647 if test "x" == "x"; then 12420 if test "x" == "x"; then
12648 12421
12649 cat << \EOF > conftest.java 12422 cat << \EOF > conftest.java
12650// #line 12650 "configure" 12423// #line 12423 "configure"
12651import org.flexdock.util.Utilities; 12424import org.flexdock.util.Utilities;
12652 12425
12653public class conftest { 12426public class conftest {
@@ -12698,7 +12471,7 @@ EOF
12698 else 12471 else
12699 12472
12700 cat << \EOF > conftest.java 12473 cat << \EOF > conftest.java
12701// #line 12701 "configure" 12474// #line 12474 "configure"
12702import org.flexdock.util.Utilities; 12475import org.flexdock.util.Utilities;
12703 12476
12704public class conftest { 12477public class conftest {
@@ -12771,7 +12544,7 @@ $as_echo_n "checking looks... " >&6; }
12771 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12544 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12772 12545
12773 cat << \EOF > conftest.java 12546 cat << \EOF > conftest.java
12774// #line 12774 "configure" 12547// #line 12547 "configure"
12775import com.jgoodies.looks.common.MenuItemRenderer; 12548import com.jgoodies.looks.common.MenuItemRenderer;
12776 12549
12777public class conftest { 12550public class conftest {
@@ -12878,7 +12651,7 @@ $as_echo_n "checking jgoodies-looks... " >&6; }
12878 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12651 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12879 12652
12880 cat << \EOF > conftest.java 12653 cat << \EOF > conftest.java
12881// #line 12881 "configure" 12654// #line 12654 "configure"
12882import com.jgoodies.looks.common.MenuItemRenderer; 12655import com.jgoodies.looks.common.MenuItemRenderer;
12883 12656
12884public class conftest { 12657public class conftest {
@@ -12986,7 +12759,7 @@ $as_echo_n "checking skinlf... " >&6; }
12986 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12759 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12987 12760
12988 cat << \EOF > conftest.java 12761 cat << \EOF > conftest.java
12989// #line 12989 "configure" 12762// #line 12762 "configure"
12990import com.l2fprod.util.AccessUtils; 12763import com.l2fprod.util.AccessUtils;
12991 12764
12992public class conftest { 12765public class conftest {
@@ -13093,7 +12866,7 @@ $as_echo_n "checking jogl... " >&6; }
13093 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12866 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13094 12867
13095 cat << \EOF > conftest.java 12868 cat << \EOF > conftest.java
13096// #line 13096 "configure" 12869// #line 12869 "configure"
13097import javax.media.opengl.glu.GLUnurbs; 12870import javax.media.opengl.glu.GLUnurbs;
13098 12871
13099public class conftest { 12872public class conftest {
@@ -13305,7 +13078,7 @@ $as_echo_n "checking gluegen-rt... " >&6; }
13305 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 13078 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13306 13079
13307 cat << \EOF > conftest.java 13080 cat << \EOF > conftest.java
13308// #line 13308 "configure" 13081// #line 13081 "configure"
13309import com.sun.gluegen.runtime.CPU; 13082import com.sun.gluegen.runtime.CPU;
13310 13083
13311public class conftest { 13084public class conftest {
@@ -13466,7 +13239,7 @@ $as_echo_n "checking jhall... " >&6; }
13466 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 13239 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13467 13240
13468 cat << \EOF > conftest.java 13241 cat << \EOF > conftest.java
13469// #line 13469 "configure" 13242// #line 13242 "configure"
13470import javax.help.JHelp; 13243import javax.help.JHelp;
13471 13244
13472public class conftest { 13245public class conftest {
@@ -13573,7 +13346,7 @@ $as_echo_n "checking javahelp2... " >&6; }
13573 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 13346 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13574 13347
13575 cat << \EOF > conftest.java 13348 cat << \EOF > conftest.java
13576// #line 13576 "configure" 13349// #line 13349 "configure"
13577import javax.help.JHelp; 13350import javax.help.JHelp;
13578 13351
13579public class conftest { 13352public class conftest {
@@ -13681,7 +13454,7 @@ $as_echo_n "checking jrosetta-API... " >&6; }
13681 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 13454 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13682 13455
13683 cat << \EOF > conftest.java 13456 cat << \EOF > conftest.java
13684// #line 13684 "configure" 13457// #line 13457 "configure"
13685import com.artenum.rosetta.interfaces.core.ConsoleConfiguration; 13458import com.artenum.rosetta.interfaces.core.ConsoleConfiguration;
13686 13459
13687public class conftest { 13460public class conftest {
@@ -13788,7 +13561,7 @@ $as_echo_n "checking jrosetta-engine... " >&6; }
13788 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 13561 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13789 13562
13790 cat << \EOF > conftest.java 13563 cat << \EOF > conftest.java
13791// #line 13791 "configure" 13564// #line 13564 "configure"
13792import com.artenum.rosetta.core.action.AbstractConsoleAction; 13565import com.artenum.rosetta.core.action.AbstractConsoleAction;
13793 13566
13794public class conftest { 13567public class conftest {
@@ -13897,7 +13670,7 @@ $as_echo_n "checking jeuclid-core... " >&6; }
13897 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 13670 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13898 13671
13899 cat << \EOF > conftest.java 13672 cat << \EOF > conftest.java
13900// #line 13900 "configure" 13673// #line 13673 "configure"
13901import net.sourceforge.jeuclid.LayoutContext; 13674import net.sourceforge.jeuclid.LayoutContext;
13902 13675
13903public class conftest { 13676public class conftest {
@@ -14006,7 +13779,7 @@ $as_echo_n "checking fop... " >&6; }
14006 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 13779 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
14007 13780
14008 cat << \EOF > conftest.java 13781 cat << \EOF > conftest.java
14009// #line 14009 "configure" 13782// #line 13782 "configure"
14010import org.apache.fop.pdf.PDFInfo; 13783import org.apache.fop.pdf.PDFInfo;
14011 13784
14012public class conftest { 13785public class conftest {
@@ -14113,7 +13886,7 @@ $as_echo_n "checking batik-all... " >&6; }
14113 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 13886 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
14114 13887
14115 cat << \EOF > conftest.java 13888 cat << \EOF > conftest.java
14116// #line 14116 "configure" 13889// #line 13889 "configure"
14117import org.apache.batik.parser.Parser; 13890import org.apache.batik.parser.Parser;
14118 13891
14119public class conftest { 13892public class conftest {
@@ -14220,7 +13993,7 @@ $as_echo_n "checking batik... " >&6; }
14220 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 13993 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
14221 13994
14222 cat << \EOF > conftest.java 13995 cat << \EOF > conftest.java
14223// #line 14223 "configure" 13996// #line 13996 "configure"
14224import org.apache.batik.parser.Parser; 13997import org.apache.batik.parser.Parser;
14225 13998
14226public class conftest { 13999public class conftest {
@@ -14314,7 +14087,7 @@ $as_echo_n "checking minimal version (1.7) of batik... " >&6; }
14314 if test "x" == "x"; then 14087 if test "x" == "x"; then
14315 14088
14316 cat << \EOF > conftest.java 14089 cat << \EOF > conftest.java
14317// #line 14317 "configure" 14090// #line 14090 "configure"
14318import org.apache.batik.Version; 14091import org.apache.batik.Version;
14319 14092
14320public class conftest { 14093public class conftest {
@@ -14365,7 +14138,7 @@ EOF
14365 else 14138 else
14366 14139
14367 cat << \EOF > conftest.java 14140 cat << \EOF > conftest.java
14368// #line 14368 "configure" 14141// #line 14141 "configure"
14369import org.apache.batik.Version; 14142import org.apache.batik.Version;
14370 14143
14371public class conftest { 14144public class conftest {
@@ -14438,7 +14211,7 @@ $as_echo_n "checking commons-io... " >&6; }
14438 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 14211 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
14439 14212
14440 cat << \EOF > conftest.java 14213 cat << \EOF > conftest.java
14441// #line 14441 "configure" 14214// #line 14214 "configure"
14442import org.apache.commons.io.output.CountingOutputStream; 14215import org.apache.commons.io.output.CountingOutputStream;
14443 14216
14444public class conftest { 14217public class conftest {
@@ -14545,7 +14318,7 @@ $as_echo_n "checking xmlgraphics-commons... " >&6; }
14545 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 14318 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
14546 14319
14547 cat << \EOF > conftest.java 14320 cat << \EOF > conftest.java
14548// #line 14548 "configure" 14321// #line 14321 "configure"
14549import org.apache.xmlgraphics.util.Service; 14322import org.apache.xmlgraphics.util.Service;
14550 14323
14551public class conftest { 14324public class conftest {
@@ -14652,7 +14425,7 @@ $as_echo_n "checking avalon-framework... " >&6; }
14652 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 14425 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
14653 14426
14654 cat << \EOF > conftest.java 14427 cat << \EOF > conftest.java
14655// #line 14655 "configure" 14428// #line 14428 "configure"
14656import org.apache.avalon.framework.configuration.ConfigurationException; 14429import org.apache.avalon.framework.configuration.ConfigurationException;
14657 14430
14658public class conftest { 14431public class conftest {
@@ -14759,7 +14532,7 @@ $as_echo_n "checking xml-apis-ext... " >&6; }
14759 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 14532 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
14760 14533
14761 cat << \EOF > conftest.java 14534 cat << \EOF > conftest.java
14762// #line 14762 "configure" 14535// #line 14535 "configure"
14763import org.w3c.dom.svg.SVGDocument; 14536import org.w3c.dom.svg.SVGDocument;
14764 14537
14765public class conftest { 14538public class conftest {
@@ -14866,7 +14639,7 @@ $as_echo_n "checking xml-commons-apis-ext... " >&6; }
14866 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 14639 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
14867 14640
14868 cat << \EOF > conftest.java 14641 cat << \EOF > conftest.java
14869// #line 14869 "configure" 14642// #line 14642 "configure"
14870import org.w3c.dom.svg.SVGDocument; 14643import org.w3c.dom.svg.SVGDocument;
14871 14644
14872public class conftest { 14645public class conftest {
@@ -14977,7 +14750,7 @@ $as_echo_n "checking commons-logging... " >&6; }
14977 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 14750 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
14978 14751
14979 cat << \EOF > conftest.java 14752 cat << \EOF > conftest.java
14980// #line 14980 "configure" 14753// #line 14753 "configure"
14981import org.apache.commons.logging.LogFactory; 14754import org.apache.commons.logging.LogFactory;
14982 14755
14983public class conftest { 14756public class conftest {
@@ -15084,7 +14857,7 @@ $as_echo_n "checking jlatexmath... " >&6; }
15084 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 14857 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
15085 14858
15086 cat << \EOF > conftest.java 14859 cat << \EOF > conftest.java
15087// #line 15087 "configure" 14860// #line 14860 "configure"
15088import org.scilab.forge.jlatexmath.TeXFormula; 14861import org.scilab.forge.jlatexmath.TeXFormula;
15089 14862
15090public class conftest { 14863public class conftest {
@@ -15178,7 +14951,7 @@ $as_echo_n "checking minimal version (0.9.4) of jlatexmath... " >&6; }
15178 if test "x" == "x"; then 14951 if test "x" == "x"; then
15179 14952
15180 cat << \EOF > conftest.java 14953 cat << \EOF > conftest.java
15181// #line 15181 "configure" 14954// #line 14954 "configure"
15182import org.scilab.forge.jlatexmath.TeXFormula; 14955import org.scilab.forge.jlatexmath.TeXFormula;
15183 14956
15184public class conftest { 14957public class conftest {
@@ -15229,7 +15002,7 @@ EOF
15229 else 15002 else
15230 15003
15231 cat << \EOF > conftest.java 15004 cat << \EOF > conftest.java
15232// #line 15232 "configure" 15005// #line 15005 "configure"
15233import org.scilab.forge.jlatexmath.TeXFormula; 15006import org.scilab.forge.jlatexmath.TeXFormula;
15234 15007
15235public class conftest { 15008public class conftest {
@@ -15308,7 +15081,7 @@ $as_echo_n "checking checkstyle... " >&6; }
15308 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 15081 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
15309 15082
15310 cat << \EOF > conftest.java 15083 cat << \EOF > conftest.java
15311// #line 15311 "configure" 15084// #line 15084 "configure"
15312import com.puppycrawl.tools.checkstyle.CheckStyleTask; 15085import com.puppycrawl.tools.checkstyle.CheckStyleTask;
15313 15086
15314public class conftest { 15087public class conftest {
@@ -15415,7 +15188,7 @@ $as_echo_n "checking commons-beanutils... " >&6; }
15415 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 15188 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
15416 15189
15417 cat << \EOF > conftest.java 15190 cat << \EOF > conftest.java
15418// #line 15418 "configure" 15191// #line 15191 "configure"
15419import org.apache.commons.beanutils.Converter; 15192import org.apache.commons.beanutils.Converter;
15420 15193
15421public class conftest { 15194public class conftest {
@@ -15522,7 +15295,7 @@ $as_echo_n "checking antlr... " >&6; }
15522 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 15295 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
15523 15296
15524 cat << \EOF > conftest.java 15297 cat << \EOF > conftest.java
15525// #line 15525 "configure" 15298// #line 15298 "configure"
15526import antlr.TokenStreamException; 15299import antlr.TokenStreamException;
15527 15300
15528public class conftest { 15301public class conftest {
@@ -15629,7 +15402,7 @@ $as_echo_n "checking testng... " >&6; }
15629 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 15402 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
15630 15403
15631 cat << \EOF > conftest.java 15404 cat << \EOF > conftest.java
15632// #line 15632 "configure" 15405// #line 15405 "configure"
15633import org.testng.TestNG; 15406import org.testng.TestNG;
15634 15407
15635public class conftest { 15408public class conftest {
@@ -15736,7 +15509,7 @@ $as_echo_n "checking qdox... " >&6; }
15736 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 15509 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
15737 15510
15738 cat << \EOF > conftest.java 15511 cat << \EOF > conftest.java
15739// #line 15739 "configure" 15512// #line 15512 "configure"
15740import com.thoughtworks.qdox.tools.QDoxTester; 15513import com.thoughtworks.qdox.tools.QDoxTester;
15741 15514
15742public class conftest { 15515public class conftest {
@@ -15843,7 +15616,7 @@ $as_echo_n "checking bsh... " >&6; }
15843 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 15616 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
15844 15617
15845 cat << \EOF > conftest.java 15618 cat << \EOF > conftest.java
15846// #line 15846 "configure" 15619// #line 15619 "configure"
15847import bsh.Console; 15620import bsh.Console;
15848 15621
15849public class conftest { 15622public class conftest {
@@ -15950,7 +15723,7 @@ $as_echo_n "checking junit... " >&6; }
15950 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 15723 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
15951 15724
15952 cat << \EOF > conftest.java 15725 cat << \EOF > conftest.java
15953// #line 15953 "configure" 15726// #line 15726 "configure"
15954import junit.framework.Assert; 15727import junit.framework.Assert;
15955 15728
15956public class conftest { 15729public class conftest {
@@ -16057,7 +15830,7 @@ $as_echo_n "checking ccsm-commons... " >&6; }
16057 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 15830 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
16058 15831
16059 cat << \EOF > conftest.java 15832 cat << \EOF > conftest.java
16060// #line 16060 "configure" 15833// #line 15833 "configure"
16061import edu.tum.cs.commons.logging.*; 15834import edu.tum.cs.commons.logging.*;
16062 15835
16063public class conftest { 15836public class conftest {
@@ -16164,7 +15937,7 @@ $as_echo_n "checking simulink... " >&6; }
16164 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 15937 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
16165 15938
16166 cat << \EOF > conftest.java 15939 cat << \EOF > conftest.java
16167// #line 16167 "configure" 15940// #line 15940 "configure"
16168import edu.tum.cs.simulink.model.*; 15941import edu.tum.cs.simulink.model.*;
16169 15942
16170public class conftest { 15943public class conftest {
@@ -16271,7 +16044,7 @@ $as_echo_n "checking cup... " >&6; }
16271 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 16044 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
16272 16045
16273 cat << \EOF > conftest.java 16046 cat << \EOF > conftest.java
16274// #line 16274 "configure" 16047// #line 16047 "configure"
16275import java_cup.runtime.*; 16048import java_cup.runtime.*;
16276 16049
16277public class conftest { 16050public class conftest {
@@ -21184,7 +20957,7 @@ fi
21184 ;; 20957 ;;
21185 # Ignore these flags. 20958 # Ignore these flags.
21186 -lang* | -lcrt*.o | -lc | -lgcc* | -lSystem | -libmil | -little \ 20959 -lang* | -lcrt*.o | -lc | -lgcc* | -lSystem | -libmil | -little \
21187 |-LANG:=* | -LIST:* | -LNO:* | -link) 20960 |-LANG:=* | -LIST:* | -LNO:*)
21188 ;; 20961 ;;
21189 -lkernel32) 20962 -lkernel32)
21190 test x"$CYGWIN" != xyes && ac_cv_f77_libs="$ac_cv_f77_libs $ac_arg" 20963 test x"$CYGWIN" != xyes && ac_cv_f77_libs="$ac_cv_f77_libs $ac_arg"
@@ -21379,7 +21152,7 @@ else
21379 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 21152 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
21380$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 21153$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
21381as_fn_error $? "linking to Fortran libraries from C fails 21154as_fn_error $? "linking to Fortran libraries from C fails
21382See \`config.log' for more details" "$LINENO" 5 ; } 21155See \`config.log' for more details" "$LINENO" 5; }
21383fi 21156fi
21384 21157
21385ac_ext=c 21158ac_ext=c
@@ -21541,7 +21314,7 @@ else
21541 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 21314 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
21542$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 21315$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
21543as_fn_error $? "cannot compile a simple Fortran program 21316as_fn_error $? "cannot compile a simple Fortran program
21544See \`config.log' for more details" "$LINENO" 5 ; } 21317See \`config.log' for more details" "$LINENO" 5; }
21545fi 21318fi
21546rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 21319rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
21547 21320
@@ -23224,7 +22997,7 @@ and PCRE_LIBS to avoid the need to call pkg-config.
23224See the pkg-config man page for more details. 22997See the pkg-config man page for more details.
23225 22998
23226To get pkg-config, see <http://pkg-config.freedesktop.org/>. 22999To get pkg-config, see <http://pkg-config.freedesktop.org/>.
23227See \`config.log' for more details" "$LINENO" 5 ; } 23000See \`config.log' for more details" "$LINENO" 5; }
23228else 23001else
23229 PCRE_CFLAGS=$pkg_cv_PCRE_CFLAGS 23002 PCRE_CFLAGS=$pkg_cv_PCRE_CFLAGS
23230 PCRE_LIBS=$pkg_cv_PCRE_LIBS 23003 PCRE_LIBS=$pkg_cv_PCRE_LIBS
@@ -23454,7 +23227,7 @@ if test "x$with_x" = xno; then
23454 have_x=disabled 23227 have_x=disabled
23455else 23228else
23456 case $x_includes,$x_libraries in #( 23229 case $x_includes,$x_libraries in #(
23457 *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5 ;; #( 23230 *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #(
23458 *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then : 23231 *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then :
23459 $as_echo_n "(cached) " >&6 23232 $as_echo_n "(cached) " >&6
23460else 23233else
@@ -23558,7 +23331,7 @@ else
23558 fi 23331 fi
23559done 23332done
23560fi 23333fi
23561rm -f conftest.err conftest.i conftest.$ac_ext 23334rm -f conftest.err conftest.$ac_ext
23562fi # $ac_x_includes = no 23335fi # $ac_x_includes = no
23563 23336
23564if test "$ac_x_libraries" = no; then 23337if test "$ac_x_libraries" = no; then
@@ -24293,7 +24066,7 @@ CPPFLAGS="$CPPFLAGS -I$CHK_TCL_INCLUDE_PATH"
24293{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later" >&5 24066{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later" >&5
24294$as_echo_n "checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later... " >&6; } 24067$as_echo_n "checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later... " >&6; }
24295cat > conftest.$ac_ext <<EOF 24068cat > conftest.$ac_ext <<EOF
24296#line 24296 "configure" 24069#line 24069 "configure"
24297#include "confdefs.h" 24070#include "confdefs.h"
24298 24071
24299#include "$CHK_TCL_INCLUDE_PATH/$CHK_TCL_INC_NAME" 24072#include "$CHK_TCL_INCLUDE_PATH/$CHK_TCL_INC_NAME"
@@ -24323,7 +24096,7 @@ if test "$cross_compiling" = yes; then :
24323 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 24096 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
24324$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 24097$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
24325as_fn_error $? "cannot run test program while cross compiling 24098as_fn_error $? "cannot run test program while cross compiling
24326See \`config.log' for more details" "$LINENO" 5 ; } 24099See \`config.log' for more details" "$LINENO" 5; }
24327else 24100else
24328 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 24101 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
24329/* end confdefs.h. */ 24102/* end confdefs.h. */
@@ -24357,7 +24130,7 @@ else
24357$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 24130$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
24358as_fn_error $? "The TCL detection of the version failed. 24131as_fn_error $? "The TCL detection of the version failed.
24359If you are using Intel Compiler, check if Intel Library (ex : libimf.so) is available (in the LD_LIBRARY_PATH for example) 24132If you are using Intel Compiler, check if Intel Library (ex : libimf.so) is available (in the LD_LIBRARY_PATH for example)
24360See \`config.log' for more details" "$LINENO" 5 ; } 24133See \`config.log' for more details" "$LINENO" 5; }
24361fi 24134fi
24362rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ 24135rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
24363 conftest.$ac_objext conftest.beam conftest.$ac_ext 24136 conftest.$ac_objext conftest.beam conftest.$ac_ext
@@ -24603,7 +24376,7 @@ CPPFLAGS="$CPPFLAGS $TCL_INC_PATH -I$CHK_TK_INCLUDE_PATH $X_CFLAGS"
24603$as_echo_n "checking if tk is version $CHK_TK_MAJOR.$CHK_TK_MINOR or later... " >&6; } 24376$as_echo_n "checking if tk is version $CHK_TK_MAJOR.$CHK_TK_MINOR or later... " >&6; }
24604 24377
24605cat > conftest.$ac_ext <<EOF 24378cat > conftest.$ac_ext <<EOF
24606#line 24606 "configure" 24379#line 24379 "configure"
24607#include "confdefs.h" 24380#include "confdefs.h"
24608 24381
24609#include "$CHK_TK_INCLUDE_PATH/$CHK_TK_INC_NAME" 24382#include "$CHK_TK_INCLUDE_PATH/$CHK_TK_INC_NAME"
@@ -25018,7 +24791,7 @@ and MATIO_LIBS to avoid the need to call pkg-config.
25018See the pkg-config man page for more details. 24791See the pkg-config man page for more details.
25019 24792
25020To get pkg-config, see <http://pkg-config.freedesktop.org/>. 24793To get pkg-config, see <http://pkg-config.freedesktop.org/>.
25021See \`config.log' for more details" "$LINENO" 5 ; } 24794See \`config.log' for more details" "$LINENO" 5; }
25022else 24795else
25023 MATIO_CFLAGS=$pkg_cv_MATIO_CFLAGS 24796 MATIO_CFLAGS=$pkg_cv_MATIO_CFLAGS
25024 MATIO_LIBS=$pkg_cv_MATIO_LIBS 24797 MATIO_LIBS=$pkg_cv_MATIO_LIBS
@@ -25184,7 +24957,7 @@ $as_echo_n "checking saxon... " >&6; }
25184 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 24957 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
25185 24958
25186 cat << \EOF > conftest.java 24959 cat << \EOF > conftest.java
25187// #line 25187 "configure" 24960// #line 24960 "configure"
25188import com.icl.saxon.Loader; 24961import com.icl.saxon.Loader;
25189 24962
25190public class conftest { 24963public class conftest {
@@ -25291,7 +25064,7 @@ $as_echo_n "checking jlatexmath-fop... " >&6; }
25291 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 25064 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
25292 25065
25293 cat << \EOF > conftest.java 25066 cat << \EOF > conftest.java
25294// #line 25294 "configure" 25067// #line 25067 "configure"
25295import org.scilab.forge.jlatexmath.fop.JLaTeXMathObj; 25068import org.scilab.forge.jlatexmath.fop.JLaTeXMathObj;
25296 25069
25297public class conftest { 25070public class conftest {
@@ -31598,7 +31371,7 @@ else
31598 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 31371 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
31599 lt_status=$lt_dlunknown 31372 lt_status=$lt_dlunknown
31600 cat > conftest.$ac_ext <<_LT_EOF 31373 cat > conftest.$ac_ext <<_LT_EOF
31601#line 31601 "configure" 31374#line 31374 "configure"
31602#include "confdefs.h" 31375#include "confdefs.h"
31603 31376
31604#if HAVE_DLFCN_H 31377#if HAVE_DLFCN_H
@@ -31704,7 +31477,7 @@ else
31704 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 31477 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
31705 lt_status=$lt_dlunknown 31478 lt_status=$lt_dlunknown
31706 cat > conftest.$ac_ext <<_LT_EOF 31479 cat > conftest.$ac_ext <<_LT_EOF
31707#line 31707 "configure" 31480#line 31480 "configure"
31708#include "confdefs.h" 31481#include "confdefs.h"
31709 31482
31710#if HAVE_DLFCN_H 31483#if HAVE_DLFCN_H
@@ -31962,7 +31735,7 @@ else
31962 # Broken: fails on valid input. 31735 # Broken: fails on valid input.
31963continue 31736continue
31964fi 31737fi
31965rm -f conftest.err conftest.i conftest.$ac_ext 31738rm -f conftest.err conftest.$ac_ext
31966 31739
31967 # OK, works on sane cases. Now check whether nonexistent headers 31740 # OK, works on sane cases. Now check whether nonexistent headers
31968 # can be detected and how. 31741 # can be detected and how.
@@ -31978,11 +31751,11 @@ else
31978ac_preproc_ok=: 31751ac_preproc_ok=:
31979break 31752break
31980fi 31753fi
31981rm -f conftest.err conftest.i conftest.$ac_ext 31754rm -f conftest.err conftest.$ac_ext
31982 31755
31983done 31756done
31984# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. 31757# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
31985rm -f conftest.i conftest.err conftest.$ac_ext 31758rm -f conftest.err conftest.$ac_ext
31986if $ac_preproc_ok; then : 31759if $ac_preproc_ok; then :
31987 break 31760 break
31988fi 31761fi
@@ -32021,7 +31794,7 @@ else
32021 # Broken: fails on valid input. 31794 # Broken: fails on valid input.
32022continue 31795continue
32023fi 31796fi
32024rm -f conftest.err conftest.i conftest.$ac_ext 31797rm -f conftest.err conftest.$ac_ext
32025 31798
32026 # OK, works on sane cases. Now check whether nonexistent headers 31799 # OK, works on sane cases. Now check whether nonexistent headers
32027 # can be detected and how. 31800 # can be detected and how.
@@ -32037,18 +31810,18 @@ else
32037ac_preproc_ok=: 31810ac_preproc_ok=:
32038break 31811break
32039fi 31812fi
32040rm -f conftest.err conftest.i conftest.$ac_ext 31813rm -f conftest.err conftest.$ac_ext
32041 31814
32042done 31815done
32043# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. 31816# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
32044rm -f conftest.i conftest.err conftest.$ac_ext 31817rm -f conftest.err conftest.$ac_ext
32045if $ac_preproc_ok; then : 31818if $ac_preproc_ok; then :
32046 31819
32047else 31820else
32048 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 31821 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
32049$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 31822$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
32050as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check 31823as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
32051See \`config.log' for more details" "$LINENO" 5 ; } 31824See \`config.log' for more details" "$LINENO" 5; }
32052fi 31825fi
32053 31826
32054ac_ext=c 31827ac_ext=c
@@ -38411,7 +38184,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
38411# values after options handling. 38184# values after options handling.
38412ac_log=" 38185ac_log="
38413This file was extended by Scilab $as_me 5, which was 38186This file was extended by Scilab $as_me 5, which was
38414generated by GNU Autoconf 2.67. Invocation command line was 38187generated by GNU Autoconf 2.66. Invocation command line was
38415 38188
38416 CONFIG_FILES = $CONFIG_FILES 38189 CONFIG_FILES = $CONFIG_FILES
38417 CONFIG_HEADERS = $CONFIG_HEADERS 38190 CONFIG_HEADERS = $CONFIG_HEADERS
@@ -38477,7 +38250,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
38477ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" 38250ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
38478ac_cs_version="\\ 38251ac_cs_version="\\
38479Scilab config.status 5 38252Scilab config.status 5
38480configured by $0, generated by GNU Autoconf 2.67, 38253configured by $0, generated by GNU Autoconf 2.66,
38481 with options \\"\$ac_cs_config\\" 38254 with options \\"\$ac_cs_config\\"
38482 38255
38483Copyright (C) 2010 Free Software Foundation, Inc. 38256Copyright (C) 2010 Free Software Foundation, Inc.
@@ -38498,16 +38271,11 @@ ac_need_defaults=:
38498while test $# != 0 38271while test $# != 0
38499do 38272do
38500 case $1 in 38273 case $1 in
38501 --*=?*) 38274 --*=*)
38502 ac_option=`expr "X$1" : 'X\([^=]*\)='` 38275 ac_option=`expr "X$1" : 'X\([^=]*\)='`
38503 ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` 38276 ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
38504 ac_shift=: 38277 ac_shift=:
38505 ;; 38278 ;;
38506 --*=)
38507 ac_option=`expr "X$1" : 'X\([^=]*\)='`
38508 ac_optarg=
38509 ac_shift=:
38510 ;;
38511 *) 38279 *)
38512 ac_option=$1 38280 ac_option=$1
38513 ac_optarg=$2 38281 ac_optarg=$2
@@ -38529,7 +38297,6 @@ do
38529 $ac_shift 38297 $ac_shift
38530 case $ac_optarg in 38298 case $ac_optarg in
38531 *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; 38299 *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
38532 '') as_fn_error $? "missing file argument" ;;
38533 esac 38300 esac
38534 as_fn_append CONFIG_FILES " '$ac_optarg'" 38301 as_fn_append CONFIG_FILES " '$ac_optarg'"
38535 ac_need_defaults=false;; 38302 ac_need_defaults=false;;
@@ -39164,7 +38931,7 @@ do
39164 "modules/development_tools/src/fake/Makefile") CONFIG_FILES="$CONFIG_FILES modules/development_tools/src/fake/Makefile" ;; 38931 "modules/development_tools/src/fake/Makefile") CONFIG_FILES="$CONFIG_FILES modules/development_tools/src/fake/Makefile" ;;
39165 "modules/core/includes/stack.h") CONFIG_COMMANDS="$CONFIG_COMMANDS modules/core/includes/stack.h" ;; 38932 "modules/core/includes/stack.h") CONFIG_COMMANDS="$CONFIG_COMMANDS modules/core/includes/stack.h" ;;
39166 38933
39167 *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; 38934 *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
39168 esac 38935 esac
39169done 38936done
39170 38937
@@ -39480,7 +39247,7 @@ do
39480 esac 39247 esac
39481 case $ac_mode$ac_tag in 39248 case $ac_mode$ac_tag in
39482 :[FHL]*:*);; 39249 :[FHL]*:*);;
39483 :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; 39250 :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
39484 :[FH]-) ac_tag=-:-;; 39251 :[FH]-) ac_tag=-:-;;
39485 :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; 39252 :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
39486 esac 39253 esac
@@ -39508,7 +39275,7 @@ do
39508 [\\/$]*) false;; 39275 [\\/$]*) false;;
39509 *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; 39276 *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
39510 esac || 39277 esac ||
39511 as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; 39278 as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
39512 esac 39279 esac
39513 case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac 39280 case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
39514 as_fn_append ac_file_inputs " '$ac_f'" 39281 as_fn_append ac_file_inputs " '$ac_f'"
@@ -39535,7 +39302,7 @@ $as_echo "$as_me: creating $ac_file" >&6;}
39535 39302
39536 case $ac_tag in 39303 case $ac_tag in
39537 *:-:* | *:-) cat >"$tmp/stdin" \ 39304 *:-:* | *:-) cat >"$tmp/stdin" \
39538 || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; 39305 || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
39539 esac 39306 esac
39540 ;; 39307 ;;
39541 esac 39308 esac
@@ -41017,7 +40784,6 @@ echo ""
41017echo "Compiler Configuration:" 40784echo "Compiler Configuration:"
41018echo " Intel (--with-intelcompilers) .... = $with_intelcompilers" 40785echo " Intel (--with-intelcompilers) .... = $with_intelcompilers"
41019echo " GNU gcc (--with-gcc) ............. = $with_gcc" 40786echo " GNU gcc (--with-gcc) ............. = $with_gcc"
41020echo " GNU Fortran 77 (--with-g77) ...... = $with_g77"
41021echo " GNU Fortran 95 (--with-gfortran) . = $with_gfortran" 40787echo " GNU Fortran 95 (--with-gfortran) . = $with_gfortran"
41022echo "" 40788echo ""
41023echo "Options:" 40789echo "Options:"
diff --git a/scilab/configure.ac b/scilab/configure.ac
index 6ac1964..031f8d3 100644
--- a/scilab/configure.ac
+++ b/scilab/configure.ac
@@ -25,7 +25,7 @@ SCI_SRCDIR_FULL="`cd $SCI_SRCDIR && pwd`"
25 25
26SCILAB_VERSION_MAJOR=5 26SCILAB_VERSION_MAJOR=5
27SCILAB_VERSION_MINOR=3 27SCILAB_VERSION_MINOR=3
28SCILAB_VERSION_MAINTENANCE=1 28SCILAB_VERSION_MAINTENANCE=2
29AC_SUBST(SCILAB_VERSION_MAJOR) 29AC_SUBST(SCILAB_VERSION_MAJOR)
30AC_SUBST(SCILAB_VERSION_MINOR) 30AC_SUBST(SCILAB_VERSION_MINOR)
31AC_SUBST(SCILAB_VERSION_MAINTENANCE) 31AC_SUBST(SCILAB_VERSION_MAINTENANCE)
@@ -116,11 +116,8 @@ AC_ARG_ENABLE(stopOnWarning,
116AC_ARG_WITH(gcc, 116AC_ARG_WITH(gcc,
117 AC_HELP_STRING([--with-gcc],[Use gcc C compiler ])) 117 AC_HELP_STRING([--with-gcc],[Use gcc C compiler ]))
118 118
119AC_ARG_WITH(g77,
120 AC_HELP_STRING([--with-g77],[Use g77, GNU Fortran 77 compiler ]))
121
122AC_ARG_WITH(gfortran, 119AC_ARG_WITH(gfortran,
123 AC_HELP_STRING([--with-gfortran],[Use gfortran, GNU Fortran 95 compiler ])) 120 AC_HELP_STRING([--with-gfortran],[Use gfortran, GNU Fortran 95 compiler]))
124 121
125AC_ARG_WITH(intelcompilers, 122AC_ARG_WITH(intelcompilers,
126 AC_HELP_STRING([--with-intelcompilers],[Use Intel C (icc) and Fortran (ifort) proprietary compilers (GNU/Linux only) ])) 123 AC_HELP_STRING([--with-intelcompilers],[Use Intel C (icc) and Fortran (ifort) proprietary compilers (GNU/Linux only) ]))
@@ -188,21 +185,11 @@ PKG_PROG_PKG_CONFIG
188## check if options are correct (or not) 185## check if options are correct (or not)
189##################################################### 186#####################################################
190 187
191if test "$with_g77" = yes -a "$with_gfortran" = yes; then
192 AC_MSG_ERROR([Conflicting options : you specified two fortran compilers])
193fi
194
195if test "$with_intelcompilers" = yes -a "$with_gcc" = yes; then 188if test "$with_intelcompilers" = yes -a "$with_gcc" = yes; then
196 AC_MSG_ERROR([Conflicting options : you specified two compiler series]) 189 AC_MSG_ERROR([Conflicting options : you specified two compiler series])
197fi 190fi
198 191
199######## fortran ######## 192######## fortran ########
200if test "$with_g77" = yes; then
201 AC_PROG_F77(g77)
202 if test -z "$F77"; then
203 AC_MSG_ERROR([You asked me to use g77 but i haven't been able to find it])
204 fi
205fi
206 193
207if test "$with_gfortran" = yes; then 194if test "$with_gfortran" = yes; then
208 AC_PROG_F77(gfortran) 195 AC_PROG_F77(gfortran)
@@ -373,7 +360,7 @@ fi
373 360
374 361
375###################### 362######################
376######## With F77 / G77 / GFortran ... 363######## With gfortran ...
377###################### 364######################
378if test -n "$F77"; then 365if test -n "$F77"; then
379 case "$F77" in 366 case "$F77" in
@@ -383,6 +370,9 @@ if test -n "$F77"; then
383 FFLAGS="$FFLAGS -fprofile-arcs -ftest-coverage" 370 FFLAGS="$FFLAGS -fprofile-arcs -ftest-coverage"
384 fi 371 fi
385 ;; 372 ;;
373 g77*)
374 AC_MSG_ERROR([g77 is no longer supported. Please consider switching to gfortran])
375 ;;
386 esac 376 esac
387 377
388 if test "$enable_debug_fortran" = yes; then 378 if test "$enable_debug_fortran" = yes; then
@@ -1881,7 +1871,6 @@ echo ""
1881echo "Compiler Configuration:" 1871echo "Compiler Configuration:"
1882echo " Intel (--with-intelcompilers) .... = $with_intelcompilers" 1872echo " Intel (--with-intelcompilers) .... = $with_intelcompilers"
1883echo " GNU gcc (--with-gcc) ............. = $with_gcc" 1873echo " GNU gcc (--with-gcc) ............. = $with_gcc"
1884echo " GNU Fortran 77 (--with-g77) ...... = $with_g77"
1885echo " GNU Fortran 95 (--with-gfortran) . = $with_gfortran" 1874echo " GNU Fortran 95 (--with-gfortran) . = $with_gfortran"
1886echo "" 1875echo ""
1887echo "Options:" 1876echo "Options:"
diff --git a/scilab/etc/Info.plist b/scilab/etc/Info.plist
index 899018a..e4fca6a 100644
--- a/scilab/etc/Info.plist
+++ b/scilab/etc/Info.plist
@@ -10,7 +10,7 @@
10 <key>CFBundleExecutable</key> 10 <key>CFBundleExecutable</key>
11 <string>bin/scilab</string> 11 <string>bin/scilab</string>
12 <key>CFBundleGetInfoString</key> 12 <key>CFBundleGetInfoString</key>
13 <string>Scilab 5.3.1, © 1998-2011 DIGITEO</string> 13 <string>Scilab 5.3.2, © 1998-2011 DIGITEO</string>
14 <key>CFBundleIconFile</key> 14 <key>CFBundleIconFile</key>
15 <string>puffin</string> 15 <string>puffin</string>
16 <key>CFBundleIdentifier</key> 16 <key>CFBundleIdentifier</key>
diff --git a/scilab/libs/GetWindowsVersion/GetWindowsVersion.rc b/scilab/libs/GetWindowsVersion/GetWindowsVersion.rc
index 864b775..e2ffbdc 100644
--- a/scilab/libs/GetWindowsVersion/GetWindowsVersion.rc
+++ b/scilab/libs/GetWindowsVersion/GetWindowsVersion.rc
@@ -48,8 +48,8 @@ END
48// 48//
49 49
50VS_VERSION_INFO VERSIONINFO 50VS_VERSION_INFO VERSIONINFO
51 FILEVERSION 5,3,1,0 51 FILEVERSION 5,3,2,0
52 PRODUCTVERSION 5,3,1,0 52 PRODUCTVERSION 5,3,2,0
53 FILEFLAGSMASK 0x17L 53 FILEFLAGSMASK 0x17L
54#ifdef _DEBUG 54#ifdef _DEBUG
55 FILEFLAGS 0x1L 55 FILEFLAGS 0x1L
@@ -65,12 +65,12 @@ BEGIN
65 BLOCK "040c04b0" 65 BLOCK "040c04b0"
66 BEGIN 66 BEGIN
67 VALUE "FileDescription", "GetWindowsVersion library for Scilab 5.x" 67 VALUE "FileDescription", "GetWindowsVersion library for Scilab 5.x"
68 VALUE "FileVersion", "5, 3, 1, 0" 68 VALUE "FileVersion", "5, 3, 2, 0"
69 VALUE "InternalName", "GetWindowsVersion library for Scilab 5.x" 69 VALUE "InternalName", "GetWindowsVersion library for Scilab 5.x"
70 VALUE "LegalCopyright", "Copyright (C) 2011" 70 VALUE "LegalCopyright", "Copyright (C) 2011"
71 VALUE "OriginalFilename", "GetWindowsVersion.dll" 71 VALUE "OriginalFilename", "GetWindowsVersion.dll"
72 VALUE "ProductName", "GetWindowsVersion library for Scilab 5.x" 72 VALUE "ProductName", "GetWindowsVersion library for Scilab 5.x"
73 VALUE "ProductVersion", "5, 3, 1, 0" 73 VALUE "ProductVersion", "5, 3, 2, 0"
74 END 74 END
75 END 75 END
76 BLOCK "VarFileInfo" 76 BLOCK "VarFileInfo"
diff --git a/scilab/libs/LibScilab/libscilab.rc b/scilab/libs/LibScilab/libscilab.rc
index 0a89a1d..35ed167 100644
--- a/scilab/libs/LibScilab/libscilab.rc
+++ b/scilab/libs/LibScilab/libscilab.rc
@@ -49,8 +49,8 @@ END
49// 49//
50 50
51VS_VERSION_INFO VERSIONINFO 51VS_VERSION_INFO VERSIONINFO
52 FILEVERSION 5,3,1,0 52 FILEVERSION 5,3,2,0
53 PRODUCTVERSION 5,3,1,0 53 PRODUCTVERSION 5,3,2,0
54 FILEFLAGSMASK 0x17L 54 FILEFLAGSMASK 0x17L
55#ifdef _DEBUG 55#ifdef _DEBUG
56 FILEFLAGS 0x1L 56 FILEFLAGS 0x1L
@@ -66,12 +66,12 @@ BEGIN
66 BLOCK "040c04b0" 66 BLOCK "040c04b0"
67 BEGIN 67 BEGIN
68 VALUE "FileDescription", "Scilab library" 68 VALUE "FileDescription", "Scilab library"
69 VALUE "FileVersion", "5, 3, 1, 0" 69 VALUE "FileVersion", "5, 3, 2, 0"
70 VALUE "InternalName", "Scilab library" 70 VALUE "InternalName", "Scilab library"
71 VALUE "LegalCopyright", "Copyright (C) 2011" 71 VALUE "LegalCopyright", "Copyright (C) 2011"
72 VALUE "OriginalFilename", "libscilab.dll" 72 VALUE "OriginalFilename", "libscilab.dll"
73 VALUE "ProductName", "Scilab library (Intel Fortran)" 73 VALUE "ProductName", "Scilab library (Intel Fortran)"
74 VALUE "ProductVersion", "5, 3, 1, 0" 74 VALUE "ProductVersion", "5, 3, 2, 0"
75 END 75 END
76 END 76 END
77 BLOCK "VarFileInfo" 77 BLOCK "VarFileInfo"
diff --git a/scilab/libs/LibScilab/libscilab_f2c.rc b/scilab/libs/LibScilab/libscilab_f2c.rc
index 8f9bd6c..7bd0651 100644
--- a/scilab/libs/LibScilab/libscilab_f2c.rc
+++ b/scilab/libs/LibScilab/libscilab_f2c.rc
@@ -48,8 +48,8 @@ END
48// 48//
49 49
50VS_VERSION_INFO VERSIONINFO 50VS_VERSION_INFO VERSIONINFO
51 FILEVERSION 5,3,1,0 51 FILEVERSION 5,3,2,0
52 PRODUCTVERSION 5,3,1,0 52 PRODUCTVERSION 5,3,2,0
53 FILEFLAGSMASK 0x17L 53 FILEFLAGSMASK 0x17L
54#ifdef _DEBUG 54#ifdef _DEBUG
55 FILEFLAGS 0x1L 55 FILEFLAGS 0x1L
@@ -65,12 +65,12 @@ BEGIN
65 BLOCK "040c04b0" 65 BLOCK "040c04b0"
66 BEGIN 66 BEGIN
67 VALUE "FileDescription", "Scilab library" 67 VALUE "FileDescription", "Scilab library"
68 VALUE "FileVersion", "5, 3, 1, 0" 68 VALUE "FileVersion", "5, 3, 2, 0"
69 VALUE "InternalName", "Scilab library" 69 VALUE "InternalName", "Scilab library"
70 VALUE "LegalCopyright", "Copyright (C) 2011" 70 VALUE "LegalCopyright", "Copyright (C) 2011"
71 VALUE "OriginalFilename", "libscilab.dll" 71 VALUE "OriginalFilename", "libscilab.dll"
72 VALUE "ProductName", "Scilab library (f2c)" 72 VALUE "ProductName", "Scilab library (f2c)"
73 VALUE "ProductVersion", "5, 3, 1, 0" 73 VALUE "ProductVersion", "5, 3, 2, 0"
74 END 74 END
75 END 75 END
76 BLOCK "VarFileInfo" 76 BLOCK "VarFileInfo"
diff --git a/scilab/libs/MALLOC/MALLOC.rc b/scilab/libs/MALLOC/MALLOC.rc
index d275117..e849ddf 100644
--- a/scilab/libs/MALLOC/MALLOC.rc
+++ b/scilab/libs/MALLOC/MALLOC.rc
@@ -48,8 +48,8 @@ END
48// 48//
49 49
50VS_VERSION_INFO VERSIONINFO 50VS_VERSION_INFO VERSIONINFO
51 FILEVERSION 5,3,1,0 51 FILEVERSION 5,3,2,0
52 PRODUCTVERSION 5,3,1,0 52 PRODUCTVERSION 5,3,2,0
53 FILEFLAGSMASK 0x17L 53 FILEFLAGSMASK 0x17L
54#ifdef _DEBUG 54#ifdef _DEBUG
55 FILEFLAGS 0x1L 55 FILEFLAGS 0x1L
@@ -65,12 +65,12 @@ BEGIN
65 BLOCK "040c04b0" 65 BLOCK "040c04b0"
66 BEGIN 66 BEGIN
67 VALUE "FileDescription", "MALLOC library for Scilab 5.x" 67 VALUE "FileDescription", "MALLOC library for Scilab 5.x"
68 VALUE "FileVersion", "5, 3, 1, 0" 68 VALUE "FileVersion", "5, 3, 2, 0"
69 VALUE "InternalName", "MALLOC library for Scilab 5.x" 69 VALUE "InternalName", "MALLOC library for Scilab 5.x"
70 VALUE "LegalCopyright", "Copyright (C) 2011" 70 VALUE "LegalCopyright", "Copyright (C) 2011"
71 VALUE "OriginalFilename", "MALLOC.dll" 71 VALUE "OriginalFilename", "MALLOC.dll"
72 VALUE "ProductName", "MALLOC library for Scilab 5.x" 72 VALUE "ProductName", "MALLOC library for Scilab 5.x"
73 VALUE "ProductVersion", "5, 3, 1, 0" 73 VALUE "ProductVersion", "5, 3, 2, 0"
74 END 74 END
75 END 75 END
76 BLOCK "VarFileInfo" 76 BLOCK "VarFileInfo"
diff --git a/scilab/libs/doublylinkedlist/doublylinkedlist.rc b/scilab/libs/doublylinkedlist/doublylinkedlist.rc
index cf038ac..5eb831f 100644
--- a/scilab/libs/doublylinkedlist/doublylinkedlist.rc
+++ b/scilab/libs/doublylinkedlist/doublylinkedlist.rc
@@ -48,8 +48,8 @@ END
48// 48//
49 49
50VS_VERSION_INFO VERSIONINFO 50VS_VERSION_INFO VERSIONINFO
51 FILEVERSION 5,3,1,0 51 FILEVERSION 5,3,2,0
52 PRODUCTVERSION 5,3,1,0 52 PRODUCTVERSION 5,3,2,0
53 FILEFLAGSMASK 0x17L 53 FILEFLAGSMASK 0x17L
54#ifdef _DEBUG 54#ifdef _DEBUG
55 FILEFLAGS 0x1L 55 FILEFLAGS 0x1L
@@ -65,12 +65,12 @@ BEGIN
65 BLOCK "040c04b0" 65 BLOCK "040c04b0"
66 BEGIN 66 BEGIN
67 VALUE "FileDescription", "doublylinkedlist library for Scilab 5.x" 67 VALUE "FileDescription", "doublylinkedlist library for Scilab 5.x"
68 VALUE "FileVersion", "5, 3, 1, 0" 68 VALUE "FileVersion", "5, 3, 2, 0"
69 VALUE "InternalName", "doublylinkedlist library for Scilab 5.x" 69 VALUE "InternalName", "doublylinkedlist library for Scilab 5.x"
70 VALUE "LegalCopyright", "Copyright (C) 2011" 70 VALUE "LegalCopyright", "Copyright (C) 2011"
71 VALUE "OriginalFilename", "doublylinkedlist.dll" 71 VALUE "OriginalFilename", "doublylinkedlist.dll"
72 VALUE "ProductName", "doublylinkedlist library for Scilab 5.x" 72 VALUE "ProductName", "doublylinkedlist library for Scilab 5.x"
73 VALUE "ProductVersion", "5, 3, 1, 0" 73 VALUE "ProductVersion", "5, 3, 2, 0"
74 END 74 END
75 END 75 END
76 BLOCK "VarFileInfo" 76 BLOCK "VarFileInfo"
diff --git a/scilab/libs/dynamiclibrary/dynamiclibrary.rc b/scilab/libs/dynamiclibrary/dynamiclibrary.rc
index d4d518e..671dc18 100644
--- a/scilab/libs/dynamiclibrary/dynamiclibrary.rc
+++ b/scilab/libs/dynamiclibrary/dynamiclibrary.rc
@@ -48,8 +48,8 @@ END
48// 48//
49 49
50VS_VERSION_INFO VERSIONINFO 50VS_VERSION_INFO VERSIONINFO
51 FILEVERSION 5,3,1,0 51 FILEVERSION 5,3,2,0
52 PRODUCTVERSION 5,3,1,0 52 PRODUCTVERSION 5,3,2,0
53 FILEFLAGSMASK 0x17L 53 FILEFLAGSMASK 0x17L
54#ifdef _DEBUG 54#ifdef _DEBUG
55 FILEFLAGS 0x1L 55 FILEFLAGS 0x1L
@@ -65,12 +65,12 @@ BEGIN
65 BLOCK "040c04b0" 65 BLOCK "040c04b0"
66 BEGIN 66 BEGIN
67 VALUE "FileDescription", "dynamiclibrary library for Scilab 5.x" 67 VALUE "FileDescription", "dynamiclibrary library for Scilab 5.x"
68 VALUE "FileVersion", "5, 3, 1, 0" 68 VALUE "FileVersion", "5, 3, 2, 0"
69 VALUE "InternalName", "dynamiclibrary library for Scilab 5.x" 69 VALUE "InternalName", "dynamiclibrary library for Scilab 5.x"
70 VALUE "LegalCopyright", "Copyright (C) 2011" 70 VALUE "LegalCopyright", "Copyright (C) 2011"
71 VALUE "OriginalFilename", "dynamiclibrary.dll" 71 VALUE "OriginalFilename", "dynamiclibrary.dll"
72 VALUE "ProductName", "dynamiclibrary library for Scilab 5.x" 72 VALUE "ProductName", "dynamiclibrary library for Scilab 5.x"
73 VALUE "ProductVersion", "5, 3, 1, 0" 73 VALUE "ProductVersion", "5, 3, 2, 0"
74 END 74 END
75 END 75 END
76 BLOCK "VarFileInfo" 76 BLOCK "VarFileInfo"
diff --git a/scilab/libs/hashtable/hashtable.rc b/scilab/libs/hashtable/hashtable.rc
index a12b95b..4de831d 100644
--- a/scilab/libs/hashtable/hashtable.rc
+++ b/scilab/libs/hashtable/hashtable.rc
@@ -48,8 +48,8 @@ END
48// 48//
49 49
50VS_VERSION_INFO VERSIONINFO 50VS_VERSION_INFO VERSIONINFO
51 FILEVERSION 5,3,1,0 51 FILEVERSION 5,3,2,0
52 PRODUCTVERSION 5,3,1,0 52 PRODUCTVERSION 5,3,2,0
53 FILEFLAGSMASK 0x17L 53 FILEFLAGSMASK 0x17L
54#ifdef _DEBUG 54#ifdef _DEBUG
55 FILEFLAGS 0x1L 55 FILEFLAGS 0x1L
@@ -65,12 +65,12 @@ BEGIN
65 BLOCK "040c04b0" 65 BLOCK "040c04b0"
66 BEGIN 66 BEGIN
67 VALUE "FileDescription", "hashtable library for Scilab 5.x" 67 VALUE "FileDescription", "hashtable library for Scilab 5.x"
68 VALUE "FileVersion", "5, 3, 1, 0" 68 VALUE "FileVersion", "5, 3, 2, 0"
69 VALUE "InternalName", "hashtable library for Scilab 5.x" 69 VALUE "InternalName", "hashtable library for Scilab 5.x"
70 VALUE "LegalCopyright", "Copyright (C) 2011" 70 VALUE "LegalCopyright", "Copyright (C) 2011"
71 VALUE "OriginalFilename", "hashtable.dll" 71 VALUE "OriginalFilename", "hashtable.dll"
72 VALUE "ProductName", "hashtable library for Scilab 5.x" 72 VALUE "ProductName", "hashtable library for Scilab 5.x"
73 VALUE "ProductVersion", "5, 3, 1, 0" 73 VALUE "ProductVersion", "5, 3, 2, 0"
74 END 74 END
75 END 75 END
76 BLOCK "VarFileInfo" 76 BLOCK "VarFileInfo"
diff --git a/scilab/libs/libst/libst.rc b/scilab/libs/libst/libst.rc
index f719664..42cd88f 100644
--- a/scilab/libs/libst/libst.rc
+++ b/scilab/libs/libst/libst.rc
@@ -48,8 +48,8 @@ END
48// 48//
49 49
50VS_VERSION_INFO VERSIONINFO 50VS_VERSION_INFO VERSIONINFO
51 FILEVERSION 5,3,1,0 51 FILEVERSION 5,3,2,0
52 PRODUCTVERSION 5,3,1,0 52 PRODUCTVERSION 5,3,2,0
53 FILEFLAGSMASK 0x17L 53 FILEFLAGSMASK 0x17L
54#ifdef _DEBUG 54#ifdef _DEBUG
55 FILEFLAGS 0x1L 55 FILEFLAGS 0x1L
@@ -65,12 +65,12 @@ BEGIN
65 BLOCK "040c04b0" 65 BLOCK "040c04b0"
66 BEGIN 66 BEGIN
67 VALUE "FileDescription", "libst library for Scilab 5.x" 67 VALUE "FileDescription", "libst library for Scilab 5.x"
68 VALUE "FileVersion", "5, 3, 1, 0" 68 VALUE "FileVersion", "5, 3, 2, 0"
69 VALUE "InternalName", "libst library for Scilab 5.x" 69 VALUE "InternalName", "libst library for Scilab 5.x"
70 VALUE "LegalCopyright", "Copyright (C) 2011" 70 VALUE "LegalCopyright", "Copyright (C) 2011"
71 VALUE "OriginalFilename", "libst.dll" 71 VALUE "OriginalFilename", "libst.dll"
72 VALUE "ProductName", "libst library for Scilab 5.x" 72 VALUE "ProductName", "libst library for Scilab 5.x"
73 VALUE "ProductVersion", "5, 3, 1, 0" 73 VALUE "ProductVersion", "5, 3, 2, 0"
74 END 74 END
75 END 75 END
76 BLOCK "VarFileInfo" 76 BLOCK "VarFileInfo"
diff --git a/scilab/modules/action_binding/locales/action_binding.pot b/scilab/modules/action_binding/locales/action_binding.pot
index f1cd8b1..0fe54e4 100644
--- a/scilab/modules/action_binding/locales/action_binding.pot
+++ b/scilab/modules/action_binding/locales/action_binding.pot
@@ -1,20 +1,20 @@
1# Localization of the module action_binding 1# Localization of the module action_binding
2# Please see in SCI/tools/localization for localization management 2# Please see in SCI/tools/localization for localization management
3# Copyright (C) 2007/2008 - INRIA / Scilab 3# Copyright (C) 2007-2008 - INRIA
4# Copyright (C) 2008-2011 - DIGITEO
4# This file is distributed under the same license as the Scilab package. 5# This file is distributed under the same license as the Scilab package.
5# Sylvestre Ledru <sylvestre.ledru@inria.fr>, 2007/2008.
6# 6#
7msgid "" 7msgid ""
8msgstr "" 8msgstr ""
9"Project-Id-Version: Scilab\n" 9"Project-Id-Version: Scilab\n"
10"Report-Msgid-Bugs-To: <localization@scilab.org>\n" 10"Report-Msgid-Bugs-To: <localization@lists.scilab.org>\n"
11"POT-Creation-Date: 2007-11-26 18:05+0100\n" 11"POT-Creation-Date: 2011-03-09 11:38+0100\n"
12"Last-Translator: Sylvestre Ledru <sylvestre.ledru@inria.fr>\n" 12"Last-Translator: Sylvestre Ledru <sylvestre.ledru@scilab.org>\n"
13"Language-Team: Scilab Localization <localization@scilab.org>\n" 13"Language-Team: Scilab Localization <localization@lists.scilab.org>\n"
14"MIME-Version: 1.0\n" 14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=ISO-8859-1\n" 15"Content-Type: text/plain; charset=ISO-8859-1\n"
16"Content-Transfer-Encoding: 8bit\n" 16"Content-Transfer-Encoding: 8bit\n"
17"Revision-Date: 2010-11-18 15:37+0100\n" 17"Revision-Date: 2011-03-09 14:19+0100\n"
18 18
19# File: sci_gateway/cpp/sci_notify.cpp, line: 79 19# File: sci_gateway/cpp/sci_notify.cpp, line: 79
20# File: sci_gateway/cpp/sci_notify.cpp, line: 94 20# File: sci_gateway/cpp/sci_notify.cpp, line: 94
diff --git a/scilab/modules/action_binding/src/c/action_binding.rc b/scilab/modules/action_binding/src/c/action_binding.rc
index ed72ab8..89321e3 100644
--- a/scilab/modules/action_binding/src/c/action_binding.rc
+++ b/scilab/modules/action_binding/src/c/action_binding.rc
@@ -49,8 +49,8 @@ END
49// 49//
50 50
51VS_VERSION_INFO VERSIONINFO 51VS_VERSION_INFO VERSIONINFO
52 FILEVERSION 5,3,1,0 52 FILEVERSION 5,3,2,0
53 PRODUCTVERSION 5,3,1,0 53 PRODUCTVERSION 5,3,2,0
54 FILEFLAGSMASK 0x17L 54 FILEFLAGSMASK 0x17L
55#ifdef _DEBUG 55#ifdef _DEBUG
56 FILEFLAGS 0x1L 56 FILEFLAGS 0x1L
@@ -66,12 +66,12 @@ BEGIN
66 BLOCK "040c04b0" 66 BLOCK "040c04b0"
67 BEGIN 67 BEGIN
68 VALUE "FileDescription", "action_binding module" 68 VALUE "FileDescription", "action_binding module"
69 VALUE "FileVersion", "5, 3, 1, 0" 69 VALUE "FileVersion", "5, 3, 2, 0"
70 VALUE "InternalName", "action_binding module" 70 VALUE "InternalName", "action_binding module"
71 VALUE "LegalCopyright", "Copyright (C) 2011" 71 VALUE "LegalCopyright", "Copyright (C) 2011"
72 VALUE "OriginalFilename", "action_binding.dll" 72 VALUE "OriginalFilename", "action_binding.dll"
73 VALUE "ProductName", " action_binding" 73 VALUE "ProductName", " action_binding"
74 VALUE "ProductVersion", "5, 3, 1, 0" 74 VALUE "ProductVersion", "5, 3, 2, 0"
75 END 75 END
76 END 76 END
77 BLOCK "VarFileInfo" 77 BLOCK "VarFileInfo"
diff --git a/scilab/modules/action_binding/src/jni/Signal.cpp b/scilab/modules/action_binding/src/jni/Signal.cpp
index 3e9ae97..ac671a9 100644
--- a/scilab/modules/action_binding/src/jni/Signal.cpp
+++ b/scilab/modules/action_binding/src/jni/Signal.cpp
@@ -1,5 +1,5 @@
1#include "Signal.hxx" 1#include "Signal.hxx"
2/* Generated by GIWS (version 1.2.1) */ 2/* Generated by GIWS (version 1.2.3) */
3/* 3/*
4 4
5Copyright 2007-2008 INRIA 5Copyright 2007-2008 INRIA
diff --git a/scilab/modules/action_binding/src/jni/Signal.hxx b/scilab/modules/action_binding/src/jni/Signal.hxx
index 76735ee..8b5b16f 100644
--- a/scilab/modules/action_binding/src/jni/Signal.hxx
+++ b/scilab/modules/action_binding/src/jni/Signal.hxx
@@ -1,4 +1,4 @@
1/* Generated by GIWS (version 1.2.1) */ 1/* Generated by GIWS (version 1.2.3) */
2/* 2/*
3 3
4Copyright 2007-2008 INRIA 4Copyright 2007-2008 INRIA
diff --git a/scilab/modules/action_binding/src/noaction_binding/noaction_binding.rc b/scilab/modules/action_binding/src/noaction_binding/noaction_binding.rc
index 84fae05..ba409de 100644
--- a/scilab/modules/action_binding/src/noaction_binding/noaction_binding.rc
+++ b/scilab/modules/action_binding/src/noaction_binding/noaction_binding.rc
@@ -49,8 +49,8 @@ END
49// 49//
50 50
51VS_VERSION_INFO VERSIONINFO 51VS_VERSION_INFO VERSIONINFO
52 FILEVERSION 5,3,1,0 52 FILEVERSION 5,3,2,0
53 PRODUCTVERSION 5,3,1,0 53 PRODUCTVERSION 5,3,2,0
54 FILEFLAGSMASK 0x17L 54 FILEFLAGSMASK 0x17L
55#ifdef _DEBUG 55#ifdef _DEBUG
56 FILEFLAGS 0x1L 56 FILEFLAGS 0x1L
@@ -66,12 +66,12 @@ BEGIN
66 BLOCK "040c04b0" 66 BLOCK "040c04b0"
67 BEGIN 67 BEGIN
68 VALUE "FileDescription", "noaction_binding module" 68 VALUE "FileDescription", "noaction_binding module"
69 VALUE "FileVersion", "5, 3, 1, 0" 69 VALUE "FileVersion", "5, 3, 2, 0"
70 VALUE "InternalName", "noaction_binding module" 70 VALUE "InternalName", "noaction_binding module"
71 VALUE "LegalCopyright", "Copyright (C) 2011" 71 VALUE "LegalCopyright", "Copyright (C) 2011"
72 VALUE "OriginalFilename", "noaction_binding.dll" 72 VALUE "OriginalFilename", "noaction_binding.dll"
73 VALUE "ProductName", " noaction_binding" 73 VALUE "ProductName", " noaction_binding"
74 VALUE "ProductVersion", "5, 3, 1, 0" 74 VALUE "ProductVersion", "5, 3, 2, 0"
75 END 75 END
76 END 76 END
77 BLOCK "VarFileInfo" 77 BLOCK "VarFileInfo"
diff --git a/scilab/modules/api_scilab/locales/api_scilab.pot b/scilab/modules/api_scilab/locales/api_scilab.pot
new file mode 100644
index 0000000..0604a9a
--- /dev/null
+++ b/scilab/modules/api_scilab/locales/api_scilab.pot
@@ -0,0 +1,632 @@
1# Localization of the module api_scilab
2# Please see in SCI/tools/localization for localization management
3# Copyright (C) 2007-2008 - INRIA
4# Copyright (C) 2008-2011 - DIGITEO
5# This file is distributed under the same license as the Scilab package.
6#
7msgid ""
8msgstr ""
9"Project-Id-Version: Scilab\n"
10"Report-Msgid-Bugs-To: <localization@lists.scilab.org>\n"
11"POT-Creation-Date: 2011-03-09 11:38+0100\n"
12"Last-Translator: Sylvestre Ledru <sylvestre.ledru@scilab.org>\n"
13"Language-Team: Scilab Localization <localization@lists.scilab.org>\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=ISO-8859-1\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Revision-Date: 2011-03-09 14:19+0100\n"
18
19# File: src/cpp/api_error.cpp, line: 112
20# File: src/cpp/api_error.cpp, line: 122
21#, c-format
22msgid "\tin %s\n"
23msgstr ""
24#
25# File: src/cpp/api_double.cpp, line: 76
26# File: src/cpp/api_sparse.cpp, line: 64
27# File: src/cpp/api_poly.cpp, line: 110
28#, c-format
29msgid "%s: Bad call to get a non complex matrix"
30msgstr ""
31#
32# File: src/cpp/api_poly.cpp, line: 210
33#, c-format
34msgid "%s: Formal variable name of polynomial can't exceed 4 characters"
35msgstr ""
36#
37# File: src/cpp/api_pointer.cpp, line: 33
38# File: src/cpp/api_pointer.cpp, line: 61
39# File: src/cpp/api_double.cpp, line: 63
40# File: src/cpp/api_boolean_sparse.cpp, line: 34
41# File: src/cpp/api_boolean_sparse.cpp, line: 105
42# File: src/cpp/api_boolean.cpp, line: 38
43# File: src/cpp/api_string.cpp, line: 50
44# File: src/cpp/api_string.cpp, line: 98
45# File: src/cpp/api_string.cpp, line: 147
46# File: src/cpp/api_string.cpp, line: 155
47# File: src/cpp/api_string.cpp, line: 238
48# File: src/cpp/api_sparse.cpp, line: 45
49# File: src/cpp/api_sparse.cpp, line: 156
50# File: src/cpp/api_poly.cpp, line: 36
51# File: src/cpp/api_poly.cpp, line: 91
52# File: src/cpp/api_int.cpp, line: 30
53# File: src/cpp/api_int.cpp, line: 81
54# File: src/cpp/api_common.cpp, line: 65
55# File: src/cpp/api_common.cpp, line: 191
56#, c-format
57msgid "%s: Invalid argument address"
58msgstr ""
59#
60# File: src/cpp/api_pointer.cpp, line: 46
61# File: src/cpp/api_double.cpp, line: 70
62# File: src/cpp/api_boolean.cpp, line: 45
63# File: src/cpp/api_string.cpp, line: 63
64# File: src/cpp/api_string.cpp, line: 251
65# File: src/cpp/api_sparse.cpp, line: 58
66# File: src/cpp/api_poly.cpp, line: 42
67# File: src/cpp/api_poly.cpp, line: 104
68# File: src/cpp/api_list.cpp, line: 110
69# File: src/cpp/api_list.cpp, line: 291
70# File: src/cpp/api_list.cpp, line: 336
71# File: src/cpp/api_list.cpp, line: 371
72# File: src/cpp/api_int.cpp, line: 36
73# File: src/cpp/api_int.cpp, line: 528
74#, c-format
75msgid "%s: Invalid argument type, %s excepted"
76msgstr ""
77#
78# File: src/cpp/api_list.cpp, line: 504
79#, c-format
80msgid "%s: Items must be inserted in order"
81msgstr ""
82#
83# File: src/cpp/api_pointer.cpp, line: 150
84# File: src/cpp/api_boolean_sparse.cpp, line: 166
85# File: src/cpp/api_boolean.cpp, line: 140
86# File: src/cpp/api_string.cpp, line: 189
87# File: src/cpp/api_string.cpp, line: 398
88# File: src/cpp/api_sparse.cpp, line: 262
89# File: src/cpp/api_poly.cpp, line: 276
90# File: src/cpp/api_list.cpp, line: 198
91#, c-format
92msgid "%s: Unable to create %s named \"%s\""
93msgstr ""
94#
95# File: src/cpp/api_list.cpp, line: 406
96# File: src/cpp/api_list.cpp, line: 413
97# File: src/cpp/api_list.cpp, line: 420
98# File: src/cpp/api_list.cpp, line: 511
99# File: src/cpp/api_list.cpp, line: 545
100# File: src/cpp/api_list.cpp, line: 604
101# File: src/cpp/api_list.cpp, line: 725
102# File: src/cpp/api_list.cpp, line: 769
103# File: src/cpp/api_list.cpp, line: 787
104# File: src/cpp/api_list.cpp, line: 1016
105# File: src/cpp/api_list.cpp, line: 1022
106# File: src/cpp/api_list.cpp, line: 1029
107# File: src/cpp/api_list.cpp, line: 1036
108# File: src/cpp/api_list.cpp, line: 1063
109# File: src/cpp/api_list.cpp, line: 1070
110# File: src/cpp/api_list.cpp, line: 1077
111# File: src/cpp/api_list.cpp, line: 1204
112# File: src/cpp/api_list.cpp, line: 1224
113# File: src/cpp/api_list.cpp, line: 1249
114# File: src/cpp/api_list.cpp, line: 1255
115# File: src/cpp/api_list.cpp, line: 1263
116# File: src/cpp/api_list.cpp, line: 1270
117# File: src/cpp/api_list.cpp, line: 1432
118# File: src/cpp/api_list.cpp, line: 1439
119# File: src/cpp/api_list.cpp, line: 1470
120# File: src/cpp/api_list.cpp, line: 1476
121# File: src/cpp/api_list.cpp, line: 1483
122# File: src/cpp/api_list.cpp, line: 1490
123# File: src/cpp/api_list.cpp, line: 1629
124# File: src/cpp/api_list.cpp, line: 1635
125# File: src/cpp/api_list.cpp, line: 1643
126# File: src/cpp/api_list.cpp, line: 1650
127# File: src/cpp/api_list.cpp, line: 1679
128# File: src/cpp/api_list.cpp, line: 1731
129# File: src/cpp/api_list.cpp, line: 2000
130# File: src/cpp/api_list.cpp, line: 2006
131# File: src/cpp/api_list.cpp, line: 2013
132# File: src/cpp/api_list.cpp, line: 2020