132 files changed, 5729 insertions, 124 deletions

diff --git a/scilab/CHANGES_SimulinkImport b/scilab/CHANGES_SimulinkImport
new file mode 100644
index 0000000..1b13b28
--- /dev/null
+++ b/scilab/CHANGES_SimulinkImport
@@ -0,0 +1,4 @@
+            Changes between version 5.3.0 and the simulinkimport branch of Scilab
+            =====================================================================
+
+* Autoreconf performed with a wrong version
diff --git a/scilab/Makefile.in b/scilab/Makefile.in
index cdf0649..4eb63c2 100644
--- a/scilab/Makefile.in
+++ b/scilab/Makefile.in
@@ -345,6 +345,7 @@ BLAS_LIBS = @BLAS_LIBS@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -403,6 +404,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -495,6 +497,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @STRIP@
diff --git a/scilab/aclocal.m4 b/scilab/aclocal.m4
index 6cf2393..bb0f051 100644
--- a/scilab/aclocal.m4
+++ b/scilab/aclocal.m4
@@ -13,8 +13,8 @@
 
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,
-[m4_warning([this file was generated for autoconf 2.67.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.66],,
+[m4_warning([this file was generated for autoconf 2.66.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically `autoreconf'.])])
diff --git a/scilab/build.incl.xml b/scilab/build.incl.xml
index 7475224..a787179 100644
--- a/scilab/build.incl.xml
+++ b/scilab/build.incl.xml
@@ -76,6 +76,10 @@
     <pathelement location="${jhdf5.jar}"/>
     <pathelement location="${jhall.jar}"/>
     <pathelement location="${jgraphx.jar}"/>
+    <!-- Only useful for the simulink importer -->
+    <pathelement location="${ccsm-commons.jar}"/>
+    <pathelement location="${simulink.jar}"/>
+    <pathelement location="${cup-runtime.jar}"/>
     <!-- Only usefull for the documentation -->
     <pathelement location="${library.helptools.dir}/${library.helptools.name}"/>
     <pathelement location="${batik.jar}"/>
diff --git a/scilab/configure b/scilab/configure
index 3cacc14..3f6a727 100755
--- a/scilab/configure
+++ b/scilab/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
 # From configure.ac Revision.
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for Scilab 5.
+# Generated by GNU Autoconf 2.66 for Scilab 5.
 #
 # Report bugs to <http://bugzilla.scilab.org/>.
 #
@@ -731,6 +731,9 @@ JAVAC_DEBUG
 JAVA_HOME
 JAVA_JNI_LIBS
 JAVA_JNI_INCLUDE
+JAVA_CUP
+SIMULINK
+CCSM
 JUNIT
 BSH
 QDOX
@@ -1067,9 +1070,8 @@ do
   fi
 
   case $ac_option in
-  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *=)   ac_optarg= ;;
-  *)    ac_optarg=yes ;;
+  *=*)  ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *)    ac_optarg=yes ;;
   esac
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
@@ -1821,7 +1823,7 @@ test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
 Scilab configure 5
-generated by GNU Autoconf 2.67
+generated by GNU Autoconf 2.66
 
 Copyright (C) 2010 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
@@ -1893,7 +1895,7 @@ $as_echo "$ac_try_echo"; } >&5
     mv -f conftest.er1 conftest.err
   fi
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } > conftest.i && {
+  test $ac_status = 0; } >/dev/null && {
          test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
          test ! -s conftest.err
        }; then :
@@ -1956,7 +1958,7 @@ if ac_fn_c_try_cpp "$LINENO"; then :
 else
   ac_header_preproc=no
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
 $as_echo "$ac_header_preproc" >&6; }
 
@@ -2518,7 +2520,7 @@ $as_echo "$ac_try_echo"; } >&5
     mv -f conftest.er1 conftest.err
   fi
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } > conftest.i && {
+  test $ac_status = 0; } >/dev/null && {
          test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
          test ! -s conftest.err
        }; then :
@@ -2630,7 +2632,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by Scilab $as_me 5, which was
-generated by GNU Autoconf 2.67.  Invocation command line was
+generated by GNU Autoconf 2.66.  Invocation command line was
 
   $ $0 $@
 
@@ -2888,7 +2890,7 @@ $as_echo "$as_me: loading site script $ac_site_file" >&6;}
       || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "failed to load site script $ac_site_file
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
   fi
 done
 
@@ -3483,7 +3485,7 @@ fi
 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 
 # Provide some information about the compiler.
 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -3598,7 +3600,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "C compiler cannot create executables
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
@@ -3641,7 +3643,7 @@ else
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest conftest$ac_cv_exeext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
@@ -3700,7 +3702,7 @@ $as_echo "$ac_try_echo"; } >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
     fi
   fi
 fi
@@ -3752,7 +3754,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
@@ -4376,7 +4378,7 @@ fi
 $as_echo "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
 esac
 build=$ac_cv_build
 ac_save_IFS=$IFS; IFS='-'
@@ -4409,7 +4411,7 @@ fi
 $as_echo "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
 esac
 host=$ac_cv_host
 ac_save_IFS=$IFS; IFS='-'
@@ -4631,7 +4633,7 @@ else
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
@@ -4647,11 +4649,11 @@ else
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
   break
 fi
@@ -4690,7 +4692,7 @@ else
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
@@ -4706,18 +4708,18 @@ else
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
 
 else
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 ac_ext=c
@@ -5157,11 +5159,11 @@ am_lf='
 '
 case `pwd` in
   *[\\\"\#\$\&\'\`$am_lf]*)
-    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;;
+    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
 esac
 case $srcdir in
   *[\\\"\#\$\&\'\`$am_lf\ \     ]*)
-    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;;
+    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
 esac
 
 # Do `set' in a subshell so we don't clobber the current shell's
@@ -5776,7 +5778,7 @@ else
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
@@ -5792,11 +5794,11 @@ else
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
   break
 fi
@@ -5835,7 +5837,7 @@ else
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
@@ -5851,18 +5853,18 @@ else
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
 
 else
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 ac_ext=c
@@ -7134,7 +7136,7 @@ fi
 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 
 # Provide some information about the compiler.
 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -7488,7 +7490,7 @@ fi
 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 
 # Provide some information about the compiler.
 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -8035,7 +8037,7 @@ fi
 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 
 # Provide some information about the compiler.
 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -8296,7 +8298,7 @@ else
      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (int)
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
    else
      ac_cv_sizeof_int=0
    fi
@@ -8329,7 +8331,7 @@ else
      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (long)
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
    else
      ac_cv_sizeof_long=0
    fi
@@ -10494,7 +10496,7 @@ $as_echo "$ac_java_classpath" >&6; }
 $as_echo_n "checking to see if the java compiler works... " >&6; }
 
     cat << \EOF > conftest.java
-// #line 10497 "configure"
+// #line 10499 "configure"
 
 
 public class conftest {
@@ -10560,7 +10562,7 @@ $as_echo_n "checking type of jvm... " >&6; }
     if test "x$ac_java_jvm_name" = "x" ; then
 
     cat << \EOF > conftest.java
-// #line 10563 "configure"
+// #line 10565 "configure"
 import gnu.java.io.EncodingManager;
 
 public class conftest {
@@ -10612,7 +10614,7 @@ $as_echo "$ac_java_jvm_name" >&6; }
     case "$ac_java_jvm_name" in
         gcj) DO=nothing ;;
         jdk) DO=nothing ;;
-        *) as_fn_error $? "'$ac_java_jvm_name' is not a supported JVM" "$LINENO" 5  ;;
+        *) as_fn_error $? "'$ac_java_jvm_name' is not a supported JVM" "$LINENO" 5 ;;
     esac
 
     # Try to detect the version of java that is installed
@@ -10624,7 +10626,7 @@ $as_echo_n "checking java API version... " >&6; }
 
 
     cat << \EOF > conftest.java
-// #line 10627 "configure"
+// #line 10629 "configure"
 import java.nio.charset.Charset;
 
 public class conftest {
@@ -10669,7 +10671,7 @@ EOF
 
 
     cat << \EOF > conftest.java
-// #line 10672 "configure"
+// #line 10674 "configure"
 import java.lang.StringBuilder;
 
 public class conftest {
@@ -12040,7 +12042,7 @@ $as_echo_n "checking jgraphx... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 12043 "configure"
+// #line 12045 "configure"
 import com.mxgraph.model.mxCell;
 
 public class conftest {
@@ -12134,7 +12136,7 @@ $as_echo_n "checking minimal version (1.4.1.0) of jgraphx... " >&6; }
    if test "x=" == "x"; then
 
     cat << \EOF > conftest.java
-// #line 12137 "configure"
+// #line 12139 "configure"
 import com.mxgraph.view.mxGraph;
 
 public class conftest {
@@ -12185,7 +12187,7 @@ EOF
    else
 
     cat << \EOF > conftest.java
-// #line 12188 "configure"
+// #line 12190 "configure"
 import com.mxgraph.view.mxGraph;
 
 public class conftest {
@@ -12262,7 +12264,7 @@ $as_echo_n "checking jhdf5... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 12265 "configure"
+// #line 12267 "configure"
 import ncsa.hdf.hdf5lib.HDF5Constants;
 
 public class conftest {
@@ -12411,7 +12413,7 @@ $as_echo_n "checking minimal version (1.8.4) of hdf5... " >&6; }
    if test "x" == "x"; then
 
     cat << \EOF > conftest.java
-// #line 12414 "configure"
+// #line 12416 "configure"
 import ncsa.hdf.hdf5lib.H5;
 
 public class conftest {
@@ -12466,7 +12468,7 @@ EOF
    else
 
     cat << \EOF > conftest.java
-// #line 12469 "configure"
+// #line 12471 "configure"
 import ncsa.hdf.hdf5lib.H5;
 
 public class conftest {
@@ -12550,7 +12552,7 @@ $as_echo_n "checking flexdock... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 12553 "configure"
+// #line 12555 "configure"
 import org.flexdock.docking.DockingManager;
 
 public class conftest {
@@ -12644,7 +12646,7 @@ $as_echo_n "checking minimal version (0.5.2) of flexdock... " >&6; }
    if test "x" == "x"; then
 
     cat << \EOF > conftest.java
-// #line 12647 "configure"
+// #line 12649 "configure"
 import org.flexdock.util.Utilities;
 
 public class conftest {
@@ -12695,7 +12697,7 @@ EOF
    else
 
     cat << \EOF > conftest.java
-// #line 12698 "configure"
+// #line 12700 "configure"
 import org.flexdock.util.Utilities;
 
 public class conftest {
@@ -12768,7 +12770,7 @@ $as_echo_n "checking looks... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 12771 "configure"
+// #line 12773 "configure"
 import com.jgoodies.looks.common.MenuItemRenderer;
 
 public class conftest {
@@ -12875,7 +12877,7 @@ $as_echo_n "checking jgoodies-looks... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 12878 "configure"
+// #line 12880 "configure"
 import com.jgoodies.looks.common.MenuItemRenderer;
 
 public class conftest {
@@ -12983,7 +12985,7 @@ $as_echo_n "checking skinlf... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 12986 "configure"
+// #line 12988 "configure"
 import com.l2fprod.util.AccessUtils;
 
 public class conftest {
@@ -13090,7 +13092,7 @@ $as_echo_n "checking jogl... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 13093 "configure"
+// #line 13095 "configure"
 import javax.media.opengl.glu.GLUnurbs;
 
 public class conftest {
@@ -13302,7 +13304,7 @@ $as_echo_n "checking gluegen-rt... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 13305 "configure"
+// #line 13307 "configure"
 import com.sun.gluegen.runtime.CPU;
 
 public class conftest {
@@ -13463,7 +13465,7 @@ $as_echo_n "checking jhall... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 13466 "configure"
+// #line 13468 "configure"
 import javax.help.JHelp;
 
 public class conftest {
@@ -13570,7 +13572,7 @@ $as_echo_n "checking javahelp2... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 13573 "configure"
+// #line 13575 "configure"
 import javax.help.JHelp;
 
 public class conftest {
@@ -13678,7 +13680,7 @@ $as_echo_n "checking jrosetta-API... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 13681 "configure"
+// #line 13683 "configure"
 import com.artenum.rosetta.interfaces.core.ConsoleConfiguration;
 
 public class conftest {
@@ -13785,7 +13787,7 @@ $as_echo_n "checking jrosetta-engine... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 13788 "configure"
+// #line 13790 "configure"
 import com.artenum.rosetta.core.action.AbstractConsoleAction;
 
 public class conftest {
@@ -13894,7 +13896,7 @@ $as_echo_n "checking jeuclid-core... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 13897 "configure"
+// #line 13899 "configure"
 import net.sourceforge.jeuclid.LayoutContext;
 
 public class conftest {
@@ -14003,7 +14005,7 @@ $as_echo_n "checking fop... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 14006 "configure"
+// #line 14008 "configure"
 import org.apache.fop.pdf.PDFInfo;
 
 public class conftest {
@@ -14110,7 +14112,7 @@ $as_echo_n "checking batik-all... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 14113 "configure"
+// #line 14115 "configure"
 import org.apache.batik.parser.Parser;
 
 public class conftest {
@@ -14217,7 +14219,7 @@ $as_echo_n "checking batik... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 14220 "configure"
+// #line 14222 "configure"
 import org.apache.batik.parser.Parser;
 
 public class conftest {
@@ -14311,7 +14313,7 @@ $as_echo_n "checking minimal version (1.7) of batik... " >&6; }
    if test "x" == "x"; then
 
     cat << \EOF > conftest.java
-// #line 14314 "configure"
+// #line 14316 "configure"
 import org.apache.batik.Version;
 
 public class conftest {
@@ -14362,7 +14364,7 @@ EOF
    else
 
     cat << \EOF > conftest.java
-// #line 14365 "configure"
+// #line 14367 "configure"
 import org.apache.batik.Version;
 
 public class conftest {
@@ -14435,7 +14437,7 @@ $as_echo_n "checking commons-io... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 14438 "configure"
+// #line 14440 "configure"
 import org.apache.commons.io.output.CountingOutputStream;
 
 public class conftest {
@@ -14542,7 +14544,7 @@ $as_echo_n "checking xmlgraphics-commons... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 14545 "configure"
+// #line 14547 "configure"
 import org.apache.xmlgraphics.util.Service;
 
 public class conftest {
@@ -14649,7 +14651,7 @@ $as_echo_n "checking avalon-framework... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 14652 "configure"
+// #line 14654 "configure"
 import org.apache.avalon.framework.configuration.ConfigurationException;
 
 public class conftest {
@@ -14756,7 +14758,7 @@ $as_echo_n "checking xml-apis-ext... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 14759 "configure"
+// #line 14761 "configure"
 import org.w3c.dom.svg.SVGDocument;
 
 public class conftest {
@@ -14863,7 +14865,7 @@ $as_echo_n "checking xml-commons-apis-ext... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 14866 "configure"
+// #line 14868 "configure"
 import org.w3c.dom.svg.SVGDocument;
 
 public class conftest {
@@ -14974,7 +14976,7 @@ $as_echo_n "checking commons-logging... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 14977 "configure"
+// #line 14979 "configure"
 import org.apache.commons.logging.LogFactory;
 
 public class conftest {
@@ -15081,7 +15083,7 @@ $as_echo_n "checking jlatexmath... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 15084 "configure"
+// #line 15086 "configure"
 import org.scilab.forge.jlatexmath.TeXFormula;
 
 public class conftest {
@@ -15175,7 +15177,7 @@ $as_echo_n "checking minimal version (0.9.4) of jlatexmath... " >&6; }
    if test "x" == "x"; then
 
     cat << \EOF > conftest.java
-// #line 15178 "configure"
+// #line 15180 "configure"
 import org.scilab.forge.jlatexmath.TeXFormula;
 
 public class conftest {
@@ -15226,7 +15228,7 @@ EOF
    else
 
     cat << \EOF > conftest.java
-// #line 15229 "configure"
+// #line 15231 "configure"
 import org.scilab.forge.jlatexmath.TeXFormula;
 
 public class conftest {
@@ -15305,7 +15307,7 @@ $as_echo_n "checking checkstyle... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 15308 "configure"
+// #line 15310 "configure"
 import com.puppycrawl.tools.checkstyle.CheckStyleTask;
 
 public class conftest {
@@ -15412,7 +15414,7 @@ $as_echo_n "checking commons-beanutils... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 15415 "configure"
+// #line 15417 "configure"
 import org.apache.commons.beanutils.Converter;
 
 public class conftest {
@@ -15519,7 +15521,7 @@ $as_echo_n "checking antlr... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 15522 "configure"
+// #line 15524 "configure"
 import antlr.TokenStreamException;
 
 public class conftest {
@@ -15626,7 +15628,7 @@ $as_echo_n "checking testng... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 15629 "configure"
+// #line 15631 "configure"
 import org.testng.TestNG;
 
 public class conftest {
@@ -15733,7 +15735,7 @@ $as_echo_n "checking qdox... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 15736 "configure"
+// #line 15738 "configure"
 import com.thoughtworks.qdox.tools.QDoxTester;
 
 public class conftest {
@@ -15840,7 +15842,7 @@ $as_echo_n "checking bsh... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 15843 "configure"
+// #line 15845 "configure"
 import bsh.Console;
 
 public class conftest {
@@ -15947,7 +15949,7 @@ $as_echo_n "checking junit... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 15950 "configure"
+// #line 15952 "configure"
 import junit.framework.Assert;
 
 public class conftest {
@@ -16033,6 +16035,327 @@ $as_echo "$as_me: WARNING: Could not find or use the Java package/jar junit used
                 JUNIT=$PACKAGE_JAR_FILE
 
 
+                # CCSM Commons
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking ccsm-commons" >&5
+$as_echo_n "checking ccsm-commons... " >&6; }
+        PACKAGE_JAR_FILE=
+        found_jar=no
+        saved_ac_java_classpath=$ac_java_classpath
+        DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/ 2>/dev/null) $(ls -d /usr/lib64/*/ 2>/dev/null) $(ls -d /usr/lib/*/ 2>/dev/null)  $(ls -d /usr/share/*/lib/ 2>/dev/null)"
+    for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
+      for jar in "$jardir/ccsm-commons.jar" "$jardir/libccsm-commons.jar" "$jardir/libccsm-commons-java.jar" "$jardir/ccsm-commons*.jar"; do
+#       jar=`echo $jar|sed -e 's/ /\\ /'`
+#       echo "protected $jar"
+#       jar_resolved=`ls $jar 2>/dev/null`
+#       echo "looking for $jar_resolved"
+# TODO check the behaviour when spaces
+        jars_resolved=`ls $jar 2>/dev/null`
+        for jar_resolved in $jars_resolved; do # If several jars matches
+        if test -e "$jar_resolved"; then
+          export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+
+    cat << \EOF > conftest.java
+// #line 16059 "configure"
+import edu.tum.cs.commons.logging.*;
+
+public class conftest {
+    public static void main(String[] argv) {
+
+    }
+}
+EOF
+
+    CLASSPATH=$ac_java_classpath
+    export CLASSPATH
+    cmd="$JAVAC ${JAVAC_FLAGS} conftest.java"
+    if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5) ; then
+       if test ""no"" = "no"; then
+           echo "yes" >&5
+
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
+$as_echo "$jar_resolved" >&6; }
+            found_jar=yes
+            PACKAGE_JAR_FILE=$jar_resolved
+            break
+
+           else
+                   cmd="$JAVA conftest"
+                   if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5); then
+                   echo "yes" >&5
+
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
+$as_echo "$jar_resolved" >&6; }
+            found_jar=yes
+            PACKAGE_JAR_FILE=$jar_resolved
+            break
+
+                        else
+                        echo "configure: failed program was:" >&5
+                                cat conftest.java >&5
+                if test -s conftest.java.output; then
+                   STDOUT=`cat conftest.java.output`
+                fi
+                        echo "configure: CLASSPATH was $CLASSPATH" >&5
+
+            ac_java_classpath=$saved_ac_java_classpath
+
+
+                                                fi
+                fi
+        if test -f conftest.java.output; then
+           rm conftest.java.output
+        fi
+    else
+        echo "configure: failed program was:" >&5
+        cat conftest.java >&5
+        echo "configure: CLASSPATH was $CLASSPATH" >&5
+
+            ac_java_classpath=$saved_ac_java_classpath
+
+
+            fi
+
+        fi
+          done
+          # If ls returns several results and the first one is OK, stop the search
+      if test "$found_jar" = "yes"; then
+        break
+      fi
+      done
+          # If found, no need to search in other directory
+      if test "$found_jar" = "yes"; then
+        break
+      fi
+    done
+    if test "$found_jar" = "no"; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+          if test ""yes"" = "yes"; then
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar ccsm-commons used by CCSM Commons (looking for package edu.tum.cs.commons.logging.*)" >&5
+$as_echo "$as_me: WARNING: Could not find or use the Java package/jar ccsm-commons used by CCSM Commons (looking for package edu.tum.cs.commons.logging.*)" >&2;}
+          else
+                  as_fn_error $? "Could not find or use the Java package/jar ccsm-commons used by CCSM Commons (looking for package edu.tum.cs.commons.logging.*)" "$LINENO" 5
+          fi
+    fi
+
+                CCSM=$PACKAGE_JAR_FILE
+
+
+                # CCSM Simulink
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking simulink" >&5
+$as_echo_n "checking simulink... " >&6; }
+        PACKAGE_JAR_FILE=
+        found_jar=no
+        saved_ac_java_classpath=$ac_java_classpath
+        DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/ 2>/dev/null) $(ls -d /usr/lib64/*/ 2>/dev/null) $(ls -d /usr/lib/*/ 2>/dev/null)  $(ls -d /usr/share/*/lib/ 2>/dev/null)"
+    for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
+      for jar in "$jardir/simulink.jar" "$jardir/libsimulink.jar" "$jardir/libsimulink-java.jar" "$jardir/simulink*.jar"; do
+#       jar=`echo $jar|sed -e 's/ /\\ /'`
+#       echo "protected $jar"
+#       jar_resolved=`ls $jar 2>/dev/null`
+#       echo "looking for $jar_resolved"
+# TODO check the behaviour when spaces
+        jars_resolved=`ls $jar 2>/dev/null`
+        for jar_resolved in $jars_resolved; do # If several jars matches
+        if test -e "$jar_resolved"; then
+          export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+
+    cat << \EOF > conftest.java
+// #line 16166 "configure"
+import edu.tum.cs.simulink.model.*;
+
+public class conftest {
+    public static void main(String[] argv) {
+
+    }
+}
+EOF
+
+    CLASSPATH=$ac_java_classpath
+    export CLASSPATH
+    cmd="$JAVAC ${JAVAC_FLAGS} conftest.java"
+    if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5) ; then
+       if test ""no"" = "no"; then
+           echo "yes" >&5
+
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
+$as_echo "$jar_resolved" >&6; }
+            found_jar=yes
+            PACKAGE_JAR_FILE=$jar_resolved
+            break
+
+           else
+                   cmd="$JAVA conftest"
+                   if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5); then
+                   echo "yes" >&5
+
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
+$as_echo "$jar_resolved" >&6; }
+            found_jar=yes
+            PACKAGE_JAR_FILE=$jar_resolved
+            break
+
+                        else
+                        echo "configure: failed program was:" >&5
+                                cat conftest.java >&5
+                if test -s conftest.java.output; then
+                   STDOUT=`cat conftest.java.output`
+                fi
+                        echo "configure: CLASSPATH was $CLASSPATH" >&5
+
+            ac_java_classpath=$saved_ac_java_classpath
+
+
+                                                fi
+                fi
+        if test -f conftest.java.output; then
+           rm conftest.java.output
+        fi
+    else
+        echo "configure: failed program was:" >&5
+        cat conftest.java >&5
+        echo "configure: CLASSPATH was $CLASSPATH" >&5
+
+            ac_java_classpath=$saved_ac_java_classpath
+
+
+            fi
+
+        fi
+          done
+          # If ls returns several results and the first one is OK, stop the search
+      if test "$found_jar" = "yes"; then
+        break
+      fi
+      done
+          # If found, no need to search in other directory
+      if test "$found_jar" = "yes"; then
+        break
+      fi
+    done
+    if test "$found_jar" = "no"; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+          if test ""yes"" = "yes"; then
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar simulink used by CCSM Simulink model (looking for package edu.tum.cs.simulink.model.*)" >&5
+$as_echo "$as_me: WARNING: Could not find or use the Java package/jar simulink used by CCSM Simulink model (looking for package edu.tum.cs.simulink.model.*)" >&2;}
+          else
+                  as_fn_error $? "Could not find or use the Java package/jar simulink used by CCSM Simulink model (looking for package edu.tum.cs.simulink.model.*)" "$LINENO" 5
+          fi
+    fi
+
+                SIMULINK=$PACKAGE_JAR_FILE
+
+
+                # CCSM Cup runtime
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking cup-runtime" >&5
+$as_echo_n "checking cup-runtime... " >&6; }
+        PACKAGE_JAR_FILE=
+        found_jar=no
+        saved_ac_java_classpath=$ac_java_classpath
+        DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/ 2>/dev/null) $(ls -d /usr/lib64/*/ 2>/dev/null) $(ls -d /usr/lib/*/ 2>/dev/null)  $(ls -d /usr/share/*/lib/ 2>/dev/null)"
+    for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
+      for jar in "$jardir/cup-runtime.jar" "$jardir/libcup-runtime.jar" "$jardir/libcup-runtime-java.jar" "$jardir/cup-runtime*.jar"; do
+#       jar=`echo $jar|sed -e 's/ /\\ /'`
+#       echo "protected $jar"
+#       jar_resolved=`ls $jar 2>/dev/null`
+#       echo "looking for $jar_resolved"
+# TODO check the behaviour when spaces
+        jars_resolved=`ls $jar 2>/dev/null`
+        for jar_resolved in $jars_resolved; do # If several jars matches
+        if test -e "$jar_resolved"; then
+          export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+
+    cat << \EOF > conftest.java
+// #line 16273 "configure"
+import java_cup.runtime.*;
+
+public class conftest {
+    public static void main(String[] argv) {
+
+    }
+}
+EOF
+
+    CLASSPATH=$ac_java_classpath
+    export CLASSPATH
+    cmd="$JAVAC ${JAVAC_FLAGS} conftest.java"
+    if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5) ; then
+       if test ""no"" = "no"; then
+           echo "yes" >&5
+
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
+$as_echo "$jar_resolved" >&6; }
+            found_jar=yes
+            PACKAGE_JAR_FILE=$jar_resolved
+            break
+
+           else
+                   cmd="$JAVA conftest"
+                   if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5); then
+                   echo "yes" >&5
+
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
+$as_echo "$jar_resolved" >&6; }
+            found_jar=yes
+            PACKAGE_JAR_FILE=$jar_resolved
+            break
+
+                        else
+                        echo "configure: failed program was:" >&5
+                                cat conftest.java >&5
+                if test -s conftest.java.output; then
+                   STDOUT=`cat conftest.java.output`
+                fi
+                        echo "configure: CLASSPATH was $CLASSPATH" >&5
+
+            ac_java_classpath=$saved_ac_java_classpath
+
+
+                                                fi
+                fi
+        if test -f conftest.java.output; then
+           rm conftest.java.output
+        fi
+    else
+        echo "configure: failed program was:" >&5
+        cat conftest.java >&5
+        echo "configure: CLASSPATH was $CLASSPATH" >&5
+
+            ac_java_classpath=$saved_ac_java_classpath
+
+
+            fi
+
+        fi
+          done
+          # If ls returns several results and the first one is OK, stop the search
+      if test "$found_jar" = "yes"; then
+        break
+      fi
+      done
+          # If found, no need to search in other directory
+      if test "$found_jar" = "yes"; then
+        break
+      fi
+    done
+    if test "$found_jar" = "no"; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+          if test ""yes"" = "yes"; then
+                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar cup-runtime used by Cup runtime (looking for package java_cup.runtime.*)" >&5
+$as_echo "$as_me: WARNING: Could not find or use the Java package/jar cup-runtime used by Cup runtime (looking for package java_cup.runtime.*)" >&2;}
+          else
+                  as_fn_error $? "Could not find or use the Java package/jar cup-runtime used by Cup runtime (looking for package java_cup.runtime.*)" "$LINENO" 5
+          fi
+    fi
+
+                JAVA_CUP=$PACKAGE_JAR_FILE
+
+
 
     else
         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Sun javac not found: I will not build the java interface" >&5
@@ -20860,7 +21183,7 @@ fi
           ;;
           # Ignore these flags.
         -lang* | -lcrt*.o | -lc | -lgcc* | -lSystem | -libmil | -little \
-          |-LANG:=* | -LIST:* | -LNO:* | -link)
+          |-LANG:=* | -LIST:* | -LNO:*)
           ;;
         -lkernel32)
           test x"$CYGWIN" != xyes && ac_cv_f77_libs="$ac_cv_f77_libs $ac_arg"
@@ -21055,7 +21378,7 @@ else
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "linking to Fortran libraries from C fails
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 ac_ext=c
@@ -21217,7 +21540,7 @@ else
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot compile a simple Fortran program
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
@@ -22900,7 +23223,7 @@ and PCRE_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
         PCRE_CFLAGS=$pkg_cv_PCRE_CFLAGS
         PCRE_LIBS=$pkg_cv_PCRE_LIBS
@@ -23130,7 +23453,7 @@ if test "x$with_x" = xno; then
   have_x=disabled
 else
   case $x_includes,$x_libraries in #(
-    *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5 ;; #(
+    *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #(
     *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -23234,7 +23557,7 @@ else
   fi
 done
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 fi # $ac_x_includes = no
 
 if test "$ac_x_libraries" = no; then
@@ -23969,7 +24292,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 23972 "configure"
+#line 24295 "configure"
 #include "confdefs.h"
 
 #include "$CHK_TCL_INCLUDE_PATH/$CHK_TCL_INC_NAME"
@@ -23999,7 +24322,7 @@ if test "$cross_compiling" = yes; then :
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -24033,7 +24356,7 @@ else
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The TCL detection of the version failed.
 If you are using Intel Compiler, check if Intel Library (ex : libimf.so) is available (in the LD_LIBRARY_PATH for example)
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
@@ -24279,7 +24602,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 24282 "configure"
+#line 24605 "configure"
 #include "confdefs.h"
 
 #include "$CHK_TK_INCLUDE_PATH/$CHK_TK_INC_NAME"
@@ -24694,7 +25017,7 @@ and MATIO_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
         MATIO_CFLAGS=$pkg_cv_MATIO_CFLAGS
         MATIO_LIBS=$pkg_cv_MATIO_LIBS
@@ -24860,7 +25183,7 @@ $as_echo_n "checking saxon... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 24863 "configure"
+// #line 25186 "configure"
 import com.icl.saxon.Loader;
 
 public class conftest {
@@ -24967,7 +25290,7 @@ $as_echo_n "checking jlatexmath-fop... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 24970 "configure"
+// #line 25293 "configure"
 import org.scilab.forge.jlatexmath.fop.JLaTeXMathObj;
 
 public class conftest {
@@ -31274,7 +31597,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 31277 "configure"
+#line 31600 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -31380,7 +31703,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 31383 "configure"
+#line 31706 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -31638,7 +31961,7 @@ else
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
@@ -31654,11 +31977,11 @@ else
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
   break
 fi
@@ -31697,7 +32020,7 @@ else
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
@@ -31713,18 +32036,18 @@ else
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
 
 else
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 ac_ext=c
@@ -38087,7 +38410,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # values after options handling.
 ac_log="
 This file was extended by Scilab $as_me 5, which was
-generated by GNU Autoconf 2.67.  Invocation command line was
+generated by GNU Autoconf 2.66.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -38153,7 +38476,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
 Scilab config.status 5
-configured by $0, generated by GNU Autoconf 2.67,
+configured by $0, generated by GNU Autoconf 2.66,
   with options \\"\$ac_cs_config\\"
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -38174,16 +38497,11 @@ ac_need_defaults=:
 while test $# != 0
 do
   case $1 in
-  --*=?*)
+  --*=*)
     ac_option=`expr "X$1" : 'X\([^=]*\)='`
     ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
     ac_shift=:
     ;;
-  --*=)
-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-    ac_optarg=
-    ac_shift=:
-    ;;
   *)
     ac_option=$1
     ac_optarg=$2
@@ -38205,7 +38523,6 @@ do
     $ac_shift
     case $ac_optarg in
     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    '') as_fn_error $? "missing file argument" ;;
     esac
     as_fn_append CONFIG_FILES " '$ac_optarg'"
     ac_need_defaults=false;;
@@ -38840,7 +39157,7 @@ do
     "modules/development_tools/src/fake/Makefile") CONFIG_FILES="$CONFIG_FILES modules/development_tools/src/fake/Makefile" ;;
     "modules/core/includes/stack.h") CONFIG_COMMANDS="$CONFIG_COMMANDS modules/core/includes/stack.h" ;;
 
-  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
 done
 
@@ -39156,7 +39473,7 @@ do
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
+  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
   esac
@@ -39184,7 +39501,7 @@ do
            [\\/$]*) false;;
            *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
            esac ||
-           as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
+           as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
       esac
       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
       as_fn_append ac_file_inputs " '$ac_f'"
@@ -39211,7 +39528,7 @@ $as_echo "$as_me: creating $ac_file" >&6;}
 
     case $ac_tag in
     *:-:* | *:-) cat >"$tmp/stdin" \
-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5  ;;
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
     esac
     ;;
   esac
diff --git a/scilab/configure.ac b/scilab/configure.ac
index 7d24b41..9f5a71a 100644
--- a/scilab/configure.ac
+++ b/scilab/configure.ac
@@ -1015,6 +1015,21 @@ the the JNI libraries."])],
                 JUNIT=$PACKAGE_JAR_FILE
                 AC_SUBST(JUNIT)
 
+                # CCSM Commons
+                AC_JAVA_CHECK_PACKAGE([ccsm-commons],[edu.tum.cs.commons.logging.*],[CCSM Commons],"yes")
+                CCSM=$PACKAGE_JAR_FILE
+                AC_SUBST(CCSM)
+
+                # CCSM Simulink
+                AC_JAVA_CHECK_PACKAGE([simulink],[edu.tum.cs.simulink.model.*],[CCSM Simulink model],"yes")
+                SIMULINK=$PACKAGE_JAR_FILE
+                AC_SUBST(SIMULINK)
+
+                # CCSM Cup runtime
+                AC_JAVA_CHECK_PACKAGE([cup-runtime],[java_cup.runtime.*],[Cup runtime],"yes")
+                JAVA_CUP=$PACKAGE_JAR_FILE
+                AC_SUBST(JAVA_CUP)
+
 
     else
         AC_MSG_WARN([Sun javac not found: I will not build the java interface])
diff --git a/scilab/contrib/Makefile.in b/scilab/contrib/Makefile.in
index 330ac0e..64dc424 100644
--- a/scilab/contrib/Makefile.in
+++ b/scilab/contrib/Makefile.in
@@ -83,6 +83,7 @@ BLAS_LIBS = @BLAS_LIBS@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -141,6 +142,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -233,6 +235,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @STRIP@
diff --git a/scilab/etc/classpath.xml.in b/scilab/etc/classpath.xml.in
index 6414b94..3dd24a6 100644
--- a/scilab/etc/classpath.xml.in
+++ b/scilab/etc/classpath.xml.in
@@ -60,6 +60,22 @@ The option is "disableUnderMode" and can be:
         <load on="HDF5"/>
 </path>
 
+<path value="@JGRAPHX@" load="onUse">
+        <load on="XCos"/>
+</path>
+
+<path value="@SIMULINK@" load="onUse">
+        <load on="XCos"/>
+</path>
+
+<path value="@CCSM@" load="onUse">
+        <load on="XCos"/>
+</path>
+
+<path value="@JAVA_CUP@" load="onUse">
+        <load on="XCos"/>
+</path>
+
 <!-- Temp. loaded at startup -->
 <path value="$SCILAB/modules/types/jar/org.scilab.modules.types.jar"/>
 <path value="$SCILAB/modules/output_stream/jar/org.scilab.modules.output_stream.jar" load="startup"/>
diff --git a/scilab/libs/MALLOC/Makefile.in b/scilab/libs/MALLOC/Makefile.in
index fd89566..7ffd1e7 100644
--- a/scilab/libs/MALLOC/Makefile.in
+++ b/scilab/libs/MALLOC/Makefile.in
@@ -149,6 +149,7 @@ BLAS_LIBS = @BLAS_LIBS@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -207,6 +208,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -299,6 +301,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @STRIP@
diff --git a/scilab/libs/Makefile.in b/scilab/libs/Makefile.in
index 2a2baef..19f47fd 100644
--- a/scilab/libs/Makefile.in
+++ b/scilab/libs/Makefile.in
@@ -121,6 +121,7 @@ BLAS_LIBS = @BLAS_LIBS@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -179,6 +180,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -271,6 +273,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @STRIP@
diff --git a/scilab/libs/doublylinkedlist/Makefile.in b/scilab/libs/doublylinkedlist/Makefile.in
index 9cfd4b5..62c688b 100644
--- a/scilab/libs/doublylinkedlist/Makefile.in
+++ b/scilab/libs/doublylinkedlist/Makefile.in
@@ -151,6 +151,7 @@ BLAS_LIBS = @BLAS_LIBS@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -209,6 +210,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -301,6 +303,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @STRIP@
diff --git a/scilab/libs/dynamiclibrary/Makefile.in b/scilab/libs/dynamiclibrary/Makefile.in
index 99c7ec5d..627168a 100644
--- a/scilab/libs/dynamiclibrary/Makefile.in
+++ b/scilab/libs/dynamiclibrary/Makefile.in
@@ -151,6 +151,7 @@ BLAS_LIBS = @BLAS_LIBS@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -209,6 +210,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -301,6 +303,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @STRIP@
diff --git a/scilab/libs/hashtable/Makefile.in b/scilab/libs/hashtable/Makefile.in
index e224e4e..45b0015 100644
--- a/scilab/libs/hashtable/Makefile.in
+++ b/scilab/libs/hashtable/Makefile.in
@@ -149,6 +149,7 @@ BLAS_LIBS = @BLAS_LIBS@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -207,6 +208,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -299,6 +301,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @STRIP@
diff --git a/scilab/libs/libst/Makefile.in b/scilab/libs/libst/Makefile.in
index ce6ae7d..0c6fce9 100644
--- a/scilab/libs/libst/Makefile.in
+++ b/scilab/libs/libst/Makefile.in
@@ -145,6 +145,7 @@ BLAS_LIBS = @BLAS_LIBS@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -203,6 +204,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -295,6 +297,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @STRIP@
diff --git a/scilab/modules/Makefile.in b/scilab/modules/Makefile.in
index 596a3ae..c1e3b59 100644
--- a/scilab/modules/Makefile.in
+++ b/scilab/modules/Makefile.in
@@ -211,6 +211,7 @@ BLAS_LIBS = @BLAS_LIBS@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -269,6 +270,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -361,6 +363,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @STRIP@
diff --git a/scilab/modules/action_binding/Makefile.in b/scilab/modules/action_binding/Makefile.in
index 0acbb40..a3003eb 100644
--- a/scilab/modules/action_binding/Makefile.in
+++ b/scilab/modules/action_binding/Makefile.in
@@ -197,6 +197,7 @@ BLAS_LIBS = @BLAS_LIBS@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -255,6 +256,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -347,6 +349,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @STRIP@
diff --git a/scilab/modules/api_scilab/Makefile.in b/scilab/modules/api_scilab/Makefile.in
index b4a6ff1..b9b7320 100644
--- a/scilab/modules/api_scilab/Makefile.in
+++ b/scilab/modules/api_scilab/Makefile.in
@@ -165,6 +165,7 @@ BLAS_LIBS = @BLAS_LIBS@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -223,6 +224,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -315,6 +317,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @STRIP@
diff --git a/scilab/modules/arnoldi/Makefile.in b/scilab/modules/arnoldi/Makefile.in
index 94b2b72..3e6a953 100644
--- a/scilab/modules/arnoldi/Makefile.in
+++ b/scilab/modules/arnoldi/Makefile.in
@@ -187,6 +187,7 @@ BLAS_LIBS = @BLAS_LIBS@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -245,6 +246,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -337,6 +339,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @STRIP@
diff --git a/scilab/modules/atoms/Makefile.in b/scilab/modules/atoms/Makefile.in
index 800da92..75c6e8a13 100644
--- a/scilab/modules/atoms/Makefile.in
+++ b/scilab/modules/atoms/Makefile.in
@@ -130,6 +130,7 @@ BLAS_LIBS = @BLAS_LIBS@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -188,6 +189,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -280,6 +282,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @STRIP@
diff --git a/scilab/modules/boolean/Makefile.in b/scilab/modules/boolean/Makefile.in
index 4b2cb99..9717384 100644
--- a/scilab/modules/boolean/Makefile.in
+++ b/scilab/modules/boolean/Makefile.in
@@ -167,6 +167,7 @@ BLAS_LIBS = @BLAS_LIBS@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -225,6 +226,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -317,6 +319,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @STRIP@
diff --git a/scilab/modules/cacsd/Makefile.in b/scilab/modules/cacsd/Makefile.in
index ea71dd6..0c44ff4 100644
--- a/scilab/modules/cacsd/Makefile.in
+++ b/scilab/modules/cacsd/Makefile.in
@@ -261,6 +261,7 @@ BLAS_LIBS = @BLAS_LIBS@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -319,6 +320,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -411,6 +413,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @STRIP@
diff --git a/scilab/modules/call_scilab/Makefile.in b/scilab/modules/call_scilab/Makefile.in
index 48e67f2..6e681ef 100644
--- a/scilab/modules/call_scilab/Makefile.in
+++ b/scilab/modules/call_scilab/Makefile.in
@@ -162,6 +162,7 @@ BLAS_LIBS = @BLAS_LIBS@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -220,6 +221,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -312,6 +314,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @STRIP@
diff --git a/scilab/modules/commons/Makefile.in b/scilab/modules/commons/Makefile.in
index ccf49d4..2670675 100644
--- a/scilab/modules/commons/Makefile.in
+++ b/scilab/modules/commons/Makefile.in
@@ -182,6 +182,7 @@ BLAS_LIBS = @BLAS_LIBS@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -240,6 +241,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -332,6 +334,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @STRIP@
diff --git a/scilab/modules/compatibility_functions/Makefile.in b/scilab/modules/compatibility_functions/Makefile.in
index f9459d5..496a422 100644
--- a/scilab/modules/compatibility_functions/Makefile.in
+++ b/scilab/modules/compatibility_functions/Makefile.in
@@ -127,6 +127,7 @@ BLAS_LIBS = @BLAS_LIBS@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -185,6 +186,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -277,6 +279,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @STRIP@
diff --git a/scilab/modules/completion/Makefile.in b/scilab/modules/completion/Makefile.in
index 8bb840f..8640a02 100644
--- a/scilab/modules/completion/Makefile.in
+++ b/scilab/modules/completion/Makefile.in
@@ -189,6 +189,7 @@ BLAS_LIBS = @BLAS_LIBS@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -247,6 +248,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -339,6 +341,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @STRIP@
diff --git a/scilab/modules/console/Makefile.in b/scilab/modules/console/Makefile.in
index 8582a91..a6e64c3 100644
--- a/scilab/modules/console/Makefile.in
+++ b/scilab/modules/console/Makefile.in
@@ -201,6 +201,7 @@ BLAS_LIBS = @BLAS_LIBS@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -259,6 +260,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -351,6 +353,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @STRIP@
diff --git a/scilab/modules/core/Makefile.in b/scilab/modules/core/Makefile.in
index 180170e..f4ead59 100644
--- a/scilab/modules/core/Makefile.in
+++ b/scilab/modules/core/Makefile.in
@@ -402,6 +402,7 @@ BLAS_LIBS = @BLAS_LIBS@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -460,6 +461,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -552,6 +554,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @STRIP@
diff --git a/scilab/modules/data_structures/Makefile.in b/scilab/modules/data_structures/Makefile.in
index d2ff9d5..cbd9d4f 100644
--- a/scilab/modules/data_structures/Makefile.in
+++ b/scilab/modules/data_structures/Makefile.in
@@ -197,6 +197,7 @@ BLAS_LIBS = @BLAS_LIBS@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -255,6 +256,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -347,6 +349,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @STRIP@
diff --git a/scilab/modules/demo_tools/Makefile.in b/scilab/modules/demo_tools/Makefile.in
index f4f2623..b8e2dee 100644
--- a/scilab/modules/demo_tools/Makefile.in
+++ b/scilab/modules/demo_tools/Makefile.in
@@ -126,6 +126,7 @@ BLAS_LIBS = @BLAS_LIBS@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -184,6 +185,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -276,6 +278,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @STRIP@
diff --git a/scilab/modules/development_tools/Makefile.in b/scilab/modules/development_tools/Makefile.in
index a2e921c..c51bf2d 100644
--- a/scilab/modules/development_tools/Makefile.in
+++ b/scilab/modules/development_tools/Makefile.in
@@ -125,6 +125,7 @@ BLAS_LIBS = @BLAS_LIBS@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -183,6 +184,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -275,6 +277,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @STRIP@
diff --git a/scilab/modules/development_tools/src/fake/Makefile.in b/scilab/modules/development_tools/src/fake/Makefile.in
index 5d8fb6b..e14e518 100644
--- a/scilab/modules/development_tools/src/fake/Makefile.in
+++ b/scilab/modules/development_tools/src/fake/Makefile.in
@@ -76,6 +76,7 @@ BLAS_LIBS = @BLAS_LIBS@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -134,6 +135,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -226,6 +228,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @STRIP@
diff --git a/scilab/modules/differential_equations/Makefile.in b/scilab/modules/differential_equations/Makefile.in
index 629185f..7831569 100644
--- a/scilab/modules/differential_equations/Makefile.in
+++ b/scilab/modules/differential_equations/Makefile.in
@@ -207,6 +207,7 @@ BLAS_LIBS = @BLAS_LIBS@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -265,6 +266,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -357,6 +359,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @STRIP@
diff --git a/scilab/modules/double/Makefile.in b/scilab/modules/double/Makefile.in
index fd7c6df..b7a23c6 100644
--- a/scilab/modules/double/Makefile.in
+++ b/scilab/modules/double/Makefile.in
@@ -166,6 +166,7 @@ BLAS_LIBS = @BLAS_LIBS@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -224,6 +225,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -316,6 +318,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @STRIP@
diff --git a/scilab/modules/dynamic_link/Makefile.in b/scilab/modules/dynamic_link/Makefile.in
index 3f9b563..6886f2f 100644
--- a/scilab/modules/dynamic_link/Makefile.in
+++ b/scilab/modules/dynamic_link/Makefile.in
@@ -184,6 +184,7 @@ BLAS_LIBS = @BLAS_LIBS@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -242,6 +243,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -334,6 +336,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @STRIP@
diff --git a/scilab/modules/elementary_functions/Makefile.in b/scilab/modules/elementary_functions/Makefile.in
index 931fd81..cfcbbe0 100644
--- a/scilab/modules/elementary_functions/Makefile.in
+++ b/scilab/modules/elementary_functions/Makefile.in
@@ -536,6 +536,7 @@ BLAS_LIBS = @BLAS_LIBS@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -594,6 +595,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -686,6 +688,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @STRIP@
diff --git a/scilab/modules/fftw/Makefile.in b/scilab/modules/fftw/Makefile.in
index 0322789..c031524 100644
--- a/scilab/modules/fftw/Makefile.in
+++ b/scilab/modules/fftw/Makefile.in
@@ -185,6 +185,7 @@ BLAS_LIBS = @BLAS_LIBS@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -243,6 +244,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -335,6 +337,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @STRIP@
diff --git a/scilab/modules/fileio/Makefile.in b/scilab/modules/fileio/Makefile.in
index e443c62..0b5bc7d 100644
--- a/scilab/modules/fileio/Makefile.in
+++ b/scilab/modules/fileio/Makefile.in
@@ -220,6 +220,7 @@ BLAS_LIBS = @BLAS_LIBS@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -278,6 +279,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -370,6 +372,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @STRIP@
diff --git a/scilab/modules/functions/Makefile.in b/scilab/modules/functions/Makefile.in
index bd70bf7..64233ba 100644
--- a/scilab/modules/functions/Makefile.in
+++ b/scilab/modules/functions/Makefile.in
@@ -175,6 +175,7 @@ BLAS_LIBS = @BLAS_LIBS@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -233,6 +234,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -325,6 +327,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @STRIP@
diff --git a/scilab/modules/genetic_algorithms/Makefile.in b/scilab/modules/genetic_algorithms/Makefile.in
index cb63128..8e1a204 100644
--- a/scilab/modules/genetic_algorithms/Makefile.in
+++ b/scilab/modules/genetic_algorithms/Makefile.in
@@ -129,6 +129,7 @@ BLAS_LIBS = @BLAS_LIBS@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -187,6 +188,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -279,6 +281,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @STRIP@
diff --git a/scilab/modules/graph/Makefile.in b/scilab/modules/graph/Makefile.in
index 17c3459..9d77570 100644
--- a/scilab/modules/graph/Makefile.in
+++ b/scilab/modules/graph/Makefile.in
@@ -165,6 +165,7 @@ BLAS_LIBS = @BLAS_LIBS@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -223,6 +224,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -315,6 +317,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @STRIP@
diff --git a/scilab/modules/graphic_export/Makefile.in b/scilab/modules/graphic_export/Makefile.in
index 5ef0c29..bb5bf59 100644
--- a/scilab/modules/graphic_export/Makefile.in
+++ b/scilab/modules/graphic_export/Makefile.in
@@ -202,6 +202,7 @@ BLAS_LIBS = @BLAS_LIBS@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -260,6 +261,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -352,6 +354,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @STRIP@
diff --git a/scilab/modules/graphics/Makefile.in b/scilab/modules/graphics/Makefile.in
index c6bd237..efcce02 100644
--- a/scilab/modules/graphics/Makefile.in
+++ b/scilab/modules/graphics/Makefile.in
@@ -537,6 +537,7 @@ BLAS_LIBS = @BLAS_LIBS@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -595,6 +596,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -687,6 +689,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @STRIP@
diff --git a/scilab/modules/gui/Makefile.in b/scilab/modules/gui/Makefile.in
index 76b48b6..3a41b18 100644
--- a/scilab/modules/gui/Makefile.in
+++ b/scilab/modules/gui/Makefile.in
@@ -292,6 +292,7 @@ BLAS_LIBS = @BLAS_LIBS@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -350,6 +351,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -442,6 +444,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @STRIP@
diff --git a/scilab/modules/hdf5/Makefile.in b/scilab/modules/hdf5/Makefile.in
index 773051c..2230a3a 100644
--- a/scilab/modules/hdf5/Makefile.in
+++ b/scilab/modules/hdf5/Makefile.in
@@ -217,6 +217,7 @@ BLAS_LIBS = @BLAS_LIBS@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -275,6 +276,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -367,6 +369,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @STRIP@
diff --git a/scilab/modules/helptools/Makefile.in b/scilab/modules/helptools/Makefile.in
index 46edfd3..d9dbab8 100644
--- a/scilab/modules/helptools/Makefile.in
+++ b/scilab/modules/helptools/Makefile.in
@@ -192,6 +192,7 @@ BLAS_LIBS = @BLAS_LIBS@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -250,6 +251,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -342,6 +344,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @STRIP@
diff --git a/scilab/modules/history_browser/Makefile.in b/scilab/modules/history_browser/Makefile.in
index 634c99f..d3c973c 100644
--- a/scilab/modules/history_browser/Makefile.in
+++ b/scilab/modules/history_browser/Makefile.in
@@ -196,6 +196,7 @@ BLAS_LIBS = @BLAS_LIBS@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -254,6 +255,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -346,6 +348,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @STRIP@
diff --git a/scilab/modules/history_manager/Makefile.in b/scilab/modules/history_manager/Makefile.in
index 4b77305..c98c52c 100644
--- a/scilab/modules/history_manager/Makefile.in
+++ b/scilab/modules/history_manager/Makefile.in
@@ -213,6 +213,7 @@ BLAS_LIBS = @BLAS_LIBS@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -271,6 +272,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -363,6 +365,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @STRIP@
diff --git a/scilab/modules/integer/Makefile.in b/scilab/modules/integer/Makefile.in
index f2d3a44..d21d552 100644
--- a/scilab/modules/integer/Makefile.in
+++ b/scilab/modules/integer/Makefile.in
@@ -200,6 +200,7 @@ BLAS_LIBS = @BLAS_LIBS@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -258,6 +259,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -350,6 +352,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @STRIP@
diff --git a/scilab/modules/interpolation/Makefile.in b/scilab/modules/interpolation/Makefile.in
index ddd47a7..db92c4e 100644
--- a/scilab/modules/interpolation/Makefile.in
+++ b/scilab/modules/interpolation/Makefile.in
@@ -182,6 +182,7 @@ BLAS_LIBS = @BLAS_LIBS@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -240,6 +241,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -332,6 +334,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @STRIP@
diff --git a/scilab/modules/intersci/Makefile.in b/scilab/modules/intersci/Makefile.in
index 2a8e00c..4f54491 100644
--- a/scilab/modules/intersci/Makefile.in
+++ b/scilab/modules/intersci/Makefile.in
@@ -167,6 +167,7 @@ BLAS_LIBS = @BLAS_LIBS@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -225,6 +226,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -317,6 +319,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @STRIP@
diff --git a/scilab/modules/io/Makefile.in b/scilab/modules/io/Makefile.in
index 66c0cc7..39a3414 100644
--- a/scilab/modules/io/Makefile.in
+++ b/scilab/modules/io/Makefile.in
@@ -179,6 +179,7 @@ BLAS_LIBS = @BLAS_LIBS@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -237,6 +238,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -329,6 +331,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @STRIP@
diff --git a/scilab/modules/javasci/Makefile.in b/scilab/modules/javasci/Makefile.in
index d519dc5..0983325 100644
--- a/scilab/modules/javasci/Makefile.in
+++ b/scilab/modules/javasci/Makefile.in
@@ -193,6 +193,7 @@ BLAS_LIBS = @BLAS_LIBS@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -251,6 +252,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -343,6 +345,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @STRIP@
diff --git a/scilab/modules/jvm/Makefile.in b/scilab/modules/jvm/Makefile.in
index b6e7100..fc9bd04 100644
--- a/scilab/modules/jvm/Makefile.in
+++ b/scilab/modules/jvm/Makefile.in
@@ -194,6 +194,7 @@ BLAS_LIBS = @BLAS_LIBS@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -252,6 +253,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -344,6 +346,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @STRIP@
diff --git a/scilab/modules/linear_algebra/Makefile.in b/scilab/modules/linear_algebra/Makefile.in
index e1863be..c0ca44d 100644
--- a/scilab/modules/linear_algebra/Makefile.in
+++ b/scilab/modules/linear_algebra/Makefile.in
@@ -203,6 +203,7 @@ BLAS_LIBS = @BLAS_LIBS@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -261,6 +262,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -353,6 +355,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @STRIP@
diff --git a/scilab/modules/localization/Makefile.in b/scilab/modules/localization/Makefile.in
index cc3d05c..0120461 100644
--- a/scilab/modules/localization/Makefile.in
+++ b/scilab/modules/localization/Makefile.in
@@ -196,6 +196,7 @@ BLAS_LIBS = @BLAS_LIBS@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -254,6 +255,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -346,6 +348,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @STRIP@
diff --git a/scilab/modules/m2sci/Makefile.in b/scilab/modules/m2sci/Makefile.in
index 22fb7b0..abb5222 100644
--- a/scilab/modules/m2sci/Makefile.in
+++ b/scilab/modules/m2sci/Makefile.in
@@ -124,6 +124,7 @@ BLAS_LIBS = @BLAS_LIBS@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -182,6 +183,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -274,6 +276,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @STRIP@
diff --git a/scilab/modules/maple2scilab/Makefile.in b/scilab/modules/maple2scilab/Makefile.in
index 41a44b8..03b7e41 100644
--- a/scilab/modules/maple2scilab/Makefile.in
+++ b/scilab/modules/maple2scilab/Makefile.in
@@ -124,6 +124,7 @@ BLAS_LIBS = @BLAS_LIBS@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -182,6 +183,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -274,6 +276,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @STRIP@
diff --git a/scilab/modules/matio/Makefile.in b/scilab/modules/matio/Makefile.in
index ff87475..9506c3b 100644
--- a/scilab/modules/matio/Makefile.in
+++ b/scilab/modules/matio/Makefile.in
@@ -191,6 +191,7 @@ BLAS_LIBS = @BLAS_LIBS@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -249,6 +250,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -341,6 +343,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @STRIP@
diff --git a/scilab/modules/mexlib/Makefile.in b/scilab/modules/mexlib/Makefile.in
index b7bbafe..0421f7f 100644
--- a/scilab/modules/mexlib/Makefile.in
+++ b/scilab/modules/mexlib/Makefile.in
@@ -168,6 +168,7 @@ BLAS_LIBS = @BLAS_LIBS@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -226,6 +227,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -318,6 +320,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @STRIP@
diff --git a/scilab/modules/modules_manager/Makefile.in b/scilab/modules/modules_manager/Makefile.in
index 47de085..ef4949c 100644
--- a/scilab/modules/modules_manager/Makefile.in
+++ b/scilab/modules/modules_manager/Makefile.in
@@ -125,6 +125,7 @@ BLAS_LIBS = @BLAS_LIBS@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -183,6 +184,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -275,6 +277,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @STRIP@
diff --git a/scilab/modules/optimization/Makefile.in b/scilab/modules/optimization/Makefile.in
index edf9328..f1d5357 100644
--- a/scilab/modules/optimization/Makefile.in
+++ b/scilab/modules/optimization/Makefile.in
@@ -193,6 +193,7 @@ BLAS_LIBS = @BLAS_LIBS@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -251,6 +252,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -343,6 +345,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @STRIP@
diff --git a/scilab/modules/output_stream/Makefile.in b/scilab/modules/output_stream/Makefile.in
index de9e105..5187e02 100644
--- a/scilab/modules/output_stream/Makefile.in
+++ b/scilab/modules/output_stream/Makefile.in
@@ -210,6 +210,7 @@ BLAS_LIBS = @BLAS_LIBS@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -268,6 +269,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -360,6 +362,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @STRIP@
diff --git a/scilab/modules/overloading/Makefile.in b/scilab/modules/overloading/Makefile.in
index 4cf09a5..5faa80c 100644
--- a/scilab/modules/overloading/Makefile.in
+++ b/scilab/modules/overloading/Makefile.in
@@ -125,6 +125,7 @@ BLAS_LIBS = @BLAS_LIBS@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -183,6 +184,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -275,6 +277,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @STRIP@
diff --git a/scilab/modules/parallel/Makefile.in b/scilab/modules/parallel/Makefile.in
index 67e17d9..ac02db2 100644
--- a/scilab/modules/parallel/Makefile.in
+++ b/scilab/modules/parallel/Makefile.in
@@ -179,6 +179,7 @@ BLAS_LIBS = @BLAS_LIBS@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -237,6 +238,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -329,6 +331,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @STRIP@
diff --git a/scilab/modules/parameters/Makefile.in b/scilab/modules/parameters/Makefile.in
index 2ff78c5..0cb9ffb 100644
--- a/scilab/modules/parameters/Makefile.in
+++ b/scilab/modules/parameters/Makefile.in
@@ -157,6 +157,7 @@ BLAS_LIBS = @BLAS_LIBS@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -215,6 +216,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -307,6 +309,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @STRIP@
diff --git a/scilab/modules/polynomials/Makefile.in b/scilab/modules/polynomials/Makefile.in
index 5d8f44c..3a94e25 100644
--- a/scilab/modules/polynomials/Makefile.in
+++ b/scilab/modules/polynomials/Makefile.in
@@ -197,6 +197,7 @@ BLAS_LIBS = @BLAS_LIBS@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -255,6 +256,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -347,6 +349,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @STRIP@
diff --git a/scilab/modules/pvm/Makefile.in b/scilab/modules/pvm/Makefile.in
index 8f5f2f9..7027642 100644
--- a/scilab/modules/pvm/Makefile.in
+++ b/scilab/modules/pvm/Makefile.in
@@ -237,6 +237,7 @@ BLAS_LIBS = @BLAS_LIBS@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -295,6 +296,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -387,6 +389,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @STRIP@
diff --git a/scilab/modules/randlib/Makefile.in b/scilab/modules/randlib/Makefile.in
index 18c8094..c79fde8 100644
--- a/scilab/modules/randlib/Makefile.in
+++ b/scilab/modules/randlib/Makefile.in
@@ -171,6 +171,7 @@ BLAS_LIBS = @BLAS_LIBS@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -229,6 +230,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -321,6 +323,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @STRIP@
diff --git a/scilab/modules/renderer/Makefile.in b/scilab/modules/renderer/Makefile.in
index 3a2933c..76806ab 100644
--- a/scilab/modules/renderer/Makefile.in
+++ b/scilab/modules/renderer/Makefile.in
@@ -421,6 +421,7 @@ BLAS_LIBS = @BLAS_LIBS@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -479,6 +480,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -571,6 +573,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @STRIP@
diff --git a/scilab/modules/scicos/Makefile.in b/scilab/modules/scicos/Makefile.in
index fdaba4a..d4a8aa9 100644
--- a/scilab/modules/scicos/Makefile.in
+++ b/scilab/modules/scicos/Makefile.in
@@ -406,6 +406,7 @@ BLAS_LIBS = @BLAS_LIBS@
 BSH = @BSH@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CCSM = @CCSM@
 CFLAGS = @CFLAGS@
 CHECKSTYLE = @CHECKSTYLE@
 COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
@@ -464,6 +465,7 @@ JAVAC_DEBUG = @JAVAC_DEBUG@
 JAVADOC = @JAVADOC@
 JAVAH = @JAVAH@
 JAVASCI_ENABLE = @JAVASCI_ENABLE@
+JAVA_CUP = @JAVA_CUP@
 JAVA_ENABLE = @JAVA_ENABLE@
 JAVA_G = @JAVA_G@
 JAVA_HOME = @JAVA_HOME@
@@ -556,6 +558,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SET_RELOCATABLE = @SET_RELOCATABLE@
 SHELL = @SHELL@
+SIMULINK = @SIMULINK@
 SKINLF = @SKINLF@
 SPLINT = @SPLINT@
 STRIP = @STRIP@
diff --git a/scilab/modules/scicos_blocks/Makefile.in b/scilab/modules/scicos_blocks/Makefile.in
index 613fa4f..784f286 100644
--- a/scilab/modules/scicos_blocks/Makefile.in
+++