1164 files changed, 14464 insertions, 19174 deletions

diff --git a/SEP/SEP_135_findobj.odt b/SEP/SEP_135_findobj.odt
new file mode 100644
index 0000000..7a0ca35
--- /dev/null
+++ b/SEP/SEP_135_findobj.odt
diff --git a/graphics/tests/nonreg_tests/bug_16407.tst b/graphics/tests/nonreg_tests/bug_16407.tst
new file mode 100644
index 0000000..0dbda28
--- /dev/null
+++ b/graphics/tests/nonreg_tests/bug_16407.tst
@@ -0,0 +1,39 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2020 - Stéphane MOTTELET
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+
+// <-- TEST WITH GRAPHIC -->
+// <-- NO CHECK REF -->
+
+// <-- Non-regression test for bug 16407 -->
+//
+// <-- Bugzilla URL -->
+// http://bugzilla.scilab.org/show_bug.cgi?id=16407
+//
+// <-- Short Description -->
+// Fec rendering is incorrect
+
+x=[0 1 0]';
+y=[0 0 1]';
+z=[0 1 1]';
+triangles=[1 1 2 3 1];
+clf
+n=4;
+gcf().color_map = jetcolormap(n)
+fec(x,y,triangles,z);
+xs2png(0,fullfile(TMPDIR,"bug_16407_1.png"))
+//
+w = 0.125;
+xfrect(0,w,w,w)
+gce().background = 1;
+xfrect(0.5-w,0.5,w,w)
+gce().background = n;
+xs2png(0,fullfile(TMPDIR,"bug_16407_2.png"))
+//
+res1 = getmd5(fullfile(TMPDIR,"bug_16407_1.png"));
+res2 = getmd5(fullfile(TMPDIR,"bug_16407_2.png"));
+assert_checkequal(res1,res2)
+
diff --git a/scilab/CHANGES.md b/scilab/CHANGES.md
index 52cf9c1..cd04a9d 100644
--- a/scilab/CHANGES.md
+++ b/scilab/CHANGES.md
@@ -28,6 +28,7 @@ For a high-level description of the main new features of this release, please co
 
 In summary, the main new features are:
 * Webtools utilities added for HTTP protocol, JSON data usage
+   - http_get can be used as an alternative download method for ATOMS
 * Profiled values are available as Scilab values
 * Values have a cleaner display:
    - they are displayed in order on assignment
@@ -38,6 +39,7 @@ In summary, the main new features are:
    - In structures, nested lists or structures are now displayed recursively compactly and more explicitly.
 * importgui function has been added to easily interface csvRead
 * function calls with zero output arguments can be detected with `argn`
+   - atoms functions can either display or output values
 
 
 Installation
@@ -48,9 +50,9 @@ Compilation
 -----------
 
 * GNU autotools have been updated to :
-   - automake 1.15
-   - autoconf 2.69
-   - libtool 2.4.6 (patched for macOS)
+   - automake (GNU automake) 1.16.1
+   - autoconf (GNU Autoconf) 2.69
+   - libtool (GNU libtool) 2.4.6 (patched for macOS)
 
 * Linux and macOS builds require a C++17 compiler. Toolboxes might also want to use this standard by specifying `-std=c++17` as a `CFLAGS`
 
@@ -192,15 +194,23 @@ Feature changes and additions
 * `function` replaces `mc` as the new overloading code for functions in Scilab language.
 
 6.1.1
-* `gsort` is fully enabled for sparse vectors and 2D matrices, in all `g, r, c, lr, lc` methods. It was formerly limited to real or complex vectors and only to the `g` mode. All boolean, real or complex vector or 2D matrices can now be sorted with any method. Multi-level sorting is enabled for all types of sparse input.
+* `gsort` is upgraded:
+  - It can now sort any sparse 2D matrix, in all `g, r, c, lr, lc` methods, including sparse booleans and in multi-level mode. It was formerly limited to sparse real or complex vectors and only to the `g` mode.
+  - Any hypermatrix can be sorted along a dimension > 2.
 * `unique` is enabled for any 2D sparse arrays, in simple, 'c' and 'r' modes.
+* `%chars` constant added, to easily access to some selected sets of unicode symbols.
+* Lists are displayed in a more compact and comprehensive way.
+* `interp1` is upgraded:
+  - complex numbers `y` now supported: the real and imaginary parts are interpolated separately.
+  - extrapolation option extended: `edgevalue` mode added for all interpolations; `periodic` mode added for linear and spline interpolations. `linear` mode added for the spline interpolations.
+* `xlfont` did not support the documented 4th argument.
 
 Help pages:
 -----------
 
-* overhauled / rewritten: `bitget`, `edit`, `factorial`, `vectorfind`, `datafit`
-* fixed / improved:  `bench_run` `M_SWITCH`, `comet`, `comet3d`
-* Rewritten: `weekday`
+* overhauled / rewritten: `bitget`, `edit`, `factorial`, `fft`, `vectorfind`, `datafit`
+* fixed / improved:  `bench_run` `M_SWITCH`, `comet`, `comet3d`, `plot2d`
+* Rewritten: `getdate`, `weekday`
 * Translations added:
   - (ru): `weekday`
 
@@ -211,6 +221,7 @@ User Interface improvements:
 * The `ans` variable is editable as any other variable in Editvar.
 * Commands history is saved before executing a command to have the correct history on a crash.
 * Used memory per variable is displayed by BrowserVar to give the user numbers on memory usage repartition and let the user `clear` the big ones first.
+* In browsevar, clicking on any function, library, list, cell, structure, custom tlist or mlist, or graphic handle now edits or displays their content.
 * Autoscroll of console in GUI mode is disabled when the user scrolls up until he scrolls to the bottom.
 
 Xcos
@@ -243,6 +254,7 @@ Obsolete functions or features
 * `scatter3` is obsolete. Please use `scatter3d` instead.
 * `saveafterncommands` is canceled. It will be removed from Scilab 6.1.x
 * `xname` is obsolete. It will be removed from Scilab 6.2.x. Please use `gcf().figure_name` instead.
+* `soundsec` is obsolete. It will be removed from Scilab 6.2.x. Please use `0 : 1/freq : t*(1-%eps)` instead.
 
 Removed Functions
 -----------------
@@ -275,37 +287,87 @@ Bug Fixes
 ### Bugs fixed in 6.1.1:
 
 * [#3188](https://bugzilla.scilab.org/3188): `part()` was slower than in Scilab 4.1.2.
+* [#7117](https://bugzilla.scilab.org/7117): `findobj()` could not search within given object.
 * [#8059](https://bugzilla.scilab.org/8059): A local `.wgetrc` config file could make troubles in `atomsDownload`.
+* [#8378](https://bugzilla.scilab.org/8378): Datatip `ContextMenu => Delete last datatip` was useless.
+* [#9221](https://bugzilla.scilab.org/9221): There was no way in Scilab to easily access to sets of unicode symbols like greek letters, etc.
 * [#9909](https://bugzilla.scilab.org/9909): In the help browser, add a way to open the online version of the current page.
+* [#10476](https://bugzilla.scilab.org/10476): From `browsevar`, displaying the content of lists, structures, cells, or other custom tlists or mlists was not possible.
+* [#12418](https://bugzilla.scilab.org/12418): Using bvode() with "continuation", i.e. `ipar(9) > 1` led to an error.
+* [#12516](https://bugzilla.scilab.org/12516): From `browsevar`, clicking on any graphical handle did not edit its figure with `ged`.
+* [#12532](https://bugzilla.scilab.org/12532): From `browsevar`, clicking on any function did not edit it with `edit`. The content of libraries could not be displayed either.
+* [#12719](https://bugzilla.scilab.org/12719): `A(%s)` gave the same result as `A($)`.
 * [#12889](https://bugzilla.scilab.org/12889): In the help browser, add a menu allowing to select the language of help pages, regardless of the language of the session.
+* [#13417](https://bugzilla.scilab.org/13417): `csvRead` page did not document the way to use the `range` up to the last row/column.
+* [#13593](https://bugzilla.scilab.org/13593): `csvRead()` did not take the `range` into account when `header` is provided. `[]` could not be used as default `range`.
+* [#13762](https://bugzilla.scilab.org/13762): In the `fft` page, the formula for the inverse FFT missed the 1/n normalization factor.
+* [#13985](https://bugzilla.scilab.org/13985): The display of lists was very loose and poor.
+* [#14435](https://bugzilla.scilab.org/14435): Errors were not well handled in overloaded functions.
+* [#14488](https://bugzilla.scilab.org/14488): The `frameflag=9` and `strf=".9."` values of these `plot2d` options were no longer accepted. Their documentation was ambiguous.
+* [#14718](https://bugzilla.scilab.org/14718): `user` is removed for a while but was still documented.
 * [#14873](https://bugzilla.scilab.org/14873): `setfield` page: The output and the 6.0 history were documented only on the en_US version. The input was wrongly restricted to matrices, while any Scilab object is acceptable. The specific role of `setfield` for mlists was not really described nor illustrated. The example did not include any call to setfield.
+* [#15012](https://bugzilla.scilab.org/15012): `covStart(["isempty" ; "isscalar"])` crashed Scilab.
+* [#15163](https://bugzilla.scilab.org/15163): `getdate` page: The time referential was obscure: a) UTC for Unix Time Convention vs Coordinated Universal Time. b) unclear influence of the time zone.
+* [#15280](https://bugzilla.scilab.org/15280): `gsort` was unable to sort any hypermatrix along dimensions > "r"|"c".
 * [#15839](https://bugzilla.scilab.org/15839): `gsort`: the only sparse possible input were real or complex vectors, and only with the `g` method.
 * [#15842](https://bugzilla.scilab.org/15842): `unique` could not process 2D sparse matrices.
+* [#15954](https://bugzilla.scilab.org/15954): `mfile2sci` abusively added a 6 lines `mode(0); ieee(1)` header to every converted file.
+* [#16069](https://bugzilla.scilab.org/16069): [].figure_name crashes Scilab.
 * [#16106](https://bugzilla.scilab.org/16106): Xcos sciblk4 user-defined blocks did not handle opar and odstate/oz correctly.
 * [#16122](https://bugzilla.scilab.org/16122): concat polynomials with <> var did not raise an error.
+* [#16141](https://bugzilla.scilab.org/16141): recursive extraction `(m:n)($)` crashed Scilab
+* [#16151](https://bugzilla.scilab.org/16151): `isequal(1:$, 2:$)` returned `%T`.
+* [#16193](https://bugzilla.scilab.org/16193): `covStart()` clear previous coverage information. `profileEnable()` could be use to append a macro later on.
+* [#16196](https://bugzilla.scilab.org/16196): `covStart()` help page was incomplete about the API usage.
 * [#16274](https://bugzilla.scilab.org/16274): assert_checkequal() did not considered equal matching Nan or void elements in (nested) containers.
+* [#16297](https://bugzilla.scilab.org/16297): After function test(), e={}, endfunction; macr2tree(test)  crashes Scilab.
 * [#16337](https://bugzilla.scilab.org/16337): The 3rd output of `[U,km,ku] = unique(..)` was not implemented.
 * [#16342](https://bugzilla.scilab.org/16342): `strcat()` was much slower in Scilab 6.0.2.
 * [#16350](https://bugzilla.scilab.org/16350): in if/while conditions, the empty sparse boolean was considered as TRUE.
 * [#16358](https://bugzilla.scilab.org/16358): `isdef([],..)` yielded an error instead of returning [].
+* [#16357](https://bugzilla.scilab.org/16357): `script2var` did get variables generated by `exec()`.
+* [#16362](https://bugzilla.scilab.org/16362): sparse empty matrix could no be concatenated.
 * [#16365](https://bugzilla.scilab.org/16365): `median(m,"r")` and `median(m,"c")` yielded wrong results (6.1.0 regression)
 * [#16366](https://bugzilla.scilab.org/16366): `plot([0 1], ":")` plotted a dash-dotted curve instead of a dotted one.
 * [#16369](https://bugzilla.scilab.org/16369): Right divisions / involving one or two sparse numerical matrices were no longer supported.
 * [#16370](https://bugzilla.scilab.org/16370): `msprintf()` did not handle LaTeX dollars anymore.
 * [#16374](https://bugzilla.scilab.org/16374): Any plot with datatips saved in Scilab 5.5 could not be loaded in Scilab 6.
 * [#16391](https://bugzilla.scilab.org/16391): `csvRead()` was crashing with CSV files containing empty lines.
+* [#16396](https://bugzilla.scilab.org/16396): recursive extraction `(m:n)(:)` crashed Scilab
 * [#16397](https://bugzilla.scilab.org/16397): display of long (real) column vectors was slow (regression).
 * [#16399](https://bugzilla.scilab.org/16399): `mtlb_zeros([])` was crashing Scilab.
 * [#16401](https://bugzilla.scilab.org/16401): global `external_object_java` class was crashing Scilab.
 * [#16403](https://bugzilla.scilab.org/16403): 1D extraction of matrix with implicit index had wrong dimensions.
 * [#16406](https://bugzilla.scilab.org/16406): `edit_curv` yielded an error when reading data.
+* [#16407](https://bugzilla.scilab.org/16407): Fec rendering was incorrect
 * [#16408](https://bugzilla.scilab.org/16408): toJSON(var, indent, filename) is the right call sequence. Documentation has been udpated.
 * [#16445](https://bugzilla.scilab.org/16445): `colorbar(..)` ignored how to guess `umin` and `umax` for a Champ object (with .colored="on").
 * [#16449](https://bugzilla.scilab.org/16449): Insertion of implicit vector in Cell was crahsing Scilab
 * [#16450](https://bugzilla.scilab.org/16450): Concatenating encoded integers with decimal or complex numbers was not possible.
 * [#16452](https://bugzilla.scilab.org/16452): `setdiff(sparse([1 3 0 2]), sparse([3 7]))` missed returning 0, and wrongly returned 3.
 * [#16454](https://bugzilla.scilab.org/16454): `gsort` yielded an error when sorting any sparse vector including some NaN.
+* [#16458](https://bugzilla.scilab.org/16458): `mean()` did not handle sparse numerical matrices.
+* [#16465](https://bugzilla.scilab.org/16465): Scinotes OpenRecent menu was not updated when it should.
 * [#16473](https://bugzilla.scilab.org/16473): Deleting rows in a sparse squared the matrix with padding zeros (Scilab 6 regression).
+* [#16474](https://bugzilla.scilab.org/16474): `imult(%z)` crashed Scilab.
+* [#16488](https://bugzilla.scilab.org/16488): Concatenations mixing boolean and double with at least one operand being sparse were not supported.
+* [#16496](https://bugzilla.scilab.org/16496): The `getdate` page should be rewritten: a) `getdate("s")` does NOT take leap seconds into account. b) `D=getdate(X)` is vectorized, accepts fractional seconds and returns them in `[0,1)` in D(10) instead of milliseconds. Moreover, the time referential of the result was unclear (time zone, daylight saving offset).
+* [#16508](https://bugzilla.scilab.org/16508): csvTextScan and csvRead did not handle well complex data.
+* [#16512](https://bugzilla.scilab.org/16512): 1 ./ uint8(0) crashes Scilab (idem with int8, uint16, int16, uint32, int32, uint64, int64).
+* [#16517](https://bugzilla.scilab.org/16517): `getdate("s")` truncated the actual time to integer seconds. `getdate(u)(10)` returned fractional seconds instead of milliseconds as `getdate()`.
+* [#16522](https://bugzilla.scilab.org/16522): `bitget(x,pos)` and `bitset(x,pos)` results could be wrong when `pos` is an encoded integer.
+* [#16525](https://bugzilla.scilab.org/16525): `soundsec(t,freq)` has the trivial equivalence `0 : 1/freq : t*(1-%eps)` and should be removed.
+* [#16549](https://bugzilla.scilab.org/16549): simple script crashed Scilab in GUI mode.
+* [#16551](https://bugzilla.scilab.org/16551): `num2cell` returned {} for any input array of empty strings.
+* [#16553](https://bugzilla.scilab.org/16553): `unique(["" ""])` returned `["" ""]`.
+* [#16557](https://bugzilla.scilab.org/16557): `macr2tree` + `tree2code` translated `e={2}` into `"e=1"` and `e={2,"ab"}` into `"e=[2,"ab"]"`.
+* [#16559](https://bugzilla.scilab.org/16553): `isempty(A)` was true for sparse matrix of dimension 2^16 or larger.
+* [#16596](https://bugzilla.scilab.org/16596): Concatenating encoded integers with sparse numeric data was not possible. 
+* [#16622](https://bugzilla.scilab.org/16622): `inv` could no longer be overloaded for hypermatrices of decimal or complex numbers.
+* [#16623](https://bugzilla.scilab.org/16623): `rand(2,2,2)^2` yielded a wrong result instead of trying to call the `%s_p_s` overload for input hypermatrices.
+* [#16629](https://bugzilla.scilab.org/16629): `interp1`'s documentation did not tell the spline edges conditions ; extrapolation modes were poorly explained. ; the description of the result's size was completely wrong ; x as an option was not documented. A wrong extrapolation value could silently return a wrong result. There was some dead code like `if varargin(5)==%nan`. A bugged error message yielded its own error. When x is implicit, the argument index in error messages could be wrong. `periodic` and `edgevalue` extrapolation modes were not available. `linear` extrapolation was not available for splines. When `xp` is an hypermatrix with `size(xp,1)==1`, the size of the result was irregular/wrong.
+* [#16644](https://bugzilla.scilab.org/16644): `input("message:")` yielded a wrong error message about `mprintf` in case of non-interpretable input.
+* [#16654](https://bugzilla.scilab.org/16654): `interp` was leaking memory.
 
 
 ### Bugs fixed in 6.1.0:
@@ -561,3 +623,4 @@ Bug Fixes
 * [#16459](https://bugzilla.scilab.org/16459): The display of one column hypermatrix was wrong.
 * [#16463](https://bugzilla.scilab.org/16463): `matrix(sparse([]),[0 0])` yielded `[]` instead of `sparse([])`.
 * [#16483](https://bugzilla.scilab.org/16483): substraction of complex polynomial matrices was broken (Scilab 6 regression).
+* [#16498](https://bugzilla.scilab.org/16498): After `esb=sparse([%t %f]); esb(1,:)=[];` , `size(esb)` answered `[0 2]` instead of `[0 0]` .
diff --git a/scilab/Makefile.in b/scilab/Makefile.in
index c451466..36e263f 100644
--- a/scilab/Makefile.in
+++ b/scilab/Makefile.in
@@ -634,7 +634,6 @@ JAVA = @JAVA@
 JAVAC = @JAVAC@
 JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
-JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
@@ -825,6 +824,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
diff --git a/scilab/configure b/scilab/configure
index 0055f92..239051c 100755
--- a/scilab/configure
+++ b/scilab/configure
@@ -830,7 +830,6 @@ ANT
 JDB
 JAVADOC
 JAR
-JAVAH
 JAVA_G
 JAVA
 JAVAC
@@ -979,6 +978,7 @@ infodir
 docdir
 oldincludedir
 includedir
+runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -1149,6 +1149,7 @@ datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1401,6 +1402,15 @@ do
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
+  -runstatedir | --runstatedir | --runstatedi | --runstated \
+  | --runstate | --runstat | --runsta | --runst | --runs \
+  | --run | --ru | --r)
+    ac_prev=runstatedir ;;
+  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+  | --run=* | --ru=* | --r=*)
+    runstatedir=$ac_optarg ;;
+
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1538,7 +1548,7 @@ fi
 for ac_var in   exec_prefix prefix bindir sbindir libexecdir datarootdir \
                 datadir sysconfdir sharedstatedir localstatedir includedir \
                 oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-                libdir localedir mandir
+                libdir localedir mandir runstatedir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1691,6 +1701,7 @@ Fine tuning of the installation directories:
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
@@ -1762,8 +1773,8 @@ Optional Features:
                           Enable unitary tests and checks at compilation time
   --enable-build-swig=path
                           Regenerate Java => C and Scilab => C wrappers
-                          produces by Swig
-  --enable-build-giws     Regenerate C/C++ => Java wrappers produces by Giws
+                          produced by Swig
+  --enable-build-giws     Regenerate C/C++ => Java wrappers produced by Giws
   --enable-build-parser   Regenerate code for the parser (Lex & YACC)
   --disable-nls           do not use Native Language Support
   --disable-build-localization
@@ -1864,7 +1875,7 @@ Optional Packages:
                           provide on AIX, [default=aix].
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
   --with-sysroot[=DIR]    Search for dependent libraries within DIR (or the
-                          compiler's sysroot if not specified).
+                          compiler's sysroot
 if not specified).
 
 Some influential environment variables:
   CC          C compiler command
@@ -12444,7 +12455,7 @@ $as_echo "$ac_java_classpath" >&6; }
 $as_echo_n "checking to see if the java compiler works... " >&6; }
 
     cat << \EOF > conftest.java
-// #line 12447 "configure"
+// #line 12458 "configure"
 import java.util.regex.Pattern;
 
 
@@ -12531,7 +12542,7 @@ $as_echo_n "checking type of jvm... " >&6; }
     if test "x$ac_java_jvm_name" = "x" ; then
 
     cat << \EOF > conftest.java
-// #line 12534 "configure"
+// #line 12545 "configure"
 import java.util.regex.Pattern;
 
 import gnu.java.io.EncodingManager;
@@ -12615,7 +12626,7 @@ $as_echo_n "checking java API version... " >&6; }
     # The class java.nio.charset.Charset is new to 1.4
 
     cat << \EOF > conftest.java
-// #line 12618 "configure"
+// #line 12629 "configure"
 import java.util.regex.Pattern;
 
 import java.nio.charset.Charset;
@@ -12680,7 +12691,7 @@ EOF
     # The class java.lang.StringBuilder is new to 1.5
 
     cat << \EOF > conftest.java
-// #line 12683 "configure"
+// #line 12694 "configure"
 import java.util.regex.Pattern;
 
 import java.lang.StringBuilder;
@@ -12745,7 +12756,7 @@ EOF
     # The class java.util.ArrayDeque is new to 1.6
 
     cat << \EOF > conftest.java
-// #line 12748 "configure"
+// #line 12759 "configure"
 import java.util.regex.Pattern;
 
 import java.util.ArrayDeque;
@@ -12810,7 +12821,7 @@ EOF
     # The class java.nio.file.Path is new to 1.7
 
     cat << \EOF > conftest.java
-// #line 12813 "configure"
+// #line 12824 "configure"
 import java.util.regex.Pattern;
 
 import java.nio.file.Path;
@@ -12875,7 +12886,7 @@ EOF
     # The class java.util.stream.DoubleStream is new to 1.8
 
     cat << \EOF > conftest.java
-// #line 12878 "configure"
+// #line 12889 "configure"
 import java.util.regex.Pattern;
 
 import java.util.stream.DoubleStream;
@@ -12940,7 +12951,7 @@ EOF
     # The class java.lang.ProcessHandle is new to 1.9
 
     cat << \EOF > conftest.java
-// #line 12943 "configure"
+// #line 12954 "configure"
 import java.util.regex.Pattern;
 
 import java.lang.ProcessHandle;
@@ -13738,101 +13749,6 @@ fi
         JAVA_G=$JAVA
     fi
 
-    TOOL=javah
-
-    if test "$cross_compiling" = "yes" ; then
-        # Extract the first word of "$TOOL", so it can be a program name with args.
-set dummy $TOOL; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_JAVAH+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $JAVAH in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_JAVAH="$JAVAH" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_JAVAH="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-JAVAH=$ac_cv_path_JAVAH
-if test -n "$JAVAH"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JAVAH" >&5
-$as_echo "$JAVAH" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    else
-        # Extract the first word of "$TOOL", so it can be a program name with args.
-set dummy $TOOL; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_JAVAH+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $JAVAH in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_JAVAH="$JAVAH" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $ac_java_jvm_bin_dir
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_JAVAH="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-JAVAH=$ac_cv_path_JAVAH
-if test -n "$JAVAH"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JAVAH" >&5
-$as_echo "$JAVAH" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    fi
-
-    # Check to see if JAVAH could not be found
-
-
-    if test "x$JAVAH" = "x" ; then
-        as_fn_error $? "Cannot find $TOOL" "$LINENO" 5
-    fi
-
-
-
 
     if test "$cross_compiling" = "yes" ; then
         # Extract the first word of "jar", so it can be a program name with args.
@@ -14438,7 +14354,7 @@ fi
                    # jgraphx
 
     cat << \EOF > conftestSharedChecker.java
-// #line 14441 "configure"
+// #line 14357 "configure"
 import java.util.regex.Pattern;
 import java.io.File;
 import java.io.IOException;
@@ -14639,7 +14555,7 @@ $as_echo_n "checking jgraphx... " >&6; }
     if test ! -f conftestSharedChecker.class ; then
 
     cat << \EOF > conftestSharedChecker.java
-// #line 14642 "configure"
+// #line 14558 "configure"
 import java.util.regex.Pattern;
 import java.io.File;
 import java.io.IOException;
@@ -14875,7 +14791,7 @@ $as_echo_n "checking scirenderer... " >&6; }
     if test ! -f conftestSharedChecker.class ; then
 
     cat << \EOF > conftestSharedChecker.java
-// #line 14878 "configure"
+// #line 14794 "configure"
 import java.util.regex.Pattern;
 import java.io.File;
 import java.io.IOException;
@@ -15117,7 +15033,7 @@ $as_echo_n "checking flexdock... " >&6; }
     if test ! -f conftestSharedChecker.class ; then
 
     cat << \EOF > conftestSharedChecker.java
-// #line 15120 "configure"
+// #line 15036 "configure"
 import java.util.regex.Pattern;
 import java.io.File;
 import java.io.IOException;
@@ -15351,7 +15267,7 @@ $as_echo_n "checking looks... " >&6; }
     if test ! -f conftestSharedChecker.class ; then
 
     cat << \EOF > conftestSharedChecker.java
-// #line 15354 "configure"
+// #line 15270 "configure"
 import java.util.regex.Pattern;
 import java.io.File;
 import java.io.IOException;
@@ -15585,7 +15501,7 @@ $as_echo_n "checking jgoodies-looks... " >&6; }
     if test ! -f conftestSharedChecker.class ; then
 
     cat << \EOF > conftestSharedChecker.java
-// #line 15588 "configure"
+// #line 15504 "configure"
 import java.util.regex.Pattern;
 import java.io.File;
 import java.io.IOException;
@@ -15820,7 +15736,7 @@ $as_echo_n "checking skinlf... " >&6; }
     if test ! -f conftestSharedChecker.class ; then
 
     cat << \EOF > conftestSharedChecker.java
-// #line 15823 "configure"
+// #line 15739 "configure"
 import java.util.regex.Pattern;
 import java.io.File;
 import java.io.IOException;
@@ -16054,7 +15970,7 @@ $as_echo_n "checking jogl2... " >&6; }
     if test ! -f conftestSharedChecker.class ; then
 
     cat << \EOF > conftestSharedChecker.java
-// #line 16057 "configure"
+// #line 15973 "configure"
 import java.util.regex.Pattern;
 import java.io.File;
 import java.io.IOException;
@@ -16394,7 +16310,7 @@ $as_echo_n "checking gluegen2-rt... " >&6; }
     if test ! -f conftestSharedChecker.class ; then
 
     cat << \EOF > conftestSharedChecker.java
-// #line 16397 "configure"
+// #line 16313 "configure"
 import java.util.regex.Pattern;
 import java.io.File;
 import java.io.IOException;
@@ -16685,7 +16601,7 @@ $as_echo_n "checking jhall... " >&6; }
     if test ! -f conftestSharedChecker.class ; then
 
     cat << \EOF > conftestSharedChecker.java
-// #line 16688 "configure"
+// #line 16604 "configure"
 import java.util.regex.Pattern;
 import java.io.File;
 import java.io.IOException;
@@ -16917,7 +16833,7 @@ $as_echo_n "checking javahelp2... " >&6; }
     if test ! -f conftestSharedChecker.class ; then
 
     cat << \EOF > conftestSharedChecker.java
-// #line 16920 "configure"
+// #line 16836 "configure"
 import java.util.regex.Pattern;
 import java.io.File;
 import java.io.IOException;
@@ -17152,7 +17068,7 @@ $as_echo_n "checking lucene-core... " >&6; }
     if test ! -f conftestSharedChecker.class ; then
 
     cat << \EOF > conftestSharedChecker.java
-// #line 17155 "configure"
+// #line 17071 "configure"
 import java.util.regex.Pattern;
 import java.io.File;
 import java.io.IOException;
@@ -17386,7 +17302,7 @@ $as_echo_n "checking lucene-analyzers-common... " >&6; }
     if test ! -f conftestSharedChecker.class ; then
 
     cat << \EOF > conftestSharedChecker.java
-// #line 17389 "configure"
+// #line 17305 "configure"
 import java.util.regex.Pattern;
 import java.io.File;
 import java.io.IOException;
@@ -17620,7 +17536,7 @@ $as_echo_n "checking lucene-queryparser... " >&6; }
     if test ! -f conftestSharedChecker.class ; then
 
     cat << \EOF > conftestSharedChecker.java
-// #line 17623 "configure"
+// #line 17539 "configure"
 import java.util.regex.Pattern;
 import java.io.File;
 import java.io.IOException;
@@ -17854,7 +17770,7 @@ $as_echo_n "checking jrosetta-API... " >&6; }
     if test ! -f conftestSharedChecker.class ; then
 
     cat << \EOF > conftestSharedChecker.java
-// #line 17857 "configure"
+// #line 17773 "configure"
 import java.util.regex.Pattern;
 import java.io.File;
 import java.io.IOException;
@@ -18085,7 +18001,7 @@ $as_echo_n "checking jrosetta-api... " >&6; }
     if test ! -f conftestSharedChecker.class ; then
 
     cat << \EOF > conftestSharedChecker.java
-// #line 18088 "configure"
+// #line 18004 "configure"
 import java.util.regex.Pattern;
 import java.io.File;
 import java.io.IOException;
@@ -18320,7 +18236,7 @@ $as_echo_n "checking jrosetta-engine... " >&6; }
     if test ! -f conftestSharedChecker.class ; then
 
     cat << \EOF > conftestSharedChecker.java
-// #line 18323 "configure"
+// #line 18239 "configure"
 import java.util.regex.Pattern;
 import java.io.File;
 import java.io.IOException;
@@ -18556,7 +18472,7 @@ $as_echo_n "checking jeuclid-core... " >&6; }
     if test ! -f conftestSharedChecker.class ; then
 
     cat << \EOF > conftestSharedChecker.java
-// #line 18559 "configure"
+// #line 18475 "configure"
 import java.util.regex.Pattern;
 import java.io.File;
 import java.io.IOException;
@@ -18792,7 +18708,7 @@ $as_echo_n "checking fop... " >&6; }
     if test ! -f conftestSharedChecker.class ; then
 
     cat << \EOF > conftestSharedChecker.java
-// #line 18795 "configure"
+// #line 18711 "configure"
 import java.util.regex.Pattern;
 import java.io.File;
 import java.io.IOException;
@@ -19033,7 +18949,7 @@ $as_echo_n "checking freehep-graphics2d... " >&6; }
     if test ! -f conftestSharedChecker.class ; then
 
     cat << \EOF > conftestSharedChecker.java
-// #line 19036 "configure"
+// #line 18952 "configure"
 import java.util.regex.Pattern;
 import java.io.File;
 import java.io.IOException;
@@ -19267,7 +19183,7 @@ $as_echo_n "checking freehep-graphicsio... " >&6; }
     if test ! -f conftestSharedChecker.class ; then
 
     cat << \EOF > conftestSharedChecker.java
-// #line 19270 "configure"
+// #line 19186 "configure"
 import java.util.regex.Pattern;
 import java.io.File;
 import java.io.IOException;
@@ -19501,7 +19417,7 @@ $as_echo_n "checking freehep-graphicsio-emf... " >&6; }
     if test ! -f conftestSharedChecker.class ; then
 
     cat << \EOF > conftestSharedChecker.java
-// #line 19504 "configure"
+// #line 19420 "configure"
 import java.util.regex.Pattern;
 import java.io.File;
 import java.io.IOException;
@@ -19735,7 +19651,7 @@ $as_echo_n "checking freehep-io... " >&6; }
     if test ! -f conftestSharedChecker.class ; then
 
     cat << \EOF > conftestSharedChecker.java
-// #line 19738 "configure"
+// #line 19654 "configure"
 import java.util.regex.Pattern;
 import java.io.File;
 import java.io.IOException;
@@ -19969,7 +19885,7 @@ $as_echo_n "checking freehep-util... " >&6; }
     if test ! -f conftestSharedChecker.class ; then
 
     cat << \EOF > conftestSharedChecker.java
-// #line 19972 "configure"
+// #line 19888 "configure"
 import java.util.regex.Pattern;
 import java.io.File;
 import java.io.IOException;
@@ -20204,7 +20120,7 @@ $as_echo_n "checking batik-all... " >&6; }
     if test ! -f conftestSharedChecker.class ; then
 
     cat << \EOF > conftestSharedChecker.java
-// #line 20207 "configure"
+// #line 20123 "configure"
 import java.util.regex.Pattern;
 import java.io.File;
 import java.io.IOException;
@@ -20438,7 +20354,7 @@ $as_echo_n "checking batik... " >&6; }
     if test ! -f conftestSharedChecker.class ; then
 
     cat << \EOF > conftestSharedChecker.java
-// #line 20441 "configure"
+// #line 20357 "configure"
 import java.util.regex.Pattern;
 import java.io.File;
 import java.io.IOException;
@@ -20673,7 +20589,7 @@ $as_echo_n "checking commons-io... " >&6; }
     if test ! -f conftestSharedChecker.class ; then
 
     cat << \EOF > conftestSharedChecker.java
-// #line 20676 "configure"
+// #line 20592 "configure"
 import java.util.regex.Pattern;
 import java.io.File;
 import java.io.IOException;
@@ -20907,7 +20823,7 @@ $as_echo_n "checking xmlgraphics-commons... " >&6; }
     if test ! -f conftestSharedChecker.class ; then
 
     cat << \EOF > conftestSharedChecker.java
-// #line 20910 "configure"
+// #line 20826 "configure"
 import java.util.regex.Pattern;
 import java.io.File;
 import java.io.IOException;
@@ -21141,7 +21057,7 @@ $as_echo_n "checking avalon-framework... " >&6; }
     if test ! -f conftestSharedChecker.class ; then
 
     cat << \EOF > conftestSharedChecker.java
-// #line 21144 "configure"
+// #line 21060 "configure"
 import java.util.regex.Pattern;
 import java.io.File;
 import java.io.IOException;
@@ -21375,7 +21291,7 @@ $as_echo_n "checking xml-apis-ext... " >&6; }
     if test ! -f conftestSharedChecker.class ; then
 
     cat << \EOF > conftestSharedChecker.java
-// #line 21378 "configure"
+// #line 21294 "configure"
 import java.util.regex.Pattern;
 import java.io.File;
 import java.io.IOException;
@@ -21609,7 +21525,7 @@ $as_echo_n "checking xml-commons-apis-ext... " >&6; }
     if test ! -f conftestSharedChecker.class ; then
 
     cat << \EOF > conftestSharedChecker.java
-// #line 21612 "configure"
+// #line 21528 "configure"
 import java.util.regex.Pattern;
 import java.io.File;
 import java.io.IOException;
@@ -21847,7 +21763,7 @@ $as_echo_n "checking commons-logging... " >&6; }
     if test ! -f conftestSharedChecker.class ; then
 
     cat << \EOF > conftestSharedChecker.java
-// #line 21850 "configure"
+// #line 21766 "configure"
 import java.util.regex.Pattern;
 import java.io.File;
 import java.io.IOException;
@@ -22081,7 +21997,7 @@ $as_echo_n "checking jlatexmath... " >&6; }
     if test ! -f conftestSharedChecker.class ; then
 
     cat << \EOF > conftestSharedChecker.java
-// #line 22084 "configure"
+// #line 22000 "configure"
 import java.util.regex.Pattern;
 import java.io.File;
 import java.io.IOException;
@@ -22315,7 +22231,7 @@ $as_echo_n "checking jlatexmath-fop... " >&6; }
     if test ! -f conftestSharedChecker.class ; then
 
     cat << \EOF > conftestSharedChecker.java
-// #line 22318 "configure"
+// #line 22234 "configure"
 import java.util.regex.Pattern;
 import java.io.File;
 import java.io.IOException;
@@ -22555,7 +22471,7 @@ $as_echo_n "checking checkstyle... " >&6; }
     if test ! -f conftestSharedChecker.class ; then
 
     cat << \EOF > conftestSharedChecker.java
-// #line 22558 "configure"
+// #line 22474 "configure"
 import java.util.regex.Pattern;
 import java.io.File;
 import java.io.IOException;
@@ -22789,7 +22705,7 @@ $as_echo_n "checking commons-beanutils... " >&6; }
     if test ! -f conftestSharedChecker.class ; then
 
     cat << \EOF > conftestSharedChecker.java
-// #line 22792 "configure"
+// #line 22708 "configure"
 import java.util.regex.Pattern;
 import java.io.File;
 import java.io.IOException;
@@ -23023,7 +22939,7 @@ $as_echo_n "checking antlr... " >&6; }
     if test ! -f conftestSharedChecker.class ; then
 
     cat << \EOF > conftestSharedChecker.java
-// #line 23026 "configure"
+// #line 22942 "configure"
 import java.util.regex.Pattern;
 import java.io.File;
 import java.io.IOException;
@@ -23257,7 +23173,7 @@ $as_echo_n "checking junit4... " >&6; }
     if test ! -f conftestSharedChecker.class ; then
 
     cat << \EOF > conftestSharedChecker.java
-// #line 23260 "configure"
+// #line 23176 "configure"
 import java.util.regex.Pattern;
 import java.io.File;
 import java.io.IOException;
@@ -23488,7 +23404,7 @@ $as_echo_n "checking junit... " >&6; }
     if test ! -f conftestSharedChecker.class ; then
 
     cat << \EOF > conftestSharedChecker.java
-// #line 23491 "configure"
+// #line 23407 "configure"
 import java.util.regex.Pattern;
 import java.io.File;
 import java.io.IOException;
@@ -23726,7 +23642,7 @@ $as_echo_n "checking hamcrest-all... " >&6; }
     if test ! -f conftestSharedChecker.class ; then
 
     cat << \EOF > conftestSharedChecker.java
-// #line 23729 "configure"
+// #line 23645 "configure"
 import java.util.regex.Pattern;
 import java.io.File;
 import java.io.IOException;
@@ -23957,7 +23873,7 @@ $as_echo_n "checking hamcrest/all... " >&6; }
     if test ! -f conftestSharedChecker.class ; then
 
     cat << \EOF > conftestSharedChecker.java
-// #line 23960 "configure"
+// #line 23876 "configure"
 import java.util.regex.Pattern;
 import java.io.File;
 import java.io.IOException;
@@ -24192,7 +24108,7 @@ $as_echo_n "checking cobertura... " >&6; }
     if test ! -f conftestSharedChecker.class ; then
 
     cat << \EOF > conftestSharedChecker.java
-// #line 24195 "configure"
+// #line 24111 "configure"
 import java.util.regex.Pattern;
 import java.io.File;
 import java.io.IOException;
@@ -24426,7 +24342,7 @@ $as_echo_n "checking asm3... " >&6; }
     if test ! -f conftestSharedChecker.class ; then
 
     cat << \EOF > conftestSharedChecker.java
-// #line 24429 "configure"
+// #line 24345 "configure"
 import java.util.regex.Pattern;
 import java.io.File;
 import java.io.IOException;
@@ -24657,7 +24573,7 @@ $as_echo_n "checking asm... " >&6; }
     if test ! -f conftestSharedChecker.class ; then
 
     cat << \EOF > conftestSharedChecker.java
-// #line 24660 "configure"
+// #line 24576 "configure"
 import java.util.regex.Pattern;
 import java.io.File;
 import java.io.IOException;
@@ -24891,7 +24807,7 @@ $as_echo_n "checking ecj... " >&6; }
     if test ! -f conftestSharedChecker.class ; then
 
     cat << \EOF > conftestSharedChecker.java
-// #line 24894 "configure"
+// #line 24810 "configure"
 import java.util.regex.Pattern;
 import java.io.File;
 import java.io.IOException;
@@ -29293,7 +29209,7 @@ CHK_EIGEN_MINOR=2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if Eigen is version $CHK_EIGEN_WORLD.$CHK_EIGEN_MAJOR.$CHK_EIGEN_MINOR or later" >&5
 $as_echo_n "checking if Eigen is version $CHK_EIGEN_WORLD.$CHK_EIGEN_MAJOR.$CHK_EIGEN_MINOR or later... " >&6; }
 cat > conftest.$ac_ext <<EOF
-#line 29296 "configure"
+#line 29212 "configure"
 #include "confdefs.h"
 
 #include "$PATH_TO_EIGEN/Eigen/Sparse"
@@ -33970,7 +33886,7 @@ CPPFLAGS="$CPPFLAGS -I$CHK_TCL_INCLUDE_PATH"
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later" >&5
 $as_echo_n "checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later... " >&6; }
 cat > conftest.$ac_ext <<EOF
-#line 33973 "configure"
+#line 33889 "configure"
 #include "confdefs.h"
 
 #include "$CHK_TCL_INCLUDE_PATH/$CHK_TCL_INC_NAME"
@@ -34281,7 +34197,7 @@ CPPFLAGS="$CPPFLAGS $TCL_INC_PATH -I$CHK_TK_INCLUDE_PATH $X_CFLAGS"
 $as_echo_n "checking if tk is version $CHK_TK_MAJOR.$CHK_TK_MINOR or later... " >&6; }
 
 cat > conftest.$ac_ext <<EOF
-#line 34284 "configure"
+#line 34200 "configure"
 #include "confdefs.h"
 
 #include "$CHK_TK_INCLUDE_PATH/$CHK_TK_INC_NAME"
@@ -34871,7 +34787,7 @@ $as_echo_n "checking saxon9he... " >&6; }
     if test ! -f conftestSharedChecker.class ; then
 
     cat << \EOF > conftestSharedChecker.java
-// #line 34874 "configure"
+// #line 34790 "configure"
 import java.util.regex.Pattern;
 import java.io.File;
 import java.io.IOException;
@@ -35103,7 +35019,7 @@ $as_echo_n "checking saxon... " >&6; }
     if test ! -f conftestSharedChecker.class ; then
 
     cat << \EOF > conftestSharedChecker.java
-// #line 35106 "configure"
+// #line 35022 "configure"
 import java.util.regex.Pattern;
 import java.io.File;
 import java.io.IOException;
@@ -35336,7 +35252,7 @@ $as_echo_n "checking saxon... " >&6; }
     if test ! -f conftestSharedChecker.class ; then
 
     cat << \EOF > conftestSharedChecker.java
-// #line 35339 "configure"
+// #line 35255 "configure"
 import java.util.regex.Pattern;
 import java.io.File;
 import java.io.IOException;
@@ -53280,7 +53196,7 @@ shlibpath_overrides_runpath=$shlibpath_overrides_runpath
 libname_spec=$lt_libname_spec
 
 # List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME
+# The last name is the one that the linker finds with -lNAME.
 library_names_spec=$lt_library_names_spec
 
 # The coded name of the library, if different from the real name.
@@ -53399,7 +53315,7 @@ allow_undefined_flag=$lt_allow_undefined_flag
 no_undefined_flag=$lt_no_undefined_flag
 
 # Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist
+# This must work even if \$libdir does not exist.
 hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
 
 # Whether we need a single "-rpath" flag with a separated argument.
@@ -53641,7 +53557,7 @@ allow_undefined_flag=$lt_allow_undefined_flag_CXX
 no_undefined_flag=$lt_no_undefined_flag_CXX
 
 # Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist
+# This must work even if \$libdir does not exist.
 hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
 
 # Whether we need a single "-rpath" flag with a separated argument.
@@ -53794,7 +53710,7 @@ allow_undefined_flag=$lt_allow_undefined_flag_F77
 no_undefined_flag=$lt_no_undefined_flag_F77
 
 # Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist
+# This must work even if \$libdir does not exist.
 hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_F77
 
 # Whether we need a single "-rpath" flag with a separated argument.
diff --git a/scilab/configure.ac b/scilab/configure.ac
index 560aaf4..46d3d6f 100644
--- a/scilab/configure.ac
+++ b/scilab/configure.ac
@@ -152,11 +152,11 @@ AC_ARG_WITH(gui,
     AS_HELP_STRING([--without-gui],[Disable the Scilab Graphical User Interface (GUI). Intended for embedded/clustering/grid Scilab ]))
 
 AC_ARG_ENABLE(build-swig,
-    AS_HELP_STRING([--enable-build-swig=path],[Regenerate Java => C and Scilab => C wrappers produces by Swig]))
+    AS_HELP_STRING([--enable-build-swig=path],[Regenerate Java => C and Scilab => C wrappers produced by Swig]))
 
 
 AC_ARG_ENABLE(build-giws,
-    AS_HELP_STRING([--enable-build-giws],[Regenerate C/C++ => Java wrappers produces by Giws]))
+    AS_HELP_STRING([--enable-build-giws],[Regenerate C/C++ => Java wrappers produced by Giws]))
 
 AC_ARG_ENABLE(build-parser,
     AS_HELP_STRING([--enable-build-parser],[Regenerate code for the parser (Lex & YACC)]))
diff --git a/scilab/contrib/Makefile.in b/scilab/contrib/Makefile.in
index f90cd91..cd9c4e7 100644
--- a/scilab/contrib/Makefile.in
+++ b/scilab/contrib/Makefile.in
@@ -237,7 +237,6 @@ JAVA = @JAVA@
 JAVAC = @JAVAC@
 JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
-JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
@@ -428,6 +427,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
diff --git a/scilab/contrib/toolbox_skeleton/builder.sce b/scilab/contrib/toolbox_skeleton/builder.sce
index f818934..6748a36 100644
--- a/scilab/contrib/toolbox_skeleton/builder.sce
+++ b/scilab/contrib/toolbox_skeleton/builder.sce
@@ -9,7 +9,7 @@ lines(0);
 function main_builder()
     TOOLBOX_NAME  = "toolbox_skeleton";
     TOOLBOX_TITLE = "Toolbox Skeleton";
-    toolbox_dir   = get_absolute_file_path("builder.sce");
+    toolbox_dir   = get_absolute_file_path();
 
     // Check Scilab's version
     // =============================================================================
diff --git a/scilab/contrib/toolbox_skeleton/demos/toolbox_skeleton.dem.gateway.sce b/scilab/contrib/toolbox_skeleton/demos/toolbox_skeleton.dem.gateway.sce
index 09d6bf6..75f9f84 100644
--- a/scilab/contrib/toolbox_skeleton/demos/toolbox_skeleton.dem.gateway.sce
+++ b/scilab/contrib/toolbox_skeleton/demos/toolbox_skeleton.dem.gateway.sce
@@ -2,7 +2,7 @@
 // This file is released under the 3-clause BSD license. See COPYING-BSD.
 
 function subdemolist = demo_gateway()
-    demopath = get_absolute_file_path("toolbox_skeleton.dem.gateway.sce");
+    demopath = get_absolute_file_path();
 
     subdemolist = ["sum with Scilab"             ,"scilab_sum.dem.sce"; ..
     "A c sum "                    ,"c_sum.dem.sce"     ; ..
diff --git a/scilab/contrib/toolbox_skeleton/help/builder_help.sce b/scilab/contrib/toolbox_skeleton/help/builder_help.sce
index 8f93d27..2e19328 100644
--- a/scilab/contrib/toolbox_skeleton/help/builder_help.sce
+++ b/scilab/contrib/toolbox_skeleton/help/builder_help.sce
@@ -1,6 +1,6 @@
 // This file is released under the 3-clause BSD license. See COPYING-BSD.
 
-here = get_absolute_file_path("builder_help.sce");
+here = get_absolute_file_path();
 d = dir(here);
 d = d.name(d.isdir);
 la_LA = d(grep(d, "/[a-z]{2}_[A-Z]{2}/", "r"));  // filtering out ./images/ ./mml/, ...
diff --git a/scilab/contrib/toolbox_skeleton/help/cleaner_help.sce b/scilab/contrib/toolbox_skeleton/help/cleaner_help.sce
index a2b5e7e..6061eb4 100644
--- a/scilab/contrib/toolbox_skeleton/help/cleaner_help.sce
+++ b/scilab/contrib/toolbox_skeleton/help/cleaner_help.sce
@@ -1,7 +1,7 @@
 // This file is released under the 3-clause BSD license. See COPYING-BSD.
 
 function cleaner_help()
-    path = get_absolute_file_path("cleaner_help.sce");
+    path = get_absolute_file_path();
     langdirs = dir(path);
     langdirs = langdirs.name(langdirs.isdir);
 
diff --git a/scilab/contrib/toolbox_skeleton/help/en_US/build_help.sce b/scilab/contrib/toolbox_skeleton/help/en_US/build_help.sce
index 7065316..a042bbd 100644
--- a/scilab/contrib/toolbox_skeleton/help/en_US/build_help.sce
+++ b/scilab/contrib/toolbox_skeleton/help/en_US/build_help.sce
@@ -1,3 +1,3 @@
 // This file is released under the 3-clause BSD license. See COPYING-BSD.
 
-tbx_build_help(TOOLBOX_TITLE,get_absolute_file_path("build_help.sce"));
+tbx_build_help(TOOLBOX_TITLE,get_absolute_file_path());
diff --git a/scilab/contrib/toolbox_skeleton/help/fr_FR/build_help.sce b/scilab/contrib/toolbox_skeleton/help/fr_FR/build_help.sce
index 7065316..a042bbd 100644
--- a/scilab/contrib/toolbox_skeleton/help/fr_FR/build_help.sce
+++ b/scilab/contrib/toolbox_skeleton/help/fr_FR/build_help.sce
@@ -1,3 +1,3 @@
 // This file is released under the 3-clause BSD license. See COPYING-BSD.
 
-tbx_build_help(TOOLBOX_TITLE,get_absolute_file_path("build_help.sce"));
+tbx_build_help(TOOLBOX_TITLE,get_absolute_file_path());
diff --git a/scilab/contrib/toolbox_skeleton/macros/buildmacros.sce b/scilab/contrib/toolbox_skeleton/macros/buildmacros.sce
index 5a872bb..e7ba8f6 100644
--- a/scilab/contrib/toolbox_skeleton/macros/buildmacros.sce
+++ b/scilab/contrib/toolbox_skeleton/macros/buildmacros.sce
@@ -1,7 +1,7 @@
 // This file is released under the 3-clause BSD license. See COPYING-BSD.
 
 function buildmacros()
-    macros_path = get_absolute_file_path("buildmacros.sce");
+    macros_path = get_absolute_file_path();
     tbx_build_macros(TOOLBOX_NAME, macros_path);
 endfunction
 
diff --git a/scilab/contrib/toolbox_skeleton/macros/cleanmacros.sce b/scilab/contrib/toolbox_skeleton/macros/cleanmacros.sce
index a6428b2..fb3cf8c 100644
--- a/scilab/contrib/toolbox_skeleton/macros/cleanmacros.sce
+++ b/scilab/contrib/toolbox_skeleton/macros/cleanmacros.sce
@@ -3,7 +3,7 @@
 // ====================================================================
 function cleanmacros()
 
-    libpath = get_absolute_file_path("cleanmacros.sce");
+    libpath = get_absolute_file_path();
 
     binfiles = ls(libpath+"/*.bin");
     for i = 1:size(binfiles,"*")
diff --git a/scilab/contrib/toolbox_skeleton/sci_gateway/builder_gateway.sce b/scilab/contrib/toolbox_skeleton/sci_gateway/builder_gateway.sce
index 0db1558..a8a672c 100644
--- a/scilab/contrib/toolbox_skeleton/sci_gateway/builder_gateway.sce
+++ b/scilab/contrib/toolbox_skeleton/sci_gateway/builder_gateway.sce
@@ -2,7 +2,7 @@
 
 function builder_gateway()
 
-    sci_gateway_dir = get_absolute_file_path("builder_gateway.sce");
+    sci_gateway_dir = get_absolute_file_path();
     languages       = ["c" "fortran" "cpp"];
 
     tbx_builder_gateway_lang(languages,sci_gateway_dir);
diff --git a/scilab/contrib/toolbox_skeleton/sci_gateway/c/builder_gateway_c.sce b/scilab/contrib/toolbox_skeleton/sci_gateway/c/builder_gateway_c.sce
index 55b8a83..b1fd568 100644
--- a/scilab/contrib/toolbox_skeleton/sci_gateway/c/builder_gateway_c.sce
+++ b/scilab/contrib/toolbox_skeleton/sci_gateway/c/builder_gateway_c.sce
@@ -2,7 +2,7 @@
 
 function builder_gw_c()
 
-    includes_src_c = ilib_include_flag(get_absolute_file_path("builder_gateway_c.sce") + "../../src/c");
+    includes_src_c = ilib_include_flag(get_absolute_file_path() + "../../src/c");
 
     // PutLhsVar managed by user in sci_sum and in sci_sub
     // if you do not this variable, PutLhsVar is added
diff --git a/scilab/contrib/toolbox_skeleton/sci_gateway/cpp/builder_gateway_cpp.sce b/scilab/contrib/toolbox_skeleton/sci_gateway/cpp/builder_gateway_cpp.sce
index b27d887..8233fd6 100644
--- a/scilab/contrib/toolbox_skeleton/sci_gateway/cpp/builder_gateway_cpp.sce
+++ b/scilab/contrib/toolbox_skeleton/sci_gateway/cpp/builder_gateway_cpp.sce
@@ -2,7 +2,7 @@
 
 function builder_gw_cpp()
 
-    includes_src_c = ilib_include_flag(get_absolute_file_path("builder_gateway_cpp.sce") + "../../src/c");
+    includes_src_c = ilib_include_flag(get_absolute_file_path() + "../../src/c");
 
     //adapt to compiler capabilities
     l = ilib_language();
diff --git a/scilab/contrib/toolbox_skeleton/sci_gateway/fortran/builder_gateway_fortran.sce b/scilab/contrib/toolbox_skeleton/sci_gateway/fortran/builder_gateway_fortran.sce
index 478320e..9b78cd8 100644
--- a/scilab/contrib/toolbox_skeleton/sci_gateway/fortran/builder_gateway_fortran.sce
+++ b/scilab/contrib/toolbox_skeleton/sci_gateway/fortran/builder_gateway_fortran.sce
@@ -5,7 +5,7 @@ function builder_gw_fortran()
     tbx_build_gateway("skeleton_fortran", ..
     ["fortran_sum","sci_fsum"], ..
     ["sci_fsum.c"], ..
-    get_absolute_file_path("builder_gateway_fortran.sce"), ..
+    get_absolute_file_path(), ..
     ["../../src/fortran/libfsum"]);
 
 endfunction
diff --git a/scilab/contrib/toolbox_skeleton/src/builder_src.sce b/scilab/contrib/toolbox_skeleton/src/builder_src.sce
index db7ff7f..7f0c180 100644
--- a/scilab/contrib/toolbox_skeleton/src/builder_src.sce
+++ b/scilab/contrib/toolbox_skeleton/src/builder_src.sce
@@ -2,7 +2,7 @@
 
 function builder_src()
     langage_src = ["fortran" "c" "java"];
-    path_src = get_absolute_file_path("builder_src.sce");
+    path_src = get_absolute_file_path();
     tbx_builder_src_lang(langage_src, path_src);
 endfunction
 
diff --git a/scilab/contrib/toolbox_skeleton/src/c/builder_c.sce b/scilab/contrib/toolbox_skeleton/src/c/builder_c.sce
index e1bb2ea..50429f2 100644
--- a/scilab/contrib/toolbox_skeleton/src/c/builder_c.sce
+++ b/scilab/contrib/toolbox_skeleton/src/c/builder_c.sce
@@ -4,7 +4,7 @@
 
 function builder_c()
 
-    src_c_path = get_absolute_file_path("builder_c.sce");
+    src_c_path = get_absolute_file_path();
 
     CFLAGS = ilib_include_flag(src_c_path);
 
diff --git a/scilab/contrib/toolbox_skeleton/src/fortran/builder_fortran.sce b/scilab/contrib/toolbox_skeleton/src/fortran/builder_fortran.sce
index 6bc3285..f1f4216 100644
--- a/scilab/contrib/toolbox_skeleton/src/fortran/builder_fortran.sce
+++ b/scilab/contrib/toolbox_skeleton/src/fortran/builder_fortran.sce
@@ -5,7 +5,7 @@ function builder_fortran()
     tbx_build_src(["fsum"],   ..
     ["fsum.f"], ..
     "f",        ..
-    get_absolute_file_path("builder_fortran.sce"));
+    get_absolute_file_path());
 
 endfunction
 
diff --git a/scilab/contrib/toolbox_skeleton/src/java/builder_java.sce b/scilab/contrib/toolbox_skeleton/src/java/builder_java.sce
index f089090..a1c7367 100644
--- a/scilab/contrib/toolbox_skeleton/src/java/builder_java.sce
+++ b/scilab/contrib/toolbox_skeleton/src/java/builder_java.sce
@@ -3,7 +3,7 @@
 // This macro compiles JAR from Java files
 
 function builder_java()
-    src_java_dir = get_absolute_file_path("builder_java.sce");
+    src_java_dir = get_absolute_file_path();
 
     curdir = pwd();
     cd(src_java_dir);
diff --git a/scilab/desktop/Makefile.in b/scilab/desktop/Makefile.in
index e1d9c9e..a27228b 100644
--- a/scilab/desktop/Makefile.in
+++ b/scilab/desktop/Makefile.in
@@ -334,7 +334,6 @@ JAVA = @JAVA@
 JAVAC = @JAVAC@
 JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
-JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
@@ -525,6 +524,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
diff --git a/scilab/desktop/images/icons/Makefile.in b/scilab/desktop/images/icons/Makefile.in
index bc4cb83..79f376e 100644
--- a/scilab/desktop/images/icons/Makefile.in
+++ b/scilab/desktop/images/icons/Makefile.in
@@ -273,7 +273,6 @@ JAVA = @JAVA@
 JAVAC = @JAVAC@
 JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
-JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
@@ -464,6 +463,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
diff --git a/scilab/etc/Info.plist.in b/scilab/etc/Info.plist.in
index 0418121..492a724 100644
--- a/scilab/etc/Info.plist.in
+++ b/scilab/etc/Info.plist.in
@@ -10,7 +10,7 @@
         <key>CFBundleExecutable</key>
         <string>bin/scilab</string>
         <key>CFBundleGetInfoString</key>
-        <string>Scilab @SCILAB_BINARY_VERSION@, © 2017-2020 ESI Group</string>
+        <string>Scilab @SCILAB_BINARY_VERSION@, © 2017-2021 ESI Group</string>
         <key>CFBundleIconFile</key>
         <string>puffin</string>
         <key>CFBundleIdentifier</key>
diff --git a/scilab/etc/modules.xml.in b/scilab/etc/modules.xml.in
index a1e3fe7..2b7cfcb 100644
--- a/scilab/etc/modules.xml.in
+++ b/scilab/etc/modules.xml.in
@@ -8,7 +8,7 @@
  ===================
  Don't touch if you do not know what you are doing
  Warning "core" module must be always the first module
- activate="yes" module will be launched ( or not "0")
+ activate="yes" module will be launched ( or not "no")
  -->
 <!-- =================== -->
 <modules>
@@ -78,7 +78,7 @@
 <module name="api_scilab" activate="yes"/>
 <module name="helptools" activate="@HELP_ENABLE@"/>
 <module name="graph" activate="@JAVA_ENABLE@"/>
-<module name="parallel" activate="yes"/>
+<module name="parallel" activate="no"/>
 <module name="modules_manager" activate="yes"/>
 <module name="history_browser" activate="@JAVA_ENABLE@"/>
 <module name="preferences" activate="@GUI_ENABLE@"/>
diff --git a/scilab/etc/modules.xml.vc b/scilab/etc/modules.xml.vc
index 605bd60..f60a525 100644
--- a/scilab/etc/modules.xml.vc
+++ b/scilab/etc/modules.xml.vc
@@ -75,7 +75,7 @@
     <module name="api_scilab" activate="yes"/>
     <module name="helptools" activate="yes"/>
     <module name="graph" activate="yes"/>
-    <module name="parallel" activate="yes"/>
+    <module name="parallel" activate="no"/>
     <module name="modules_manager" activate="yes"/>
     <module name="history_browser" activate="yes"/>
     <module name="preferences" activate="yes"/>
diff --git a/scilab/etc/scilab.start b/scilab/etc/scilab.start
index 949509b..872f33d 100644
--- a/scilab/etc/scilab.start
+++ b/scilab/etc/scilab.start
@@ -76,6 +76,9 @@ if getos() <> "Windows" then
 end
 setenv("VERSION", getversion());
 
+// Add %chars constant ================================================
+%chars = percentchars()
+
 // ATOMS ===============================================================
 if with_module("atoms") then
   atomsSystemInit();
diff --git a/scilab/libs/GetWindowsVersion/GetWindowsVersion.rc b/scilab/libs/GetWindowsVersion/GetWindowsVersion.rc
index a90db8c..c871958 100644
--- a/scilab/libs/GetWindowsVersion/GetWindowsVersion.rc
+++ b/scilab/libs/GetWindowsVersion/GetWindowsVersion.rc
@@ -67,7 +67,7 @@ BEGIN
             VALUE "FileDescription", "GetWindowsVersion library for Scilab 6.2"
             VALUE "FileVersion", "6, 2, 0, 0"
             VALUE "InternalName", "GetWindowsVersion library for Scilab 6.2"
-            VALUE "LegalCopyright", "Copyright (C) 2020"
+            VALUE "LegalCopyright", "Copyright (C) 2021"
             VALUE "OriginalFilename", "GetWindowsVersion.dll"
             VALUE "ProductName", "GetWindowsVersion library for Scilab 6.2"
             VALUE "ProductVersion", "6, 2, 2, 0"
diff --git a/scilab/m4/java.m4 b/scilab/m4/java.m4
index a2724ad..828b9fa 100644
--- a/scilab/m4/java.m4
+++ b/scilab/m4/java.m4
@@ -796,9 +796,6 @@ AC_DEFUN([AC_JAVA_TOOLS], [
         JAVA_G=$JAVA
     fi
 
-    TOOL=javah
-    AC_JAVA_TOOLS_CHECK(JAVAH, $TOOL, $ac_java_jvm_bin_dir)
-
     AC_JAVA_TOOLS_CHECK(JAR, jar, $ac_java_jvm_bin_dir)
 
     AC_JAVA_TOOLS_CHECK(JAVADOC, javadoc, $ac_java_jvm_bin_dir)
diff --git a/scilab/modules/Makefile.in b/scilab/modules/Makefile.in
index 14bc23c..61fa923 100644
--- a/scilab/modules/Makefile.in
+++ b/scilab/modules/Makefile.in
@@ -410,7 +410,6 @@ JAVA = @JAVA@
 JAVAC = @JAVAC@
 JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
-JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
@@ -601,6 +600,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
diff --git a/scilab/modules/action_binding/Makefile.in b/scilab/modules/action_binding/Makefile.in
index bf2d8c1..81b88a5 100644
--- a/scilab/modules/action_binding/Makefile.in
+++ b/scilab/modules/action_binding/Makefile.in
@@ -406,7 +406,6 @@ JAVA = @JAVA@
 JAVAC = @JAVAC@
 JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
-JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
@@ -597,6 +596,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
diff --git a/scilab/modules/action_binding/src/c/InterpreterManagement.c b/scilab/modules/action_binding/src/c/InterpreterManagement.c
index 98f9c3c..8c18f73 100644
--- a/scilab/modules/action_binding/src/c/InterpreterManagement.c
+++ b/scilab/modules/action_binding/src/c/InterpreterManagement.c
@@ -19,7 +19,19 @@
 /*--------------------------------------------------------------------------*/
 int putCommandInScilabQueue(char *command)
 {
-    return StoreCommand(command);
+    if(isEnableDebug())
+    {
+        if(isDebugInterrupted())
+        {
+            return 1;
+        }
+
+        return debuggerManagerExecute(command);
+    }
+    else
+    {
+        return StoreCommand(command);
+    }
 }
 /*--------------------------------------------------------------------------*/
 /*
@@ -30,7 +42,19 @@ int putCommandInScilabQueue(char *command)
 */
 int requestScilabExec(char *command)
 {
-    return StorePrioritaryCommand(command);
+    if(isEnableDebug())
+    {
+        if(isDebugInterrupted())
+        {
+            return 1;
+        }
+
+        return debuggerManagerExecute(command);
+    }
+    else
+    {
+        return StorePrioritaryCommand(command);
+    }
 }
 /*--------------------------------------------------------------------------*/
 int interruptScilab(void)
diff --git a/scilab/modules/action_binding/src/c/action_binding.rc b/scilab/modules/action_binding/src/c/action_binding.rc
index c205735..30f9e80 100644
--- a/scilab/modules/action_binding/src/c/action_binding.rc
+++ b/scilab/modules/action_binding/src/c/action_binding.rc
@@ -68,7 +68,7 @@ BEGIN
             VALUE "FileDescription", "action_binding module"
             VALUE "FileVersion", "6, 2, 0, 0"
             VALUE "InternalName", "action_binding module"
-            VALUE "LegalCopyright", "Copyright (C) 2020"
+            VALUE "LegalCopyright", "Copyright (C) 2021"
             VALUE "OriginalFilename", "action_binding.dll"
             VALUE "ProductName", " action_binding"
             VALUE "ProductVersion", "6, 2, 0, 0"
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 adbc7a5..ab052b4 100644
--- a/scilab/modules/action_binding/src/noaction_binding/noaction_binding.rc
+++ b/scilab/modules/action_binding/src/noaction_binding/noaction_binding.rc
@@ -68,7 +68,7 @@ BEGIN
             VALUE "FileDescription", "noaction_binding module"
             VALUE "FileVersion", "6, 0, 1, 0"
             VALUE "InternalName", "noaction_binding module"
-            VALUE "LegalCopyright", "Copyright (C) 2020"
+            VALUE "LegalCopyright", "Copyright (C) 2021"
             VALUE "OriginalFilename", "noaction_binding.dll"
             VALUE "ProductName", " noaction_binding"
             VALUE "ProductVersion", "6, 0, 1, 0"
diff --git a/scilab/modules/api_scilab/Makefile.in b/scilab/modules/api_scilab/Makefile.in
index 9d3eaf1..83aa14e 100644
--- a/scilab/modules/api_scilab/Makefile.in
+++ b/scilab/modules/api_scilab/Makefile.in
@@ -390,7 +390,6 @@ JAVA = @JAVA@
 JAVAC = @JAVAC@
 JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
-JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
@@ -581,6 +580,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
diff --git a/scilab/modules/api_scilab/src/c/api_scilab.rc b/scilab/modules/api_scilab/src/c/api_scilab.rc
index 0a603ed..a9e672a 100644
--- a/scilab/modules/api_scilab/src/c/api_scilab.rc
+++ b/scilab/modules/api_scilab/src/c/api_scilab.rc
@@ -67,7 +67,7 @@ BEGIN
             VALUE "FileDescription", "api_scilab module"
             VALUE "FileVersion", "6, 2, 0, 0"
             VALUE "InternalName", "api_scilab module"
-            VALUE "LegalCopyright", "Copyright (C) 2020"
+            VALUE "LegalCopyright", "Copyright (C) 2021"
             VALUE "OriginalFilename", "api_scilab.dll"
             VALUE "ProductName", "api_scilab module"
             VALUE "ProductVersion", "6, 2, 0, 0"
diff --git a/scilab/modules/arnoldi/Makefile.in b/scilab/modules/arnoldi/Makefile.in
index 803422a..a1a077a 100644
--- a/scilab/modules/arnoldi/Makefile.in
+++ b/scilab/modules/arnoldi/Makefile.in
@@ -365,7 +365,6 @@ JAVA = @JAVA@
 JAVAC = @JAVAC@
 JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
-JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
@@ -556,6 +555,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
diff --git a/scilab/modules/arnoldi/src/c/arnoldi.rc b/scilab/modules/arnoldi/src/c/arnoldi.rc
index 78f43f9..9113e1d 100644
--- a/scilab/modules/arnoldi/src/c/arnoldi.rc
+++ b/scilab/modules/arnoldi/src/c/arnoldi.rc
@@ -72,7 +72,7 @@ BEGIN
             VALUE "FileDescription", "arnoldi module"
             VALUE "FileVersion", "6, 2, 0, 0"
             VALUE "InternalName", "arnoldi"
-            VALUE "LegalCopyright", "Copyright (C) 2020"
+            VALUE "LegalCopyright", "Copyright (C) 2021"
             VALUE "OriginalFilename", "arnoldi.dll"
             VALUE "ProductName", "arnoldi module"
             VALUE "ProductVersion", "6, 2, 0, 0"
diff --git a/scilab/modules/ast/Makefile.in b/scilab/modules/ast/Makefile.in
index 86ec193..43b0074 100644
--- a/scilab/modules/ast/Makefile.in
+++ b/scilab/modules/ast/Makefile.in
@@ -1038,7 +1038,6 @@ JAVA = @JAVA@
 JAVAC = @JAVAC@
 JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
-JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
@@ -1229,6 +1228,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
diff --git a/scilab/modules/ast/ast.rc b/scilab/modules/ast/ast.rc
index d69e0bf..771b9df 100644
--- a/scilab/modules/ast/ast.rc
+++ b/scilab/modules/ast/ast.rc
@@ -66,7 +66,7 @@ BEGIN
             VALUE "FileDescription", "ast module"
             VALUE "FileVersion", "6, 2, 0, 0"
             VALUE "InternalName", "ast module"
-            VALUE "LegalCopyright", "Copyright (C) 2020"
+            VALUE "LegalCopyright", "Copyright (C) 2021"
             VALUE "OriginalFilename", "ast.dll"
             VALUE "ProductName", "ast module"
             VALUE "ProductVersion", "6, 2, 0, 0"
diff --git a/scilab/modules/ast/includes/ast/breakpoint.hxx b/scilab/modules/ast/includes/ast/breakpoint.hxx
index 1628ee4..89247fa 100644
--- a/scilab/modules/ast/includes/ast/breakpoint.hxx
+++ b/scilab/modules/ast/includes/ast/breakpoint.hxx
@@ -35,6 +35,7 @@ struct Breakpoint
                     _iFileLine(0),
                     _iFirstColumn(0),
                     _condition(""),
+                    _conditionError(""),
                     _conditionExp(NULL),
                     _enable(true) {}
     ~Breakpoint()
@@ -100,6 +101,16 @@ struct Breakpoint
         return _pFileName.empty() == false && _iFileLine >= 0;
     }
 
+    bool hasCondition() const
+    {
+        return _condition.empty() == false;
+    }
+
+    bool hasConditionError() const
+    {
+        return _conditionError.empty() == false;
+    }
+
     void setEnable()
     {
         _enable = true;
@@ -113,14 +124,26 @@ struct Breakpoint
         return _enable;
     }
 
+    const std::string& getConditionError(void)
+    {
+        return _conditionError;
+    }
+
+    void setConditionError(const std::string& error)
+    {
+        _conditionError = error;
+    }
+
     char* setCondition(const std::string& condition)
     {
+        _condition = condition;
         char* error = parseCommand(condition.data(), (void**)(&_conditionExp));
         if(error)
         {
+            _conditionError = error;
             return error;
         }
-        _condition = condition;
+        _conditionExp->mute();
         return nullptr;
     }
 
@@ -141,6 +164,7 @@ private:
     std::string _pFileName;
     int _iFileLine;
     std::string _condition;