[scilab] Initial import

Clément David davidcl at fedoraproject.org
Tue Nov 15 17:07:14 UTC 2011


commit fb2a7c75618f6b91687e75033563a63f29c8aa12
Author: Clément DAVID <clement.david at scilab-enterprises.com>
Date:   Tue Nov 15 18:06:44 2011 +0100

    Initial import

 .gitignore                                       |    1 +
 0001-configure-upstream-patches.patch            |  420 +
 0002-Update-saxon-dependency-wrong-version.patch |  420 +
 0003-Remove-Xcos-dependencies-check.patch        |   90 +
 0004-fix-javadoc-encoding.patch                  |   25 +
 0005-autoreconf.patch                            | 7306 ++++++++
 0006-fix-incorrect-fsf-adress.patch              |21353 ++++++++++++++++++++++
 0007-fix-zero-length.patch                       |  606 +
 0008-fix-class-path-in-manifest.patch            |   32 +
 scilab.spec                                      |  282 +
 sources                                          |    1 +
 11 files changed, 30536 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..1775aa6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/scilab-5.3.3-src.tar.gz
diff --git a/0001-configure-upstream-patches.patch b/0001-configure-upstream-patches.patch
new file mode 100644
index 0000000..6addc5e
--- /dev/null
+++ b/0001-configure-upstream-patches.patch
@@ -0,0 +1,420 @@
+From ab1fbc01bc782dcb46de2ee7eea1ed3775d9f46e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Cl=C3=A9ment=20DAVID?= <clement.david at scilab-enterprises.com>
+Date: Mon, 31 Oct 2011 11:13:13 +0100
+Subject: [PATCH 1/8] configure upstream patches
+
+---
+ build.incl.xml      |    1 +
+ configure.ac        |   40 ++++++++++++++++++++++++++++++++++------
+ etc/librarypath.xml |    9 +++++++++
+ m4/backtrace.m4     |   14 ++++++++------
+ m4/compiler.m4      |   17 +++++++++++++++++
+ m4/docbook.m4       |    2 +-
+ m4/giws.m4          |   26 +++++++++++++++++++++++++-
+ m4/hdf5.m4          |   12 ++++++++----
+ m4/java.m4          |   31 +++++++++++++++++++------------
+ m4/libsmath.m4      |    8 ++++++++
+ 10 files changed, 130 insertions(+), 30 deletions(-)
+ create mode 100644 m4/compiler.m4
+
+diff --git a/build.incl.xml b/build.incl.xml
+index 482ec90..d9d4542 100644
+--- a/build.incl.xml
++++ b/build.incl.xml
+@@ -83,6 +83,7 @@
+     <pathelement location="${batik.jar}"/>
+     <pathelement location="${xml_apis_ext.jar}"/>
+     <pathelement location="${saxon.jar}"/>
++    <pathelement location="${xmlgraphics-commons.jar}"/>
+     <pathelement location="${fop.jar}"/>
+     <pathelement location="${jlatexmath-fop.jar}"/>
+     <pathelement location="${avalon-framework.jar}"/>
+diff --git a/configure.ac b/configure.ac
+index 13cf07c..8423ccf 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -206,8 +206,12 @@ if test "$with_intelcompilers" = yes; then
+ fi
+ 
+ if test -z "$F77"; then
+-## No Frotran compiler specified... We rely on Autoconf to find the best
+-   AC_PROG_F77
++## No Fortran compiler specified... Prefer gfortran and intel compilers
++   AC_PROG_F77([gfortran ifc ifort])
++   if test -z "$F77"; then
++        # Best effort to find a compiler (might be g77)
++	AC_PROG_F77
++   fi
+ fi
+ 
+ 
+@@ -682,6 +686,21 @@ fi
+ AM_CONDITIONAL(IS_64_BITS_CPU, test $IS_64_BITS_CPU = true)
+ AM_CONDITIONAL(USE_DYNAMIC_STACK, test $IS_64_BITS_CPU = true -o "$MACOSX" = "1")
+ 
++################
++## SSE
++## By default, for x86 CPU, enable the SSE.
++## Note that it is already the case with 64 bits CPU
++## (these extensions are enabled by default by gcc)
++################
++
++case "$host" in
++     i*86-linux-gnu|i*86-*-linux-gnu)
++        CFLAGS="$CFLAGS -msse"
++        FFLAGS="$FFLAGS -msse"
++        CPPFLAGS="$CPPFLAGS -msse"
++     ;;
++esac
++
+ #######################
+ ## test for underscores (name mangling issues between C and fortran)
+ #######################
+@@ -837,7 +856,7 @@ if test "$with_javasci" != no -o "$with_gui" != no -o "$enable_build_help" != no
+                 AC_JAVA_CHECK_PACKAGE([looks],[com.jgoodies.looks.common.MenuItemRenderer],[Scilab Gui - Look and feel],"yes")
+                 LOOKS=$PACKAGE_JAR_FILE
+ 
+-                # Named differently under ArchLinux
++                # Named differently under ArchLinux or Fedora
+                 if test -z "$LOOKS"; then
+                     AC_JAVA_CHECK_PACKAGE([jgoodies-looks],[com.jgoodies.looks.common.MenuItemRenderer],[Scilab Gui - Look and feel])
+                     LOOKS=$PACKAGE_JAR_FILE
+@@ -859,7 +878,9 @@ if test "$with_javasci" != no -o "$with_gui" != no -o "$enable_build_help" != no
+                 else
+                    LDFLAGS_save=$LDFLAGS
+                    # Provide known paths where distribs/OS can store JNI libs
+-                   LDFLAGS="-L/usr/lib/jni -L/usr/lib64/jni/ -L$SCI_SRCDIR/thirdparty/ -L$SCI_SRCDIR/bin/"
++                   LDFLAGS="$LDFLAGS -L/usr/lib/jni -L/usr/lib64/jni"                   # Debian
++                   LDFLAGS="$LDFLAGS -L/usr/lib/jogl -L/usr/lib64/jogl"                 # RedHat
++                   LDFLAGS="$LDFLAGS -L$SCI_SRCDIR/thirdparty -L$SCI_SRCDIR/bin"        # Scilab thirdparties
+                    AC_CHECK_LIB([jogl], [glTexParameterf], [JOGL_LIBS="-ljogl"],[AC_MSG_WARN([Could not link against -ljogl. Will try against -ljogl -lGL])])
+                    if test -z "$JOGL_LIBS"; then # The previous test failed add more options to the LDFLAGS
+                        # the space after "jogl" in the following line is on
+@@ -887,7 +908,9 @@ the the JNI libraries."])],
+                 else
+                    LDFLAGS_save=$LDFLAGS
+                    # Provide known paths where distribs/OS can store JNI libs
+-                   LDFLAGS="-L/usr/lib/jni -L/usr/lib64/jni/ -ldl -L$SCI_SRCDIR/thirdparty/ -L$SCI_SRCDIR/bin/"
++                   LDFLAGS="$LDFLAGS -L/usr/lib/jni -L/usr/lib64/jni"                   # Debian
++                   LDFLAGS="$LDFLAGS -L/usr/lib/gluegen -L/usr/lib64/gluegen"           # RedHat
++                   LDFLAGS="$LDFLAGS -L$SCI_SRCDIR/thirdparty -L$SCI_SRCDIR/bin"        # Scilab thirdparties
+                    symbol="Java_com_sun_gluegen_runtime_UnixDynamicLinkerImpl_dlclose__J"
+                    AC_CHECK_LIB([gluegen-rt], [$symbol], [GLUEGEN_RT_LIBS="-lgluegen-rt"],
+                    [AC_MSG_ERROR([libgluegen-rt: Library missing (Cannot find symbol glTexParameterf). Check if libgluegen-rt - C/Java (JNI) interface for GLUEGEN - is installed and if the version is correct. Note that you might have to update etc/librarypath.xml to provide the actual path the the JNI libraries.])],
+@@ -899,7 +922,7 @@ the the JNI libraries."])],
+                 AC_JAVA_CHECK_PACKAGE([jhall],[javax.help.JHelp],[Scilab Help Browser],"yes")
+                 JHALL=$PACKAGE_JAR_FILE
+ 
+-                # Named differently under Mandriva
++                # Named differently under Mandriva or Fedora
+                 if test -z "$JHALL"; then
+                     AC_JAVA_CHECK_PACKAGE([javahelp2],[javax.help.JHelp],[Scilab Help Browser])
+                     JHALL=$PACKAGE_JAR_FILE
+@@ -909,12 +932,17 @@ the the JNI libraries."])],
+                 # Console API
+                 AC_JAVA_CHECK_PACKAGE([jrosetta-API],[com.artenum.rosetta.interfaces.core.ConsoleConfiguration],[JRosetta : Console API Artenum / Scilab])
+                 JROSETTA_API=$PACKAGE_JAR_FILE
++		if test -z "$JROSETTA_API"; then
++	                AC_JAVA_CHECK_PACKAGE([jrosetta-api],[com.artenum.rosetta.interfaces.core.ConsoleConfiguration],[JRosetta : Console API Artenum / Scilab])
++        	        JROSETTA_API=$PACKAGE_JAR_FILE
++		fi
+                 AC_SUBST(JROSETTA_API)
+ 
+                 # Console Core
+                 AC_JAVA_CHECK_PACKAGE([jrosetta-engine],[com.artenum.rosetta.core.action.AbstractConsoleAction],[JRosetta : Console Core Artenum / Scilab])
+                 JROSETTA_ENGINE=$PACKAGE_JAR_FILE
+                 AC_SUBST(JROSETTA_ENGINE)
++                AC_JAVA_CHECK_VERSION_PACKAGE([jrosetta-engine],[import com.artenum.rosetta.util.ConfigurationBuilder;],$JROSETTA_ENGINE,[1.0.4],[ConfigurationBuilder.getVersion()])
+ 
+ 
+                 # MathML rendering solution
+diff --git a/etc/librarypath.xml b/etc/librarypath.xml
+index 5b4be70..cdc53d3 100644
+--- a/etc/librarypath.xml
++++ b/etc/librarypath.xml
+@@ -28,11 +28,20 @@
+ <path value="$SCILAB/modules/graphic_export/.libs"/>
+ <path value="$SCILAB/modules/scinotes/.libs"/>
+ <path value="$SCILAB/modules/commons/.libs"/>
++<path value="$SCILAB/modules/gui/.libs"/>
+ <path value="$SCILAB/.libs"/>
+ 
+ <!-- Default path to the JNI classes under some Linux (JoGL under Debian for example) -->
+ <path value="/usr/lib/jni/"/>
+ 
++<!-- RedHat put JNI on /usr/%{libdir}/%{name} instead of /usr/lib/jni -->
++<path value="/usr/lib/jogl/"/>
++<path value="/usr/lib64/jogl/"/>
++<path value="/usr/lib/gluegen/"/>
++<path value="/usr/lib64/gluegen/"/>
++<path value="/usr/lib/jhdf5/"/>
++<path value="/usr/lib64/jhdf5/"/>
++
+ <!-- Some distributions (like openSUSE) put gluegen-rt in /usr/lib instead pf /usr/lib/jni -->
+ <path value="/usr/lib" />
+ 
+diff --git a/m4/backtrace.m4 b/m4/backtrace.m4
+index 0d57271..25c36a2 100644
+--- a/m4/backtrace.m4
++++ b/m4/backtrace.m4
+@@ -20,9 +20,10 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#if defined(__GNUC__)
+ AC_MSG_RESULT($have_glibc_backtrace)
+ 
+ if test "x$have_glibc_backtrace" = "xyes"; then
+-  CFLAGS="$CFLAGS -rdynamic"
+-  CPPFLAGS="$CPPFLAGS -rdynamic"
+-  FFLAGS="$FFLAGS -rdynamic"
++  CHECK_COMPILER_ARG(C,"-rdynamic",CFLAGS)
++  CHECK_COMPILER_ARG(C++,"-rdynamic",CXXFLAGS)
++  CHECK_COMPILER_ARG(Fortran 77,"-rdynamic",FFLAGS)
++  
+   AC_DEFINE(HAVE_GLIBC_BACKTRACE, 1, HAVE_GLIBC_BACKTRACE)
+ fi
+ 
+@@ -38,10 +39,11 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <demangle.h>]],
+ AC_MSG_RESULT($have_cplus_demangle)
+ 
+ if test "x$have_cplus_demangle" = "xyes"; then
+-  CFLAGS="$CFLAGS -rdynamic"
+-  CPPFLAGS="$CPPFLAGS -rdynamic"
+-  FFLAGS="$FFLAGS -rdynamic"
+ 
++  CHECK_COMPILER_ARG(C,"-rdynamic",CFLAGS)
++  CHECK_COMPILER_ARG(C++,"-rdynamic",CXXFLAGS)
++  CHECK_COMPILER_ARG(Fortran 77,"-rdynamic",FFLAGS)
++  
+   AC_DEFINE(HAVE_CPLUS_DEMANGLE, 1, HAVE_CPLUS_DEMANGLE)
+ fi
+ ])
+diff --git a/m4/compiler.m4 b/m4/compiler.m4
+new file mode 100644
+index 0000000..39104b1
+--- /dev/null
++++ b/m4/compiler.m4
+@@ -0,0 +1,17 @@
++
++dnl CHECK_COMPILER_ARG(LANG, ARG, ACTION-IF-NOT_FOUND)
++AC_DEFUN([CHECK_COMPILER_ARG],[
++    AC_LANG_PUSH([$1])
++    AC_MSG_CHECKING([if the $1 compiler accepts $2])
++    ac_save_$3="$$3"
++    $3="$$3 -rdynamic"
++
++    AC_COMPILE_IFELSE([AC_LANG_PROGRAM()],
++       [AC_MSG_RESULT([yes])],
++       [AC_MSG_RESULT([no])
++       $3="$ac_save_$3"
++       ]
++    )
++    AC_LANG_POP([$1])
++
++])
+diff --git a/m4/docbook.m4 b/m4/docbook.m4
+index 6947c5c..48b2414 100644
+--- a/m4/docbook.m4
++++ b/m4/docbook.m4
+@@ -24,7 +24,7 @@ AC_ARG_WITH(docbook,
+ 		[with_docbook='yes']
+ 		)
+ 
+-	for dir in $with_docbook $SCI_SRCDIR_FULL/thirdparty/docbook/ /usr/share/sgml/docbook/stylesheet/xsl/nwalsh /usr/share/docbook2X/xslt/man/ /usr/share/xml/docbook/stylesheet/nwalsh/ /usr/share/xml/docbook/stylesheet/nwalsh/current/ /sw/share/xml/xsl/docbook-xsl /usr/share/xml/docbook/xsl-stylesheets-*/ /usr/share/sgml/docbook/xsl-stylesheets-*/ /usr/share/sgml/docbook/xsl-stylesheets; do
++	for dir in $with_docbook $SCI_SRCDIR_FULL/thirdparty/docbook/ /usr/share/sgml/docbook/stylesheet/xsl/nwalsh /usr/share/docbook2X/xslt/man/ /usr/share/xml/docbook/stylesheet/nwalsh/ /usr/share/xml/docbook/stylesheet/nwalsh/current/ /sw/share/xml/xsl/docbook-xsl /usr/share/xml/docbook/xsl-stylesheets-*/ /usr/share/sgml/docbook/xsl-stylesheets-*/ /usr/share/sgml/docbook/xsl-stylesheets /usr/share/sgml/docbook/xsl-ns-stylesheets-*/; do
+ 		if test -r "$dir/javahelp/javahelp.xsl" -a "$DOCBOOK_ROOT" = ""; then
+ 			DOCBOOK_ROOT=$dir
+         fi
+diff --git a/m4/giws.m4 b/m4/giws.m4
+index 0fc0d73..1b526f3 100644
+--- a/m4/giws.m4
++++ b/m4/giws.m4
+@@ -8,6 +8,7 @@ dnl you should have received as part of this distribution.  The terms
+ dnl are also available at    
+ dnl http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+ dnl
++dnl AC_GIWS([required-version = N[.N[.N]]])
+ 
+ AC_DEFUN([AC_GIWS], [
+ # Checking Python in the current path... As Giws is not at all mandatory
+@@ -35,7 +36,30 @@ else
+ 		AC_MSG_ERROR([Could find giws in the PATH])
+    fi
+ fi
+-chmod +x $GIWS_BIN
++
++if test -f $GIWS_BIN; then
++   chmod +x $GIWS_BIN
++fi
++
++AC_MSG_CHECKING([for GIWS version])
++[giws_version=`$GIWS_BIN --version 2>&1 | grep 'GIWS' | sed 's/.*\([0-9]\+\.[0-9]\+\.[0-9]\+\).*/\1/g'`]
++AC_MSG_RESULT([$giws_version])
++if test -n "$giws_version" ; then
++	# Calculate the required version number
++    [giws_tmp=`echo $1 | sed 's/[^0-9]\+/ /g'`]
++    [giws_required_version=`echo $giws_tmp | awk '{print  1000000 * $ 1 +  1000 * $ 2 + $ 3}'`]
++
++	# Calculate the available version number
++    [giws_tmp=`echo $giws_version | sed 's/[^0-9]\+/ /g'`]
++    [giws_tmp=`echo $giws_tmp | awk '{print  1000000 * $ 1 +  1000 * $ 2 + $ 3}'`]
++
++	if test $giws_required_version -gt $giws_tmp ; then
++       AC_MSG_ERROR([GIWS version $1 is required, $giws_version detected])
++    fi
++else
++	AC_MSG_ERROR([cannot determine GIWS version])
++fi
++
+ AC_SUBST(GIWS_BIN)
+ 
+ ])
+\ No newline at end of file
+diff --git a/m4/hdf5.m4 b/m4/hdf5.m4
+index b5b5ebd..9a2737d 100644
+--- a/m4/hdf5.m4
++++ b/m4/hdf5.m4
+@@ -84,16 +84,20 @@ AC_DEFUN([AC_JAVA_HDF5], [
+ ])
+ 
+ AC_DEFUN([AC_JNI_HDF5], [
+-     LDFLAGS_save=$LDFLAGS
+-   # Provide known paths where distribs/OS can store JNI libs
+-        LDFLAGS="-L/usr/lib/jni -L/usr/lib64/jni/ -L$SCI_SRCDIR/bin/ -L$SCI_SRCDIR/thirdparty/  -lpthread $HDF5_LIBS"
++      LDFLAGS_save=$LDFLAGS
++      # Provide known paths where distribs/OS can store JNI libs
++      LDFLAGS="$LDFLAGS -L/usr/lib/jni -L/usr/lib64/jni"                   # Debian
++      LDFLAGS="$LDFLAGS -L/usr/lib/jhdf5 -L/usr/lib64/jhdf5"               # RedHat
++      LDFLAGS="$LDFLAGS -L$SCI_SRCDIR/thirdparty -L$SCI_SRCDIR/bin"        # Scilab
+    # -lpthread because of packaging bug in jhdf5
+       AC_CHECK_LIB([jhdf5], [h5JNIFatalError], [JHDF5_LIBS="-ljhdf5"],
+            [AC_MSG_ERROR([libjhdf5: Library missing (Cannot find symbol h5JNIFatalError). Check if libjhdf5 - C/Java (JNI) interface for HDF5 - is installed and if the version is correct. Note that you might have to update etc/librarypath.xml to provide the actual path the the JNI libraries.])])
+       LDFLAGS=$LDFLAGS_save
+ 
+       LD_LIBRARY_PATH_save=$LD_LIBRARY_PATH
+-      LD_LIBRARY_PATH="/usr/lib/jni:/usr/lib64/jni/:$SCI_SRCDIR/bin/:$SCI_SRCDIR/thirdparty/:$with_hdf5_library"
++      LD_LIBRARY_PATH="/usr/lib/jni:/usr/lib64/jni:"
++      LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/lib/jhdf5:/usr/lib64/jhdf5:"
++      LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$SCI_SRCDIR/bin/:$SCI_SRCDIR/thirdparty/:$with_hdf5_library"
+       export LD_LIBRARY_PATH
+       AC_JAVA_CHECK_VERSION_PACKAGE([hdf5],[import ncsa.hdf.hdf5lib.H5;],$JHDF5,[1.8.4],[ver],[int[] vers = new int[3];
+                 try { H5.H5get_libversion(vers); }
+diff --git a/m4/java.m4 b/m4/java.m4
+index 94479fb..35ca493 100644
+--- a/m4/java.m4
++++ b/m4/java.m4
+@@ -202,7 +202,7 @@ EOF
+ #
+ # VARIABLES SET:
+ #    JAVAC
+-#    ac_java_jvm_version can be set to 1.4, 1.5 or 1.6
++#    ac_java_jvm_version can be set to 1.4, 1.5, 1.6 or 1.7
+ #    ac_java_jvm_dir can be set to the jvm's root directory
+ #
+ # DEPENDS ON:
+@@ -275,17 +275,17 @@ Maybe JAVA_HOME is pointing to a JRE (Java Runtime Environment) instead of a JDK
+     AC_MSG_CHECKING([java API version])
+ 
+     # The class java.nio.charset.Charset is new to 1.4
+-
+     AC_JAVA_TRY_COMPILE([import java.nio.charset.Charset;], , "no", ac_java_jvm_version=1.4)
+ 
+     # The class java.lang.StringBuilder is new to 1.5
+-
+     AC_JAVA_TRY_COMPILE([import java.lang.StringBuilder;], , "no", ac_java_jvm_version=1.5)
+ 
+     # The class java.util.ArrayDeque is new to 1.6
+-
+     AC_JAVA_TRY_COMPILE([import java.util.ArrayDeque;], , "no", ac_java_jvm_version=1.6)
+ 
++    # The class java.nio.file.Path is new to 1.7
++    AC_JAVA_TRY_COMPILE([import java.nio.file.Path;], , "no", ac_java_jvm_version=1.7)
++
+     if test "x$ac_java_jvm_version" = "x" ; then
+         AC_MSG_ERROR([Could not detect Java version, 1.4 or newer is required])
+     fi
+@@ -451,17 +451,20 @@ AC_DEFUN([AC_JAVA_JNI_LIBS], [
+           machine=sparc
+           ;;
+         powerpc|ppc64)
+-            machine=ppc
++          machine=ppc
+           ;;
+-          armv*)
++        armv*)
+           machine=arm
+           ;;
+-          s390x) # s390 arch can also returns s390x
++        s390x) # s390 arch can also returns s390x
+           machine=s390
+           ;;
+         sh*)
+             machine=sh
+           ;;
++        mips64)
++            machine=mips
++          ;;
+     esac
+ 
+     AC_MSG_LOG([Looking for JNI libs with $machine as machine hardware name])
+@@ -496,8 +499,10 @@ AC_DEFUN([AC_JAVA_JNI_LIBS], [
+                 ac_java_jvm_jni_lib_runtime_path="${ac_java_jvm_jni_lib_runtime_path}:$D"
+                 ac_java_jvm_jni_lib_flags="$ac_java_jvm_jni_lib_flags -L$D -ljvm"
+                 D=$ac_java_jvm_dir/jre/lib/$machine/native_threads
+-                ac_java_jvm_jni_lib_runtime_path="${ac_java_jvm_jni_lib_runtime_path}:$D"
+-                ac_java_jvm_jni_lib_flags="$ac_java_jvm_jni_lib_flags -L$D -lhpi"
++                if test -d $D; then
++                  ac_java_jvm_jni_lib_runtime_path="${ac_java_jvm_jni_lib_runtime_path}:$D"
++                  ac_java_jvm_jni_lib_flags="$ac_java_jvm_jni_lib_flags -L$D -lhpi"
++                fi
+             fi
+         fi
+ 
+@@ -597,8 +602,10 @@ AC_DEFUN([AC_JAVA_JNI_LIBS], [
+                 ac_java_jvm_jni_lib_runtime_path="${ac_java_jvm_jni_lib_runtime_path}:$D"
+                 ac_java_jvm_jni_lib_flags="$ac_java_jvm_jni_lib_flags -L$D -ljvm"
+                 D=$ac_java_jvm_dir/jre/lib/mipsel/native_threads
+-                ac_java_jvm_jni_lib_runtime_path="${ac_java_jvm_jni_lib_runtime_path}:$D"
+-                ac_java_jvm_jni_lib_flags="$ac_java_jvm_jni_lib_flags -L$D -lhpi"
++                if test -d $D; then
++                  ac_java_jvm_jni_lib_runtime_path="${ac_java_jvm_jni_lib_runtime_path}:$D"
++                  ac_java_jvm_jni_lib_flags="$ac_java_jvm_jni_lib_flags -L$D -lhpi"
++                fi
+             fi
+         fi
+ 
+@@ -816,7 +823,7 @@ AC_DEFUN([AC_JAVA_CHECK_PACKAGE], [
+     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)"
++    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/$1.jar" "$jardir/lib$1.jar" "$jardir/lib$1-java.jar" "$jardir/$1*.jar"; do
+ #    jar=`echo $jar|sed -e 's/ /\\ /'`
+diff --git a/m4/libsmath.m4 b/m4/libsmath.m4
+index 20676d6..dc911f4 100644
+--- a/m4/libsmath.m4
++++ b/m4/libsmath.m4
+@@ -145,6 +145,10 @@ if test $acx_blas_ok = no; then
+ 	AC_CHECK_LIB(blas, $sgemm, [acx_blas_ok=yes; BLAS_TYPE="Generic Blas"; BLAS_LIBS="-lblas"])
+ fi
+ 
++if test "$with_blas_library" != no -a "$with_blas_library" != ""; then
++BLAS_LIBS="$BLAS_LIBS -L$with_blas_library"
++fi
++
+ AC_SUBST(BLAS_LIBS)
+ 
+ LIBS="$acx_blas_save_LIBS"
+@@ -249,6 +253,10 @@ done
+ 
+ LDFLAGS="$saved_ldflags"
+ 
++if test "$with_lapack_library" != no -a "$with_lapack_library" != ""; then
++LAPACK_LIBS="$LAPACK_LIBS -L$with_lapack_library"
++fi
++
+ AC_SUBST(LAPACK_LIBS)
+ 
+ # Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
+-- 
+1.7.7
+
diff --git a/0002-Update-saxon-dependency-wrong-version.patch b/0002-Update-saxon-dependency-wrong-version.patch
new file mode 100644
index 0000000..c49c1a1
--- /dev/null
+++ b/0002-Update-saxon-dependency-wrong-version.patch
@@ -0,0 +1,420 @@
+From b1b49af43df5c15a35bcca42f074793436eeaf1c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Cl=C3=A9ment=20DAVID?= <clement.david at scilab-enterprises.com>
+Date: Mon, 31 Oct 2011 11:20:17 +0100
+Subject: [PATCH 2/8] Update saxon dependency (wrong version)
+
+---
+ m4/docbook.m4                                      |    2 +-
+ .../scilab/modules/helptools/BuildDocObject.java   |  387 --------------------
+ 2 files changed, 1 insertions(+), 388 deletions(-)
+ delete mode 100644 modules/helptools/src/java/org/scilab/modules/helptools/BuildDocObject.java
+
+diff --git a/m4/docbook.m4 b/m4/docbook.m4
+index 48b2414..a484d90 100644
+--- a/m4/docbook.m4
++++ b/m4/docbook.m4
+@@ -35,7 +35,7 @@ AC_ARG_WITH(docbook,
+ 
+ 
+ 	# Saxon XSLT Processor
+-	AC_JAVA_CHECK_PACKAGE([saxon],[com.icl.saxon.Loader],[Saxon XSLT Processor])
++	AC_JAVA_CHECK_PACKAGE([saxon],[net.sf.saxon.Version],[Saxon XSLT Processor])
+ 	SAXON=$PACKAGE_JAR_FILE
+ 	AC_SUBST(SAXON)
+ 
+diff --git a/modules/helptools/src/java/org/scilab/modules/helptools/BuildDocObject.java b/modules/helptools/src/java/org/scilab/modules/helptools/BuildDocObject.java
+deleted file mode 100644
+index 4f317fa..0000000
+--- a/modules/helptools/src/java/org/scilab/modules/helptools/BuildDocObject.java
++++ /dev/null
+@@ -1,387 +0,0 @@
+-/*
+- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+- * Copyright (C) 2008 - INRIA - Sylvestre LEDRU
+- *
+- * This file must be used under the terms of the CeCILL.
+- * This source file is licensed as described in the file COPYING, which
+- * you should have received as part of this distribution.  The terms
+- * are also available at
+- * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+- *
+- */
+-
+-package org.scilab.modules.helptools;
+-
+-import java.io.File;
+-import java.io.FileNotFoundException;
+-import java.io.IOException;
+-import java.util.ArrayList;
+-
+-import org.xml.sax.SAXParseException;
+-import org.xml.sax.SAXException;
+-
+-import com.icl.saxon.StyleSheet; /* saxon */
+-
+-import org.scilab.modules.commons.ScilabConstants;
+-
+-/**
+- * This classes intends to wrap Saxon features in a easy-to-use class.
+- */
+-public class BuildDocObject extends StyleSheet {
+-
+-    /**
+-     * Windows version ?
+-     */
+-    public static final boolean IS_WINDOWS = (File.pathSeparatorChar == ';');
+-
+-    private static final String SCI = System.getenv("SCI");
+-    private static final String ERROR_WHILE_COPYING = "Error while copying ";
+-    private static final String CANNOT_COPY_CONVERT = "Cannot copy/convert '";
+-    private static final String COULD_NOT_FIND_STYLE_DOC = "Could not find the style document: ";
+-    private static final String TO_WITH_QUOTES = "' to '";
+-    private static final String TO = " to ";
+-    private static final String COLON_WITH_QUOTES = "': ";
+-    private static final String COLON = " : ";
+-    private static final String PDF_FORMAT = "PDF";
+-    private static final String POSTSCRIPT_FORMAT = "PS";
+-    private static final String JH_FORMAT = "JH";
+-    private static final String JAVAHELP_FORMAT = "JAVAHELP";
+-    private static final String USE_EXTENSIONS_1 = "use.extensions=1";
+-    private static final String GRAPHICSIZE_EXTENSION_0 = "graphicsize.extension=0";
+-    private static final String TOC_SECTION_DEPTH_3 = "toc.section.depth=3";
+-    private static final String SECTION_AUTOLABEL_1 = "section.autolabel=1";
+-    private static final String USE_ID_AS_FILENAME = "use.id.as.filename=1";
+-    private static final String GENERATE_TOC = "\"generate.toc= \"";
+-
+-    private String outputDirectory;
+-    private String format;
+-    private String language;
+-    private String docbookPath;
+-    private String styleDoc;
+-    private ArrayList<String> specificArgs = new ArrayList<String>();
+-    private boolean isLatexConverted = true;
+-
+-    /**
+-     * Creator ... creates the BuildDocObject object
+-     *
+-     * @throws FileNotFoundException if Docbook is not found
+-     */
+-    public BuildDocObject() throws FileNotFoundException {
+-        super();
+-        this.docbookPath = System.getenv("DOCBOOK_ROOT");
+-
+-        if (IS_WINDOWS) {
+-            if (this.docbookPath == null) {
+-                this.docbookPath = SCI + "/thirdparty/docbook";
+-            }
+-        } else {
+-            if (this.docbookPath == null) {
+-                throw new FileNotFoundException("Could not find variable DOCBOOK_ROOT defining Docbook root directory");
+-            }
+-        }
+-    }
+-
+-    /**
+-     * Set the path to the DocBook XSL application
+-     * See: http://wiki.docbook.org/topic/DocBookXslStylesheets
+-     * @param docbookPath The absolute path to the base directory
+-     */
+-    public void setDocbookPath(String docbookPath) {
+-        this.docbookPath = docbookPath;
+-    }
+-
+-    /**
+-     * Set the directory where files must be exported
+-     * Note that directory is created
+-     *
+-     * @param outputDirectory The path to the directory
+-     * @return If the directory exists
+-     */
+-    public boolean setOutputDirectory(String outputDirectory) {
+-        File directory = new File(outputDirectory);
+-        if (!directory.isDirectory()) {
+-            if (!directory.mkdirs()) {
+-                return false;
+-            }
+-        }
+-        this.outputDirectory = outputDirectory;
+-        return true;
+-    }
+-
+-    /**
+-     * Defines the language
+-     *
+-     * @param language the language (xx_XX ex: en_US, fr_FR)
+-     */
+-    public void setWorkingLanguage(String language) {
+-        this.language = language;
+-    }
+-
+-
+-    /**
+-     * Defines the export format
+-     * @param format the format (among the list CHM, HTML, PDF, JH, PS)
+-     */
+-    public void setExportFormat(String format) {
+-
+-        // Need to work with a String instead of a enum since it needs
+-        // to be called from C/C++ and GIWS doesn't manage this type.
+-        // Can be CHM, HTML, PDF, JavaHelp, Postscript
+-        if (format.equalsIgnoreCase(PDF_FORMAT) || format.equalsIgnoreCase(POSTSCRIPT_FORMAT)) {
+-            specificArgs.add(USE_EXTENSIONS_1);
+-            specificArgs.add(GRAPHICSIZE_EXTENSION_0);
+-            specificArgs.add("paper.type=A4");
+-            specificArgs.add("\"generate.toc=book toc,title,figure,table,example,equation part toc,title reference toc,title\"");
+-            specificArgs.add(TOC_SECTION_DEPTH_3);
+-            specificArgs.add(SECTION_AUTOLABEL_1);
+-            specificArgs.add("variablelist.as.blocks=1");
+-            specificArgs.add("shade.verbatim=1");
+-            specificArgs.add("img.src.path=" + outputDirectory);
+-            this.styleDoc = docbookPath + "/fo/docbook.xsl";
+-            this.isLatexConverted = false;
+-        }
+-
+-        /* HTML Format */
+-        if (format.equalsIgnoreCase("HTML")) {
+-            specificArgs.add(USE_ID_AS_FILENAME);
+-            specificArgs.add("html.stylesheet=html.css");
+-            specificArgs.add(USE_EXTENSIONS_1);
+-            specificArgs.add(GRAPHICSIZE_EXTENSION_0);
+-            specificArgs.add(TOC_SECTION_DEPTH_3);
+-            specificArgs.add(SECTION_AUTOLABEL_1);
+-            this.styleDoc = docbookPath + "/html/chunk.xsl";
+-
+-            /* Copy the css file for thr HTML pages */
+-            String cssFile = new String(SCI + "/modules/helptools/css/html.css");
+-            try {
+-                Helpers.copyFile(new File(cssFile), new File(outputDirectory + "/html.css"));
+-            } catch (java.io.FileNotFoundException e) {
+-                System.err.println(ERROR_WHILE_COPYING + cssFile + TO
+-                                   + outputDirectory + COLON + e.getMessage());
+-            } catch (java.io.IOException e) {
+-                System.err.println(ERROR_WHILE_COPYING + cssFile + TO
+-                                   + outputDirectory + COLON + e.getMessage());
+-            }
+-        }
+-
+-        /* CHM Format */
+-        if (format.equalsIgnoreCase("CHM")) {
+-            specificArgs.add(USE_ID_AS_FILENAME);
+-            specificArgs.add("html.stylesheet=htmlhelp.css");
+-            specificArgs.add(USE_EXTENSIONS_1);
+-            specificArgs.add(GRAPHICSIZE_EXTENSION_0);
+-            specificArgs.add(GENERATE_TOC);
+-            this.styleDoc = docbookPath + "/htmlhelp/htmlhelp.xsl";
+-
+-            /* Copy the css file for thr HTML pages */
+-            String cssFile = new String(SCI + "/modules/helptools/css/htmlhelp.css");
+-            try {
+-                Helpers.copyFile(new File(cssFile), new File(outputDirectory + "/htmlhelp.css"));
+-            } catch (java.io.FileNotFoundException e) {
+-                System.err.println(ERROR_WHILE_COPYING + cssFile + TO
+-                                   + outputDirectory + COLON + e.getMessage());
+-            } catch (java.io.IOException e) {
+-                System.err.println(ERROR_WHILE_COPYING + cssFile + TO
+-                                   + outputDirectory + COLON + e.getMessage());
+-            }
+-        }
+-
+-
+-        /* Java Help */
+-        if (format.equalsIgnoreCase(JH_FORMAT) || format.equalsIgnoreCase(JAVAHELP_FORMAT)) {
+-            // JavaHelp
+-            specificArgs.add(USE_EXTENSIONS_1);
+-            specificArgs.add(GRAPHICSIZE_EXTENSION_0);
+-            specificArgs.add(GENERATE_TOC);
+-            specificArgs.add(USE_ID_AS_FILENAME);
+-            this.styleDoc = docbookPath + "/javahelp/javahelp.xsl";
+-        }
+-        this.format = format;
+-    }
+-
+-
+-    /**
+-     * Replace links by the contents of the XML files in the master
+-     * @param masterXML name of the master file
+-     * @param styleSheet CSS to be used
+-     * @return the absolute path the the new master file
+-     */
+-    private String preProcessMaster(String masterXML) {
+-
+-        String filename = (String) new File(masterXML).getName();
+-        /* Create the output file which will be created by copyconvert.run into the working directory  */
+-        File masterXMLTransformed = new File(this.outputDirectory
+-                                             + File.separator + filename.substring(0, filename.lastIndexOf(".")) + "-processed.xml");
+-
+-        CopyConvert copyConvert = new CopyConvert();
+-        copyConvert.setVerbose(true);
+-        copyConvert.setPrintFormat(this.format);
+-        copyConvert.setLatexConverted(isLatexConverted);
+-
+-        try {
+-            copyConvert.run(new File(masterXML), masterXMLTransformed);
+-        } catch (SAXParseException e) {
+-            System.err.println(CANNOT_COPY_CONVERT + masterXML + TO_WITH_QUOTES
+-                               + masterXMLTransformed + COLON_WITH_QUOTES + Helpers.reason(e));
+-            System.err.println("Line: " + e.getLineNumber());
+-            System.err.println("Column: " + e.getColumnNumber());
+-            System.err.println("Public ID: " + e.getPublicId());
+-            System.err.println("System Id: " + e.getSystemId());
+-            return null;
+-        } catch (SAXException e) {
+-            System.err.println(CANNOT_COPY_CONVERT + masterXML + TO_WITH_QUOTES
+-                               + masterXMLTransformed + COLON_WITH_QUOTES + Helpers.reason(e));
+-            return null;
+-
+-        } catch (IOException e) {
+-            System.err.println(CANNOT_COPY_CONVERT + masterXML + TO_WITH_QUOTES
+-                               + masterXMLTransformed + COLON_WITH_QUOTES + Helpers.reason(e));
+-            return null;
+-        }
+-
+-        return masterXMLTransformed.getAbsolutePath();
+-
+-    }
+-
+-    /**
+-     * Private method which manages the post processing
+-     * @return The path to the file/directory created.
+-     */
+-    private String postProcess() {
+-        if (this.format.equalsIgnoreCase(JH_FORMAT) || format.equalsIgnoreCase(JAVAHELP_FORMAT)) {
+-            return BuildJavaHelp.buildJavaHelp(this.outputDirectory, this.language);
+-        }
+-        if (format.equalsIgnoreCase(PDF_FORMAT) || format.equalsIgnoreCase(POSTSCRIPT_FORMAT)) {
+-            return BuildPDF.buildPDF(this.outputDirectory, this.language, format);
+-        }
+-
+-        return this.outputDirectory;
+-    }
+-
+-    /**
+-     * Preprocess the extendedStyle.xsl file
+-     * Basically, we load the xsl and replace STYLE_DOC by the actual path
+-     * to the xsl file since docbook cannot replace env variables
+-     * @return the path to the preprocessed file
+-     */
+-
+-    private File generateExtendedStyle() {
+-        String mainStyleDoc = SCI + "/modules/helptools/schema/extendedStyle.xsl";
+-        try {
+-            String contentMainStyleDoc = Helpers.loadString(new File(mainStyleDoc), "UTF-8");
+-
+-            /* STYLE_DOC is a predefined variable */
+-            File tmpFileForURI = new File(this.styleDoc);
+-            contentMainStyleDoc = contentMainStyleDoc.replaceAll("STYLE_DOC", tmpFileForURI.toURI().toString());
+-
+-            File temporaryStyleFile = File.createTempFile("style_",".xsl");
+-
+-            Helpers.saveString(contentMainStyleDoc, temporaryStyleFile, "UTF-8");
+-            return temporaryStyleFile;
+-        } catch (java.io.IOException e) {
+-            System.err.println("Could not convert "+mainStyleDoc);
+-            return null;
+-        }
+-    }
+-
+-    /**
+-     * Launch the whole Saxon process
+-     *
+-     * @param sourceDoc Path to the XML master document
+-     * @param styleSheet Path to the CSS stylesheet
+-     * @return The path to the file/directory created.
+-     * @throws FileNotFoundException Raises an exception if no file/dir found
+-     */
+-    public String process(String sourceDoc, String styleSheet) throws FileNotFoundException {
+-        ArrayList<String> args = new ArrayList<String>();
+-
+-        if (!new File(sourceDoc).isFile()) {
+-            throw new FileNotFoundException("Could not find master document: " + sourceDoc);
+-        }
+-
+-        if (!new File(this.styleDoc).isFile()) {
+-            throw new FileNotFoundException(COULD_NOT_FIND_STYLE_DOC + this.styleDoc);
+-        }
+-
+-        String path = styleDoc;
+-        File processedStyle = null;
+-        if (!isLatexConverted) {
+-            processedStyle = generateExtendedStyle();
+-            path = processedStyle.getAbsolutePath();
+-        }
+-
+-        if (!new File(this.outputDirectory).isDirectory()) {
+-            throw new FileNotFoundException("Could not find directory: " + this.outputDirectory);
+-        }
+-
+-        String sourceDocProcessed = this.preProcessMaster(sourceDoc);
+-
+-        if (sourceDocProcessed == null) {
+-            throw new FileNotFoundException("Unable to parse generated master file.");
+-        }
+-
+-        if (format.equalsIgnoreCase(PDF_FORMAT) || format.equalsIgnoreCase(POSTSCRIPT_FORMAT)) {
+-            /* PDF & postscript take other args */
+-            args.add("-o");
+-            args.add(Helpers.getTemporaryNameFo(outputDirectory));
+-        } else {
+-            if (!new File(styleSheet).isFile()) {
+-                throw new FileNotFoundException("Could not find CSS stylesheet: " + styleSheet);
+-            }
+-            /* Where it will be stored */
+-            String out = this.outputDirectory + File.separator + (String) new File(styleSheet).getName();
+-
+-            try {
+-                Helpers.copyFile(new File(styleSheet), new File(out));
+-            } catch (java.io.FileNotFoundException e) {
+-                System.err.println(ERROR_WHILE_COPYING + styleSheet + TO + out + COLON + e.getMessage());
+-            } catch (java.io.IOException e) {
+-                System.err.println(ERROR_WHILE_COPYING + styleSheet + TO + out + COLON + e.getMessage());
+-            }
+-
+-            args.add("html.stylesheet=" + new File(styleSheet).getName());
+-        }
+-
+-        //args.add("-t");
+-        args.add(sourceDocProcessed);
+-        args.add(path);
+-        args.add("base.dir=" + this.outputDirectory);
+-        args.addAll(specificArgs);
+-        /**
+-         * We are calling directly the method as we were using a command line
+-         * program because it is much easier ...
+-         * However, this should be rewritted using the API
+-         */
+-        doMain(args.toArray(new String [args.size()]), new StyleSheet(), "java com.icl.saxon.StyleSheet");
+-
+-        if (new File(sourceDocProcessed).isDirectory()) {
+-            /* Delete the master temp file to avoid to be shipped with the rest */
+-            new File(sourceDocProcessed).delete();
+-        }
+-
+-        if (processedStyle != null) {
+-            processedStyle.delete();
+-        }
+-
+-        return this.postProcess();
+-
+-    }
+-
+-    /**
+-     * The case to see if it working
+-     *
+-     * @param arg Useless arg
+-     */
+-    public static void main(String[] arg) {
+-        try {
+-            BuildDocObject d = new BuildDocObject();
+-            d.setOutputDirectory("/tmp/");
+-            d.setExportFormat(JH_FORMAT);
+-            d.setDocbookPath("/usr/share/xml/docbook/stylesheet/nwalsh/");
+-            d.process(SCI + "/modules/helptools/master_en_US_help.xml",
+-                      SCI + "/modules/helptools/css/javahelp.css");
+-        } catch (FileNotFoundException e) {
+-            System.err.println("Exception catched: " + e.getMessage());
+-        }
+-    }
+-}
+-- 
+1.7.7
+
diff --git a/0003-Remove-Xcos-dependencies-check.patch b/0003-Remove-Xcos-dependencies-check.patch
new file mode 100644
index 0000000..143e77e
--- /dev/null
+++ b/0003-Remove-Xcos-dependencies-check.patch
@@ -0,0 +1,90 @@
+From 86ea77b316580c685263e54cd6564e4b939daf72 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Cl=C3=A9ment=20DAVID?= <clement.david at scilab.org>
+Date: Wed, 14 Sep 2011 20:52:14 +0200
+Subject: [PATCH 3/8] Remove Xcos dependencies check
+
+---
+ .../src/java/org/scilab/modules/xcos/Xcos.java     |   67 +------------------
+ 1 files changed, 4 insertions(+), 63 deletions(-)
+
+diff --git a/modules/xcos/src/java/org/scilab/modules/xcos/Xcos.java b/modules/xcos/src/java/org/scilab/modules/xcos/Xcos.java
+index 2417b06..35ed224 100644
+--- a/modules/xcos/src/java/org/scilab/modules/xcos/Xcos.java
++++ b/modules/xcos/src/java/org/scilab/modules/xcos/Xcos.java
+@@ -145,69 +145,10 @@ public final class Xcos {
+ 	// CSOFF: IllegalCatch
+ 	// CSOFF: MagicNumber
+ 	private void checkDependencies() {
+-		final ClassLoader loader = ClassLoader.getSystemClassLoader();
+-		
+-		/* JGraphx */
+-		String mxGraphVersion = "";
+-		try {
+-			final Class< ? > klass = loader.loadClass("com.mxgraph.view.mxGraph");
+-			mxGraphVersion = (String) klass.getDeclaredField("VERSION").get(null);
+-				
+-			if (!MXGRAPH_VERSIONS.contains(mxGraphVersion)) {
+-				throw new Exception();
+-			}
+-		} catch (final Throwable e) {
+-			throw new RuntimeException(String.format(UNABLE_TO_LOAD_JGRAPHX,
+-					MXGRAPH_VERSIONS.get(0), mxGraphVersion), e);
+-		}
+-		
+-		/* HDF5 */
+-		final int[] libVersion = new int[3]; 
+-		try {
+-			final Class< ? > klass = loader.loadClass("ncsa.hdf.hdf5lib.H5");
+-			
+-			/* hdf5-java */
+-			int ret = (Integer) klass.getMethod("H5get_libversion", libVersion.getClass())
+-									.invoke(null, libVersion);
+-			if (ret < 0) {
+-				throw new Exception();
+-			}
+-			
+-			if (!HDF5_VERSIONS.contains(Arrays.toString(libVersion))) {
+-				throw new Exception();
+-			}
+-			
+-			
+-			/* hdf5 */
+-			ret = (Integer) klass.getMethod("H5check_version", int.class,
+-					int.class, int.class).invoke(null, libVersion[0],
+-					libVersion[1], libVersion[2]);
+-			if (ret < 0) {
+-				throw new RuntimeException(UNABLE_TO_LOAD_HDF5);
+-			}
+-			
+-		} catch (final Throwable e) {
+-			if (!(e instanceof RuntimeException)) {
+-				throw new RuntimeException(String.format(UNABLE_TO_LOAD_JHDF5,
+-						HDF5_VERSIONS.get(0), Arrays.toString(libVersion)), e);
+-			}
+-		}
+-		
+-		/* Batik */
+-		String batikVersion = null;
+-		try {
+-			final Class< ? > klass = loader.loadClass("org.apache.batik.Version");
+-			batikVersion = klass.getPackage().getImplementationVersion()
+-								.split("\\+")[0];
+-			
+-			if (!BATIK_VERSIONS.contains(batikVersion)) {
+-				throw new Exception();
+-			}
+-			
+-		} catch (final Throwable e) {
+-			throw new RuntimeException(String.format(UNABLE_TO_LOAD_BATIK,
+-					BATIK_VERSIONS.get(0), batikVersion), e);
+-		}
++		LOG.trace("dependencies check removed");
++		// Remove all dependencies check
++		// It may cause some trouble in case of any API change but will
++		// ease maintenance.
+ 	}
+ 	// CSON: MagicNumber
+ 	// CSON: IllegalCatch
+-- 
+1.7.7
+
diff --git a/0004-fix-javadoc-encoding.patch b/0004-fix-javadoc-encoding.patch
new file mode 100644
index 0000000..b4b2175
--- /dev/null
+++ b/0004-fix-javadoc-encoding.patch
@@ -0,0 +1,25 @@
+From e42e4a78fa2e070bad79257f575d9a500547e809 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Cl=C3=A9ment=20DAVID?= <clement.david at scilab-enterprises.com>
+Date: Mon, 31 Oct 2011 14:31:27 +0100
+Subject: [PATCH 4/8] fix javadoc encoding
+
+---
+ Makefile.am |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 1e4d590..7b905ae 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -163,7 +163,7 @@ macros:$(top_builddir)/scilab-cli-bin $(top_builddir)/bin/scilab-cli
+ # This is not done in the module itself because its needs also the "types"
+ # module
+ javadoc:
+-	$(JAVADOC) -noindex -nohelp -nonavbar -notree \
++	$(JAVADOC) -noindex -nohelp -nonavbar -notree -encoding "utf-8" \
+ 	-d $(top_builddir)/modules/javasci/javadoc \
+ 	-sourcepath $(top_srcdir)/modules/javasci/src/java:$(top_srcdir)/modules/types/src/java \
+ 	org.scilab.modules.javasci org.scilab.modules.types
+-- 
+1.7.7
+
diff --git a/0005-autoreconf.patch b/0005-autoreconf.patch
new file mode 100644
index 0000000..fb70218
--- /dev/null
+++ b/0005-autoreconf.patch
@@ -0,0 +1,7306 @@
+From 53209526a2f48f09e8020b05bc59eb8de4ad976f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Cl=C3=A9ment=20DAVID?= <clement.david at scilab-enterprises.com>
+Date: Thu, 10 Nov 2011 07:52:17 +0100
+Subject: [PATCH 5/8] autoreconf
+
+---
+ Makefile.in                                    |    9 +-
+ aclocal.m4                                     |    5 +-
+ configure                                      | 1943 +++++++++++++++++-------
+ contrib/Makefile.in                            |    7 +-
+ libs/MALLOC/Makefile.in                        |    7 +-
+ libs/Makefile.in                               |    7 +-
+ libs/doublylinkedlist/Makefile.in              |    7 +-
+ libs/dynamiclibrary/Makefile.in                |    7 +-
+ libs/hashtable/Makefile.in                     |    7 +-
+ libs/libst/Makefile.in                         |    7 +-
+ modules/Makefile.in                            |    7 +-
+ modules/action_binding/Makefile.in             |    7 +-
+ modules/api_scilab/Makefile.in                 |    7 +-
+ modules/arnoldi/Makefile.in                    |    7 +-
+ modules/atoms/Makefile.in                      |    7 +-
+ modules/boolean/Makefile.in                    |    7 +-
+ modules/cacsd/Makefile.in                      |    7 +-
+ modules/call_scilab/Makefile.in                |    7 +-
+ modules/commons/Makefile.in                    |    7 +-
+ modules/compatibility_functions/Makefile.in    |    7 +-
+ modules/completion/Makefile.in                 |    7 +-
+ modules/console/Makefile.in                    |    7 +-
+ modules/core/Makefile.in                       |    7 +-
+ modules/data_structures/Makefile.in            |    7 +-
+ modules/demo_tools/Makefile.in                 |    7 +-
+ modules/development_tools/Makefile.in          |    7 +-
+ modules/development_tools/src/fake/Makefile.in |    7 +-
+ modules/differential_equations/Makefile.in     |    7 +-
+ modules/double/Makefile.in                     |    7 +-
+ modules/dynamic_link/Makefile.in               |    7 +-
+ modules/elementary_functions/Makefile.in       |    7 +-
+ modules/fftw/Makefile.in                       |    7 +-
+ modules/fileio/Makefile.in                     |    7 +-
+ modules/functions/Makefile.in                  |    7 +-
+ modules/genetic_algorithms/Makefile.in         |    7 +-
+ modules/graph/Makefile.in                      |    7 +-
+ modules/graphic_export/Makefile.in             |    7 +-
+ modules/graphics/Makefile.in                   |    7 +-
+ modules/gui/Makefile.in                        |    7 +-
+ modules/hdf5/Makefile.in                       |    7 +-
+ modules/helptools/Makefile.in                  |    7 +-
+ modules/history_browser/Makefile.in            |    7 +-
+ modules/history_manager/Makefile.in            |    7 +-
+ modules/integer/Makefile.in                    |    7 +-
+ modules/interpolation/Makefile.in              |    7 +-
+ modules/intersci/Makefile.in                   |    7 +-
+ modules/io/Makefile.in                         |    7 +-
+ modules/javasci/Makefile.in                    |    7 +-
+ modules/jvm/Makefile.in                        |    7 +-
+ modules/linear_algebra/Makefile.in             |    7 +-
+ modules/localization/Makefile.in               |    7 +-
+ modules/m2sci/Makefile.in                      |    7 +-
+ modules/maple2scilab/Makefile.in               |    7 +-
+ modules/matio/Makefile.in                      |    7 +-
+ modules/mexlib/Makefile.in                     |    7 +-
+ modules/modules_manager/Makefile.in            |    7 +-
+ modules/optimization/Makefile.in               |    7 +-
+ modules/output_stream/Makefile.in              |    7 +-
+ modules/overloading/Makefile.in                |    7 +-
+ modules/parallel/Makefile.in                   |    7 +-
+ modules/parameters/Makefile.in                 |    7 +-
+ modules/polynomials/Makefile.in                |    7 +-
+ modules/pvm/Makefile.in                        |    7 +-
+ modules/randlib/Makefile.in                    |    7 +-
+ modules/renderer/Makefile.in                   |    7 +-
+ modules/scicos/Makefile.in                     |    7 +-
+ modules/scicos_blocks/Makefile.in              |    7 +-
+ modules/scinotes/Makefile.in                   |    7 +-
+ modules/shell/Makefile.in                      |    7 +-
+ modules/signal_processing/Makefile.in          |    7 +-
+ modules/simulated_annealing/Makefile.in        |    7 +-
+ modules/sound/Makefile.in                      |    7 +-
+ modules/sparse/Makefile.in                     |    7 +-
+ modules/special_functions/Makefile.in          |    7 +-
+ modules/spreadsheet/Makefile.in                |    7 +-
+ modules/statistics/Makefile.in                 |    7 +-
+ modules/string/Makefile.in                     |    7 +-
+ modules/symbolic/Makefile.in                   |    7 +-
+ modules/tclsci/Makefile.in                     |    7 +-
+ modules/texmacs/Makefile.in                    |    7 +-
+ modules/time/Makefile.in                       |    7 +-
+ modules/types/Makefile.in                      |    7 +-
+ modules/ui_data/Makefile.in                    |    7 +-
+ modules/umfpack/Makefile.in                    |    7 +-
+ modules/windows_tools/Makefile.in              |    7 +-
+ modules/xcos/Makefile.in                       |    7 +-
+ 86 files changed, 1724 insertions(+), 814 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 4f7ceeb..e78d91e 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -95,9 +95,10 @@ check_PROGRAMS = call_scilab_c_simple$(EXEEXT) call_scilab_c$(EXEEXT) \
+ subdir = .
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+@@ -1712,7 +1713,7 @@ macros:$(top_builddir)/scilab-cli-bin $(top_builddir)/bin/scilab-cli
+ # This is not done in the module itself because its needs also the "types"
+ # module
+ javadoc:
+-	$(JAVADOC) -noindex -nohelp -nonavbar -notree \
++	$(JAVADOC) -noindex -nohelp -nonavbar -notree -encoding "utf-8" \
+ 	-d $(top_builddir)/modules/javasci/javadoc \
+ 	-sourcepath $(top_srcdir)/modules/javasci/src/java:$(top_srcdir)/modules/types/src/java \
+ 	org.scilab.modules.javasci org.scilab.modules.types
+diff --git a/aclocal.m4 b/aclocal.m4
+index fb246da..41d4466 100644
+--- a/aclocal.m4
++++ b/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.68],,
++[m4_warning([this file was generated for autoconf 2.68.
+ 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'.])])
+@@ -3252,6 +3252,7 @@ AC_SUBST([am__untar])
+ ]) # _AM_PROG_TAR
+ 
+ m4_include([m4/backtrace.m4])
++m4_include([m4/compiler.m4])
+ m4_include([m4/docbook.m4])
+ m4_include([m4/fftw.m4])
+ m4_include([m4/fortran.m4])
+diff --git a/configure b/configure
+index 9ddd7b1..386091c 100755
+--- a/configure
++++ b/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.68 for Scilab 5.
+ #
+ # Report bugs to <http://bugzilla.scilab.org/>.
+ #
+@@ -92,6 +92,7 @@ fi
+ IFS=" ""	$as_nl"
+ 
+ # Find who we are.  Look in the path if we contain no directory separator.
++as_myself=
+ case $0 in #((
+   *[\\/]* ) as_myself=$0 ;;
+   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+@@ -225,11 +226,18 @@ IFS=$as_save_IFS
+   # We cannot yet assume a decent shell, so we have to provide a
+ 	# neutralization value for shells without unset; and this also
+ 	# works around shells that cannot unset nonexistent variables.
++	# Preserve -v and -x to the replacement shell.
+ 	BASH_ENV=/dev/null
+ 	ENV=/dev/null
+ 	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+ 	export CONFIG_SHELL
+-	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
++	case $- in # ((((
++	  *v*x* | *x*v* ) as_opts=-vx ;;
++	  *v* ) as_opts=-v ;;
++	  *x* ) as_opts=-x ;;
++	  * ) as_opts= ;;
++	esac
++	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
+ fi
+ 
+     if test x$as_have_required = xno; then :
+@@ -1408,7 +1416,7 @@ Try \`$0 --help' for more information"
+     $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+       $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
++    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
+     ;;
+ 
+   esac
+@@ -1819,7 +1827,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.68
+ 
+ Copyright (C) 2010 Free Software Foundation, Inc.
+ This configure script is free software; the Free Software Foundation
+@@ -1865,7 +1873,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_retval=1
+ fi
+-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+   as_fn_set_status $ac_retval
+ 
+ } # ac_fn_c_try_compile
+@@ -1902,7 +1910,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+     ac_retval=1
+ fi
+-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+   as_fn_set_status $ac_retval
+ 
+ } # ac_fn_c_try_cpp
+@@ -1915,10 +1923,10 @@ fi
+ ac_fn_c_check_header_mongrel ()
+ {
+   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+-  if eval "test \"\${$3+set}\"" = set; then :
++  if eval \${$3+:} false; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+ $as_echo_n "checking for $2... " >&6; }
+-if eval "test \"\${$3+set}\"" = set; then :
++if eval \${$3+:} false; then :
+   $as_echo_n "(cached) " >&6
+ fi
+ eval ac_res=\$$3
+@@ -1985,7 +1993,7 @@ $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+ esac
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+ $as_echo_n "checking for $2... " >&6; }
+-if eval "test \"\${$3+set}\"" = set; then :
++if eval \${$3+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   eval "$3=\$ac_header_compiler"
+@@ -1994,7 +2002,7 @@ eval ac_res=\$$3
+ 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+ fi
+-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ 
+ } # ac_fn_c_check_header_mongrel
+ 
+@@ -2035,7 +2043,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+        ac_retval=$ac_status
+ fi
+   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+   as_fn_set_status $ac_retval
+ 
+ } # ac_fn_c_try_run
+@@ -2049,7 +2057,7 @@ ac_fn_c_check_header_compile ()
+   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+ $as_echo_n "checking for $2... " >&6; }
+-if eval "test \"\${$3+set}\"" = set; then :
++if eval \${$3+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -2067,7 +2075,7 @@ fi
+ eval ac_res=\$$3
+ 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ 
+ } # ac_fn_c_check_header_compile
+ 
+@@ -2112,7 +2120,7 @@ fi
+   # interfere with the next link command; also delete a directory that is
+   # left behind by Apple's compiler.  We do this before executing the actions.
+   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+   as_fn_set_status $ac_retval
+ 
+ } # ac_fn_c_try_link
+@@ -2125,7 +2133,7 @@ ac_fn_c_check_func ()
+   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+ $as_echo_n "checking for $2... " >&6; }
+-if eval "test \"\${$3+set}\"" = set; then :
++if eval \${$3+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -2180,7 +2188,7 @@ fi
+ eval ac_res=\$$3
+ 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ 
+ } # ac_fn_c_check_func
+ 
+@@ -2217,7 +2225,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_retval=1
+ fi
+-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+   as_fn_set_status $ac_retval
+ 
+ } # ac_fn_f77_try_compile
+@@ -2395,7 +2403,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ rm -f conftest.val
+ 
+   fi
+-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+   as_fn_set_status $ac_retval
+ 
+ } # ac_fn_c_compute_int
+@@ -2433,7 +2441,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	ac_retval=1
+ fi
+-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+   as_fn_set_status $ac_retval
+ 
+ } # ac_fn_cxx_try_compile
+@@ -2447,7 +2455,7 @@ ac_fn_c_check_member ()
+   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
+ $as_echo_n "checking for $2.$3... " >&6; }
+-if eval "test \"\${$4+set}\"" = set; then :
++if eval \${$4+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -2491,7 +2499,7 @@ fi
+ eval ac_res=\$$4
+ 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ 
+ } # ac_fn_c_check_member
+ 
+@@ -2527,7 +2535,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+     ac_retval=1
+ fi
+-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+   as_fn_set_status $ac_retval
+ 
+ } # ac_fn_cxx_try_cpp
+@@ -2573,7 +2581,7 @@ fi
+   # interfere with the next link command; also delete a directory that is
+   # left behind by Apple's compiler.  We do this before executing the actions.
+   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+   as_fn_set_status $ac_retval
+ 
+ } # ac_fn_cxx_try_link
+@@ -2619,7 +2627,7 @@ fi
+   # interfere with the next link command; also delete a directory that is
+   # left behind by Apple's compiler.  We do this before executing the actions.
+   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+   as_fn_set_status $ac_retval
+ 
+ } # ac_fn_f77_try_link
+@@ -2628,7 +2636,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.68.  Invocation command line was
+ 
+   $ $0 $@
+ 
+@@ -2886,7 +2894,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
+ 
+@@ -3078,7 +3086,7 @@ if test "$cross_compiling" != no; then
+ set dummy ${ac_tool_prefix}strip; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_STRIP+set}" = set; then :
++if ${ac_cv_prog_STRIP+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$STRIP"; then
+@@ -3118,7 +3126,7 @@ if test -z "$ac_cv_prog_STRIP"; then
+ set dummy strip; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
++if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_STRIP"; then
+@@ -3190,7 +3198,7 @@ if test -n "$ac_tool_prefix"; then
+ set dummy ${ac_tool_prefix}gcc; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then :
++if ${ac_cv_prog_CC+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$CC"; then
+@@ -3230,7 +3238,7 @@ if test -z "$ac_cv_prog_CC"; then
+ set dummy gcc; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
++if ${ac_cv_prog_ac_ct_CC+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_CC"; then
+@@ -3283,7 +3291,7 @@ if test -z "$CC"; then
+ set dummy ${ac_tool_prefix}cc; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then :
++if ${ac_cv_prog_CC+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$CC"; then
+@@ -3323,7 +3331,7 @@ if test -z "$CC"; then
+ set dummy cc; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then :
++if ${ac_cv_prog_CC+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$CC"; then
+@@ -3382,7 +3390,7 @@ if test -z "$CC"; then
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then :
++if ${ac_cv_prog_CC+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$CC"; then
+@@ -3426,7 +3434,7 @@ do
+ set dummy $ac_prog; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
++if ${ac_cv_prog_ac_ct_CC+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_CC"; then
+@@ -3481,7 +3489,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
+@@ -3596,7 +3604,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; }
+@@ -3639,7 +3647,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
+@@ -3698,7 +3706,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
+@@ -3709,7 +3717,7 @@ rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
+ ac_clean_files=$ac_clean_files_save
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+ $as_echo_n "checking for suffix of object files... " >&6; }
+-if test "${ac_cv_objext+set}" = set; then :
++if ${ac_cv_objext+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -3750,7 +3758,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
+@@ -3760,7 +3768,7 @@ OBJEXT=$ac_cv_objext
+ ac_objext=$OBJEXT
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+ $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
++if ${ac_cv_c_compiler_gnu+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -3797,7 +3805,7 @@ ac_test_CFLAGS=${CFLAGS+set}
+ ac_save_CFLAGS=$CFLAGS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+ $as_echo_n "checking whether $CC accepts -g... " >&6; }
+-if test "${ac_cv_prog_cc_g+set}" = set; then :
++if ${ac_cv_prog_cc_g+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_save_c_werror_flag=$ac_c_werror_flag
+@@ -3875,7 +3883,7 @@ else
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+ $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+-if test "${ac_cv_prog_cc_c89+set}" = set; then :
++if ${ac_cv_prog_cc_c89+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_cv_prog_cc_c89=no
+@@ -3981,7 +3989,7 @@ if test "$enable_largefile" != no; then
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
+ $as_echo_n "checking for special C compiler options needed for large files... " >&6; }
+-if test "${ac_cv_sys_largefile_CC+set}" = set; then :
++if ${ac_cv_sys_largefile_CC+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_cv_sys_largefile_CC=no
+@@ -4032,7 +4040,7 @@ $as_echo "$ac_cv_sys_largefile_CC" >&6; }
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+ $as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
+-if test "${ac_cv_sys_file_offset_bits+set}" = set; then :
++if ${ac_cv_sys_file_offset_bits+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   while :; do
+@@ -4101,7 +4109,7 @@ rm -rf conftest*
+   if test $ac_cv_sys_file_offset_bits = unknown; then
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
+ $as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
+-if test "${ac_cv_sys_large_files+set}" = set; then :
++if ${ac_cv_sys_large_files+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   while :; do
+@@ -4173,7 +4181,7 @@ fi
+     echo "ac:  $ac_cv_sys_file_offset_bits"
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGEFILE64_SOURCE value needed for large files" >&5
+ $as_echo_n "checking for _LARGEFILE64_SOURCE value needed for large files... " >&6; }
+-if test "${largefile64_source+set}" = set; then :
++if ${largefile64_source+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -4276,7 +4284,7 @@ $as_echo "#define O_LARGEFILE 0" >>confdefs.h
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
+ $as_echo_n "checking for a BSD-compatible install... " >&6; }
+ if test -z "$INSTALL"; then
+-if test "${ac_cv_path_install+set}" = set; then :
++if ${ac_cv_path_install+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+@@ -4358,7 +4366,7 @@ $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+ $as_echo_n "checking build system type... " >&6; }
+-if test "${ac_cv_build+set}" = set; then :
++if ${ac_cv_build+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_build_alias=$build_alias
+@@ -4374,7 +4382,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='-'
+@@ -4392,7 +4400,7 @@ case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+ $as_echo_n "checking host system type... " >&6; }
+-if test "${ac_cv_host+set}" = set; then :
++if ${ac_cv_host+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test "x$host_alias" = x; then
+@@ -4407,7 +4415,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='-'
+@@ -4483,7 +4491,7 @@ else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+ $as_echo_n "checking for non-GNU ld... " >&6; }
+ fi
+-if test "${acl_cv_path_LD+set}" = set; then :
++if ${acl_cv_path_LD+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -z "$LD"; then
+@@ -4520,7 +4528,7 @@ fi
+ test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+ $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+-if test "${acl_cv_prog_gnu_ld+set}" = set; then :
++if ${acl_cv_prog_gnu_ld+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   # I'd rather use --version here, but apparently some GNU ld's only accept -v.
+@@ -4539,7 +4547,7 @@ with_gnu_ld=$acl_cv_prog_gnu_ld
+ 
+                               { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shared library path variable" >&5
+ $as_echo_n "checking for shared library path variable... " >&6; }
+-if test "${acl_cv_libpath+set}" = set; then :
++if ${acl_cv_libpath+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -4599,7 +4607,7 @@ if test -n "$CPP" && test -d "$CPP"; then
+   CPP=
+ fi
+ if test -z "$CPP"; then
+-  if test "${ac_cv_prog_CPP+set}" = set; then :
++  if ${ac_cv_prog_CPP+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+       # Double quotes because CPP needs to be expanded
+@@ -4715,7 +4723,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 $? "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
+@@ -4727,7 +4735,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+ $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
+-if test "${ac_cv_path_GREP+set}" = set; then :
++if ${ac_cv_path_GREP+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -z "$GREP"; then
+@@ -4790,7 +4798,7 @@ $as_echo "$ac_cv_path_GREP" >&6; }
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+ $as_echo_n "checking for egrep... " >&6; }
+-if test "${ac_cv_path_EGREP+set}" = set; then :
++if ${ac_cv_path_EGREP+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+@@ -4857,7 +4865,7 @@ $as_echo "$ac_cv_path_EGREP" >&6; }
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+ $as_echo_n "checking for ANSI C header files... " >&6; }
+-if test "${ac_cv_header_stdc+set}" = set; then :
++if ${ac_cv_header_stdc+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -5014,7 +5022,7 @@ done
+     for ac_func in _NSGetExecutablePath
+ do :
+   ac_fn_c_check_func "$LINENO" "_NSGetExecutablePath" "ac_cv_func__NSGetExecutablePath"
+-if test "x$ac_cv_func__NSGetExecutablePath" = x""yes; then :
++if test "x$ac_cv_func__NSGetExecutablePath" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE__NSGETEXECUTABLEPATH 1
+ _ACEOF
+@@ -5084,7 +5092,7 @@ _ACEOF
+ 
+                                                 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5
+ $as_echo_n "checking for shared library run path origin... " >&6; }
+-if test "${acl_cv_rpath+set}" = set; then :
++if ${acl_cv_rpath+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -5155,11 +5163,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
+@@ -5226,7 +5234,7 @@ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
+ $as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
+ if test -z "$MKDIR_P"; then
+-  if test "${ac_cv_path_mkdir+set}" = set; then :
++  if ${ac_cv_path_mkdir+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+@@ -5277,7 +5285,7 @@ do
+ set dummy $ac_prog; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_AWK+set}" = set; then :
++if ${ac_cv_prog_AWK+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$AWK"; then
+@@ -5317,7 +5325,7 @@ done
+ $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+ set x ${MAKE-make}
+ ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
++if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat >conftest.make <<\_ACEOF
+@@ -5480,7 +5488,7 @@ depcc="$CC"   am_compiler_list=
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+ $as_echo_n "checking dependency style of $depcc... " >&6; }
+-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
++if ${am_cv_CC_dependencies_compiler_type+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+@@ -5737,7 +5745,7 @@ if test -n "$CPP" && test -d "$CPP"; then
+   CPP=
+ fi
+ if test -z "$CPP"; then
+-  if test "${ac_cv_prog_CPP+set}" = set; then :
++  if ${ac_cv_prog_CPP+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+       # Double quotes because CPP needs to be expanded
+@@ -5853,7 +5861,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 $? "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
+@@ -5864,7 +5872,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+ $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
+-if test "${ac_cv_path_GREP+set}" = set; then :
++if ${ac_cv_path_GREP+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -z "$GREP"; then
+@@ -5970,7 +5978,7 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
++if ${ac_cv_path_PKG_CONFIG+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $PKG_CONFIG in
+@@ -6013,7 +6021,7 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then
+ set dummy pkg-config; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
++if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $ac_pt_PKG_CONFIG in
+@@ -6101,7 +6109,7 @@ if test -n "$ac_tool_prefix"; then
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_F77+set}" = set; then :
++if ${ac_cv_prog_F77+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$F77"; then
+@@ -6145,7 +6153,7 @@ do
+ set dummy $ac_prog; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_F77+set}" = set; then :
++if ${ac_cv_prog_ac_ct_F77+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_F77"; then
+@@ -6227,7 +6235,7 @@ ac_save_ext=$ac_ext
+ ac_ext=F
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU Fortran 77 compiler" >&5
+ $as_echo_n "checking whether we are using the GNU Fortran 77 compiler... " >&6; }
+-if test "${ac_cv_f77_compiler_gnu+set}" = set; then :
++if ${ac_cv_f77_compiler_gnu+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat > conftest.$ac_ext <<_ACEOF
+@@ -6255,7 +6263,7 @@ ac_save_FFLAGS=$FFLAGS
+ FFLAGS=
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $F77 accepts -g" >&5
+ $as_echo_n "checking whether $F77 accepts -g... " >&6; }
+-if test "${ac_cv_prog_f77_g+set}" = set; then :
++if ${ac_cv_prog_f77_g+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   FFLAGS=-g
+@@ -6318,7 +6326,7 @@ if test -n "$ac_tool_prefix"; then
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_F77+set}" = set; then :
++if ${ac_cv_prog_F77+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$F77"; then
+@@ -6362,7 +6370,7 @@ do
+ set dummy $ac_prog; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_F77+set}" = set; then :
++if ${ac_cv_prog_ac_ct_F77+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_F77"; then
+@@ -6444,7 +6452,7 @@ ac_save_ext=$ac_ext
+ ac_ext=F
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU Fortran 77 compiler" >&5
+ $as_echo_n "checking whether we are using the GNU Fortran 77 compiler... " >&6; }
+-if test "${ac_cv_f77_compiler_gnu+set}" = set; then :
++if ${ac_cv_f77_compiler_gnu+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat > conftest.$ac_ext <<_ACEOF
+@@ -6472,7 +6480,7 @@ ac_save_FFLAGS=$FFLAGS
+ FFLAGS=
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $F77 accepts -g" >&5
+ $as_echo_n "checking whether $F77 accepts -g... " >&6; }
+-if test "${ac_cv_prog_f77_g+set}" = set; then :
++if ${ac_cv_prog_f77_g+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   FFLAGS=-g
+@@ -6524,19 +6532,232 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ fi
+ 
+ if test -z "$F77"; then
+-## No Frotran compiler specified... We rely on Autoconf to find the best
++## No Fortran compiler specified... Prefer gfortran and intel compilers
+    ac_ext=f
+ ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
+ ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_f77_compiler_gnu
+ if test -n "$ac_tool_prefix"; then
++  for ac_prog in gfortran ifc ifort
++  do
++    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
++set dummy $ac_tool_prefix$ac_prog; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_prog_F77+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  if test -n "$F77"; then
++  ac_cv_prog_F77="$F77" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++  done
++IFS=$as_save_IFS
++
++fi
++fi
++F77=$ac_cv_prog_F77
++if test -n "$F77"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $F77" >&5
++$as_echo "$F77" >&6; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++
++    test -n "$F77" && break
++  done
++fi
++if test -z "$F77"; then
++  ac_ct_F77=$F77
++  for ac_prog in gfortran ifc ifort
++do
++  # Extract the first word of "$ac_prog", so it can be a program name with args.
++set dummy $ac_prog; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_prog_ac_ct_F77+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  if test -n "$ac_ct_F77"; then
++  ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_ac_ct_F77="$ac_prog"
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++  done
++IFS=$as_save_IFS
++
++fi
++fi
++ac_ct_F77=$ac_cv_prog_ac_ct_F77
++if test -n "$ac_ct_F77"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_F77" >&5
++$as_echo "$ac_ct_F77" >&6; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++
++  test -n "$ac_ct_F77" && break
++done
++
++  if test "x$ac_ct_F77" = x; then
++    F77=""
++  else
++    case $cross_compiling:$ac_tool_warned in
++yes:)
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++ac_tool_warned=yes ;;
++esac
++    F77=$ac_ct_F77
++  fi
++fi
++
++
++# Provide some information about the compiler.
++$as_echo "$as_me:${as_lineno-$LINENO}: checking for Fortran 77 compiler version" >&5
++set X $ac_compile
++ac_compiler=$2
++for ac_option in --version -v -V -qversion; do
++  { { ac_try="$ac_compiler $ac_option >&5"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
++  ac_status=$?
++  if test -s conftest.err; then
++    sed '10a\
++... rest of stderr output deleted ...
++         10q' conftest.err >conftest.er1
++    cat conftest.er1 >&5
++  fi
++  rm -f conftest.er1 conftest.err
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }
++done
++rm -f a.out
++
++# If we don't use `.F' as extension, the preprocessor is not run on the
++# input file.  (Note that this only needs to work for GNU compilers.)
++ac_save_ext=$ac_ext
++ac_ext=F
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU Fortran 77 compiler" >&5
++$as_echo_n "checking whether we are using the GNU Fortran 77 compiler... " >&6; }
++if ${ac_cv_f77_compiler_gnu+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  cat > conftest.$ac_ext <<_ACEOF
++      program main
++#ifndef __GNUC__
++       choke me
++#endif
++
++      end
++_ACEOF
++if ac_fn_f77_try_compile "$LINENO"; then :
++  ac_compiler_gnu=yes
++else
++  ac_compiler_gnu=no
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ac_cv_f77_compiler_gnu=$ac_compiler_gnu
++
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_f77_compiler_gnu" >&5
++$as_echo "$ac_cv_f77_compiler_gnu" >&6; }
++ac_ext=$ac_save_ext
++ac_test_FFLAGS=${FFLAGS+set}
++ac_save_FFLAGS=$FFLAGS
++FFLAGS=
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $F77 accepts -g" >&5
++$as_echo_n "checking whether $F77 accepts -g... " >&6; }
++if ${ac_cv_prog_f77_g+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  FFLAGS=-g
++cat > conftest.$ac_ext <<_ACEOF
++      program main
++
++      end
++_ACEOF
++if ac_fn_f77_try_compile "$LINENO"; then :
++  ac_cv_prog_f77_g=yes
++else
++  ac_cv_prog_f77_g=no
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_f77_g" >&5
++$as_echo "$ac_cv_prog_f77_g" >&6; }
++if test "$ac_test_FFLAGS" = set; then
++  FFLAGS=$ac_save_FFLAGS
++elif test $ac_cv_prog_f77_g = yes; then
++  if test "x$ac_cv_f77_compiler_gnu" = xyes; then
++    FFLAGS="-g -O2"
++  else
++    FFLAGS="-g"
++  fi
++else
++  if test "x$ac_cv_f77_compiler_gnu" = xyes; then
++    FFLAGS="-O2"
++  else
++    FFLAGS=
++  fi
++fi
++
++if test $ac_compiler_gnu = yes; then
++  G77=yes
++else
++  G77=
++fi
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++   if test -z "$F77"; then
++        # Best effort to find a compiler (might be g77)
++	ac_ext=f
++ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
++ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_f77_compiler_gnu
++if test -n "$ac_tool_prefix"; then
+   for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgfortran pgf95 lf95 ftn
+   do
+     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_F77+set}" = set; then :
++if ${ac_cv_prog_F77+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$F77"; then
+@@ -6580,7 +6801,7 @@ do
+ set dummy $ac_prog; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_F77+set}" = set; then :
++if ${ac_cv_prog_ac_ct_F77+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_F77"; then
+@@ -6662,7 +6883,7 @@ ac_save_ext=$ac_ext
+ ac_ext=F
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU Fortran 77 compiler" >&5
+ $as_echo_n "checking whether we are using the GNU Fortran 77 compiler... " >&6; }
+-if test "${ac_cv_f77_compiler_gnu+set}" = set; then :
++if ${ac_cv_f77_compiler_gnu+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat > conftest.$ac_ext <<_ACEOF
+@@ -6690,7 +6911,7 @@ ac_save_FFLAGS=$FFLAGS
+ FFLAGS=
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $F77 accepts -g" >&5
+ $as_echo_n "checking whether $F77 accepts -g... " >&6; }
+-if test "${ac_cv_prog_f77_g+set}" = set; then :
++if ${ac_cv_prog_f77_g+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   FFLAGS=-g
+@@ -6736,6 +6957,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
++   fi
+ fi
+ 
+ 
+@@ -6808,7 +7030,7 @@ if test -n "$ac_tool_prefix"; then
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then :
++if ${ac_cv_prog_CC+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$CC"; then
+@@ -6852,7 +7074,7 @@ do
+ set dummy $ac_prog; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
++if ${ac_cv_prog_ac_ct_CC+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_CC"; then
+@@ -6905,7 +7127,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
+@@ -6934,7 +7156,7 @@ done
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+ $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
++if ${ac_cv_c_compiler_gnu+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -6971,7 +7193,7 @@ ac_test_CFLAGS=${CFLAGS+set}
+ ac_save_CFLAGS=$CFLAGS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+ $as_echo_n "checking whether $CC accepts -g... " >&6; }
+-if test "${ac_cv_prog_cc_g+set}" = set; then :
++if ${ac_cv_prog_cc_g+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_save_c_werror_flag=$ac_c_werror_flag
+@@ -7049,7 +7271,7 @@ else
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+ $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+-if test "${ac_cv_prog_cc_c89+set}" = set; then :
++if ${ac_cv_prog_cc_c89+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_cv_prog_cc_c89=no
+@@ -7162,7 +7384,7 @@ if test -n "$ac_tool_prefix"; then
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then :
++if ${ac_cv_prog_CC+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$CC"; then
+@@ -7206,7 +7428,7 @@ do
+ set dummy $ac_prog; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
++if ${ac_cv_prog_ac_ct_CC+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_CC"; then
+@@ -7259,7 +7481,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
+@@ -7288,7 +7510,7 @@ done
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+ $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
++if ${ac_cv_c_compiler_gnu+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -7325,7 +7547,7 @@ ac_test_CFLAGS=${CFLAGS+set}
+ ac_save_CFLAGS=$CFLAGS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+ $as_echo_n "checking whether $CC accepts -g... " >&6; }
+-if test "${ac_cv_prog_cc_g+set}" = set; then :
++if ${ac_cv_prog_cc_g+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_save_c_werror_flag=$ac_c_werror_flag
+@@ -7403,7 +7625,7 @@ else
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+ $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+-if test "${ac_cv_prog_cc_c89+set}" = set; then :
++if ${ac_cv_prog_cc_c89+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_cv_prog_cc_c89=no
+@@ -7515,7 +7737,7 @@ if test -n "$ac_tool_prefix"; then
+ set dummy ${ac_tool_prefix}gcc; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then :
++if ${ac_cv_prog_CC+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$CC"; then
+@@ -7555,7 +7777,7 @@ if test -z "$ac_cv_prog_CC"; then
+ set dummy gcc; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
++if ${ac_cv_prog_ac_ct_CC+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_CC"; then
+@@ -7608,7 +7830,7 @@ if test -z "$CC"; then
+ set dummy ${ac_tool_prefix}cc; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then :
++if ${ac_cv_prog_CC+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$CC"; then
+@@ -7648,7 +7870,7 @@ if test -z "$CC"; then
+ set dummy cc; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then :
++if ${ac_cv_prog_CC+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$CC"; then
+@@ -7707,7 +7929,7 @@ if test -z "$CC"; then
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then :
++if ${ac_cv_prog_CC+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$CC"; then
+@@ -7751,7 +7973,7 @@ do
+ set dummy $ac_prog; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
++if ${ac_cv_prog_ac_ct_CC+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_CC"; then
+@@ -7806,7 +8028,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
+@@ -7835,7 +8057,7 @@ done
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+ $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
++if ${ac_cv_c_compiler_gnu+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -7872,7 +8094,7 @@ ac_test_CFLAGS=${CFLAGS+set}
+ ac_save_CFLAGS=$CFLAGS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+ $as_echo_n "checking whether $CC accepts -g... " >&6; }
+-if test "${ac_cv_prog_cc_g+set}" = set; then :
++if ${ac_cv_prog_cc_g+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_save_c_werror_flag=$ac_c_werror_flag
+@@ -7950,7 +8172,7 @@ else
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+ $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+-if test "${ac_cv_prog_cc_c89+set}" = set; then :
++if ${ac_cv_prog_cc_c89+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_cv_prog_cc_c89=no
+@@ -8057,7 +8279,7 @@ fi
+ # This bug is HP SR number 8606223364.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5
+ $as_echo_n "checking size of int... " >&6; }
+-if test "${ac_cv_sizeof_int+set}" = set; then :
++if ${ac_cv_sizeof_int+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int"        "$ac_includes_default"; then :
+@@ -8067,7 +8289,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
+@@ -8090,7 +8312,7 @@ _ACEOF
+ # This bug is HP SR number 8606223364.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
+ $as_echo_n "checking size of long... " >&6; }
+-if test "${ac_cv_sizeof_long+set}" = set; then :
++if ${ac_cv_sizeof_long+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"; then :
+@@ -8100,7 +8322,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
+@@ -8135,7 +8357,7 @@ if test -z "$CXX"; then
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CXX+set}" = set; then :
++if ${ac_cv_prog_CXX+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$CXX"; then
+@@ -8179,7 +8401,7 @@ do
+ set dummy $ac_prog; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
++if ${ac_cv_prog_ac_ct_CXX+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_CXX"; then
+@@ -8257,7 +8479,7 @@ done
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
+ $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
+-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
++if ${ac_cv_cxx_compiler_gnu+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -8294,7 +8516,7 @@ ac_test_CXXFLAGS=${CXXFLAGS+set}
+ ac_save_CXXFLAGS=$CXXFLAGS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
+ $as_echo_n "checking whether $CXX accepts -g... " >&6; }
+-if test "${ac_cv_prog_cxx_g+set}" = set; then :
++if ${ac_cv_prog_cxx_g+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_save_cxx_werror_flag=$ac_cxx_werror_flag
+@@ -8380,7 +8602,7 @@ depcc="$CXX"  am_compiler_list=
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+ $as_echo_n "checking dependency style of $depcc... " >&6; }
+-if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then :
++if ${am_cv_CXX_dependencies_compiler_type+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+@@ -8514,7 +8736,7 @@ case $CXX in
+ set dummy $CXX; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_cxx_present+set}" = set; then :
++if ${ac_cv_prog_cxx_present+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$cxx_present"; then
+@@ -8565,7 +8787,7 @@ $as_echo_n "checking whether cc understands -c and -o together... " >&6; }
+ fi
+ set dummy $CC; ac_cc=`$as_echo "$2" |
+ 		      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
+-if eval "test \"\${ac_cv_prog_cc_${ac_cc}_c_o+set}\"" = set; then :
++if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -8688,7 +8910,7 @@ ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_f77_compiler_gnu
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $F77 understands -c and -o together" >&5
+ $as_echo_n "checking whether $F77 understands -c and -o together... " >&6; }
+-if test "${ac_cv_prog_f77_c_o+set}" = set; then :
++if ${ac_cv_prog_f77_c_o+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat > conftest.$ac_ext <<_ACEOF
+@@ -9193,7 +9415,7 @@ if test "$enable_code_coverage" = yes; then
+ set dummy lcov; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_LCOV+set}" = set; then :
++if ${ac_cv_path_LCOV+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $LCOV in
+@@ -9236,7 +9458,7 @@ fi
+ set dummy genhtml; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_GENHTML+set}" = set; then :
++if ${ac_cv_path_GENHTML+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $GENHTML in
+@@ -9317,6 +9539,21 @@ else
+ fi
+ 
+ 
++################
++## SSE
++## By default, for x86 CPU, enable the SSE.
++## Note that it is already the case with 64 bits CPU
++## (these extensions are enabled by default by gcc)
++################
++
++case "$host" in
++     i*86-linux-gnu|i*86-*-linux-gnu)
++        CFLAGS="$CFLAGS -msse"
++        FFLAGS="$FFLAGS -msse"
++        CPPFLAGS="$CPPFLAGS -msse"
++     ;;
++esac
++
+ #######################
+ ## test for underscores (name mangling issues between C and fortran)
+ #######################
+@@ -9328,7 +9565,7 @@ do
+ set dummy $ac_prog; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_NM+set}" = set; then :
++if ${ac_cv_prog_NM+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$NM"; then
+@@ -9535,7 +9772,7 @@ if test "x$with_hdf5_include" != "xyes"; then
+     save_CFLAGS="$CFLAGS"
+     CFLAGS="-I$with_hdf5_include"
+     ac_fn_c_check_header_mongrel "$LINENO" "hdf5.h" "ac_cv_header_hdf5_h" "$ac_includes_default"
+-if test "x$ac_cv_header_hdf5_h" = x""yes; then :
++if test "x$ac_cv_header_hdf5_h" = xyes; then :
+   HDF5_CFLAGS="$CFLAGS"
+ else
+   as_fn_error $? "Cannot find headers (hdf5.h) of the library HDF5 in $with_hdf5_include. Please install the dev package" "$LINENO" 5
+@@ -9547,7 +9784,7 @@ fi
+ else
+     HDF5_CFLAGS=""
+     ac_fn_c_check_header_mongrel "$LINENO" "hdf5.h" "ac_cv_header_hdf5_h" "$ac_includes_default"
+-if test "x$ac_cv_header_hdf5_h" = x""yes; then :
++if test "x$ac_cv_header_hdf5_h" = xyes; then :
+   HDF5_CFLAGS=""
+ else
+   as_fn_error $? "Cannot find headers (hdf5.h) of the library HDF5. Please install the dev package" "$LINENO" 5
+@@ -9564,7 +9801,7 @@ if test "x$with_hdf5_library" != "xyes"; then
+     LIBS="$LIBS $HDF5_LIBS"
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for H5Fopen in -lhdf5" >&5
+ $as_echo_n "checking for H5Fopen in -lhdf5... " >&6; }
+-if test "${ac_cv_lib_hdf5_H5Fopen+set}" = set; then :
++if ${ac_cv_lib_hdf5_H5Fopen+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -9598,7 +9835,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_hdf5_H5Fopen" >&5
+ $as_echo "$ac_cv_lib_hdf5_H5Fopen" >&6; }
+-if test "x$ac_cv_lib_hdf5_H5Fopen" = x""yes; then :
++if test "x$ac_cv_lib_hdf5_H5Fopen" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBHDF5 1
+ _ACEOF
+@@ -9616,7 +9853,7 @@ else
+     LIBS="$LIBS $HDF5_LIBS"
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for H5Fopen in -lhdf5" >&5
+ $as_echo_n "checking for H5Fopen in -lhdf5... " >&6; }
+-if test "${ac_cv_lib_hdf5_H5Fopen+set}" = set; then :
++if ${ac_cv_lib_hdf5_H5Fopen+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -9650,7 +9887,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_hdf5_H5Fopen" >&5
+ $as_echo "$ac_cv_lib_hdf5_H5Fopen" >&6; }
+-if test "x$ac_cv_lib_hdf5_H5Fopen" = x""yes; then :
++if test "x$ac_cv_lib_hdf5_H5Fopen" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBHDF5 1
+ _ACEOF
+@@ -9719,7 +9956,7 @@ $as_echo "#define WITH_XCOS /**/" >>confdefs.h
+ 
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clock_gettime in -lrt" >&5
+ $as_echo_n "checking for clock_gettime in -lrt... " >&6; }
+-if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then :
++if ${ac_cv_lib_rt_clock_gettime+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -9753,7 +9990,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_clock_gettime" >&5
+ $as_echo "$ac_cv_lib_rt_clock_gettime" >&6; }
+-if test "x$ac_cv_lib_rt_clock_gettime" = x""yes; then :
++if test "x$ac_cv_lib_rt_clock_gettime" = xyes; then :
+   RT_LIB="-lrt";
+ 
+ $as_echo "#define HAVE_CLOCK_GETTIME 1" >>confdefs.h
+@@ -9782,7 +10019,7 @@ fi
+ set dummy ocamlc; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_OCAMLC+set}" = set; then :
++if ${ac_cv_prog_OCAMLC+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$OCAMLC"; then
+@@ -9824,7 +10061,7 @@ $as_echo "$as_me: WARNING: ocamlc not found. Mandatory to build the Scicos model
+ set dummy ocamlopt; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_OCAMLOPT+set}" = set; then :
++if ${ac_cv_prog_OCAMLOPT+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$OCAMLOPT"; then
+@@ -9866,7 +10103,7 @@ $as_echo "$as_me: WARNING: ocamlopt not found. Mandatory to build the Scicos mod
+ set dummy ocamldep; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_OCAMLDEP+set}" = set; then :
++if ${ac_cv_prog_OCAMLDEP+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$OCAMLDEP"; then
+@@ -9908,7 +10145,7 @@ $as_echo "$as_me: WARNING: ocamldep not found. Mandatory to build the Scicos mod
+ set dummy ocamlyacc; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_OCAMLYACC+set}" = set; then :
++if ${ac_cv_prog_OCAMLYACC+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$OCAMLYACC"; then
+@@ -9950,7 +10187,7 @@ $as_echo "$as_me: WARNING: ocamlyacc not found. Mandatory to build the Scicos mo
+ set dummy ocamllex; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_OCAMLLEX+set}" = set; then :
++if ${ac_cv_prog_OCAMLLEX+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$OCAMLLEX"; then
+@@ -10133,7 +10370,7 @@ $as_echo "Darwin (Mac OS X) found. Use the standard paths." >&6; }
+ set dummy javac; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_JAVAC+set}" = set; then :
++if ${ac_cv_path_JAVAC+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $JAVAC in
+@@ -10268,7 +10505,7 @@ $as_echo "$ac_java_classpath" >&6; }
+ $as_echo_n "checking to see if the java compiler works... " >&6; }
+ 
+     cat << \EOF > conftest.java
+-// #line 10271 "configure"
++// #line 10508 "configure"
+ 
+ 
+ public class conftest {
+@@ -10334,7 +10571,7 @@ $as_echo_n "checking type of jvm... " >&6; }
+     if test "x$ac_java_jvm_name" = "x" ; then
+ 
+     cat << \EOF > conftest.java
+-// #line 10337 "configure"
++// #line 10574 "configure"
+ import gnu.java.io.EncodingManager;
+ 
+ public class conftest {
+@@ -10386,7 +10623,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
+@@ -10396,9 +10633,8 @@ $as_echo_n "checking java API version... " >&6; }
+ 
+     # The class java.nio.charset.Charset is new to 1.4
+ 
+-
+     cat << \EOF > conftest.java
+-// #line 10401 "configure"
++// #line 10637 "configure"
+ import java.nio.charset.Charset;
+ 
+ public class conftest {
+@@ -10441,9 +10677,8 @@ EOF
+ 
+     # The class java.lang.StringBuilder is new to 1.5
+ 
+-
+     cat << \EOF > conftest.java
+-// #line 10446 "configure"
++// #line 10681 "configure"
+ import java.lang.StringBuilder;
+ 
+ public class conftest {
+@@ -10486,9 +10721,8 @@ EOF
+ 
+     # The class java.util.ArrayDeque is new to 1.6
+ 
+-
+     cat << \EOF > conftest.java
+-// #line 10491 "configure"
++// #line 10725 "configure"
+ import java.util.ArrayDeque;
+ 
+ public class conftest {
+@@ -10529,6 +10763,50 @@ EOF
+             fi
+ 
+ 
++    # The class java.nio.file.Path is new to 1.7
++
++    cat << \EOF > conftest.java
++// #line 10769 "configure"
++import java.nio.file.Path;
++
++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
++              ac_java_jvm_version=1.7
++       else
++              cmd="$JAVA conftest"
++              if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5); then
++               echo "yes" >&5
++                  ac_java_jvm_version=1.7
++            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
++                            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
++            fi
++
++
+     if test "x$ac_java_jvm_version" = "x" ; then
+         as_fn_error $? "Could not detect Java version, 1.4 or newer is required" "$LINENO" 5
+     fi
+@@ -10596,7 +10874,7 @@ $as_echo "$ac_java_jvm_version" >&6; }
+ 
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking if jni.h can be included" >&5
+ $as_echo_n "checking if jni.h can be included... " >&6; }
+-if test "${ac_cv_java_jvm_jni_working+set}" = set; then :
++if ${ac_cv_java_jvm_jni_working+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -10664,17 +10942,20 @@ $as_echo "$ac_cv_java_jvm_jni_working" >&6; }
+           machine=sparc
+           ;;
+         powerpc|ppc64)
+-            machine=ppc
++          machine=ppc
+           ;;
+-          armv*)
++        armv*)
+           machine=arm
+           ;;
+-          s390x) # s390 arch can also returns s390x
++        s390x) # s390 arch can also returns s390x
+           machine=s390
+           ;;
+         sh*)
+             machine=sh
+           ;;
++        mips64)
++            machine=mips
++          ;;
+     esac
+ 
+ 
+@@ -10718,8 +10999,10 @@ $as_echo "$ac_cv_java_jvm_jni_working" >&6; }
+                 ac_java_jvm_jni_lib_runtime_path="${ac_java_jvm_jni_lib_runtime_path}:$D"
+                 ac_java_jvm_jni_lib_flags="$ac_java_jvm_jni_lib_flags -L$D -ljvm"
+                 D=$ac_java_jvm_dir/jre/lib/$machine/native_threads
+-                ac_java_jvm_jni_lib_runtime_path="${ac_java_jvm_jni_lib_runtime_path}:$D"
+-                ac_java_jvm_jni_lib_flags="$ac_java_jvm_jni_lib_flags -L$D -lhpi"
++                if test -d $D; then
++                  ac_java_jvm_jni_lib_runtime_path="${ac_java_jvm_jni_lib_runtime_path}:$D"
++                  ac_java_jvm_jni_lib_flags="$ac_java_jvm_jni_lib_flags -L$D -lhpi"
++                fi
+             fi
+         fi
+ 
+@@ -10849,8 +11132,10 @@ $as_echo "$ac_cv_java_jvm_jni_working" >&6; }
+                 ac_java_jvm_jni_lib_runtime_path="${ac_java_jvm_jni_lib_runtime_path}:$D"
+                 ac_java_jvm_jni_lib_flags="$ac_java_jvm_jni_lib_flags -L$D -ljvm"
+                 D=$ac_java_jvm_dir/jre/lib/mipsel/native_threads
+-                ac_java_jvm_jni_lib_runtime_path="${ac_java_jvm_jni_lib_runtime_path}:$D"
+-                ac_java_jvm_jni_lib_flags="$ac_java_jvm_jni_lib_flags -L$D -lhpi"
++                if test -d $D; then
++                  ac_java_jvm_jni_lib_runtime_path="${ac_java_jvm_jni_lib_runtime_path}:$D"
++                  ac_java_jvm_jni_lib_flags="$ac_java_jvm_jni_lib_flags -L$D -lhpi"
++                fi
+             fi
+         fi
+ 
+@@ -10886,7 +11171,7 @@ $as_echo "$ac_cv_java_jvm_jni_working" >&6; }
+ 
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if we can link a JNI application" >&5
+ $as_echo_n "checking to see if we can link a JNI application... " >&6; }
+-if test "${ac_cv_java_jvm_working_jni_link+set}" = set; then :
++if ${ac_cv_java_jvm_working_jni_link+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -11046,7 +11331,7 @@ $as_echo "$ac_java_classpath" >&6; }
+ set dummy java; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_JAVA+set}" = set; then :
++if ${ac_cv_path_JAVA+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $JAVA in
+@@ -11087,7 +11372,7 @@ fi
+ set dummy java; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_JAVA+set}" = set; then :
++if ${ac_cv_path_JAVA+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $JAVA in
+@@ -11141,7 +11426,7 @@ fi
+ set dummy java_g; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_JAVA_G+set}" = set; then :
++if ${ac_cv_path_JAVA_G+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $JAVA_G in
+@@ -11182,7 +11467,7 @@ fi
+ set dummy java_g; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_JAVA_G+set}" = set; then :
++if ${ac_cv_path_JAVA_G+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $JAVA_G in
+@@ -11236,7 +11521,7 @@ fi
+ set dummy $TOOL; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_JAVAH+set}" = set; then :
++if ${ac_cv_path_JAVAH+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $JAVAH in
+@@ -11277,7 +11562,7 @@ fi
+ set dummy $TOOL; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_JAVAH+set}" = set; then :
++if ${ac_cv_path_JAVAH+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $JAVAH in
+@@ -11330,7 +11615,7 @@ fi
+ set dummy jar; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_JAR+set}" = set; then :
++if ${ac_cv_path_JAR+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $JAR in
+@@ -11371,7 +11656,7 @@ fi
+ set dummy jar; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_JAR+set}" = set; then :
++if ${ac_cv_path_JAR+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $JAR in
+@@ -11424,7 +11709,7 @@ fi
+ set dummy javadoc; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_JAVADOC+set}" = set; then :
++if ${ac_cv_path_JAVADOC+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $JAVADOC in
+@@ -11465,7 +11750,7 @@ fi
+ set dummy javadoc; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_JAVADOC+set}" = set; then :
++if ${ac_cv_path_JAVADOC+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $JAVADOC in
+@@ -11519,7 +11804,7 @@ fi
+ set dummy jdb; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_JDB+set}" = set; then :
++if ${ac_cv_path_JDB+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $JDB in
+@@ -11560,7 +11845,7 @@ fi
+ set dummy jdb; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_JDB+set}" = set; then :
++if ${ac_cv_path_JDB+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $JDB in
+@@ -11633,7 +11918,7 @@ fi
+ set dummy ant; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_ANT+set}" = set; then :
++if ${ac_cv_path_ANT+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $ANT in
+@@ -11674,7 +11959,7 @@ fi
+ set dummy ant; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_ANT+set}" = set; then :
++if ${ac_cv_path_ANT+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $ANT in
+@@ -11729,7 +12014,7 @@ fi
+ set dummy ant; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_ANT+set}" = set; then :
++if ${ac_cv_path_ANT+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $ANT in
+@@ -11770,7 +12055,7 @@ fi
+ set dummy ant; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_ANT+set}" = set; then :
++if ${ac_cv_path_ANT+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $ANT in
+@@ -11836,7 +12121,7 @@ $as_echo_n "checking jgraphx... " >&6; }
+     PACKAGE_JAR_FILE=
+     found_jar=no
+     saved_ac_java_classpath=$ac_java_classpath
+-    DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/ 2>/dev/null) $(ls -d /usr/lib64/*/ 2>/dev/null) $(ls -d /usr/lib/*/ 2>/dev/null)  $(ls -d /usr/share/*/lib/ 2>/dev/null)"
++    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/jgraphx.jar" "$jardir/libjgraphx.jar" "$jardir/libjgraphx-java.jar" "$jardir/jgraphx*.jar"; do
+ #    jar=`echo $jar|sed -e 's/ /\\ /'`
+@@ -11850,7 +12135,7 @@ $as_echo_n "checking jgraphx... " >&6; }
+           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+ 
+     cat << \EOF > conftest.java
+-// #line 11853 "configure"
++// #line 12138 "configure"
+ import com.mxgraph.model.mxCell;
+ 
+ public class conftest {
+@@ -11944,7 +12229,7 @@ $as_echo_n "checking minimal version (1.4.1.0) of jgraphx... " >&6; }
+    if test "x=" == "x"; then
+ 
+     cat << \EOF > conftest.java
+-// #line 11947 "configure"
++// #line 12232 "configure"
+ import com.mxgraph.view.mxGraph;
+ 
+ public class conftest {
+@@ -11995,7 +12280,7 @@ EOF
+    else
+ 
+     cat << \EOF > conftest.java
+-// #line 11998 "configure"
++// #line 12283 "configure"
+ import com.mxgraph.view.mxGraph;
+ 
+ public class conftest {
+@@ -12058,7 +12343,7 @@ $as_echo_n "checking jhdf5... " >&6; }
+     PACKAGE_JAR_FILE=
+     found_jar=no
+     saved_ac_java_classpath=$ac_java_classpath
+-    DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/ 2>/dev/null) $(ls -d /usr/lib64/*/ 2>/dev/null) $(ls -d /usr/lib/*/ 2>/dev/null)  $(ls -d /usr/share/*/lib/ 2>/dev/null)"
++    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/jhdf5.jar" "$jardir/libjhdf5.jar" "$jardir/libjhdf5-java.jar" "$jardir/jhdf5*.jar"; do
+ #    jar=`echo $jar|sed -e 's/ /\\ /'`
+@@ -12072,7 +12357,7 @@ $as_echo_n "checking jhdf5... " >&6; }
+           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+ 
+     cat << \EOF > conftest.java
+-// #line 12075 "configure"
++// #line 12360 "configure"
+ import ncsa.hdf.hdf5lib.HDF5Constants;
+ 
+ public class conftest {
+@@ -12162,13 +12447,15 @@ $as_echo "$as_me: WARNING: Could not find or use the Java package/jar jhdf5 used
+                          echo "Check of the presence of libjhdf5.jnilib disabled under Mac OS X"
+                       else
+ 
+-     LDFLAGS_save=$LDFLAGS
+-   # Provide known paths where distribs/OS can store JNI libs
+-        LDFLAGS="-L/usr/lib/jni -L/usr/lib64/jni/ -L$SCI_SRCDIR/bin/ -L$SCI_SRCDIR/thirdparty/  -lpthread $HDF5_LIBS"
++      LDFLAGS_save=$LDFLAGS
++      # Provide known paths where distribs/OS can store JNI libs
++      LDFLAGS="$LDFLAGS -L/usr/lib/jni -L/usr/lib64/jni"                   # Debian
++      LDFLAGS="$LDFLAGS -L/usr/lib/jhdf5 -L/usr/lib64/jhdf5"               # RedHat
++      LDFLAGS="$LDFLAGS -L$SCI_SRCDIR/thirdparty -L$SCI_SRCDIR/bin"        # Scilab
+    # -lpthread because of packaging bug in jhdf5
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for h5JNIFatalError in -ljhdf5" >&5
+ $as_echo_n "checking for h5JNIFatalError in -ljhdf5... " >&6; }
+-if test "${ac_cv_lib_jhdf5_h5JNIFatalError+set}" = set; then :
++if ${ac_cv_lib_jhdf5_h5JNIFatalError+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -12202,7 +12489,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jhdf5_h5JNIFatalError" >&5
+ $as_echo "$ac_cv_lib_jhdf5_h5JNIFatalError" >&6; }
+-if test "x$ac_cv_lib_jhdf5_h5JNIFatalError" = x""yes; then :
++if test "x$ac_cv_lib_jhdf5_h5JNIFatalError" = xyes; then :
+   JHDF5_LIBS="-ljhdf5"
+ else
+   as_fn_error $? "libjhdf5: Library missing (Cannot find symbol h5JNIFatalError). Check if libjhdf5 - C/Java (JNI) interface for HDF5 - is installed and if the version is correct. Note that you might have to update etc/librarypath.xml to provide the actual path the the JNI libraries." "$LINENO" 5
+@@ -12211,7 +12498,9 @@ fi
+       LDFLAGS=$LDFLAGS_save
+ 
+       LD_LIBRARY_PATH_save=$LD_LIBRARY_PATH
+-      LD_LIBRARY_PATH="/usr/lib/jni:/usr/lib64/jni/:$SCI_SRCDIR/bin/:$SCI_SRCDIR/thirdparty/:$with_hdf5_library"
++      LD_LIBRARY_PATH="/usr/lib/jni:/usr/lib64/jni:"
++      LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/lib/jhdf5:/usr/lib64/jhdf5:"
++      LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$SCI_SRCDIR/bin/:$SCI_SRCDIR/thirdparty/:$with_hdf5_library"
+       export LD_LIBRARY_PATH
+ 
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking minimal version (1.8.4) of hdf5" >&5
+@@ -12221,7 +12510,7 @@ $as_echo_n "checking minimal version (1.8.4) of hdf5... " >&6; }
+    if test "x" == "x"; then
+ 
+     cat << \EOF > conftest.java
+-// #line 12224 "configure"
++// #line 12513 "configure"
+ import ncsa.hdf.hdf5lib.H5;
+ 
+ public class conftest {
+@@ -12276,7 +12565,7 @@ EOF
+    else
+ 
+     cat << \EOF > conftest.java
+-// #line 12279 "configure"
++// #line 12568 "configure"
+ import ncsa.hdf.hdf5lib.H5;
+ 
+ public class conftest {
+@@ -12346,7 +12635,7 @@ $as_echo_n "checking flexdock... " >&6; }
+     PACKAGE_JAR_FILE=
+     found_jar=no
+     saved_ac_java_classpath=$ac_java_classpath
+-    DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/ 2>/dev/null) $(ls -d /usr/lib64/*/ 2>/dev/null) $(ls -d /usr/lib/*/ 2>/dev/null)  $(ls -d /usr/share/*/lib/ 2>/dev/null)"
++    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/flexdock.jar" "$jardir/libflexdock.jar" "$jardir/libflexdock-java.jar" "$jardir/flexdock*.jar"; do
+ #    jar=`echo $jar|sed -e 's/ /\\ /'`
+@@ -12360,7 +12649,7 @@ $as_echo_n "checking flexdock... " >&6; }
+           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+ 
+     cat << \EOF > conftest.java
+-// #line 12363 "configure"
++// #line 12652 "configure"
+ import org.flexdock.docking.DockingManager;
+ 
+ public class conftest {
+@@ -12454,7 +12743,7 @@ $as_echo_n "checking minimal version (0.5.2) of flexdock... " >&6; }
+    if test "x" == "x"; then
+ 
+     cat << \EOF > conftest.java
+-// #line 12457 "configure"
++// #line 12746 "configure"
+ import org.flexdock.util.Utilities;
+ 
+ public class conftest {
+@@ -12505,7 +12794,7 @@ EOF
+    else
+ 
+     cat << \EOF > conftest.java
+-// #line 12508 "configure"
++// #line 12797 "configure"
+ import org.flexdock.util.Utilities;
+ 
+ public class conftest {
+@@ -12564,7 +12853,7 @@ $as_echo_n "checking looks... " >&6; }
+     PACKAGE_JAR_FILE=
+     found_jar=no
+     saved_ac_java_classpath=$ac_java_classpath
+-    DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/ 2>/dev/null) $(ls -d /usr/lib64/*/ 2>/dev/null) $(ls -d /usr/lib/*/ 2>/dev/null)  $(ls -d /usr/share/*/lib/ 2>/dev/null)"
++    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/looks.jar" "$jardir/liblooks.jar" "$jardir/liblooks-java.jar" "$jardir/looks*.jar"; do
+ #    jar=`echo $jar|sed -e 's/ /\\ /'`
+@@ -12578,7 +12867,7 @@ $as_echo_n "checking looks... " >&6; }
+           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+ 
+     cat << \EOF > conftest.java
+-// #line 12581 "configure"
++// #line 12870 "configure"
+ import com.jgoodies.looks.common.MenuItemRenderer;
+ 
+ public class conftest {
+@@ -12663,7 +12952,7 @@ $as_echo "$as_me: WARNING: Could not find or use the Java package/jar looks used
+ 
+                 LOOKS=$PACKAGE_JAR_FILE
+ 
+-                # Named differently under ArchLinux
++                # Named differently under ArchLinux or Fedora
+                 if test -z "$LOOKS"; then
+ 
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking jgoodies-looks" >&5
+@@ -12671,7 +12960,7 @@ $as_echo_n "checking jgoodies-looks... " >&6; }
+     PACKAGE_JAR_FILE=
+     found_jar=no
+     saved_ac_java_classpath=$ac_java_classpath
+-    DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/ 2>/dev/null) $(ls -d /usr/lib64/*/ 2>/dev/null) $(ls -d /usr/lib/*/ 2>/dev/null)  $(ls -d /usr/share/*/lib/ 2>/dev/null)"
++    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/jgoodies-looks.jar" "$jardir/libjgoodies-looks.jar" "$jardir/libjgoodies-looks-java.jar" "$jardir/jgoodies-looks*.jar"; do
+ #    jar=`echo $jar|sed -e 's/ /\\ /'`
+@@ -12685,7 +12974,7 @@ $as_echo_n "checking jgoodies-looks... " >&6; }
+           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+ 
+     cat << \EOF > conftest.java
+-// #line 12688 "configure"
++// #line 12977 "configure"
+ import com.jgoodies.looks.common.MenuItemRenderer;
+ 
+ public class conftest {
+@@ -12779,7 +13068,7 @@ $as_echo_n "checking skinlf... " >&6; }
+     PACKAGE_JAR_FILE=
+     found_jar=no
+     saved_ac_java_classpath=$ac_java_classpath
+-    DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/ 2>/dev/null) $(ls -d /usr/lib64/*/ 2>/dev/null) $(ls -d /usr/lib/*/ 2>/dev/null)  $(ls -d /usr/share/*/lib/ 2>/dev/null)"
++    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/skinlf.jar" "$jardir/libskinlf.jar" "$jardir/libskinlf-java.jar" "$jardir/skinlf*.jar"; do
+ #    jar=`echo $jar|sed -e 's/ /\\ /'`
+@@ -12793,7 +13082,7 @@ $as_echo_n "checking skinlf... " >&6; }
+           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+ 
+     cat << \EOF > conftest.java
+-// #line 12796 "configure"
++// #line 13085 "configure"
+ import com.l2fprod.util.AccessUtils;
+ 
+ public class conftest {
+@@ -12886,7 +13175,7 @@ $as_echo_n "checking jogl... " >&6; }
+     PACKAGE_JAR_FILE=
+     found_jar=no
+     saved_ac_java_classpath=$ac_java_classpath
+-    DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/ 2>/dev/null) $(ls -d /usr/lib64/*/ 2>/dev/null) $(ls -d /usr/lib/*/ 2>/dev/null)  $(ls -d /usr/share/*/lib/ 2>/dev/null)"
++    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/jogl.jar" "$jardir/libjogl.jar" "$jardir/libjogl-java.jar" "$jardir/jogl*.jar"; do
+ #    jar=`echo $jar|sed -e 's/ /\\ /'`
+@@ -12900,7 +13189,7 @@ $as_echo_n "checking jogl... " >&6; }
+           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+ 
+     cat << \EOF > conftest.java
+-// #line 12903 "configure"
++// #line 13192 "configure"
+ import javax.media.opengl.glu.GLUnurbs;
+ 
+ public class conftest {
+@@ -12991,10 +13280,12 @@ $as_echo "$as_me: WARNING: Could not find or use the Java package/jar jogl used
+                 else
+                    LDFLAGS_save=$LDFLAGS
+                    # Provide known paths where distribs/OS can store JNI libs
+-                   LDFLAGS="-L/usr/lib/jni -L/usr/lib64/jni/ -L$SCI_SRCDIR/thirdparty/ -L$SCI_SRCDIR/bin/"
++                   LDFLAGS="$LDFLAGS -L/usr/lib/jni -L/usr/lib64/jni"                   # Debian
++                   LDFLAGS="$LDFLAGS -L/usr/lib/jogl -L/usr/lib64/jogl"                 # RedHat
++                   LDFLAGS="$LDFLAGS -L$SCI_SRCDIR/thirdparty -L$SCI_SRCDIR/bin"        # Scilab thirdparties
+                    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glTexParameterf in -ljogl" >&5
+ $as_echo_n "checking for glTexParameterf in -ljogl... " >&6; }
+-if test "${ac_cv_lib_jogl_glTexParameterf+set}" = set; then :
++if ${ac_cv_lib_jogl_glTexParameterf+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -13028,7 +13319,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jogl_glTexParameterf" >&5
+ $as_echo "$ac_cv_lib_jogl_glTexParameterf" >&6; }
+-if test "x$ac_cv_lib_jogl_glTexParameterf" = x""yes; then :
++if test "x$ac_cv_lib_jogl_glTexParameterf" = xyes; then :
+   JOGL_LIBS="-ljogl"
+ else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not link against -ljogl. Will try against -ljogl -lGL" >&5
+@@ -13041,7 +13332,7 @@ fi
+                           as_ac_Lib=`$as_echo "ac_cv_lib_jogl ''_glTexParameterf" | $as_tr_sh`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glTexParameterf in -ljogl " >&5
+ $as_echo_n "checking for glTexParameterf in -ljogl ... " >&6; }
+-if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
++if eval \${$as_ac_Lib+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -13098,7 +13389,7 @@ $as_echo_n "checking gluegen-rt... " >&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)"
++    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/gluegen-rt.jar" "$jardir/libgluegen-rt.jar" "$jardir/libgluegen-rt-java.jar" "$jardir/gluegen-rt*.jar"; do
+ #    jar=`echo $jar|sed -e 's/ /\\ /'`
+@@ -13112,7 +13403,7 @@ $as_echo_n "checking gluegen-rt... " >&6; }
+           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+ 
+     cat << \EOF > conftest.java
+-// #line 13115 "configure"
++// #line 13406 "configure"
+ import com.sun.gluegen.runtime.CPU;
+ 
+ public class conftest {
+@@ -13203,12 +13494,14 @@ $as_echo "$as_me: WARNING: Could not find or use the Java package/jar gluegen-rt
+                 else
+                    LDFLAGS_save=$LDFLAGS
+                    # Provide known paths where distribs/OS can store JNI libs
+-                   LDFLAGS="-L/usr/lib/jni -L/usr/lib64/jni/ -ldl -L$SCI_SRCDIR/thirdparty/ -L$SCI_SRCDIR/bin/"
++                   LDFLAGS="$LDFLAGS -L/usr/lib/jni -L/usr/lib64/jni"                   # Debian
++                   LDFLAGS="$LDFLAGS -L/usr/lib/gluegen -L/usr/lib64/gluegen"           # RedHat
++                   LDFLAGS="$LDFLAGS -L$SCI_SRCDIR/thirdparty -L$SCI_SRCDIR/bin"        # Scilab thirdparties
+                    symbol="Java_com_sun_gluegen_runtime_UnixDynamicLinkerImpl_dlclose__J"
+                    as_ac_Lib=`$as_echo "ac_cv_lib_gluegen-rt_$symbol" | $as_tr_sh`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $symbol in -lgluegen-rt" >&5
+ $as_echo_n "checking for $symbol in -lgluegen-rt... " >&6; }
+-if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
++if eval \${$as_ac_Lib+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -13259,7 +13552,7 @@ $as_echo_n "checking jhall... " >&6; }
+     PACKAGE_JAR_FILE=
+     found_jar=no
+     saved_ac_java_classpath=$ac_java_classpath
+-    DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/ 2>/dev/null) $(ls -d /usr/lib64/*/ 2>/dev/null) $(ls -d /usr/lib/*/ 2>/dev/null)  $(ls -d /usr/share/*/lib/ 2>/dev/null)"
++    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/jhall.jar" "$jardir/libjhall.jar" "$jardir/libjhall-java.jar" "$jardir/jhall*.jar"; do
+ #    jar=`echo $jar|sed -e 's/ /\\ /'`
+@@ -13273,7 +13566,7 @@ $as_echo_n "checking jhall... " >&6; }
+           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+ 
+     cat << \EOF > conftest.java
+-// #line 13276 "configure"
++// #line 13569 "configure"
+ import javax.help.JHelp;
+ 
+ public class conftest {
+@@ -13358,7 +13651,7 @@ $as_echo "$as_me: WARNING: Could not find or use the Java package/jar jhall used
+ 
+                 JHALL=$PACKAGE_JAR_FILE
+ 
+-                # Named differently under Mandriva
++                # Named differently under Mandriva or Fedora
+                 if test -z "$JHALL"; then
+ 
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking javahelp2" >&5
+@@ -13366,7 +13659,7 @@ $as_echo_n "checking javahelp2... " >&6; }
+     PACKAGE_JAR_FILE=
+     found_jar=no
+     saved_ac_java_classpath=$ac_java_classpath
+-    DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/ 2>/dev/null) $(ls -d /usr/lib64/*/ 2>/dev/null) $(ls -d /usr/lib/*/ 2>/dev/null)  $(ls -d /usr/share/*/lib/ 2>/dev/null)"
++    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/javahelp2.jar" "$jardir/libjavahelp2.jar" "$jardir/libjavahelp2-java.jar" "$jardir/javahelp2*.jar"; do
+ #    jar=`echo $jar|sed -e 's/ /\\ /'`
+@@ -13380,7 +13673,7 @@ $as_echo_n "checking javahelp2... " >&6; }
+           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+ 
+     cat << \EOF > conftest.java
+-// #line 13383 "configure"
++// #line 13676 "configure"
+ import javax.help.JHelp;
+ 
+ public class conftest {
+@@ -13474,7 +13767,7 @@ $as_echo_n "checking jrosetta-API... " >&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)"
++    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/jrosetta-API.jar" "$jardir/libjrosetta-API.jar" "$jardir/libjrosetta-API-java.jar" "$jardir/jrosetta-API*.jar"; do
+ #    jar=`echo $jar|sed -e 's/ /\\ /'`
+@@ -13488,7 +13781,7 @@ $as_echo_n "checking jrosetta-API... " >&6; }
+           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+ 
+     cat << \EOF > conftest.java
+-// #line 13491 "configure"
++// #line 13784 "configure"
+ import com.artenum.rosetta.interfaces.core.ConsoleConfiguration;
+ 
+ public class conftest {
+@@ -13572,6 +13865,112 @@ $as_echo "$as_me: WARNING: Could not find or use the Java package/jar jrosetta-A
+     fi
+ 
+                 JROSETTA_API=$PACKAGE_JAR_FILE
++		if test -z "$JROSETTA_API"; then
++
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking jrosetta-api" >&5
++$as_echo_n "checking jrosetta-api... " >&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/jrosetta-api.jar" "$jardir/libjrosetta-api.jar" "$jardir/libjrosetta-api-java.jar" "$jardir/jrosetta-api*.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 13889 "configure"
++import com.artenum.rosetta.interfaces.core.ConsoleConfiguration;
++
++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"; then
++         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar jrosetta-api used by JRosetta : Console API Artenum / Scilab (looking for package com.artenum.rosetta.interfaces.core.ConsoleConfiguration)" >&5
++$as_echo "$as_me: WARNING: Could not find or use the Java package/jar jrosetta-api used by JRosetta : Console API Artenum / Scilab (looking for package com.artenum.rosetta.interfaces.core.ConsoleConfiguration)" >&2;}
++      else
++          as_fn_error $? "Could not find or use the Java package/jar jrosetta-api used by JRosetta : Console API Artenum / Scilab (looking for package com.artenum.rosetta.interfaces.core.ConsoleConfiguration)" "$LINENO" 5
++      fi
++    fi
++
++        	        JROSETTA_API=$PACKAGE_JAR_FILE
++		fi
+ 
+ 
+                 # Console Core
+@@ -13581,7 +13980,7 @@ $as_echo_n "checking jrosetta-engine... " >&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)"
++    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/jrosetta-engine.jar" "$jardir/libjrosetta-engine.jar" "$jardir/libjrosetta-engine-java.jar" "$jardir/jrosetta-engine*.jar"; do
+ #    jar=`echo $jar|sed -e 's/ /\\ /'`
+@@ -13595,7 +13994,7 @@ $as_echo_n "checking jrosetta-engine... " >&6; }
+           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+ 
+     cat << \EOF > conftest.java
+-// #line 13598 "configure"
++// #line 13997 "configure"
+ import com.artenum.rosetta.core.action.AbstractConsoleAction;
+ 
+ public class conftest {
+@@ -13681,6 +14080,116 @@ $as_echo "$as_me: WARNING: Could not find or use the Java package/jar jrosetta-e
+                 JROSETTA_ENGINE=$PACKAGE_JAR_FILE
+ 
+ 
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking minimal version (1.0.4) of jrosetta-engine" >&5
++$as_echo_n "checking minimal version (1.0.4) of jrosetta-engine... " >&6; }
++   saved_ac_java_classpath=$ac_java_classpath
++   export ac_java_classpath="$JROSETTA_ENGINE:$ac_java_classpath"
++   if test "x" == "x"; then
++
++    cat << \EOF > conftest.java
++// #line 14090 "configure"
++import com.artenum.rosetta.util.ConfigurationBuilder;
++
++public class conftest {
++    public static void main(String[] argv) {
++        String minVersion="1.0.4";
++
++                            System.out.println(ConfigurationBuilder.getVersion());
++                                  if (minVersion.compareTo(ConfigurationBuilder.getVersion()) > 0) {
++                                   System.exit(-1);
++                                }
++
++    }
++}
++EOF
++
++    CLASSPATH=$ac_java_classpath
++    export CLASSPATH
++    cmd="$JAVAC ${JAVAC_FLAGS} conftest.java"
++    if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5) ; then
++       if test ""yes"" = "no"; then
++           echo "yes" >&5
++              echo "yes"
++       else
++              cmd="$JAVA conftest"
++              if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5); then
++               echo "yes" >&5
++                  echo "yes"
++            else
++                echo "configure: failed program was:" >&5
++                cat conftest.java >&5
++                if test -s conftest.java.output; then
++                   STDOUT=`cat conftest.java.output`
++                fi
++                echo "configure: CLASSPATH was $CLASSPATH" >&5
++                  as_fn_error $? "Wrong version of jrosetta-engine. Expected at least 1.0.4. Found $STDOUT" "$LINENO" 5
++                            fi
++        fi
++        if test -f conftest.java.output; then
++           rm conftest.java.output
++        fi
++    else
++        echo "configure: failed program was:" >&5
++        cat conftest.java >&5
++        echo "configure: CLASSPATH was $CLASSPATH" >&5
++          as_fn_error $? "Wrong version of jrosetta-engine. Expected at least 1.0.4. Found $STDOUT" "$LINENO" 5
++            fi
++
++   else
++
++    cat << \EOF > conftest.java
++// #line 14141 "configure"
++import com.artenum.rosetta.util.ConfigurationBuilder;
++
++public class conftest {
++    public static void main(String[] argv) {
++        String minVersion="1.0.4";
++
++                            System.out.println(ConfigurationBuilder.getVersion());
++                                  if (minVersion.compareTo(ConfigurationBuilder.getVersion()) != 0) {
++                                   System.exit(-1);
++                                }
++
++    }
++}
++EOF
++
++    CLASSPATH=$ac_java_classpath
++    export CLASSPATH
++    cmd="$JAVAC ${JAVAC_FLAGS} conftest.java"
++    if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5) ; then
++       if test ""yes"" = "no"; then
++           echo "yes" >&5
++              echo "yes"
++       else
++              cmd="$JAVA conftest"
++              if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5); then
++               echo "yes" >&5
++                  echo "yes"
++            else
++                echo "configure: failed program was:" >&5
++                cat conftest.java >&5
++                if test -s conftest.java.output; then
++                   STDOUT=`cat conftest.java.output`
++                fi
++                echo "configure: CLASSPATH was $CLASSPATH" >&5
++                  as_fn_error $? "Wrong version of jrosetta-engine. Expected exact version 1.0.4. Found $STDOUT" "$LINENO" 5
++                            fi
++        fi
++        if test -f conftest.java.output; then
++           rm conftest.java.output
++        fi
++    else
++        echo "configure: failed program was:" >&5
++        cat conftest.java >&5
++        echo "configure: CLASSPATH was $CLASSPATH" >&5
++          as_fn_error $? "Wrong version of jrosetta-engine. Expected exact version 1.0.4. Found $STDOUT" "$LINENO" 5
++            fi
++
++    fi
++   ac_java_classpath=$saved_ac_java_classpath
++
++
+ 
+                 # MathML rendering solution
+                 # Used in both graphic & help
+@@ -13690,7 +14199,7 @@ $as_echo_n "checking jeuclid-core... " >&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)"
++    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/jeuclid-core.jar" "$jardir/libjeuclid-core.jar" "$jardir/libjeuclid-core-java.jar" "$jardir/jeuclid-core*.jar"; do
+ #    jar=`echo $jar|sed -e 's/ /\\ /'`
+@@ -13704,7 +14213,7 @@ $as_echo_n "checking jeuclid-core... " >&6; }
+           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+ 
+     cat << \EOF > conftest.java
+-// #line 13707 "configure"
++// #line 14216 "configure"
+ import net.sourceforge.jeuclid.LayoutContext;
+ 
+ public class conftest {
+@@ -13799,7 +14308,7 @@ $as_echo_n "checking fop... " >&6; }
+     PACKAGE_JAR_FILE=
+     found_jar=no
+     saved_ac_java_classpath=$ac_java_classpath
+-    DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/ 2>/dev/null) $(ls -d /usr/lib64/*/ 2>/dev/null) $(ls -d /usr/lib/*/ 2>/dev/null)  $(ls -d /usr/share/*/lib/ 2>/dev/null)"
++    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/fop.jar" "$jardir/libfop.jar" "$jardir/libfop-java.jar" "$jardir/fop*.jar"; do
+ #    jar=`echo $jar|sed -e 's/ /\\ /'`
+@@ -13813,7 +14322,7 @@ $as_echo_n "checking fop... " >&6; }
+           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+ 
+     cat << \EOF > conftest.java
+-// #line 13816 "configure"
++// #line 14325 "configure"
+ import org.apache.fop.pdf.PDFInfo;
+ 
+ public class conftest {
+@@ -13906,7 +14415,7 @@ $as_echo_n "checking batik-all... " >&6; }
+     PACKAGE_JAR_FILE=
+     found_jar=no
+     saved_ac_java_classpath=$ac_java_classpath
+-    DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/ 2>/dev/null) $(ls -d /usr/lib64/*/ 2>/dev/null) $(ls -d /usr/lib/*/ 2>/dev/null)  $(ls -d /usr/share/*/lib/ 2>/dev/null)"
++    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/batik-all.jar" "$jardir/libbatik-all.jar" "$jardir/libbatik-all-java.jar" "$jardir/batik-all*.jar"; do
+ #    jar=`echo $jar|sed -e 's/ /\\ /'`
+@@ -13920,7 +14429,7 @@ $as_echo_n "checking batik-all... " >&6; }
+           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+ 
+     cat << \EOF > conftest.java
+-// #line 13923 "configure"
++// #line 14432 "configure"
+ import org.apache.batik.parser.Parser;
+ 
+ public class conftest {
+@@ -14013,7 +14522,7 @@ $as_echo_n "checking batik... " >&6; }
+     PACKAGE_JAR_FILE=
+     found_jar=no
+     saved_ac_java_classpath=$ac_java_classpath
+-    DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/ 2>/dev/null) $(ls -d /usr/lib64/*/ 2>/dev/null) $(ls -d /usr/lib/*/ 2>/dev/null)  $(ls -d /usr/share/*/lib/ 2>/dev/null)"
++    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/batik.jar" "$jardir/libbatik.jar" "$jardir/libbatik-java.jar" "$jardir/batik*.jar"; do
+ #    jar=`echo $jar|sed -e 's/ /\\ /'`
+@@ -14027,7 +14536,7 @@ $as_echo_n "checking batik... " >&6; }
+           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+ 
+     cat << \EOF > conftest.java
+-// #line 14030 "configure"
++// #line 14539 "configure"
+ import org.apache.batik.parser.Parser;
+ 
+ public class conftest {
+@@ -14121,7 +14630,7 @@ $as_echo_n "checking minimal version (1.7) of batik... " >&6; }
+    if test "x" == "x"; then
+ 
+     cat << \EOF > conftest.java
+-// #line 14124 "configure"
++// #line 14633 "configure"
+ import org.apache.batik.Version;
+ 
+ public class conftest {
+@@ -14172,7 +14681,7 @@ EOF
+    else
+ 
+     cat << \EOF > conftest.java
+-// #line 14175 "configure"
++// #line 14684 "configure"
+ import org.apache.batik.Version;
+ 
+ public class conftest {
+@@ -14231,7 +14740,7 @@ $as_echo_n "checking commons-io... " >&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)"
++    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/commons-io.jar" "$jardir/libcommons-io.jar" "$jardir/libcommons-io-java.jar" "$jardir/commons-io*.jar"; do
+ #    jar=`echo $jar|sed -e 's/ /\\ /'`
+@@ -14245,7 +14754,7 @@ $as_echo_n "checking commons-io... " >&6; }
+           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+ 
+     cat << \EOF > conftest.java
+-// #line 14248 "configure"
++// #line 14757 "configure"
+ import org.apache.commons.io.output.CountingOutputStream;
+ 
+ public class conftest {
+@@ -14338,7 +14847,7 @@ $as_echo_n "checking xmlgraphics-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)"
++    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/xmlgraphics-commons.jar" "$jardir/libxmlgraphics-commons.jar" "$jardir/libxmlgraphics-commons-java.jar" "$jardir/xmlgraphics-commons*.jar"; do
+ #    jar=`echo $jar|sed -e 's/ /\\ /'`
+@@ -14352,7 +14861,7 @@ $as_echo_n "checking xmlgraphics-commons... " >&6; }
+           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+ 
+     cat << \EOF > conftest.java
+-// #line 14355 "configure"
++// #line 14864 "configure"
+ import org.apache.xmlgraphics.util.Service;
+ 
+ public class conftest {
+@@ -14445,7 +14954,7 @@ $as_echo_n "checking avalon-framework... " >&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)"
++    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/avalon-framework.jar" "$jardir/libavalon-framework.jar" "$jardir/libavalon-framework-java.jar" "$jardir/avalon-framework*.jar"; do
+ #    jar=`echo $jar|sed -e 's/ /\\ /'`
+@@ -14459,7 +14968,7 @@ $as_echo_n "checking avalon-framework... " >&6; }
+           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+ 
+     cat << \EOF > conftest.java
+-// #line 14462 "configure"
++// #line 14971 "configure"
+ import org.apache.avalon.framework.configuration.ConfigurationException;
+ 
+ public class conftest {
+@@ -14552,7 +15061,7 @@ $as_echo_n "checking xml-apis-ext... " >&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)"
++    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/xml-apis-ext.jar" "$jardir/libxml-apis-ext.jar" "$jardir/libxml-apis-ext-java.jar" "$jardir/xml-apis-ext*.jar"; do
+ #    jar=`echo $jar|sed -e 's/ /\\ /'`
+@@ -14566,7 +15075,7 @@ $as_echo_n "checking xml-apis-ext... " >&6; }
+           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+ 
+     cat << \EOF > conftest.java
+-// #line 14569 "configure"
++// #line 15078 "configure"
+ import org.w3c.dom.svg.SVGDocument;
+ 
+ public class conftest {
+@@ -14659,7 +15168,7 @@ $as_echo_n "checking xml-commons-apis-ext... " >&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)"
++    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/xml-commons-apis-ext.jar" "$jardir/libxml-commons-apis-ext.jar" "$jardir/libxml-commons-apis-ext-java.jar" "$jardir/xml-commons-apis-ext*.jar"; do
+ #    jar=`echo $jar|sed -e 's/ /\\ /'`
+@@ -14673,7 +15182,7 @@ $as_echo_n "checking xml-commons-apis-ext... " >&6; }
+           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+ 
+     cat << \EOF > conftest.java
+-// #line 14676 "configure"
++// #line 15185 "configure"
+ import org.w3c.dom.svg.SVGDocument;
+ 
+ public class conftest {
+@@ -14770,7 +15279,7 @@ $as_echo_n "checking commons-logging... " >&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)"
++    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/commons-logging.jar" "$jardir/libcommons-logging.jar" "$jardir/libcommons-logging-java.jar" "$jardir/commons-logging*.jar"; do
+ #    jar=`echo $jar|sed -e 's/ /\\ /'`
+@@ -14784,7 +15293,7 @@ $as_echo_n "checking commons-logging... " >&6; }
+           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+ 
+     cat << \EOF > conftest.java
+-// #line 14787 "configure"
++// #line 15296 "configure"
+ import org.apache.commons.logging.LogFactory;
+ 
+ public class conftest {
+@@ -14877,7 +15386,7 @@ $as_echo_n "checking jlatexmath... " >&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)"
++    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/jlatexmath.jar" "$jardir/libjlatexmath.jar" "$jardir/libjlatexmath-java.jar" "$jardir/jlatexmath*.jar"; do
+ #    jar=`echo $jar|sed -e 's/ /\\ /'`
+@@ -14891,7 +15400,7 @@ $as_echo_n "checking jlatexmath... " >&6; }
+           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+ 
+     cat << \EOF > conftest.java
+-// #line 14894 "configure"
++// #line 15403 "configure"
+ import org.scilab.forge.jlatexmath.TeXFormula;
+ 
+ public class conftest {
+@@ -14985,7 +15494,7 @@ $as_echo_n "checking minimal version (0.9.4) of jlatexmath... " >&6; }
+    if test "x" == "x"; then
+ 
+     cat << \EOF > conftest.java
+-// #line 14988 "configure"
++// #line 15497 "configure"
+ import org.scilab.forge.jlatexmath.TeXFormula;
+ 
+ public class conftest {
+@@ -15036,7 +15545,7 @@ EOF
+    else
+ 
+     cat << \EOF > conftest.java
+-// #line 15039 "configure"
++// #line 15548 "configure"
+ import org.scilab.forge.jlatexmath.TeXFormula;
+ 
+ public class conftest {
+@@ -15101,7 +15610,7 @@ $as_echo_n "checking checkstyle... " >&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)"
++    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/checkstyle.jar" "$jardir/libcheckstyle.jar" "$jardir/libcheckstyle-java.jar" "$jardir/checkstyle*.jar"; do
+ #    jar=`echo $jar|sed -e 's/ /\\ /'`
+@@ -15115,7 +15624,7 @@ $as_echo_n "checking checkstyle... " >&6; }
+           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+ 
+     cat << \EOF > conftest.java
+-// #line 15118 "configure"
++// #line 15627 "configure"
+ import com.puppycrawl.tools.checkstyle.CheckStyleTask;
+ 
+ public class conftest {
+@@ -15208,7 +15717,7 @@ $as_echo_n "checking commons-beanutils... " >&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)"
++    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/commons-beanutils.jar" "$jardir/libcommons-beanutils.jar" "$jardir/libcommons-beanutils-java.jar" "$jardir/commons-beanutils*.jar"; do
+ #    jar=`echo $jar|sed -e 's/ /\\ /'`
+@@ -15222,7 +15731,7 @@ $as_echo_n "checking commons-beanutils... " >&6; }
+           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+ 
+     cat << \EOF > conftest.java
+-// #line 15225 "configure"
++// #line 15734 "configure"
+ import org.apache.commons.beanutils.Converter;
+ 
+ public class conftest {
+@@ -15315,7 +15824,7 @@ $as_echo_n "checking antlr... " >&6; }
+     PACKAGE_JAR_FILE=
+     found_jar=no
+     saved_ac_java_classpath=$ac_java_classpath
+-    DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/ 2>/dev/null) $(ls -d /usr/lib64/*/ 2>/dev/null) $(ls -d /usr/lib/*/ 2>/dev/null)  $(ls -d /usr/share/*/lib/ 2>/dev/null)"
++    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/antlr.jar" "$jardir/libantlr.jar" "$jardir/libantlr-java.jar" "$jardir/antlr*.jar"; do
+ #    jar=`echo $jar|sed -e 's/ /\\ /'`
+@@ -15329,7 +15838,7 @@ $as_echo_n "checking antlr... " >&6; }
+           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+ 
+     cat << \EOF > conftest.java
+-// #line 15332 "configure"
++// #line 15841 "configure"
+ import antlr.TokenStreamException;
+ 
+ public class conftest {
+@@ -15422,7 +15931,7 @@ $as_echo_n "checking testng... " >&6; }
+     PACKAGE_JAR_FILE=
+     found_jar=no
+     saved_ac_java_classpath=$ac_java_classpath
+-    DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/ 2>/dev/null) $(ls -d /usr/lib64/*/ 2>/dev/null) $(ls -d /usr/lib/*/ 2>/dev/null)  $(ls -d /usr/share/*/lib/ 2>/dev/null)"
++    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/testng.jar" "$jardir/libtestng.jar" "$jardir/libtestng-java.jar" "$jardir/testng*.jar"; do
+ #    jar=`echo $jar|sed -e 's/ /\\ /'`
+@@ -15436,7 +15945,7 @@ $as_echo_n "checking testng... " >&6; }
+           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+ 
+     cat << \EOF > conftest.java
+-// #line 15439 "configure"
++// #line 15948 "configure"
+ import org.testng.TestNG;
+ 
+ public class conftest {
+@@ -15529,7 +16038,7 @@ $as_echo_n "checking qdox... " >&6; }
+     PACKAGE_JAR_FILE=
+     found_jar=no
+     saved_ac_java_classpath=$ac_java_classpath
+-    DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/ 2>/dev/null) $(ls -d /usr/lib64/*/ 2>/dev/null) $(ls -d /usr/lib/*/ 2>/dev/null)  $(ls -d /usr/share/*/lib/ 2>/dev/null)"
++    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/qdox.jar" "$jardir/libqdox.jar" "$jardir/libqdox-java.jar" "$jardir/qdox*.jar"; do
+ #    jar=`echo $jar|sed -e 's/ /\\ /'`
+@@ -15543,7 +16052,7 @@ $as_echo_n "checking qdox... " >&6; }
+           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+ 
+     cat << \EOF > conftest.java
+-// #line 15546 "configure"
++// #line 16055 "configure"
+ import com.thoughtworks.qdox.tools.QDoxTester;
+ 
+ public class conftest {
+@@ -15636,7 +16145,7 @@ $as_echo_n "checking bsh... " >&6; }
+     PACKAGE_JAR_FILE=
+     found_jar=no
+     saved_ac_java_classpath=$ac_java_classpath
+-    DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/ 2>/dev/null) $(ls -d /usr/lib64/*/ 2>/dev/null) $(ls -d /usr/lib/*/ 2>/dev/null)  $(ls -d /usr/share/*/lib/ 2>/dev/null)"
++    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/bsh.jar" "$jardir/libbsh.jar" "$jardir/libbsh-java.jar" "$jardir/bsh*.jar"; do
+ #    jar=`echo $jar|sed -e 's/ /\\ /'`
+@@ -15650,7 +16159,7 @@ $as_echo_n "checking bsh... " >&6; }
+           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+ 
+     cat << \EOF > conftest.java
+-// #line 15653 "configure"
++// #line 16162 "configure"
+ import bsh.Console;
+ 
+ public class conftest {
+@@ -15743,7 +16252,7 @@ $as_echo_n "checking junit... " >&6; }
+     PACKAGE_JAR_FILE=
+     found_jar=no
+     saved_ac_java_classpath=$ac_java_classpath
+-    DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/ 2>/dev/null) $(ls -d /usr/lib64/*/ 2>/dev/null) $(ls -d /usr/lib/*/ 2>/dev/null)  $(ls -d /usr/share/*/lib/ 2>/dev/null)"
++    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/junit.jar" "$jardir/libjunit.jar" "$jardir/libjunit-java.jar" "$jardir/junit*.jar"; do
+ #    jar=`echo $jar|sed -e 's/ /\\ /'`
+@@ -15757,7 +16266,7 @@ $as_echo_n "checking junit... " >&6; }
+           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+ 
+     cat << \EOF > conftest.java
+-// #line 15760 "configure"
++// #line 16269 "configure"
+ import junit.framework.Assert;
+ 
+ public class conftest {
+@@ -15870,7 +16379,7 @@ $as_echo "$as_me: WARNING: We do not support $ac_java_jvm_name yet" >&2;}
+ set dummy swig; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_SWIG_BIN+set}" = set; then :
++if ${ac_cv_path_SWIG_BIN+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $SWIG_BIN in
+@@ -15959,7 +16468,7 @@ do
+ set dummy $ac_prog; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_PYTHON+set}" = set; then :
++if ${ac_cv_prog_PYTHON+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$PYTHON"; then
+@@ -16020,7 +16529,7 @@ do
+ set dummy $ac_prog; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_GIWS_BIN+set}" = set; then :
++if ${ac_cv_prog_GIWS_BIN+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$GIWS_BIN"; then
+@@ -16061,7 +16570,32 @@ test -n "$GIWS_BIN" || GIWS_BIN="no"
+ 		as_fn_error $? "Could find giws in the PATH" "$LINENO" 5
+    fi
+ fi
+-chmod +x $GIWS_BIN
++
++if test -f $GIWS_BIN; then
++   chmod +x $GIWS_BIN
++fi
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GIWS version" >&5
++$as_echo_n "checking for GIWS version... " >&6; }
++giws_version=`$GIWS_BIN --version 2>&1 | grep 'GIWS' | sed 's/.*\([0-9]\+\.[0-9]\+\.[0-9]\+\).*/\1/g'`
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $giws_version" >&5
++$as_echo "$giws_version" >&6; }
++if test -n "$giws_version" ; then
++	# Calculate the required version number
++    giws_tmp=`echo  | sed 's/[^0-9]\+/ /g'`
++    giws_required_version=`echo $giws_tmp | awk '{print  1000000 * $ 1 +  1000 * $ 2 + $ 3}'`
++
++	# Calculate the available version number
++    giws_tmp=`echo $giws_version | sed 's/[^0-9]\+/ /g'`
++    giws_tmp=`echo $giws_tmp | awk '{print  1000000 * $ 1 +  1000 * $ 2 + $ 3}'`
++
++	if test $giws_required_version -gt $giws_tmp ; then
++       as_fn_error $? "GIWS version  is required, $giws_version detected" "$LINENO" 5
++    fi
++else
++	as_fn_error $? "cannot determine GIWS version" "$LINENO" 5
++fi
++
+ 
+ 
+ 
+@@ -16154,7 +16688,7 @@ done
+ for ac_func in rmdir
+ do :
+   ac_fn_c_check_func "$LINENO" "rmdir" "ac_cv_func_rmdir"
+-if test "x$ac_cv_func_rmdir" = x""yes; then :
++if test "x$ac_cv_func_rmdir" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_RMDIR 1
+ _ACEOF
+@@ -16164,7 +16698,7 @@ done
+ 
+ 
+ ac_fn_c_check_func "$LINENO" "getwd" "ac_cv_func_getwd"
+-if test "x$ac_cv_func_getwd" = x""yes; then :
++if test "x$ac_cv_func_getwd" = xyes; then :
+ 
+ $as_echo "#define HAVE_GETWD 1" >>confdefs.h
+ 
+@@ -16179,7 +16713,7 @@ fi
+ for ac_func in regcomp
+ do :
+   ac_fn_c_check_func "$LINENO" "regcomp" "ac_cv_func_regcomp"
+-if test "x$ac_cv_func_regcomp" = x""yes; then :
++if test "x$ac_cv_func_regcomp" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_REGCOMP 1
+ _ACEOF
+@@ -16220,7 +16754,7 @@ done
+ for ac_func in select
+ do :
+   ac_fn_c_check_func "$LINENO" "select" "ac_cv_func_select"
+-if test "x$ac_cv_func_select" = x""yes; then :
++if test "x$ac_cv_func_select" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_SELECT 1
+ _ACEOF
+@@ -16233,7 +16767,7 @@ done
+ for ac_func in endpwent
+ do :
+   ac_fn_c_check_func "$LINENO" "endpwent" "ac_cv_func_endpwent"
+-if test "x$ac_cv_func_endpwent" = x""yes; then :
++if test "x$ac_cv_func_endpwent" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_ENDPWENT 1
+ _ACEOF
+@@ -16260,7 +16794,7 @@ done
+ for ac_func in gettimeofday
+ do :
+   ac_fn_c_check_func "$LINENO" "gettimeofday" "ac_cv_func_gettimeofday"
+-if test "x$ac_cv_func_gettimeofday" = x""yes; then :
++if test "x$ac_cv_func_gettimeofday" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_GETTIMEOFDAY 1
+ _ACEOF
+@@ -16273,7 +16807,7 @@ done
+ for ac_func in isascii
+ do :
+   ac_fn_c_check_func "$LINENO" "isascii" "ac_cv_func_isascii"
+-if test "x$ac_cv_func_isascii" = x""yes; then :
++if test "x$ac_cv_func_isascii" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_ISASCII 1
+ _ACEOF
+@@ -16286,7 +16820,7 @@ done
+ for ac_func in iswprint
+ do :
+   ac_fn_c_check_func "$LINENO" "iswprint" "ac_cv_func_iswprint"
+-if test "x$ac_cv_func_iswprint" = x""yes; then :
++if test "x$ac_cv_func_iswprint" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_ISWPRINT 1
+ _ACEOF
+@@ -16299,7 +16833,7 @@ done
+ for ac_func in mkdir
+ do :
+   ac_fn_c_check_func "$LINENO" "mkdir" "ac_cv_func_mkdir"
+-if test "x$ac_cv_func_mkdir" = x""yes; then :
++if test "x$ac_cv_func_mkdir" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_MKDIR 1
+ _ACEOF
+@@ -16312,7 +16846,7 @@ done
+ for ac_func in munmap
+ do :
+   ac_fn_c_check_func "$LINENO" "munmap" "ac_cv_func_munmap"
+-if test "x$ac_cv_func_munmap" = x""yes; then :
++if test "x$ac_cv_func_munmap" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_MUNMAP 1
+ _ACEOF
+@@ -16325,7 +16859,7 @@ done
+ for ac_func in strsignal
+ do :
+   ac_fn_c_check_func "$LINENO" "strsignal" "ac_cv_func_strsignal"
+-if test "x$ac_cv_func_strsignal" = x""yes; then :
++if test "x$ac_cv_func_strsignal" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRSIGNAL 1
+ _ACEOF
+@@ -16345,7 +16879,7 @@ case $host in
+ *-ncr-sysv4.3*)
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _mwvalidcheckl in -lmw" >&5
+ $as_echo_n "checking for _mwvalidcheckl in -lmw... " >&6; }
+-if test "${ac_cv_lib_mw__mwvalidcheckl+set}" = set; then :
++if ${ac_cv_lib_mw__mwvalidcheckl+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -16379,13 +16913,13 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mw__mwvalidcheckl" >&5
+ $as_echo "$ac_cv_lib_mw__mwvalidcheckl" >&6; }
+-if test "x$ac_cv_lib_mw__mwvalidcheckl" = x""yes; then :
++if test "x$ac_cv_lib_mw__mwvalidcheckl" = xyes; then :
+   LIBM="-lmw"
+ fi
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5
+ $as_echo_n "checking for cos in -lm... " >&6; }
+-if test "${ac_cv_lib_m_cos+set}" = set; then :
++if ${ac_cv_lib_m_cos+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -16419,7 +16953,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5
+ $as_echo "$ac_cv_lib_m_cos" >&6; }
+-if test "x$ac_cv_lib_m_cos" = x""yes; then :
++if test "x$ac_cv_lib_m_cos" = xyes; then :
+   LIBM="$LIBM -lm"
+ fi
+ 
+@@ -16427,7 +16961,7 @@ fi
+ *)
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5
+ $as_echo_n "checking for cos in -lm... " >&6; }
+-if test "${ac_cv_lib_m_cos+set}" = set; then :
++if ${ac_cv_lib_m_cos+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -16461,7 +16995,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5
+ $as_echo "$ac_cv_lib_m_cos" >&6; }
+-if test "x$ac_cv_lib_m_cos" = x""yes; then :
++if test "x$ac_cv_lib_m_cos" = xyes; then :
+   LIBM="-lm"
+ fi
+ 
+@@ -16489,7 +17023,7 @@ done
+ ### If isinf exists or not (used to not be the case under Solaris)
+ ### See bug #4164
+ ac_fn_c_check_func "$LINENO" "isinf" "ac_cv_func_isinf"
+-if test "x$ac_cv_func_isinf" = x""yes; then :
++if test "x$ac_cv_func_isinf" = xyes; then :
+ 
+ else
+ 
+@@ -16506,7 +17040,7 @@ LDFLAGS="$save_LDFLAGS"
+ for ac_func in re_comp
+ do :
+   ac_fn_c_check_func "$LINENO" "re_comp" "ac_cv_func_re_comp"
+-if test "x$ac_cv_func_re_comp" = x""yes; then :
++if test "x$ac_cv_func_re_comp" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_RE_COMP 1
+ _ACEOF
+@@ -16519,7 +17053,7 @@ done
+ for ac_func in socket
+ do :
+   ac_fn_c_check_func "$LINENO" "socket" "ac_cv_func_socket"
+-if test "x$ac_cv_func_socket" = x""yes; then :
++if test "x$ac_cv_func_socket" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_SOCKET 1
+ _ACEOF
+@@ -16532,7 +17066,7 @@ done
+ for ac_func in uname
+ do :
+   ac_fn_c_check_func "$LINENO" "uname" "ac_cv_func_uname"
+-if test "x$ac_cv_func_uname" = x""yes; then :
++if test "x$ac_cv_func_uname" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_UNAME 1
+ _ACEOF
+@@ -16545,7 +17079,7 @@ done
+ for ac_func in setlocale
+ do :
+   ac_fn_c_check_func "$LINENO" "setlocale" "ac_cv_func_setlocale"
+-if test "x$ac_cv_func_setlocale" = x""yes; then :
++if test "x$ac_cv_func_setlocale" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_SETLOCALE 1
+ _ACEOF
+@@ -16557,7 +17091,7 @@ done
+ # Function memcmp used in modules/fileio/src/c/xls.c
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working memcmp" >&5
+ $as_echo_n "checking for working memcmp... " >&6; }
+-if test "${ac_cv_func_memcmp_working+set}" = set; then :
++if ${ac_cv_func_memcmp_working+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test "$cross_compiling" = yes; then :
+@@ -16621,7 +17155,7 @@ esac
+ # function stat used in modules/core/src/c/link_std.c
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether lstat correctly handles trailing slash" >&5
+ $as_echo_n "checking whether lstat correctly handles trailing slash... " >&6; }
+-if test "${ac_cv_func_lstat_dereferences_slashed_symlink+set}" = set; then :
++if ${ac_cv_func_lstat_dereferences_slashed_symlink+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   rm -f conftest.sym conftest.file
+@@ -16683,7 +17217,7 @@ fi
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat accepts an empty string" >&5
+ $as_echo_n "checking whether stat accepts an empty string... " >&6; }
+-if test "${ac_cv_func_stat_empty_string_bug+set}" = set; then :
++if ${ac_cv_func_stat_empty_string_bug+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test "$cross_compiling" = yes; then :
+@@ -16731,7 +17265,7 @@ fi
+ # function strtod used in modules/core/src/c/getval.c
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strtod" >&5
+ $as_echo_n "checking for working strtod... " >&6; }
+-if test "${ac_cv_func_strtod+set}" = set; then :
++if ${ac_cv_func_strtod+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test "$cross_compiling" = yes; then :
+@@ -16790,14 +17324,14 @@ if test $ac_cv_func_strtod = no; then
+ esac
+ 
+ ac_fn_c_check_func "$LINENO" "pow" "ac_cv_func_pow"
+-if test "x$ac_cv_func_pow" = x""yes; then :
++if test "x$ac_cv_func_pow" = xyes; then :
+ 
+ fi
+ 
+ if test $ac_cv_func_pow = no; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pow in -lm" >&5
+ $as_echo_n "checking for pow in -lm... " >&6; }
+-if test "${ac_cv_lib_m_pow+set}" = set; then :
++if ${ac_cv_lib_m_pow+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -16831,7 +17365,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_pow" >&5
+ $as_echo "$ac_cv_lib_m_pow" >&6; }
+-if test "x$ac_cv_lib_m_pow" = x""yes; then :
++if test "x$ac_cv_lib_m_pow" = xyes; then :
+   POW_LIB=-lm
+ else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot find library containing definition of pow" >&5
+@@ -16881,7 +17415,7 @@ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
+   as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5
+ $as_echo_n "checking for $ac_hdr that defines DIR... " >&6; }
+-if eval "test \"\${$as_ac_Header+set}\"" = set; then :
++if eval \${$as_ac_Header+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -16921,7 +17455,7 @@ done
+ if test $ac_header_dirent = dirent.h; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
+ $as_echo_n "checking for library containing opendir... " >&6; }
+-if test "${ac_cv_search_opendir+set}" = set; then :
++if ${ac_cv_search_opendir+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_func_search_save_LIBS=$LIBS
+@@ -16955,11 +17489,11 @@ for ac_lib in '' dir; do
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext
+-  if test "${ac_cv_search_opendir+set}" = set; then :
++  if ${ac_cv_search_opendir+:} false; then :
+   break
+ fi
+ done
+-if test "${ac_cv_search_opendir+set}" = set; then :
++if ${ac_cv_search_opendir+:} false; then :
+ 
+ else
+   ac_cv_search_opendir=no
+@@ -16978,7 +17512,7 @@ fi
+ else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
+ $as_echo_n "checking for library containing opendir... " >&6; }
+-if test "${ac_cv_search_opendir+set}" = set; then :
++if ${ac_cv_search_opendir+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_func_search_save_LIBS=$LIBS
+@@ -17012,11 +17546,11 @@ for ac_lib in '' x; do
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext
+-  if test "${ac_cv_search_opendir+set}" = set; then :
++  if ${ac_cv_search_opendir+:} false; then :
+   break
+ fi
+ done
+-if test "${ac_cv_search_opendir+set}" = set; then :
++if ${ac_cv_search_opendir+:} false; then :
+ 
+ else
+   ac_cv_search_opendir=no
+@@ -17038,7 +17572,7 @@ fi
+ # static struct timeval defined or not | used in modules/core/src/c/timer.c
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
+ $as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
+-if test "${ac_cv_header_time+set}" = set; then :
++if ${ac_cv_header_time+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -17075,7 +17609,7 @@ fi
+ # check if the specific header is available or not | used in modules/core/src/c/link_SYSV.c
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5
+ $as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; }
+-if test "${ac_cv_header_sys_wait_h+set}" = set; then :
++if ${ac_cv_header_sys_wait_h+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -17120,7 +17654,7 @@ fi
+ ## Test for structures ##
+ #######################
+ ac_fn_c_check_member "$LINENO" "struct stat" "st_blksize" "ac_cv_member_struct_stat_st_blksize" "$ac_includes_default"
+-if test "x$ac_cv_member_struct_stat_st_blksize" = x""yes; then :
++if test "x$ac_cv_member_struct_stat_st_blksize" = xyes; then :
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRUCT_STAT_ST_BLKSIZE 1
+@@ -17130,7 +17664,7 @@ _ACEOF
+ fi
+ 
+ ac_fn_c_check_member "$LINENO" "struct stat" "st_rdev" "ac_cv_member_struct_stat_st_rdev" "$ac_includes_default"
+-if test "x$ac_cv_member_struct_stat_st_rdev" = x""yes; then :
++if test "x$ac_cv_member_struct_stat_st_rdev" = xyes; then :
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRUCT_STAT_ST_RDEV 1
+@@ -17199,7 +17733,7 @@ rm -f conf$$.file
+ set dummy msgfmt; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_MSGFMT+set}" = set; then :
++if ${ac_cv_path_MSGFMT+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case "$MSGFMT" in
+@@ -17240,7 +17774,7 @@ fi
+ set dummy gmsgfmt; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_GMSGFMT+set}" = set; then :
++if ${ac_cv_path_GMSGFMT+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $GMSGFMT in
+@@ -17322,7 +17856,7 @@ rm -f conf$$.file
+ set dummy xgettext; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_XGETTEXT+set}" = set; then :
++if ${ac_cv_path_XGETTEXT+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case "$XGETTEXT" in
+@@ -17400,7 +17934,7 @@ rm -f conf$$.file
+ set dummy msgmerge; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_MSGMERGE+set}" = set; then :
++if ${ac_cv_path_MSGMERGE+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case "$MSGMERGE" in
+@@ -17470,7 +18004,7 @@ fi
+     solaris*)
+                                     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit host" >&5
+ $as_echo_n "checking for 64-bit host... " >&6; }
+-if test "${gl_cv_solaris_64bit+set}" = set; then :
++if ${gl_cv_solaris_64bit+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -18017,7 +18551,7 @@ fi
+ 
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5
+ $as_echo_n "checking for CFPreferencesCopyAppValue... " >&6; }
+-if test "${gt_cv_func_CFPreferencesCopyAppValue+set}" = set; then :
++if ${gt_cv_func_CFPreferencesCopyAppValue+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   gt_save_LIBS="$LIBS"
+@@ -18051,7 +18585,7 @@ $as_echo "#define HAVE_CFPREFERENCESCOPYAPPVALUE 1" >>confdefs.h
+   fi
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyCurrent" >&5
+ $as_echo_n "checking for CFLocaleCopyCurrent... " >&6; }
+-if test "${gt_cv_func_CFLocaleCopyCurrent+set}" = set; then :
++if ${gt_cv_func_CFLocaleCopyCurrent+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   gt_save_LIBS="$LIBS"
+@@ -18127,7 +18661,7 @@ typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
+ 
+         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5
+ $as_echo_n "checking for GNU gettext in libc... " >&6; }
+-if eval "test \"\${$gt_func_gnugettext_libc+set}\"" = set; then :
++if eval \${$gt_func_gnugettext_libc+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -18190,7 +18724,7 @@ $as_echo "$ac_res" >&6; }
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
+ $as_echo_n "checking for iconv... " >&6; }
+-if test "${am_cv_func_iconv+set}" = set; then :
++if ${am_cv_func_iconv+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -18247,7 +18781,7 @@ $as_echo "$am_cv_func_iconv" >&6; }
+   if test "$am_cv_func_iconv" = yes; then
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5
+ $as_echo_n "checking for working iconv... " >&6; }
+-if test "${am_cv_func_iconv_works+set}" = set; then :
++if ${am_cv_func_iconv_works+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -18843,7 +19377,7 @@ fi
+ 
+           { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5
+ $as_echo_n "checking for GNU gettext in libintl... " >&6; }
+-if eval "test \"\${$gt_func_gnugettext_libintl+set}\"" = set; then :
++if eval \${$gt_func_gnugettext_libintl+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   gt_save_CPPFLAGS="$CPPFLAGS"
+@@ -19023,7 +19557,7 @@ $as_echo "#define HAVE_DCGETTEXT 1" >>confdefs.h
+ # function closedir used in modules/metanet/src/c/files.c
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether closedir returns void" >&5
+ $as_echo_n "checking whether closedir returns void... " >&6; }
+-if test "${ac_cv_func_closedir_void+set}" = set; then :
++if ${ac_cv_func_closedir_void+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test "$cross_compiling" = yes; then :
+@@ -19067,7 +19601,7 @@ fi
+ # Signals used in modules/core/src/c/realmain.c
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
+ $as_echo_n "checking return type of signal handlers... " >&6; }
+-if test "${ac_cv_type_signal+set}" = set; then :
++if ${ac_cv_type_signal+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -19102,7 +19636,7 @@ _ACEOF
+ # struct tm used in modules/core/src/c/history.c
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5
+ $as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; }
+-if test "${ac_cv_struct_tm+set}" = set; then :
++if ${ac_cv_struct_tm+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -19138,7 +19672,7 @@ fi
+ 
+ # st_blocks in the struct in modules/io/sci_gateway/c/intfilestat.c
+ ac_fn_c_check_member "$LINENO" "struct stat" "st_blocks" "ac_cv_member_struct_stat_st_blocks" "$ac_includes_default"
+-if test "x$ac_cv_member_struct_stat_st_blocks" = x""yes; then :
++if test "x$ac_cv_member_struct_stat_st_blocks" = xyes; then :
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRUCT_STAT_ST_BLOCKS 1
+@@ -19187,7 +19721,7 @@ TERMCAP_LIB=no
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lcurses" >&5
+ $as_echo_n "checking for main in -lcurses... " >&6; }
+-if test "${ac_cv_lib_curses_main+set}" = set; then :
++if ${ac_cv_lib_curses_main+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -19215,7 +19749,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curses_main" >&5
+ $as_echo "$ac_cv_lib_curses_main" >&6; }
+-if test "x$ac_cv_lib_curses_main" = x""yes; then :
++if test "x$ac_cv_lib_curses_main" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBCURSES 1
+ _ACEOF
+@@ -19227,7 +19761,7 @@ fi
+ if test $ac_cv_lib_curses_main = no ; then
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lncurses" >&5
+ $as_echo_n "checking for main in -lncurses... " >&6; }
+-if test "${ac_cv_lib_ncurses_main+set}" = set; then :
++if ${ac_cv_lib_ncurses_main+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -19255,7 +19789,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_main" >&5
+ $as_echo "$ac_cv_lib_ncurses_main" >&6; }
+-if test "x$ac_cv_lib_ncurses_main" = x""yes; then :
++if test "x$ac_cv_lib_ncurses_main" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBNCURSES 1
+ _ACEOF
+@@ -19269,7 +19803,7 @@ fi
+ # make sure we have what we need for tgetent
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing tgetent" >&5
+ $as_echo_n "checking for library containing tgetent... " >&6; }
+-if test "${ac_cv_search_tgetent+set}" = set; then :
++if ${ac_cv_search_tgetent+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_func_search_save_LIBS=$LIBS
+@@ -19303,11 +19837,11 @@ for ac_lib in '' termcap; do
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext
+-  if test "${ac_cv_search_tgetent+set}" = set; then :
++  if ${ac_cv_search_tgetent+:} false; then :
+   break
+ fi
+ done
+-if test "${ac_cv_search_tgetent+set}" = set; then :
++if ${ac_cv_search_tgetent+:} false; then :
+ 
+ else
+   ac_cv_search_tgetent=no
+@@ -19352,7 +19886,7 @@ fi
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+ $as_echo_n "checking for dlopen in -ldl... " >&6; }
+-if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
++if ${ac_cv_lib_dl_dlopen+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -19386,7 +19920,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+ $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
++if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBDL 1
+ _ACEOF
+@@ -19398,7 +19932,7 @@ fi
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing pthread_join" >&5
+ $as_echo_n "checking for library containing pthread_join... " >&6; }
+-if test "${ac_cv_search_pthread_join+set}" = set; then :
++if ${ac_cv_search_pthread_join+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_func_search_save_LIBS=$LIBS
+@@ -19432,11 +19966,11 @@ for ac_lib in '' pthread; do
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext
+-  if test "${ac_cv_search_pthread_join+set}" = set; then :
++  if ${ac_cv_search_pthread_join+:} false; then :
+   break
+ fi
+ done
+-if test "${ac_cv_search_pthread_join+set}" = set; then :
++if ${ac_cv_search_pthread_join+:} false; then :
+ 
+ else
+   ac_cv_search_pthread_join=no
+@@ -19492,7 +20026,7 @@ if test "x$with_fftw_include" != "xyes"; then
+ 	save_CFLAGS="$CFLAGS"
+ 	CFLAGS="-I$with_fftw_include"
+ 	ac_fn_c_check_header_mongrel "$LINENO" "fftw3.h" "ac_cv_header_fftw3_h" "$ac_includes_default"
+-if test "x$ac_cv_header_fftw3_h" = x""yes; then :
++if test "x$ac_cv_header_fftw3_h" = xyes; then :
+   FFTW3_CFLAGS="$CFLAGS"
+ else
+   as_fn_error $? "Cannot find headers (fftw3.h) of the library FFTW in $with_fftw_include. Please install the dev package (Debian : libfftw3-dev)" "$LINENO" 5
+@@ -19503,7 +20037,7 @@ fi
+ 	CFLAGS="$save_CFLAGS"
+ else
+ 	ac_fn_c_check_header_mongrel "$LINENO" "fftw3.h" "ac_cv_header_fftw3_h" "$ac_includes_default"
+-if test "x$ac_cv_header_fftw3_h" = x""yes; then :
++if test "x$ac_cv_header_fftw3_h" = xyes; then :
+   FFTW3_CFLAGS=""
+ else
+   as_fn_error $? "Cannot find headers (fftw3.h) of the library fftw. Please install the dev package (Debian : libfftw3-dev)" "$LINENO" 5
+@@ -19519,7 +20053,7 @@ if test "x$with_fftw_library" != "xyes"; then
+ 	LIBS="-L$with_fftw_library -lfftw3"
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fftw_plan_dft_r2c in -lfftw3" >&5
+ $as_echo_n "checking for fftw_plan_dft_r2c in -lfftw3... " >&6; }
+-if test "${ac_cv_lib_fftw3_fftw_plan_dft_r2c+set}" = set; then :
++if ${ac_cv_lib_fftw3_fftw_plan_dft_r2c+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -19553,7 +20087,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_fftw3_fftw_plan_dft_r2c" >&5
+ $as_echo "$ac_cv_lib_fftw3_fftw_plan_dft_r2c" >&6; }
+-if test "x$ac_cv_lib_fftw3_fftw_plan_dft_r2c" = x""yes; then :
++if test "x$ac_cv_lib_fftw3_fftw_plan_dft_r2c" = xyes; then :
+   FFTW3_LIB="-L$with_fftw_library -lfftw3"
+ else
+   as_fn_error $? "libfftw3 : library missing. (Cannot find symbol fftw_plan_dft_r2c) in $with_fftw_library. Check if libfftw3 is installed and if the version is correct" "$LINENO" 5
+@@ -19565,7 +20099,7 @@ else
+ 	save_LIBS="$LIBS"
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fftw_plan_dft_r2c in -lfftw3" >&5
+ $as_echo_n "checking for fftw_plan_dft_r2c in -lfftw3... " >&6; }
+-if test "${ac_cv_lib_fftw3_fftw_plan_dft_r2c+set}" = set; then :
++if ${ac_cv_lib_fftw3_fftw_plan_dft_r2c+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -19599,7 +20133,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_fftw3_fftw_plan_dft_r2c" >&5
+ $as_echo "$ac_cv_lib_fftw3_fftw_plan_dft_r2c" >&6; }
+-if test "x$ac_cv_lib_fftw3_fftw_plan_dft_r2c" = x""yes; then :
++if test "x$ac_cv_lib_fftw3_fftw_plan_dft_r2c" = xyes; then :
+   FFTW3_LIB="-lfftw3"
+ else
+   as_fn_error $? "libfftw3 : library missing. (Cannot find symbol fftw_plan_dft_r2c). Check if libfftw3 is installed and if the version is correct" "$LINENO" 5
+@@ -19717,7 +20251,7 @@ not defined) or set to a valid directory that is the root of a pvm3 installation
+ set dummy pvmgetarch; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_PVMGETARCH+set}" = set; then :
++if ${ac_cv_path_PVMGETARCH+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $PVMGETARCH in
+@@ -19765,7 +20299,7 @@ fi
+     # more details on the supported environment variables.
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PVM architecture" >&5
+ $as_echo_n "checking for PVM architecture... " >&6; }
+-if test "${PVM_ARCH+set}" = set; then :
++if ${PVM_ARCH+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   PVM_ARCH=`$PVMGETARCH`
+@@ -19854,7 +20388,7 @@ $as_echo "PVM header found in $PVM_INCLUDE_DIR" >&6; }
+     CFLAGS="-I$PVM_INCLUDE_DIR $CFLAGS"
+ 
+     ac_fn_c_check_header_mongrel "$LINENO" "pvm3.h" "ac_cv_header_pvm3_h" "$ac_includes_default"
+-if test "x$ac_cv_header_pvm3_h" = x""yes; then :
++if test "x$ac_cv_header_pvm3_h" = xyes; then :
+ 
+ else
+   as_fn_error $? "check for PVM headers failed" "$LINENO" 5
+@@ -19959,7 +20493,7 @@ $as_echo "found $m in $PATH_LIB_PVM" >&6; }
+                 # pvm_spawn() is a basic pvm3 function and should be in libpvm3
+                 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing pvm_spawn" >&5
+ $as_echo_n "checking for library containing pvm_spawn... " >&6; }
+-if test "${ac_cv_search_pvm_spawn+set}" = set; then :
++if ${ac_cv_search_pvm_spawn+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_func_search_save_LIBS=$LIBS
+@@ -19993,11 +20527,11 @@ for ac_lib in '' pvm3 pvm; do
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext
+-  if test "${ac_cv_search_pvm_spawn+set}" = set; then :
++  if ${ac_cv_search_pvm_spawn+:} false; then :
+   break
+ fi
+ done
+-if test "${ac_cv_search_pvm_spawn+set}" = set; then :
++if ${ac_cv_search_pvm_spawn+:} false; then :
+ 
+ else
+   ac_cv_search_pvm_spawn=no
+@@ -20024,7 +20558,7 @@ fi
+                 # pvm_barrier() is one of the group functions and should be in libgpvm3
+                 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing pvm_barrier" >&5
+ $as_echo_n "checking for library containing pvm_barrier... " >&6; }
+-if test "${ac_cv_search_pvm_barrier+set}" = set; then :
++if ${ac_cv_search_pvm_barrier+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_func_search_save_LIBS=$LIBS
+@@ -20058,11 +20592,11 @@ for ac_lib in '' pvm3 gpvm3; do
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext
+-  if test "${ac_cv_search_pvm_barrier+set}" = set; then :
++  if ${ac_cv_search_pvm_barrier+:} false; then :
+   break
+ fi
+ done
+-if test "${ac_cv_search_pvm_barrier+set}" = set; then :
++if ${ac_cv_search_pvm_barrier+:} false; then :
+ 
+ else
+   ac_cv_search_pvm_barrier=no
+@@ -20176,7 +20710,7 @@ if test "$with_openmp" != no; then
+     for ac_header in omp.h
+ do :
+   ac_fn_c_check_header_mongrel "$LINENO" "omp.h" "ac_cv_header_omp_h" "$ac_includes_default"
+-if test "x$ac_cv_header_omp_h" = x""yes; then :
++if test "x$ac_cv_header_omp_h" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_OMP_H 1
+ _ACEOF
+@@ -20239,7 +20773,7 @@ do
+ set dummy $ac_prog; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_XML_CONFIG+set}" = set; then :
++if ${ac_cv_prog_XML_CONFIG+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$XML_CONFIG"; then
+@@ -20292,7 +20826,7 @@ LIBS="$LIBS $XML_LIBS"
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xmlReaderForFile in -lxml2" >&5
+ $as_echo_n "checking for xmlReaderForFile in -lxml2... " >&6; }
+-if test "${ac_cv_lib_xml2_xmlReaderForFile+set}" = set; then :
++if ${ac_cv_lib_xml2_xmlReaderForFile+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -20326,7 +20860,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_xml2_xmlReaderForFile" >&5
+ $as_echo "$ac_cv_lib_xml2_xmlReaderForFile" >&6; }
+-if test "x$ac_cv_lib_xml2_xmlReaderForFile" = x""yes; then :
++if test "x$ac_cv_lib_xml2_xmlReaderForFile" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBXML2 1
+ _ACEOF
+@@ -20391,7 +20925,7 @@ if test "$enable_build_localization" != no; then
+    for ac_func in bind_textdomain_codeset
+ do :
+   ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
+-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
++if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_BIND_TEXTDOMAIN_CODESET 1
+ _ACEOF
+@@ -20404,7 +20938,7 @@ done
+ set dummy msgcat; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_MSGCAT+set}" = set; then :
++if ${ac_cv_path_MSGCAT+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $MSGCAT in
+@@ -20473,7 +21007,7 @@ ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_f77_compiler_gnu
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to get verbose linking output from $F77" >&5
+ $as_echo_n "checking how to get verbose linking output from $F77... " >&6; }
+-if test "${ac_cv_prog_f77_v+set}" = set; then :
++if ${ac_cv_prog_f77_v+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat > conftest.$ac_ext <<_ACEOF
+@@ -20503,7 +21037,8 @@ $as_echo "$as_me:${as_lineno-$LINENO}: $*" >&5
+ # gfortran 4.3 outputs lines setting COLLECT_GCC_OPTIONS, COMPILER_PATH,
+ # LIBRARY_PATH; skip all such settings.
+ ac_f77_v_output=`eval $ac_link 5>&1 2>&1 |
+-  grep -v 'Driving:' | grep -v "^[_$as_cr_Letters][_$as_cr_alnum]*="`
++  sed '/^Driving:/d; /^Configured with:/d;
++      '"/^[_$as_cr_Letters][_$as_cr_alnum]*=/d"`
+ $as_echo "$ac_f77_v_output" >&5
+ FFLAGS=$ac_save_FFLAGS
+ 
+@@ -20568,7 +21103,7 @@ fi
+ $as_echo "$ac_cv_prog_f77_v" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Fortran 77 libraries of $F77" >&5
+ $as_echo_n "checking for Fortran 77 libraries of $F77... " >&6; }
+-if test "${ac_cv_f77_libs+set}" = set; then :
++if ${ac_cv_f77_libs+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test "x$FLIBS" != "x"; then
+@@ -20593,7 +21128,8 @@ $as_echo "$as_me:${as_lineno-$LINENO}: $*" >&5
+ # gfortran 4.3 outputs lines setting COLLECT_GCC_OPTIONS, COMPILER_PATH,
+ # LIBRARY_PATH; skip all such settings.
+ ac_f77_v_output=`eval $ac_link 5>&1 2>&1 |
+-  grep -v 'Driving:' | grep -v "^[_$as_cr_Letters][_$as_cr_alnum]*="`
++  sed '/^Driving:/d; /^Configured with:/d;
++      '"/^[_$as_cr_Letters][_$as_cr_alnum]*=/d"`
+ $as_echo "$ac_f77_v_output" >&5
+ FFLAGS=$ac_save_FFLAGS
+ 
+@@ -20781,7 +21317,7 @@ ac_compiler_gnu=$ac_cv_f77_compiler_gnu
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dummy main to link with Fortran 77 libraries" >&5
+ $as_echo_n "checking for dummy main to link with Fortran 77 libraries... " >&6; }
+-if test "${ac_cv_f77_dummy_main+set}" = set; then :
++if ${ac_cv_f77_dummy_main+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_f77_dm_save_LIBS=$LIBS
+@@ -20878,7 +21414,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
+@@ -20893,7 +21429,7 @@ ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_f77_compiler_gnu
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Fortran 77 name-mangling scheme" >&5
+ $as_echo_n "checking for Fortran 77 name-mangling scheme... " >&6; }
+-if test "${ac_cv_f77_mangling+set}" = set; then :
++if ${ac_cv_f77_mangling+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat > conftest.$ac_ext <<_ACEOF
+@@ -21040,7 +21576,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
+ 
+@@ -21178,7 +21714,7 @@ fi
+ if test $acx_blas_ok = no; then
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ATL_xerbla in -latlas" >&5
+ $as_echo_n "checking for ATL_xerbla in -latlas... " >&6; }
+-if test "${ac_cv_lib_atlas_ATL_xerbla+set}" = set; then :
++if ${ac_cv_lib_atlas_ATL_xerbla+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -21220,11 +21756,11 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_atlas_ATL_xerbla" >&5
+ $as_echo "$ac_cv_lib_atlas_ATL_xerbla" >&6; }
+-if test "x$ac_cv_lib_atlas_ATL_xerbla" = x""yes; then :
++if test "x$ac_cv_lib_atlas_ATL_xerbla" = xyes; then :
+   as_ac_Lib=`$as_echo "ac_cv_lib_f77blas_$sgemm" | $as_tr_sh`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $sgemm in -lf77blas" >&5
+ $as_echo_n "checking for $sgemm in -lf77blas... " >&6; }
+-if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
++if eval \${$as_ac_Lib+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -21270,7 +21806,7 @@ $as_echo "$ac_res" >&6; }
+ if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cblas_dgemm in -lcblas" >&5
+ $as_echo_n "checking for cblas_dgemm in -lcblas... " >&6; }
+-if test "${ac_cv_lib_cblas_cblas_dgemm+set}" = set; then :
++if ${ac_cv_lib_cblas_cblas_dgemm+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -21312,7 +21848,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cblas_cblas_dgemm" >&5
+ $as_echo "$ac_cv_lib_cblas_cblas_dgemm" >&6; }
+-if test "x$ac_cv_lib_cblas_cblas_dgemm" = x""yes; then :
++if test "x$ac_cv_lib_cblas_cblas_dgemm" = xyes; then :
+   acx_blas_ok=yes; BLAS_TYPE="Atlas"
+ 			 BLAS_LIBS="-lcblas -lf77blas -latlas"
+ fi
+@@ -21328,7 +21864,7 @@ if test $acx_blas_ok = no; then
+ 	as_ac_Lib=`$as_echo "ac_cv_lib_mkl_$sgemm" | $as_tr_sh`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $sgemm in -lmkl" >&5
+ $as_echo_n "checking for $sgemm in -lmkl... " >&6; }
+-if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
++if eval \${$as_ac_Lib+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -21382,7 +21918,7 @@ if test $acx_blas_ok = no; then
+ 	as_ac_Lib=`$as_echo "ac_cv_lib_blas_$sgemm" | $as_tr_sh`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $sgemm in -lblas" >&5
+ $as_echo_n "checking for $sgemm in -lblas... " >&6; }
+-if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
++if eval \${$as_ac_Lib+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -21429,7 +21965,7 @@ if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
+   as_ac_Lib=`$as_echo "ac_cv_lib_dgemm_$dgemm" | $as_tr_sh`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $dgemm in -ldgemm" >&5
+ $as_echo_n "checking for $dgemm in -ldgemm... " >&6; }
+-if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
++if eval \${$as_ac_Lib+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -21476,7 +22012,7 @@ if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
+   as_ac_Lib=`$as_echo "ac_cv_lib_sgemm_$sgemm" | $as_tr_sh`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $sgemm in -lsgemm" >&5
+ $as_echo_n "checking for $sgemm in -lsgemm... " >&6; }
+-if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
++if eval \${$as_ac_Lib+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -21534,7 +22070,7 @@ if test $acx_blas_ok = no; then
+ 	as_ac_Lib=`$as_echo "ac_cv_lib_cxml_$sgemm" | $as_tr_sh`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $sgemm in -lcxml" >&5
+ $as_echo_n "checking for $sgemm in -lcxml... " >&6; }
+-if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
++if eval \${$as_ac_Lib+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -21588,7 +22124,7 @@ if test $acx_blas_ok = no; then
+ 	as_ac_Lib=`$as_echo "ac_cv_lib_dxml_$sgemm" | $as_tr_sh`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $sgemm in -ldxml" >&5
+ $as_echo_n "checking for $sgemm in -ldxml... " >&6; }
+-if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
++if eval \${$as_ac_Lib+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -21642,7 +22178,7 @@ if test $acx_blas_ok = no; then
+ 	if test "x$GCC" != xyes; then # only works with Sun CC
+ 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for acosp in -lsunmath" >&5
+ $as_echo_n "checking for acosp in -lsunmath... " >&6; }
+-if test "${ac_cv_lib_sunmath_acosp+set}" = set; then :
++if ${ac_cv_lib_sunmath_acosp+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -21684,11 +22220,11 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sunmath_acosp" >&5
+ $as_echo "$ac_cv_lib_sunmath_acosp" >&6; }
+-if test "x$ac_cv_lib_sunmath_acosp" = x""yes; then :
++if test "x$ac_cv_lib_sunmath_acosp" = xyes; then :
+   as_ac_Lib=`$as_echo "ac_cv_lib_sunperf_$sgemm" | $as_tr_sh`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $sgemm in -lsunperf" >&5
+ $as_echo_n "checking for $sgemm in -lsunperf... " >&6; }
+-if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
++if eval \${$as_ac_Lib+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -21747,7 +22283,7 @@ if test $acx_blas_ok = no; then
+ 	as_ac_Lib=`$as_echo "ac_cv_lib_scs_$sgemm" | $as_tr_sh`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $sgemm in -lscs" >&5
+ $as_echo_n "checking for $sgemm in -lscs... " >&6; }
+-if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
++if eval \${$as_ac_Lib+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -21801,7 +22337,7 @@ if test $acx_blas_ok = no; then
+ 	as_ac_Lib=`$as_echo "ac_cv_lib_complib.sgimath_$sgemm" | $as_tr_sh`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $sgemm in -lcomplib.sgimath" >&5
+ $as_echo_n "checking for $sgemm in -lcomplib.sgimath... " >&6; }
+-if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
++if eval \${$as_ac_Lib+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -21855,7 +22391,7 @@ if test $acx_blas_ok = no; then
+ 	as_ac_Lib=`$as_echo "ac_cv_lib_blas_$sgemm" | $as_tr_sh`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $sgemm in -lblas" >&5
+ $as_echo_n "checking for $sgemm in -lblas... " >&6; }
+-if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
++if eval \${$as_ac_Lib+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -21902,7 +22438,7 @@ if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
+   as_ac_Lib=`$as_echo "ac_cv_lib_essl_$sgemm" | $as_tr_sh`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $sgemm in -lessl" >&5
+ $as_echo_n "checking for $sgemm in -lessl... " >&6; }
+-if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
++if eval \${$as_ac_Lib+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -21958,7 +22494,7 @@ if test $acx_blas_ok = no; then
+ 	as_ac_Lib=`$as_echo "ac_cv_lib_blas_$sgemm" | $as_tr_sh`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $sgemm in -lblas" >&5
+ $as_echo_n "checking for $sgemm in -lblas... " >&6; }
+-if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
++if eval \${$as_ac_Lib+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -22007,6 +22543,10 @@ fi
+ 
+ fi
+ 
++if test "$with_blas_library" != no -a "$with_blas_library" != ""; then
++BLAS_LIBS="$BLAS_LIBS -L$with_blas_library"
++fi
++
+ 
+ 
+ LIBS="$acx_blas_save_LIBS"
+@@ -22136,7 +22676,7 @@ for lapack in lapack lapack_rs6k; do
+                 as_ac_Lib=`$as_echo "ac_cv_lib_$lapack''_$cheev" | $as_tr_sh`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $cheev in -l$lapack" >&5
+ $as_echo_n "checking for $cheev in -l$lapack... " >&6; }
+-if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
++if eval \${$as_ac_Lib+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -22189,6 +22729,10 @@ done
+ 
+ LDFLAGS="$saved_ldflags"
+ 
++if test "$with_lapack_library" != no -a "$with_lapack_library" != ""; then
++LAPACK_LIBS="$LAPACK_LIBS -L$with_lapack_library"
++fi
++
+ 
+ 
+ # Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
+@@ -22248,11 +22792,11 @@ if test "x$with_umfpack_include" != "xyes"; then
+ 	save_CFLAGS="$CFLAGS"
+ 	CFLAGS="-I$with_umfpack_include"
+ 	ac_fn_c_check_header_mongrel "$LINENO" "suitesparse/umfpack.h" "ac_cv_header_suitesparse_umfpack_h" "$ac_includes_default"
+-if test "x$ac_cv_header_suitesparse_umfpack_h" = x""yes; then :
++if test "x$ac_cv_header_suitesparse_umfpack_h" = xyes; then :
+   UMFPACK_CFLAGS="$CFLAGS"; SUITESPARSE=yes
+ else
+   ac_fn_c_check_header_mongrel "$LINENO" "umfpack.h" "ac_cv_header_umfpack_h" "$ac_includes_default"
+-if test "x$ac_cv_header_umfpack_h" = x""yes; then :
++if test "x$ac_cv_header_umfpack_h" = xyes; then :
+   UMFPACK_CFLAGS="$CFLAGS"; SUITESPARSE=no
+ else
+   as_fn_error $? "Cannot find headers (umfpack.h) of the library UMFPACK. Please install the dev package (Debian : libsuitesparse-dev)" "$LINENO" 5
+@@ -22270,11 +22814,11 @@ fi
+ # Look in the default paths
+ if test "x$UMFPACK_INCLUDE" = "x" ; then
+ ac_fn_c_check_header_mongrel "$LINENO" "suitesparse/umfpack.h" "ac_cv_header_suitesparse_umfpack_h" "$ac_includes_default"
+-if test "x$ac_cv_header_suitesparse_umfpack_h" = x""yes; then :
++if test "x$ac_cv_header_suitesparse_umfpack_h" = xyes; then :
+   SUITESPARSE=yes
+ else
+   ac_fn_c_check_header_mongrel "$LINENO" "umfpack.h" "ac_cv_header_umfpack_h" "$ac_includes_default"
+-if test "x$ac_cv_header_umfpack_h" = x""yes; then :
++if test "x$ac_cv_header_umfpack_h" = xyes; then :
+   SUITESPARSE=no
+ else
+   as_fn_error $? "Cannot find headers (umfpack.h) of the library UMFPACK. Please install the dev package (Debian : libsuitesparse-dev)" "$LINENO" 5
+@@ -22298,7 +22842,7 @@ $as_echo_n "checking for umf_divcomplex in $with_umfpack_library... " >&6; }
+ 
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for amd_info in -lamd" >&5
+ $as_echo_n "checking for amd_info in -lamd... " >&6; }
+-if test "${ac_cv_lib_amd_amd_info+set}" = set; then :
++if ${ac_cv_lib_amd_amd_info+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -22340,7 +22884,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_amd_amd_info" >&5
+ $as_echo "$ac_cv_lib_amd_amd_info" >&6; }
+-if test "x$ac_cv_lib_amd_amd_info" = x""yes; then :
++if test "x$ac_cv_lib_amd_amd_info" = xyes; then :
+   UMFPACK_LIB="-lamd"
+ else
+   as_fn_error $? "libamd: Library missing (Cannot find symbol amd_info). Check if libamd (sparse matrix minimum degree ordering) is installed and if the version is correct" "$LINENO" 5
+@@ -22349,7 +22893,7 @@ fi
+ 
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for umf_divcomplex in -lumfpack" >&5
+ $as_echo_n "checking for umf_divcomplex in -lumfpack... " >&6; }
+-if test "${ac_cv_lib_umfpack_umf_divcomplex+set}" = set; then :
++if ${ac_cv_lib_umfpack_umf_divcomplex+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -22391,7 +22935,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_umfpack_umf_divcomplex" >&5
+ $as_echo "$ac_cv_lib_umfpack_umf_divcomplex" >&6; }
+-if test "x$ac_cv_lib_umfpack_umf_divcomplex" = x""yes; then :
++if test "x$ac_cv_lib_umfpack_umf_divcomplex" = xyes; then :
+   UMFPACK_LIB="-L$with_umfpack_library -lumfpack $UMFPACK_LIB"; UMFPACK_OK=yes
+ else
+   as_fn_error $? "libumfpack : Library missing. (Cannot find umf_divcomplex). Check if libumfpack is installed and if the version is correct (also called lib suitesparse)" "$LINENO" 5
+@@ -22413,7 +22957,7 @@ if test $UMFPACK_OK = no; then
+ 
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for amd_info in -lamd" >&5
+ $as_echo_n "checking for amd_info in -lamd... " >&6; }
+-if test "${ac_cv_lib_amd_amd_info+set}" = set; then :
++if ${ac_cv_lib_amd_amd_info+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -22455,7 +22999,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_amd_amd_info" >&5
+ $as_echo "$ac_cv_lib_amd_amd_info" >&6; }
+-if test "x$ac_cv_lib_amd_amd_info" = x""yes; then :
++if test "x$ac_cv_lib_amd_amd_info" = xyes; then :
+   UMFPACK_LIB="-lamd"
+ else
+   as_fn_error $? "libamd: Library missing (Cannot find symbol amd_info). Check if libamd (sparse matrix minimum degree ordering) is installed and if the version is correct" "$LINENO" 5
+@@ -22465,7 +23009,7 @@ fi
+ 	LIBS="$UMFPACK_LIB $LIBS"
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for umf_divcomplex in -lumfpack" >&5
+ $as_echo_n "checking for umf_divcomplex in -lumfpack... " >&6; }
+-if test "${ac_cv_lib_umfpack_umf_divcomplex+set}" = set; then :
++if ${ac_cv_lib_umfpack_umf_divcomplex+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -22507,7 +23051,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_umfpack_umf_divcomplex" >&5
+ $as_echo "$ac_cv_lib_umfpack_umf_divcomplex" >&6; }
+-if test "x$ac_cv_lib_umfpack_umf_divcomplex" = x""yes; then :
++if test "x$ac_cv_lib_umfpack_umf_divcomplex" = xyes; then :
+   UMFPACK_LIB="-lumfpack $UMFPACK_LIB"; UMFPACK_OK=yes
+ else
+   as_fn_error $? "libumfpack: Library missing. (Cannot find symbol umf_divcomplex). Check if libumfpack is installed and if the version is correct (also called lib suitesparse)" "$LINENO" 5
+@@ -22592,7 +23136,7 @@ do
+ set dummy $ac_prog; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_PCRE_CONFIG+set}" = set; then :
++if ${ac_cv_prog_PCRE_CONFIG+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$PCRE_CONFIG"; then
+@@ -22723,7 +23267,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
+@@ -22737,7 +23281,7 @@ CFLAGS="$PCRE_CFLAGS $CFLAGS"
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pcre_compile in -lpcre" >&5
+ $as_echo_n "checking for pcre_compile in -lpcre... " >&6; }
+-if test "${ac_cv_lib_pcre_pcre_compile+set}" = set; then :
++if ${ac_cv_lib_pcre_pcre_compile+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -22779,7 +23323,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pcre_pcre_compile" >&5
+ $as_echo "$ac_cv_lib_pcre_pcre_compile" >&6; }
+-if test "x$ac_cv_lib_pcre_pcre_compile" = x""yes; then :
++if test "x$ac_cv_lib_pcre_pcre_compile" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBPCRE 1
+ _ACEOF
+@@ -22794,7 +23338,7 @@ fi
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for regexec in -lpcreposix" >&5
+ $as_echo_n "checking for regexec in -lpcreposix... " >&6; }
+-if test "${ac_cv_lib_pcreposix_regexec+set}" = set; then :
++if ${ac_cv_lib_pcreposix_regexec+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -22836,7 +23380,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pcreposix_regexec" >&5
+ $as_echo "$ac_cv_lib_pcreposix_regexec" >&6; }
+-if test "x$ac_cv_lib_pcreposix_regexec" = x""yes; then :
++if test "x$ac_cv_lib_pcreposix_regexec" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBPCREPOSIX 1
+ _ACEOF
+@@ -22851,7 +23395,7 @@ fi
+ for ac_header in pcre.h
+ do :
+   ac_fn_c_check_header_mongrel "$LINENO" "pcre.h" "ac_cv_header_pcre_h" "$ac_includes_default"
+-if test "x$ac_cv_header_pcre_h" = x""yes; then :
++if test "x$ac_cv_header_pcre_h" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_PCRE_H 1
+ _ACEOF
+@@ -22953,8 +23497,8 @@ 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 ;; #(
+-    *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then :
++    *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #(
++    *,NONE | NONE,*) if ${ac_cv_have_x+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   # One or both of the vars are not set, and there is no cached value.
+@@ -23263,7 +23807,7 @@ if ac_fn_c_try_link "$LINENO"; then :
+ else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5
+ $as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; }
+-if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then :
++if ${ac_cv_lib_dnet_dnet_ntoa+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -23305,14 +23849,14 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+ $as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; }
+-if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then :
++if test "x$ac_cv_lib_dnet_dnet_ntoa" = xyes; then :
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
+ fi
+ 
+     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5
+ $as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; }
+-if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then :
++if ${ac_cv_lib_dnet_stub_dnet_ntoa+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -23354,7 +23898,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+ $as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
+-if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then :
++if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = xyes; then :
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
+ fi
+ 
+@@ -23373,14 +23917,14 @@ rm -f core conftest.err conftest.$ac_objext \
+     # The functions gethostbyname, getservbyname, and inet_addr are
+     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
+     ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
+-if test "x$ac_cv_func_gethostbyname" = x""yes; then :
++if test "x$ac_cv_func_gethostbyname" = xyes; then :
+ 
+ fi
+ 
+     if test $ac_cv_func_gethostbyname = no; then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
+ $as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
+-if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then :
++if ${ac_cv_lib_nsl_gethostbyname+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -23422,14 +23966,14 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5
+ $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
+-if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then :
++if test "x$ac_cv_lib_nsl_gethostbyname" = xyes; then :
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
+ fi
+ 
+       if test $ac_cv_lib_nsl_gethostbyname = no; then
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5
+ $as_echo_n "checking for gethostbyname in -lbsd... " >&6; }
+-if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then :
++if ${ac_cv_lib_bsd_gethostbyname+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -23471,7 +24015,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5
+ $as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }
+-if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then :
++if test "x$ac_cv_lib_bsd_gethostbyname" = xyes; then :
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
+ fi
+ 
+@@ -23486,14 +24030,14 @@ fi
+     # must be given before -lnsl if both are needed.  We assume that
+     # if connect needs -lnsl, so does gethostbyname.
+     ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect"
+-if test "x$ac_cv_func_connect" = x""yes; then :
++if test "x$ac_cv_func_connect" = xyes; then :
+ 
+ fi
+ 
+     if test $ac_cv_func_connect = no; then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5
+ $as_echo_n "checking for connect in -lsocket... " >&6; }
+-if test "${ac_cv_lib_socket_connect+set}" = set; then :
++if ${ac_cv_lib_socket_connect+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -23535,7 +24079,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5
+ $as_echo "$ac_cv_lib_socket_connect" >&6; }
+-if test "x$ac_cv_lib_socket_connect" = x""yes; then :
++if test "x$ac_cv_lib_socket_connect" = xyes; then :
+   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
+ fi
+ 
+@@ -23543,14 +24087,14 @@ fi
+ 
+     # Guillermo Gomez says -lposix is necessary on A/UX.
+     ac_fn_c_check_func "$LINENO" "remove" "ac_cv_func_remove"
+-if test "x$ac_cv_func_remove" = x""yes; then :
++if test "x$ac_cv_func_remove" = xyes; then :
+ 
+ fi
+ 
+     if test $ac_cv_func_remove = no; then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5
+ $as_echo_n "checking for remove in -lposix... " >&6; }
+-if test "${ac_cv_lib_posix_remove+set}" = set; then :
++if ${ac_cv_lib_posix_remove+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -23592,7 +24136,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5
+ $as_echo "$ac_cv_lib_posix_remove" >&6; }
+-if test "x$ac_cv_lib_posix_remove" = x""yes; then :
++if test "x$ac_cv_lib_posix_remove" = xyes; then :
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
+ fi
+ 
+@@ -23600,14 +24144,14 @@ fi
+ 
+     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
+     ac_fn_c_check_func "$LINENO" "shmat" "ac_cv_func_shmat"
+-if test "x$ac_cv_func_shmat" = x""yes; then :
++if test "x$ac_cv_func_shmat" = xyes; then :
+ 
+ fi
+ 
+     if test $ac_cv_func_shmat = no; then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5
+ $as_echo_n "checking for shmat in -lipc... " >&6; }
+-if test "${ac_cv_lib_ipc_shmat+set}" = set; then :
++if ${ac_cv_lib_ipc_shmat+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -23649,7 +24193,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5
+ $as_echo "$ac_cv_lib_ipc_shmat" >&6; }
+-if test "x$ac_cv_lib_ipc_shmat" = x""yes; then :
++if test "x$ac_cv_lib_ipc_shmat" = xyes; then :
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
+ fi
+ 
+@@ -23667,7 +24211,7 @@ fi
+   # John Interrante, Karl Berry
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5
+ $as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; }
+-if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then :
++if ${ac_cv_lib_ICE_IceConnectionNumber+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -23709,7 +24253,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+ $as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
+-if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then :
++if test "x$ac_cv_lib_ICE_IceConnectionNumber" = xyes; then :
+   X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
+ fi
+ 
+@@ -23725,7 +24269,7 @@ fi
+ 
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ldl" >&5
+ $as_echo_n "checking for main in -ldl... " >&6; }
+-if test "${ac_cv_lib_dl_main+set}" = set; then :
++if ${ac_cv_lib_dl_main+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -23761,7 +24305,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_main" >&5
+ $as_echo "$ac_cv_lib_dl_main" >&6; }
+-if test "x$ac_cv_lib_dl_main" = x""yes; then :
++if test "x$ac_cv_lib_dl_main" = xyes; then :
+   TCLTK_LIBS=" -ldl"
+ fi
+ 
+@@ -23792,7 +24336,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 23795 "configure"
++#line 24339 "configure"
+ #include "confdefs.h"
+ 
+ #include "$CHK_TCL_INCLUDE_PATH/$CHK_TCL_INC_NAME"
+@@ -23822,7 +24366,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.  */
+@@ -23856,7 +24400,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
+@@ -23925,7 +24469,7 @@ $as_echo "found $m using -L$PATH_LIB_TCL -l$NAME_LIB_TCL" >&6; }
+ 					as_ac_Lib=`$as_echo "ac_cv_lib_$NAME_LIB_TCL''_Tcl_DoOneEvent" | $as_tr_sh`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Tcl_DoOneEvent in -l$NAME_LIB_TCL" >&5
+ $as_echo_n "checking for Tcl_DoOneEvent in -l$NAME_LIB_TCL... " >&6; }
+-if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
++if eval \${$as_ac_Lib+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -23979,7 +24523,7 @@ fi
+ 					as_ac_Lib=`$as_echo "ac_cv_lib_$NAME_LIB_TCL''_Tcl_DoOneEvent" | $as_tr_sh`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Tcl_DoOneEvent in -l$NAME_LIB_TCL" >&5
+ $as_echo_n "checking for Tcl_DoOneEvent in -l$NAME_LIB_TCL... " >&6; }
+-if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
++if eval \${$as_ac_Lib+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -24064,7 +24608,7 @@ done
+    for ac_header in X11/Xlib.h
+ do :
+   ac_fn_c_check_header_mongrel "$LINENO" "X11/Xlib.h" "ac_cv_header_X11_Xlib_h" "$ac_includes_default"
+-if test "x$ac_cv_header_X11_Xlib_h" = x""yes; then :
++if test "x$ac_cv_header_X11_Xlib_h" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_X11_XLIB_H 1
+ _ACEOF
+@@ -24102,7 +24646,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 24105 "configure"
++#line 24649 "configure"
+ #include "confdefs.h"
+ 
+ #include "$CHK_TK_INCLUDE_PATH/$CHK_TK_INC_NAME"
+@@ -24237,7 +24781,7 @@ $as_echo "found $m using -L$PATH_LIB_TK -l$NAME_LIB_TK" >&6; }
+ 					as_ac_Lib=`$as_echo "ac_cv_lib_$NAME_LIB_TK''_Tk_BindEvent" | $as_tr_sh`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Tk_BindEvent in -l$NAME_LIB_TK" >&5
+ $as_echo_n "checking for Tk_BindEvent in -l$NAME_LIB_TK... " >&6; }
+-if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
++if eval \${$as_ac_Lib+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -24292,7 +24836,7 @@ fi
+ 					as_ac_Lib=`$as_echo "ac_cv_lib_$NAME_LIB_TK''_Tk_BindEvent" | $as_tr_sh`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Tk_BindEvent in -l$NAME_LIB_TK" >&5
+ $as_echo_n "checking for Tk_BindEvent in -l$NAME_LIB_TK... " >&6; }
+-if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
++if eval \${$as_ac_Lib+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -24517,7 +25061,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
+@@ -24550,7 +25094,7 @@ done
+ 
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Mat_Open in -lmatio" >&5
+ $as_echo_n "checking for Mat_Open in -lmatio... " >&6; }
+-if test "${ac_cv_lib_matio_Mat_Open+set}" = set; then :
++if ${ac_cv_lib_matio_Mat_Open+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -24592,7 +25136,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_matio_Mat_Open" >&5
+ $as_echo "$ac_cv_lib_matio_Mat_Open" >&6; }
+-if test "x$ac_cv_lib_matio_Mat_Open" = x""yes; then :
++if test "x$ac_cv_lib_matio_Mat_Open" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBMATIO 1
+ _ACEOF
+@@ -24652,7 +25196,7 @@ else
+ fi
+ 
+ 
+-	for dir in $with_docbook $SCI_SRCDIR_FULL/thirdparty/docbook/ /usr/share/sgml/docbook/stylesheet/xsl/nwalsh /usr/share/docbook2X/xslt/man/ /usr/share/xml/docbook/stylesheet/nwalsh/ /usr/share/xml/docbook/stylesheet/nwalsh/current/ /sw/share/xml/xsl/docbook-xsl /usr/share/xml/docbook/xsl-stylesheets-*/ /usr/share/sgml/docbook/xsl-stylesheets-*/ /usr/share/sgml/docbook/xsl-stylesheets; do
++	for dir in $with_docbook $SCI_SRCDIR_FULL/thirdparty/docbook/ /usr/share/sgml/docbook/stylesheet/xsl/nwalsh /usr/share/docbook2X/xslt/man/ /usr/share/xml/docbook/stylesheet/nwalsh/ /usr/share/xml/docbook/stylesheet/nwalsh/current/ /sw/share/xml/xsl/docbook-xsl /usr/share/xml/docbook/xsl-stylesheets-*/ /usr/share/sgml/docbook/xsl-stylesheets-*/ /usr/share/sgml/docbook/xsl-stylesheets /usr/share/sgml/docbook/xsl-ns-stylesheets-*/; do
+ 		if test -r "$dir/javahelp/javahelp.xsl" -a "$DOCBOOK_ROOT" = ""; then
+ 			DOCBOOK_ROOT=$dir
+         fi
+@@ -24669,7 +25213,7 @@ $as_echo_n "checking saxon... " >&6; }
+     PACKAGE_JAR_FILE=
+     found_jar=no
+     saved_ac_java_classpath=$ac_java_classpath
+-    DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/ 2>/dev/null) $(ls -d /usr/lib64/*/ 2>/dev/null) $(ls -d /usr/lib/*/ 2>/dev/null)  $(ls -d /usr/share/*/lib/ 2>/dev/null)"
++    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/saxon.jar" "$jardir/libsaxon.jar" "$jardir/libsaxon-java.jar" "$jardir/saxon*.jar"; do
+ #    jar=`echo $jar|sed -e 's/ /\\ /'`
+@@ -24683,8 +25227,8 @@ $as_echo_n "checking saxon... " >&6; }
+           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+ 
+     cat << \EOF > conftest.java
+-// #line 24686 "configure"
+-import com.icl.saxon.Loader;
++// #line 25230 "configure"
++import net.sf.saxon.Version;
+ 
+ public class conftest {
+     public static void main(String[] argv) {
+@@ -24759,10 +25303,10 @@ $as_echo "$jar_resolved" >&6; }
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+       if test "" = "yes"; then
+-         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar saxon used by Saxon XSLT Processor (looking for package com.icl.saxon.Loader)" >&5
+-$as_echo "$as_me: WARNING: Could not find or use the Java package/jar saxon used by Saxon XSLT Processor (looking for package com.icl.saxon.Loader)" >&2;}
++         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar saxon used by Saxon XSLT Processor (looking for package net.sf.saxon.Version)" >&5
++$as_echo "$as_me: WARNING: Could not find or use the Java package/jar saxon used by Saxon XSLT Processor (looking for package net.sf.saxon.Version)" >&2;}
+       else
+-          as_fn_error $? "Could not find or use the Java package/jar saxon used by Saxon XSLT Processor (looking for package com.icl.saxon.Loader)" "$LINENO" 5
++          as_fn_error $? "Could not find or use the Java package/jar saxon used by Saxon XSLT Processor (looking for package net.sf.saxon.Version)" "$LINENO" 5
+       fi
+     fi
+ 
+@@ -24776,7 +25320,7 @@ $as_echo_n "checking jlatexmath-fop... " >&6; }
+     PACKAGE_JAR_FILE=
+     found_jar=no
+     saved_ac_java_classpath=$ac_java_classpath
+-    DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/ 2>/dev/null) $(ls -d /usr/lib64/*/ 2>/dev/null) $(ls -d /usr/lib/*/ 2>/dev/null)  $(ls -d /usr/share/*/lib/ 2>/dev/null)"
++    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/jlatexmath-fop.jar" "$jardir/libjlatexmath-fop.jar" "$jardir/libjlatexmath-fop-java.jar" "$jardir/jlatexmath-fop*.jar"; do
+ #    jar=`echo $jar|sed -e 's/ /\\ /'`
+@@ -24790,7 +25334,7 @@ $as_echo_n "checking jlatexmath-fop... " >&6; }
+           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+ 
+     cat << \EOF > conftest.java
+-// #line 24793 "configure"
++// #line 25337 "configure"
+ import org.scilab.forge.jlatexmath.fop.JLaTeXMathObj;
+ 
+ public class conftest {
+@@ -25111,7 +25655,7 @@ esac
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+ $as_echo_n "checking for a sed that does not truncate output... " >&6; }
+-if test "${ac_cv_path_SED+set}" = set; then :
++if ${ac_cv_path_SED+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+             ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+@@ -25193,7 +25737,7 @@ Xsed="$SED -e 1s/^X//"
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
+ $as_echo_n "checking for fgrep... " >&6; }
+-if test "${ac_cv_path_FGREP+set}" = set; then :
++if ${ac_cv_path_FGREP+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
+@@ -25324,7 +25868,7 @@ else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+ $as_echo_n "checking for non-GNU ld... " >&6; }
+ fi
+-if test "${lt_cv_path_LD+set}" = set; then :
++if ${lt_cv_path_LD+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -z "$LD"; then
+@@ -25364,7 +25908,7 @@ fi
+ test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+ $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+-if test "${lt_cv_prog_gnu_ld+set}" = set; then :
++if ${lt_cv_prog_gnu_ld+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   # I'd rather use --version here, but apparently some GNU lds only accept -v.
+@@ -25391,7 +25935,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
+ $as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
+-if test "${lt_cv_path_NM+set}" = set; then :
++if ${lt_cv_path_NM+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$NM"; then
+@@ -25454,7 +25998,7 @@ else
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_DUMPBIN+set}" = set; then :
++if ${ac_cv_prog_DUMPBIN+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$DUMPBIN"; then
+@@ -25498,7 +26042,7 @@ do
+ set dummy $ac_prog; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then :
++if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_DUMPBIN"; then
+@@ -25570,7 +26114,7 @@ test -z "$NM" && NM=nm
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
+ $as_echo_n "checking the name lister ($NM) interface... " >&6; }
+-if test "${lt_cv_nm_interface+set}" = set; then :
++if ${lt_cv_nm_interface+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   lt_cv_nm_interface="BSD nm"
+@@ -25594,7 +26138,7 @@ $as_echo "$lt_cv_nm_interface" >&6; }
+ # find the maximum length of command line arguments
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
+ $as_echo_n "checking the maximum length of command line arguments... " >&6; }
+-if test "${lt_cv_sys_max_cmd_len+set}" = set; then :
++if ${lt_cv_sys_max_cmd_len+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+     i=0
+@@ -25791,7 +26335,7 @@ esac
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
+ $as_echo_n "checking for $LD option to reload object files... " >&6; }
+-if test "${lt_cv_ld_reload_flag+set}" = set; then :
++if ${lt_cv_ld_reload_flag+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   lt_cv_ld_reload_flag='-r'
+@@ -25827,7 +26371,7 @@ if test -n "$ac_tool_prefix"; then
+ set dummy ${ac_tool_prefix}objdump; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
++if ${ac_cv_prog_OBJDUMP+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$OBJDUMP"; then
+@@ -25867,7 +26411,7 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
+ set dummy objdump; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
++if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_OBJDUMP"; then
+@@ -25926,7 +26470,7 @@ test -z "$OBJDUMP" && OBJDUMP=objdump
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
+ $as_echo_n "checking how to recognize dependent libraries... " >&6; }
+-if test "${lt_cv_deplibs_check_method+set}" = set; then :
++if ${lt_cv_deplibs_check_method+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   lt_cv_file_magic_cmd='$MAGIC_CMD'
+@@ -26143,7 +26687,7 @@ if test -n "$ac_tool_prefix"; then
+ set dummy ${ac_tool_prefix}ar; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_AR+set}" = set; then :
++if ${ac_cv_prog_AR+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$AR"; then
+@@ -26183,7 +26727,7 @@ if test -z "$ac_cv_prog_AR"; then
+ set dummy ar; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
++if ${ac_cv_prog_ac_ct_AR+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_AR"; then
+@@ -26248,7 +26792,7 @@ if test -n "$ac_tool_prefix"; then
+ set dummy ${ac_tool_prefix}strip; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_STRIP+set}" = set; then :
++if ${ac_cv_prog_STRIP+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$STRIP"; then
+@@ -26288,7 +26832,7 @@ if test -z "$ac_cv_prog_STRIP"; then
+ set dummy strip; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
++if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_STRIP"; then
+@@ -26347,7 +26891,7 @@ if test -n "$ac_tool_prefix"; then
+ set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_RANLIB+set}" = set; then :
++if ${ac_cv_prog_RANLIB+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$RANLIB"; then
+@@ -26387,7 +26931,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
+ set dummy ranlib; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
++if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_RANLIB"; then
+@@ -26516,7 +27060,7 @@ compiler=$CC
+ # Check for command to grab the raw symbol name followed by C symbol from nm.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
+ $as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
+-if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then :
++if ${lt_cv_sys_global_symbol_pipe+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -26887,7 +27431,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+   CFLAGS="$CFLAGS -belf"
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
+ $as_echo_n "checking whether the C compiler needs -belf... " >&6; }
+-if test "${lt_cv_cc_needs_belf+set}" = set; then :
++if ${lt_cv_cc_needs_belf+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_ext=c
+@@ -26971,7 +27515,7 @@ need_locks="$enable_libtool_lock"
+ set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_DSYMUTIL+set}" = set; then :
++if ${ac_cv_prog_DSYMUTIL+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$DSYMUTIL"; then
+@@ -27011,7 +27555,7 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then
+ set dummy dsymutil; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then :
++if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_DSYMUTIL"; then
+@@ -27063,7 +27607,7 @@ fi
+ set dummy ${ac_tool_prefix}nmedit; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_NMEDIT+set}" = set; then :
++if ${ac_cv_prog_NMEDIT+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$NMEDIT"; then
+@@ -27103,7 +27647,7 @@ if test -z "$ac_cv_prog_NMEDIT"; then
+ set dummy nmedit; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then :
++if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_NMEDIT"; then
+@@ -27155,7 +27699,7 @@ fi
+ set dummy ${ac_tool_prefix}lipo; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_LIPO+set}" = set; then :
++if ${ac_cv_prog_LIPO+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$LIPO"; then
+@@ -27195,7 +27739,7 @@ if test -z "$ac_cv_prog_LIPO"; then
+ set dummy lipo; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then :
++if ${ac_cv_prog_ac_ct_LIPO+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_LIPO"; then
+@@ -27247,7 +27791,7 @@ fi
+ set dummy ${ac_tool_prefix}otool; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_OTOOL+set}" = set; then :
++if ${ac_cv_prog_OTOOL+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$OTOOL"; then
+@@ -27287,7 +27831,7 @@ if test -z "$ac_cv_prog_OTOOL"; then
+ set dummy otool; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then :
++if ${ac_cv_prog_ac_ct_OTOOL+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_OTOOL"; then
+@@ -27339,7 +27883,7 @@ fi
+ set dummy ${ac_tool_prefix}otool64; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_OTOOL64+set}" = set; then :
++if ${ac_cv_prog_OTOOL64+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$OTOOL64"; then
+@@ -27379,7 +27923,7 @@ if test -z "$ac_cv_prog_OTOOL64"; then
+ set dummy otool64; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then :
++if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_OTOOL64"; then
+@@ -27454,7 +27998,7 @@ fi
+ 
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
+ $as_echo_n "checking for -single_module linker flag... " >&6; }
+-if test "${lt_cv_apple_cc_single_mod+set}" = set; then :
++if ${lt_cv_apple_cc_single_mod+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   lt_cv_apple_cc_single_mod=no
+@@ -27483,7 +28027,7 @@ fi
+ $as_echo "$lt_cv_apple_cc_single_mod" >&6; }
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
+ $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
+-if test "${lt_cv_ld_exported_symbols_list+set}" = set; then :
++if ${lt_cv_ld_exported_symbols_list+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   lt_cv_ld_exported_symbols_list=no
+@@ -27523,7 +28067,7 @@ fi
+ $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
+ $as_echo_n "checking for -force_load linker flag... " >&6; }
+-if test "${lt_cv_ld_force_load+set}" = set; then :
++if ${lt_cv_ld_force_load+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   lt_cv_ld_force_load=no
+@@ -27590,7 +28134,7 @@ for ac_header in dlfcn.h
+ do :
+   ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
+ "
+-if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
++if test "x$ac_cv_header_dlfcn_h" = xyes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_DLFCN_H 1
+ _ACEOF
+@@ -27746,7 +28290,7 @@ fi
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
+ $as_echo_n "checking for objdir... " >&6; }
+-if test "${lt_cv_objdir+set}" = set; then :
++if ${lt_cv_objdir+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   rm -f .libs 2>/dev/null
+@@ -27824,7 +28368,7 @@ file_magic*)
+   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
+ $as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
+-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
++if ${lt_cv_path_MAGIC_CMD+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $MAGIC_CMD in
+@@ -27890,7 +28434,7 @@ if test -z "$lt_cv_path_MAGIC_CMD"; then
+   if test -n "$ac_tool_prefix"; then
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
+ $as_echo_n "checking for file... " >&6; }
+-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
++if ${lt_cv_path_MAGIC_CMD+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $MAGIC_CMD in
+@@ -28032,7 +28576,7 @@ if test "$GCC" = yes; then
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+ $as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
+-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then :
++if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   lt_cv_prog_compiler_rtti_exceptions=no
+@@ -28384,7 +28928,7 @@ $as_echo "$lt_prog_compiler_pic" >&6; }
+ if test -n "$lt_prog_compiler_pic"; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+ $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
+-if test "${lt_cv_prog_compiler_pic_works+set}" = set; then :
++if ${lt_cv_prog_compiler_pic_works+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   lt_cv_prog_compiler_pic_works=no
+@@ -28443,7 +28987,7 @@ fi
+ wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+ $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+-if test "${lt_cv_prog_compiler_static_works+set}" = set; then :
++if ${lt_cv_prog_compiler_static_works+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   lt_cv_prog_compiler_static_works=no
+@@ -28486,7 +29030,7 @@ fi
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+ $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+-if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
++if ${lt_cv_prog_compiler_c_o+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   lt_cv_prog_compiler_c_o=no
+@@ -28541,7 +29085,7 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6; }
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+ $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+-if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
++if ${lt_cv_prog_compiler_c_o+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   lt_cv_prog_compiler_c_o=no
+@@ -29370,7 +29914,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ 	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
+ 	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
+ $as_echo_n "checking if $CC understands -b... " >&6; }
+-if test "${lt_cv_prog_compiler__b+set}" = set; then :
++if ${lt_cv_prog_compiler__b+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   lt_cv_prog_compiler__b=no
+@@ -29742,7 +30286,7 @@ x|xyes)
+       # to ld, don't add -lc before -lgcc.
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
+ $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
+-if test "${lt_cv_archive_cmds_need_lc+set}" = set; then :
++if ${lt_cv_archive_cmds_need_lc+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   $RM conftest*
+@@ -30371,7 +30915,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+   shlibpath_overrides_runpath=no
+ 
+   # Some binutils ld are patched to set DT_RUNPATH
+-  if test "${lt_cv_shlibpath_overrides_runpath+set}" = set; then :
++  if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   lt_cv_shlibpath_overrides_runpath=no
+@@ -30799,7 +31343,7 @@ else
+   # if libdl is installed we need to link against it
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+ $as_echo_n "checking for dlopen in -ldl... " >&6; }
+-if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
++if ${ac_cv_lib_dl_dlopen+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -30841,7 +31385,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+ $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
++if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
+   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+ else
+ 
+@@ -30855,12 +31399,12 @@ fi
+ 
+   *)
+     ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
+-if test "x$ac_cv_func_shl_load" = x""yes; then :
++if test "x$ac_cv_func_shl_load" = xyes; then :
+   lt_cv_dlopen="shl_load"
+ else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
+ $as_echo_n "checking for shl_load in -ldld... " >&6; }
+-if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
++if ${ac_cv_lib_dld_shl_load+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -30902,16 +31446,16 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
+ $as_echo "$ac_cv_lib_dld_shl_load" >&6; }
+-if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
++if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
+   lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
+ else
+   ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
+-if test "x$ac_cv_func_dlopen" = x""yes; then :
++if test "x$ac_cv_func_dlopen" = xyes; then :
+   lt_cv_dlopen="dlopen"
+ else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+ $as_echo_n "checking for dlopen in -ldl... " >&6; }
+-if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
++if ${ac_cv_lib_dl_dlopen+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -30953,12 +31497,12 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+ $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
++if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
+   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+ else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
+ $as_echo_n "checking for dlopen in -lsvld... " >&6; }
+-if test "${ac_cv_lib_svld_dlopen+set}" = set; then :
++if ${ac_cv_lib_svld_dlopen+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -31000,12 +31544,12 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
+ $as_echo "$ac_cv_lib_svld_dlopen" >&6; }
+-if test "x$ac_cv_lib_svld_dlopen" = x""yes; then :
++if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
+   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
+ else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
+ $as_echo_n "checking for dld_link in -ldld... " >&6; }
+-if test "${ac_cv_lib_dld_dld_link+set}" = set; then :
++if ${ac_cv_lib_dld_dld_link+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -31047,7 +31591,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
+ $as_echo "$ac_cv_lib_dld_dld_link" >&6; }
+-if test "x$ac_cv_lib_dld_dld_link" = x""yes; then :
++if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
+   lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
+ fi
+ 
+@@ -31088,7 +31632,7 @@ fi
+ 
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
+ $as_echo_n "checking whether a program can dlopen itself... " >&6; }
+-if test "${lt_cv_dlopen_self+set}" = set; then :
++if ${lt_cv_dlopen_self+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   	  if test "$cross_compiling" = yes; then :
+@@ -31097,7 +31641,7 @@ else
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 31100 "configure"
++#line 31644 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -31194,7 +31738,7 @@ $as_echo "$lt_cv_dlopen_self" >&6; }
+       wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
+ $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
+-if test "${lt_cv_dlopen_self_static+set}" = set; then :
++if ${lt_cv_dlopen_self_static+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   	  if test "$cross_compiling" = yes; then :
+@@ -31203,7 +31747,7 @@ else
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 31206 "configure"
++#line 31750 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -31431,7 +31975,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
+ $as_echo_n "checking how to run the C++ preprocessor... " >&6; }
+ if test -z "$CXXCPP"; then
+-  if test "${ac_cv_prog_CXXCPP+set}" = set; then :
++  if ${ac_cv_prog_CXXCPP+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+       # Double quotes because CXXCPP needs to be expanded
+@@ -31547,7 +32091,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 $? "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
+@@ -31732,7 +32276,7 @@ else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+ $as_echo_n "checking for non-GNU ld... " >&6; }
+ fi
+-if test "${lt_cv_path_LD+set}" = set; then :
++if ${lt_cv_path_LD+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -z "$LD"; then
+@@ -31772,7 +32316,7 @@ fi
+ test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+ $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+-if test "${lt_cv_prog_gnu_ld+set}" = set; then :
++if ${lt_cv_prog_gnu_ld+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   # I'd rather use --version here, but apparently some GNU lds only accept -v.
+@@ -33324,7 +33868,7 @@ $as_echo "$lt_prog_compiler_pic_CXX" >&6; }
+ if test -n "$lt_prog_compiler_pic_CXX"; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
+ $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; }
+-if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then :
++if ${lt_cv_prog_compiler_pic_works_CXX+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   lt_cv_prog_compiler_pic_works_CXX=no
+@@ -33380,7 +33924,7 @@ fi
+ wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+ $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+-if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then :
++if ${lt_cv_prog_compiler_static_works_CXX+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   lt_cv_prog_compiler_static_works_CXX=no
+@@ -33420,7 +33964,7 @@ fi
+ 
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+ $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+-if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then :
++if ${lt_cv_prog_compiler_c_o_CXX+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   lt_cv_prog_compiler_c_o_CXX=no
+@@ -33472,7 +34016,7 @@ $as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
+ 
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+ $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+-if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then :
++if ${lt_cv_prog_compiler_c_o_CXX+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   lt_cv_prog_compiler_c_o_CXX=no
+@@ -33605,7 +34149,7 @@ x|xyes)
+       # to ld, don't add -lc before -lgcc.
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
+ $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
+-if test "${lt_cv_archive_cmds_need_lc_CXX+set}" = set; then :
++if ${lt_cv_archive_cmds_need_lc_CXX+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   $RM conftest*
+@@ -34075,7 +34619,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+   shlibpath_overrides_runpath=no
+ 
+   # Some binutils ld are patched to set DT_RUNPATH
+-  if test "${lt_cv_shlibpath_overrides_runpath+set}" = set; then :
++  if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   lt_cv_shlibpath_overrides_runpath=no
+@@ -34890,7 +35434,7 @@ $as_echo "$lt_prog_compiler_pic_F77" >&6; }
+ if test -n "$lt_prog_compiler_pic_F77"; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
+ $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... " >&6; }
+-if test "${lt_cv_prog_compiler_pic_works_F77+set}" = set; then :
++if ${lt_cv_prog_compiler_pic_works_F77+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   lt_cv_prog_compiler_pic_works_F77=no
+@@ -34946,7 +35490,7 @@ fi
+ wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+ $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+-if test "${lt_cv_prog_compiler_static_works_F77+set}" = set; then :
++if ${lt_cv_prog_compiler_static_works_F77+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   lt_cv_prog_compiler_static_works_F77=no
+@@ -34986,7 +35530,7 @@ fi
+ 
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+ $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+-if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then :
++if ${lt_cv_prog_compiler_c_o_F77+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   lt_cv_prog_compiler_c_o_F77=no
+@@ -35038,7 +35582,7 @@ $as_echo "$lt_cv_prog_compiler_c_o_F77" >&6; }
+ 
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+ $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+-if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then :
++if ${lt_cv_prog_compiler_c_o_F77+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   lt_cv_prog_compiler_c_o_F77=no
+@@ -36159,7 +36703,7 @@ x|xyes)
+       # to ld, don't add -lc before -lgcc.
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
+ $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
+-if test "${lt_cv_archive_cmds_need_lc_F77+set}" = set; then :
++if ${lt_cv_archive_cmds_need_lc_F77+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   $RM conftest*
+@@ -36629,7 +37173,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+   shlibpath_overrides_runpath=no
+ 
+   # Some binutils ld are patched to set DT_RUNPATH
+-  if test "${lt_cv_shlibpath_overrides_runpath+set}" = set; then :
++  if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   lt_cv_shlibpath_overrides_runpath=no
+@@ -37022,7 +37566,7 @@ fi
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
+ $as_echo_n "checking for an ANSI C-conforming const... " >&6; }
+-if test "${ac_cv_c_const+set}" = set; then :
++if ${ac_cv_c_const+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -37110,7 +37654,7 @@ fi
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
+ $as_echo_n "checking for inline... " >&6; }
+-if test "${ac_cv_c_inline+set}" = set; then :
++if ${ac_cv_c_inline+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_cv_c_inline=no
+@@ -37197,9 +37741,142 @@ rm -f core conftest.err conftest.$ac_objext \
+ $as_echo "$have_glibc_backtrace" >&6; }
+ 
+ if test "x$have_glibc_backtrace" = "xyes"; then
+-  CFLAGS="$CFLAGS -rdynamic"
+-  CPPFLAGS="$CPPFLAGS -rdynamic"
+-  FFLAGS="$FFLAGS -rdynamic"
++
++    ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the C compiler accepts \"-rdynamic\"" >&5
++$as_echo_n "checking if the C compiler accepts \"-rdynamic\"... " >&6; }
++    ac_save_CFLAGS="$CFLAGS"
++    CFLAGS="$CFLAGS -rdynamic"
++
++    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++
++#ifdef F77_DUMMY_MAIN
++
++#  ifdef __cplusplus
++     extern "C"
++#  endif
++   int F77_DUMMY_MAIN() { return 1; }
++
++#endif
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++       CFLAGS="$ac_save_CFLAGS"
++
++
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++    ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++
++
++
++    ac_ext=cpp
++ac_cpp='$CXXCPP $CPPFLAGS'
++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
++
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the C++ compiler accepts \"-rdynamic\"" >&5
++$as_echo_n "checking if the C++ compiler accepts \"-rdynamic\"... " >&6; }
++    ac_save_CXXFLAGS="$CXXFLAGS"
++    CXXFLAGS="$CXXFLAGS -rdynamic"
++
++    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++
++#ifdef F77_DUMMY_MAIN
++
++#  ifdef __cplusplus
++     extern "C"
++#  endif
++   int F77_DUMMY_MAIN() { return 1; }
++
++#endif
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_cxx_try_compile "$LINENO"; then :
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++       CXXFLAGS="$ac_save_CXXFLAGS"
++
++
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++    ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++
++
++
++    ac_ext=f
++ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
++ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_f77_compiler_gnu
++
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the Fortran 77 compiler accepts \"-rdynamic\"" >&5
++$as_echo_n "checking if the Fortran 77 compiler accepts \"-rdynamic\"... " >&6; }
++    ac_save_FFLAGS="$FFLAGS"
++    FFLAGS="$FFLAGS -rdynamic"
++
++    cat > conftest.$ac_ext <<_ACEOF
++      program main
++
++      end
++_ACEOF
++if ac_fn_f77_try_compile "$LINENO"; then :
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++       FFLAGS="$ac_save_FFLAGS"
++
++
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++    ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++
++
++
+ 
+ $as_echo "#define HAVE_GLIBC_BACKTRACE 1" >>confdefs.h
+ 
+@@ -37241,9 +37918,142 @@ rm -f core conftest.err conftest.$ac_objext \
+ $as_echo "$have_cplus_demangle" >&6; }
+ 
+ if test "x$have_cplus_demangle" = "xyes"; then
+-  CFLAGS="$CFLAGS -rdynamic"
+-  CPPFLAGS="$CPPFLAGS -rdynamic"
+-  FFLAGS="$FFLAGS -rdynamic"
++
++
++    ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the C compiler accepts \"-rdynamic\"" >&5
++$as_echo_n "checking if the C compiler accepts \"-rdynamic\"... " >&6; }
++    ac_save_CFLAGS="$CFLAGS"
++    CFLAGS="$CFLAGS -rdynamic"
++
++    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++
++#ifdef F77_DUMMY_MAIN
++
++#  ifdef __cplusplus
++     extern "C"
++#  endif
++   int F77_DUMMY_MAIN() { return 1; }
++
++#endif
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++       CFLAGS="$ac_save_CFLAGS"
++
++
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++    ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++
++
++
++    ac_ext=cpp
++ac_cpp='$CXXCPP $CPPFLAGS'
++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
++
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the C++ compiler accepts \"-rdynamic\"" >&5
++$as_echo_n "checking if the C++ compiler accepts \"-rdynamic\"... " >&6; }
++    ac_save_CXXFLAGS="$CXXFLAGS"
++    CXXFLAGS="$CXXFLAGS -rdynamic"
++
++    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++
++#ifdef F77_DUMMY_MAIN
++
++#  ifdef __cplusplus
++     extern "C"
++#  endif
++   int F77_DUMMY_MAIN() { return 1; }
++
++#endif
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_cxx_try_compile "$LINENO"; then :
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++       CXXFLAGS="$ac_save_CXXFLAGS"
++
++
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++    ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++
++
++
++    ac_ext=f
++ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
++ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_f77_compiler_gnu
++
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the Fortran 77 compiler accepts \"-rdynamic\"" >&5
++$as_echo_n "checking if the Fortran 77 compiler accepts \"-rdynamic\"... " >&6; }
++    ac_save_FFLAGS="$FFLAGS"
++    FFLAGS="$FFLAGS -rdynamic"
++
++    cat > conftest.$ac_ext <<_ACEOF
++      program main
++
++      end
++_ACEOF
++if ac_fn_f77_try_compile "$LINENO"; then :
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++       FFLAGS="$ac_save_FFLAGS"
++
++
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++    ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++
++
+ 
+ 
+ $as_echo "#define HAVE_CPLUS_DEMANGLE 1" >>confdefs.h
+@@ -37258,7 +38068,7 @@ fi
+ set dummy splint; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_SPLINT+set}" = set; then :
++if ${ac_cv_path_SPLINT+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $SPLINT in
+@@ -37430,10 +38240,21 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      :end' >>confcache
+ if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
+   if test -w "$cache_file"; then
+-    test "x$cache_file" != "x/dev/null" &&
++    if test "x$cache_file" != "x/dev/null"; then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+ $as_echo "$as_me: updating cache $cache_file" >&6;}
+-    cat confcache >$cache_file
++      if test ! -f "$cache_file" || test -h "$cache_file"; then
++	cat confcache >"$cache_file"
++      else
++        case $cache_file in #(
++        */* | ?:*)
++	  mv -f confcache "$cache_file"$$ &&
++	  mv -f "$cache_file"$$ "$cache_file" ;; #(
++        *)
++	  mv -f confcache "$cache_file" ;;
++	esac
++      fi
++    fi
+   else
+     { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+ $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+@@ -37601,7 +38422,7 @@ if test -z "${ENABLE_STATIC_TRUE}" && test -z "${ENABLE_STATIC_FALSE}"; then
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ 
+-: ${CONFIG_STATUS=./config.status}
++: "${CONFIG_STATUS=./config.status}"
+ ac_write_fail=0
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+@@ -37702,6 +38523,7 @@ fi
+ IFS=" ""	$as_nl"
+ 
+ # Find who we are.  Look in the path if we contain no directory separator.
++as_myself=
+ case $0 in #((
+   *[\\/]* ) as_myself=$0 ;;
+   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+@@ -38009,7 +38831,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.68.  Invocation command line was
+ 
+   CONFIG_FILES    = $CONFIG_FILES
+   CONFIG_HEADERS  = $CONFIG_HEADERS
+@@ -38075,7 +38897,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.68,
+   with options \\"\$ac_cs_config\\"
+ 
+ Copyright (C) 2010 Free Software Foundation, Inc.
+@@ -38762,7 +39584,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
+ 
+@@ -38785,9 +39607,10 @@ fi
+ # after its creation but before its name has been assigned to `$tmp'.
+ $debug ||
+ {
+-  tmp=
++  tmp= ac_tmp=
+   trap 'exit_status=$?
+-  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
++  : "${ac_tmp:=$tmp}"
++  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
+ ' 0
+   trap 'as_fn_exit 1' 1 2 13 15
+ }
+@@ -38795,12 +39618,13 @@ $debug ||
+ 
+ {
+   tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
+-  test -n "$tmp" && test -d "$tmp"
++  test -d "$tmp"
+ }  ||
+ {
+   tmp=./conf$$-$RANDOM
+   (umask 077 && mkdir "$tmp")
+ } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
++ac_tmp=$tmp
+ 
+ # Set up the scripts for CONFIG_FILES section.
+ # No need to generate them if there are no CONFIG_FILES.
+@@ -38822,7 +39646,7 @@ else
+   ac_cs_awk_cr=$ac_cr
+ fi
+ 
+-echo 'BEGIN {' >"$tmp/subs1.awk" &&
++echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
+ _ACEOF
+ 
+ 
+@@ -38850,7 +39674,7 @@ done
+ rm -f conf$$subs.sh
+ 
+ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
++cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
+ _ACEOF
+ sed -n '
+ h
+@@ -38898,7 +39722,7 @@ t delim
+ rm -f conf$$subs.awk
+ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ _ACAWK
+-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
++cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
+   for (key in S) S_is_set[key] = 1
+   FS = ""
+ 
+@@ -38930,7 +39754,7 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+   sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+ else
+   cat
+-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
++fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
+   || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
+ _ACEOF
+ 
+@@ -38964,7 +39788,7 @@ fi # test -n "$CONFIG_FILES"
+ # No need to generate them if there are no CONFIG_HEADERS.
+ # This happens for instance with `./config.status Makefile'.
+ if test -n "$CONFIG_HEADERS"; then
+-cat >"$tmp/defines.awk" <<\_ACAWK ||
++cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
+ BEGIN {
+ _ACEOF
+ 
+@@ -38976,8 +39800,8 @@ _ACEOF
+ # handling of long lines.
+ ac_delim='%!_!# '
+ for ac_last_try in false false :; do
+-  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
+-  if test -z "$ac_t"; then
++  ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
++  if test -z "$ac_tt"; then
+     break
+   elif $ac_last_try; then
+     as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
+@@ -39078,7 +39902,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
+@@ -39097,7 +39921,7 @@ do
+     for ac_f
+     do
+       case $ac_f in
+-      -) ac_f="$tmp/stdin";;
++      -) ac_f="$ac_tmp/stdin";;
+       *) # Look for the file first in the build tree, then in the source tree
+ 	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
+ 	 # because $ac_f cannot contain `:'.
+@@ -39106,7 +39930,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'"
+@@ -39132,8 +39956,8 @@ $as_echo "$as_me: creating $ac_file" >&6;}
+     esac
+ 
+     case $ac_tag in
+-    *:-:* | *:-) cat >"$tmp/stdin" \
+-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5  ;;
++    *:-:* | *:-) cat >"$ac_tmp/stdin" \
++      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
+     esac
+     ;;
+   esac
+@@ -39269,21 +40093,22 @@ s&@INSTALL@&$ac_INSTALL&;t t
+ s&@MKDIR_P@&$ac_MKDIR_P&;t t
+ $ac_datarootdir_hack
+ "
+-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
+-  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
++eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
++  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ 
+ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+-  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
+-  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
++  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
++  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
++      "$ac_tmp/out"`; test -z "$ac_out"; } &&
+   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+ which seems to be undefined.  Please make sure it is defined" >&5
+ $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+ which seems to be undefined.  Please make sure it is defined" >&2;}
+ 
+-  rm -f "$tmp/stdin"
++  rm -f "$ac_tmp/stdin"
+   case $ac_file in
+-  -) cat "$tmp/out" && rm -f "$tmp/out";;
+-  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
++  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
++  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
+   esac \
+   || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+  ;;
+@@ -39294,20 +40119,20 @@ which seems to be undefined.  Please make sure it is defined" >&2;}
+   if test x"$ac_file" != x-; then
+     {
+       $as_echo "/* $configure_input  */" \
+-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
+-    } >"$tmp/config.h" \
++      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
++    } >"$ac_tmp/config.h" \
+       || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+-    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
++    if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
+ $as_echo "$as_me: $ac_file is unchanged" >&6;}
+     else
+       rm -f "$ac_file"
+-      mv "$tmp/config.h" "$ac_file" \
++      mv "$ac_tmp/config.h" "$ac_file" \
+ 	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
+     fi
+   else
+     $as_echo "/* $configure_input  */" \
+-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
++      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
+       || as_fn_error $? "could not create -" "$LINENO" 5
+   fi
+ # Compute "$ac_file"'s index in $config_headers.
+diff --git a/contrib/Makefile.in b/contrib/Makefile.in
+index f60091d..0224260 100644
+--- a/contrib/Makefile.in
++++ b/contrib/Makefile.in
+@@ -44,9 +44,10 @@ subdir = contrib
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/libs/MALLOC/Makefile.in b/libs/MALLOC/Makefile.in
+index 5a60a3f..f75057e 100644
+--- a/libs/MALLOC/Makefile.in
++++ b/libs/MALLOC/Makefile.in
+@@ -62,9 +62,10 @@ DIST_COMMON = $(libscimalloc_la_include_HEADERS) $(srcdir)/Makefile.am \
+ subdir = libs/MALLOC
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/libs/Makefile.in b/libs/Makefile.in
+index 0654568..82d81bf 100644
+--- a/libs/Makefile.in
++++ b/libs/Makefile.in
+@@ -42,9 +42,10 @@ subdir = libs
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/libs/doublylinkedlist/Makefile.in b/libs/doublylinkedlist/Makefile.in
+index 808fda4..eef9f75 100644
+--- a/libs/doublylinkedlist/Makefile.in
++++ b/libs/doublylinkedlist/Makefile.in
+@@ -63,9 +63,10 @@ DIST_COMMON = $(libscidoublylinkedlist_la_include_HEADERS) \
+ subdir = libs/doublylinkedlist
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/libs/dynamiclibrary/Makefile.in b/libs/dynamiclibrary/Makefile.in
+index e5e9194..d338b3d 100644
+--- a/libs/dynamiclibrary/Makefile.in
++++ b/libs/dynamiclibrary/Makefile.in
+@@ -63,9 +63,10 @@ DIST_COMMON = $(libscidynamiclibrary_la_include_HEADERS) \
+ subdir = libs/dynamiclibrary
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/libs/hashtable/Makefile.in b/libs/hashtable/Makefile.in
+index 772aac1..f60c5f5 100644
+--- a/libs/hashtable/Makefile.in
++++ b/libs/hashtable/Makefile.in
+@@ -63,9 +63,10 @@ DIST_COMMON = $(libscihashtable_la_include_HEADERS) \
+ subdir = libs/hashtable
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/libs/libst/Makefile.in b/libs/libst/Makefile.in
+index dfef3bc..b31c018 100644
+--- a/libs/libst/Makefile.in
++++ b/libs/libst/Makefile.in
+@@ -61,9 +61,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ subdir = libs/libst
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/modules/Makefile.in b/modules/Makefile.in
+index 7a30cb4..261ad50 100644
+--- a/modules/Makefile.in
++++ b/modules/Makefile.in
+@@ -71,9 +71,10 @@ subdir = modules
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/modules/action_binding/Makefile.in b/modules/action_binding/Makefile.in
+index c7c9730..d13a4c3 100644
+--- a/modules/action_binding/Makefile.in
++++ b/modules/action_binding/Makefile.in
+@@ -68,9 +68,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ subdir = modules/action_binding
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/modules/api_scilab/Makefile.in b/modules/api_scilab/Makefile.in
+index dd37ec5..5fcb8a7 100644
+--- a/modules/api_scilab/Makefile.in
++++ b/modules/api_scilab/Makefile.in
+@@ -66,9 +66,10 @@ DIST_COMMON = $(libsciapi_scilab_la_include_HEADERS) \
+ subdir = modules/api_scilab
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/modules/arnoldi/Makefile.in b/modules/arnoldi/Makefile.in
+index 6169997..8b8e796 100644
+--- a/modules/arnoldi/Makefile.in
++++ b/modules/arnoldi/Makefile.in
+@@ -62,9 +62,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ subdir = modules/arnoldi
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/modules/atoms/Makefile.in b/modules/atoms/Makefile.in
+index f9f05af..6c38c26 100644
+--- a/modules/atoms/Makefile.in
++++ b/modules/atoms/Makefile.in
+@@ -65,9 +65,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ subdir = modules/atoms
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/modules/boolean/Makefile.in b/modules/boolean/Makefile.in
+index 8377c74..c20ae07 100644
+--- a/modules/boolean/Makefile.in
++++ b/modules/boolean/Makefile.in
+@@ -62,9 +62,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ subdir = modules/boolean
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/modules/cacsd/Makefile.in b/modules/cacsd/Makefile.in
+index 040e8ce..137bbb0 100644
+--- a/modules/cacsd/Makefile.in
++++ b/modules/cacsd/Makefile.in
+@@ -62,9 +62,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ subdir = modules/cacsd
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/modules/call_scilab/Makefile.in b/modules/call_scilab/Makefile.in
+index 51cda9d..4d5d8e9 100644
+--- a/modules/call_scilab/Makefile.in
++++ b/modules/call_scilab/Makefile.in
+@@ -64,9 +64,10 @@ DIST_COMMON = $(libscicall_scilab_la_include_HEADERS) \
+ subdir = modules/call_scilab
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/modules/commons/Makefile.in b/modules/commons/Makefile.in
+index 0a91348..8b15c81 100644
+--- a/modules/commons/Makefile.in
++++ b/modules/commons/Makefile.in
+@@ -69,9 +69,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ subdir = modules/commons
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/modules/compatibility_functions/Makefile.in b/modules/compatibility_functions/Makefile.in
+index 05e79e8..97e394f 100644
+--- a/modules/compatibility_functions/Makefile.in
++++ b/modules/compatibility_functions/Makefile.in
+@@ -62,9 +62,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ subdir = modules/compatibility_functions
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/modules/completion/Makefile.in b/modules/completion/Makefile.in
+index db56980..5d8780f 100644
+--- a/modules/completion/Makefile.in
++++ b/modules/completion/Makefile.in
+@@ -68,9 +68,10 @@ DIST_COMMON = $(libscicompletion_la_include_HEADERS) \
+ subdir = modules/completion
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/modules/console/Makefile.in b/modules/console/Makefile.in
+index 25589d1..578e156 100644
+--- a/modules/console/Makefile.in
++++ b/modules/console/Makefile.in
+@@ -74,9 +74,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ subdir = modules/console
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/modules/core/Makefile.in b/modules/core/Makefile.in
+index 9fd10fd..c87d1bd 100644
+--- a/modules/core/Makefile.in
++++ b/modules/core/Makefile.in
+@@ -74,9 +74,10 @@ DIST_COMMON = $(libscicore_la_include_HEADERS) $(srcdir)/Makefile.am \
+ subdir = modules/core
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/modules/data_structures/Makefile.in b/modules/data_structures/Makefile.in
+index d45eb34..bba3ba2 100644
+--- a/modules/data_structures/Makefile.in
++++ b/modules/data_structures/Makefile.in
+@@ -62,9 +62,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ subdir = modules/data_structures
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/modules/demo_tools/Makefile.in b/modules/demo_tools/Makefile.in
+index a8f5526..94aef6e 100644
+--- a/modules/demo_tools/Makefile.in
++++ b/modules/demo_tools/Makefile.in
+@@ -61,9 +61,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ subdir = modules/demo_tools
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/modules/development_tools/Makefile.in b/modules/development_tools/Makefile.in
+index a252c71..7bfa15e 100644
+--- a/modules/development_tools/Makefile.in
++++ b/modules/development_tools/Makefile.in
+@@ -61,9 +61,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ subdir = modules/development_tools
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/modules/development_tools/src/fake/Makefile.in b/modules/development_tools/src/fake/Makefile.in
+index 4075f48..e9ba1ec 100644
+--- a/modules/development_tools/src/fake/Makefile.in
++++ b/modules/development_tools/src/fake/Makefile.in
+@@ -37,9 +37,10 @@ subdir = modules/development_tools/src/fake
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/modules/differential_equations/Makefile.in b/modules/differential_equations/Makefile.in
+index 085cfc3..d132184 100644
+--- a/modules/differential_equations/Makefile.in
++++ b/modules/differential_equations/Makefile.in
+@@ -62,9 +62,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ subdir = modules/differential_equations
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/modules/double/Makefile.in b/modules/double/Makefile.in
+index e731cb9..2cdb672 100644
+--- a/modules/double/Makefile.in
++++ b/modules/double/Makefile.in
+@@ -62,9 +62,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ subdir = modules/double
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/modules/dynamic_link/Makefile.in b/modules/dynamic_link/Makefile.in
+index 7285928..6dd1c89 100644
+--- a/modules/dynamic_link/Makefile.in
++++ b/modules/dynamic_link/Makefile.in
+@@ -63,9 +63,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ subdir = modules/dynamic_link
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/modules/elementary_functions/Makefile.in b/modules/elementary_functions/Makefile.in
+index afe8aa1..83e0e2a 100644
+--- a/modules/elementary_functions/Makefile.in
++++ b/modules/elementary_functions/Makefile.in
+@@ -62,9 +62,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ subdir = modules/elementary_functions
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/modules/fftw/Makefile.in b/modules/fftw/Makefile.in
+index 4009741..49c5a5a 100644
+--- a/modules/fftw/Makefile.in
++++ b/modules/fftw/Makefile.in
+@@ -67,9 +67,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ subdir = modules/fftw
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/modules/fileio/Makefile.in b/modules/fileio/Makefile.in
+index 0c619c6..18cd5a3 100644
+--- a/modules/fileio/Makefile.in
++++ b/modules/fileio/Makefile.in
+@@ -63,9 +63,10 @@ DIST_COMMON = $(libscifileio_la_include_HEADERS) $(srcdir)/Makefile.am \
+ subdir = modules/fileio
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/modules/functions/Makefile.in b/modules/functions/Makefile.in
+index 6c41fb1..0e9081b 100644
+--- a/modules/functions/Makefile.in
++++ b/modules/functions/Makefile.in
+@@ -62,9 +62,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ subdir = modules/functions
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/modules/genetic_algorithms/Makefile.in b/modules/genetic_algorithms/Makefile.in
+index 6385f79..fce107e 100644
+--- a/modules/genetic_algorithms/Makefile.in
++++ b/modules/genetic_algorithms/Makefile.in
+@@ -65,9 +65,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ subdir = modules/genetic_algorithms
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/modules/graph/Makefile.in b/modules/graph/Makefile.in
+index 36a0257..2eebfff 100644
+--- a/modules/graph/Makefile.in
++++ b/modules/graph/Makefile.in
+@@ -69,9 +69,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ subdir = modules/graph
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/modules/graphic_export/Makefile.in b/modules/graphic_export/Makefile.in
+index d2f7a63..012de01 100644
+--- a/modules/graphic_export/Makefile.in
++++ b/modules/graphic_export/Makefile.in
+@@ -70,9 +70,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ subdir = modules/graphic_export
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/modules/graphics/Makefile.in b/modules/graphics/Makefile.in
+index ed04810..fd3bc00 100644
+--- a/modules/graphics/Makefile.in
++++ b/modules/graphics/Makefile.in
+@@ -70,9 +70,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ subdir = modules/graphics
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/modules/gui/Makefile.in b/modules/gui/Makefile.in
+index fd262b7..b5001b1 100644
+--- a/modules/gui/Makefile.in
++++ b/modules/gui/Makefile.in
+@@ -73,9 +73,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ subdir = modules/gui
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/modules/hdf5/Makefile.in b/modules/hdf5/Makefile.in
+index add22b8..644645f 100644
+--- a/modules/hdf5/Makefile.in
++++ b/modules/hdf5/Makefile.in
+@@ -70,9 +70,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ subdir = modules/hdf5
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/modules/helptools/Makefile.in b/modules/helptools/Makefile.in
+index 199e91f..fc4cad7 100644
+--- a/modules/helptools/Makefile.in
++++ b/modules/helptools/Makefile.in
+@@ -62,9 +62,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ subdir = modules/helptools
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/modules/history_browser/Makefile.in b/modules/history_browser/Makefile.in
+index bcbb5f1..edb3a26 100644
+--- a/modules/history_browser/Makefile.in
++++ b/modules/history_browser/Makefile.in
+@@ -69,9 +69,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ subdir = modules/history_browser
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/modules/history_manager/Makefile.in b/modules/history_manager/Makefile.in
+index 850f947..469e612 100644
+--- a/modules/history_manager/Makefile.in
++++ b/modules/history_manager/Makefile.in
+@@ -67,9 +67,10 @@ DIST_COMMON = $(libscihistory_manager_la_include_HEADERS) \
+ subdir = modules/history_manager
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/modules/integer/Makefile.in b/modules/integer/Makefile.in
+index 2a16456..6e9b251 100644
+--- a/modules/integer/Makefile.in
++++ b/modules/integer/Makefile.in
+@@ -62,9 +62,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ subdir = modules/integer
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/modules/interpolation/Makefile.in b/modules/interpolation/Makefile.in
+index 73d7a09..44bdb55 100644
+--- a/modules/interpolation/Makefile.in
++++ b/modules/interpolation/Makefile.in
+@@ -66,9 +66,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ subdir = modules/interpolation
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/modules/intersci/Makefile.in b/modules/intersci/Makefile.in
+index fe5587e..7a0d132 100644
+--- a/modules/intersci/Makefile.in
++++ b/modules/intersci/Makefile.in
+@@ -66,9 +66,10 @@ DIST_COMMON = $(libsciintersci_la_include_HEADERS) \
+ subdir = modules/intersci
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/modules/io/Makefile.in b/modules/io/Makefile.in
+index 7219e2d..c5030ae 100644
+--- a/modules/io/Makefile.in
++++ b/modules/io/Makefile.in
+@@ -62,9 +62,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ subdir = modules/io
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/modules/javasci/Makefile.in b/modules/javasci/Makefile.in
+index 21b419e..3269a16 100644
+--- a/modules/javasci/Makefile.in
++++ b/modules/javasci/Makefile.in
+@@ -70,9 +70,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ subdir = modules/javasci
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/modules/jvm/Makefile.in b/modules/jvm/Makefile.in
+index 5066efa..8efbd8e 100644
+--- a/modules/jvm/Makefile.in
++++ b/modules/jvm/Makefile.in
+@@ -72,9 +72,10 @@ DIST_COMMON = $(libscijvm_la_include_HEADERS) $(srcdir)/Makefile.am \
+ subdir = modules/jvm
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/modules/linear_algebra/Makefile.in b/modules/linear_algebra/Makefile.in
+index 56ae652..d189d39 100644
+--- a/modules/linear_algebra/Makefile.in
++++ b/modules/linear_algebra/Makefile.in
+@@ -62,9 +62,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ subdir = modules/linear_algebra
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/modules/localization/Makefile.in b/modules/localization/Makefile.in
+index efdef53..5bc93c9 100644
+--- a/modules/localization/Makefile.in
++++ b/modules/localization/Makefile.in
+@@ -74,9 +74,10 @@ DIST_COMMON = $(libscilocalization_la_include_HEADERS) \
+ subdir = modules/localization
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/modules/m2sci/Makefile.in b/modules/m2sci/Makefile.in
+index f3f6a28..8b81634 100644
+--- a/modules/m2sci/Makefile.in
++++ b/modules/m2sci/Makefile.in
+@@ -61,9 +61,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ subdir = modules/m2sci
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/modules/maple2scilab/Makefile.in b/modules/maple2scilab/Makefile.in
+index 7e32712..229b429 100644
+--- a/modules/maple2scilab/Makefile.in
++++ b/modules/maple2scilab/Makefile.in
+@@ -61,9 +61,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ subdir = modules/maple2scilab
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/modules/matio/Makefile.in b/modules/matio/Makefile.in
+index 5d69b9c..772fd1d 100644
+--- a/modules/matio/Makefile.in
++++ b/modules/matio/Makefile.in
+@@ -63,9 +63,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ subdir = modules/matio
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/modules/mexlib/Makefile.in b/modules/mexlib/Makefile.in
+index 43baccb..493a6d3 100644
+--- a/modules/mexlib/Makefile.in
++++ b/modules/mexlib/Makefile.in
+@@ -63,9 +63,10 @@ DIST_COMMON = $(libmex_la_include_HEADERS) $(srcdir)/Makefile.am \
+ subdir = modules/mexlib
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/modules/modules_manager/Makefile.in b/modules/modules_manager/Makefile.in
+index 3ca04fc..4cdf44a 100644
+--- a/modules/modules_manager/Makefile.in
++++ b/modules/modules_manager/Makefile.in
+@@ -61,9 +61,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ subdir = modules/modules_manager
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/modules/optimization/Makefile.in b/modules/optimization/Makefile.in
+index 441dc8a..df9bf73 100644
+--- a/modules/optimization/Makefile.in
++++ b/modules/optimization/Makefile.in
+@@ -62,9 +62,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ subdir = modules/optimization
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/modules/output_stream/Makefile.in b/modules/output_stream/Makefile.in
+index 65a2805..7ef0f79 100644
+--- a/modules/output_stream/Makefile.in
++++ b/modules/output_stream/Makefile.in
+@@ -69,9 +69,10 @@ DIST_COMMON = $(libscioutput_stream_la_include_HEADERS) \
+ subdir = modules/output_stream
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/modules/overloading/Makefile.in b/modules/overloading/Makefile.in
+index ad595e9..1e4eb7a 100644
+--- a/modules/overloading/Makefile.in
++++ b/modules/overloading/Makefile.in
+@@ -61,9 +61,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ subdir = modules/overloading
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/modules/parallel/Makefile.in b/modules/parallel/Makefile.in
+index 4642785..a3e0aa4 100644
+--- a/modules/parallel/Makefile.in
++++ b/modules/parallel/Makefile.in
+@@ -68,9 +68,10 @@ DIST_COMMON = $(libsciparallel_la_include_HEADERS) \
+ subdir = modules/parallel
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/modules/parameters/Makefile.in b/modules/parameters/Makefile.in
+index 021a7de..9786908 100644
+--- a/modules/parameters/Makefile.in
++++ b/modules/parameters/Makefile.in
+@@ -68,9 +68,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ subdir = modules/parameters
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/modules/polynomials/Makefile.in b/modules/polynomials/Makefile.in
+index 3a72637..7c0b856 100644
+--- a/modules/polynomials/Makefile.in
++++ b/modules/polynomials/Makefile.in
+@@ -62,9 +62,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ subdir = modules/polynomials
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/modules/pvm/Makefile.in b/modules/pvm/Makefile.in
+index 0224f4f..bcbb994 100644
+--- a/modules/pvm/Makefile.in
++++ b/modules/pvm/Makefile.in
+@@ -79,9 +79,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ subdir = modules/pvm
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/modules/randlib/Makefile.in b/modules/randlib/Makefile.in
+index e8a49f8..4a98450 100644
+--- a/modules/randlib/Makefile.in
++++ b/modules/randlib/Makefile.in
+@@ -62,9 +62,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ subdir = modules/randlib
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/modules/renderer/Makefile.in b/modules/renderer/Makefile.in
+index eebdcdf..122578b 100644
+--- a/modules/renderer/Makefile.in
++++ b/modules/renderer/Makefile.in
+@@ -69,9 +69,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ subdir = modules/renderer
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/modules/scicos/Makefile.in b/modules/scicos/Makefile.in
+index ee28a8f..ac1e5cb 100644
+--- a/modules/scicos/Makefile.in
++++ b/modules/scicos/Makefile.in
+@@ -88,9 +88,10 @@ DIST_COMMON = $(am__libsciscicos_la_include_HEADERS_DIST) \
+ subdir = modules/scicos
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/modules/scicos_blocks/Makefile.in b/modules/scicos_blocks/Makefile.in
+index 718a253..098c4d0 100644
+--- a/modules/scicos_blocks/Makefile.in
++++ b/modules/scicos_blocks/Makefile.in
+@@ -69,9 +69,10 @@ DIST_COMMON = $(am__libsciscicos_blocks_la_include_HEADERS_DIST) \
+ subdir = modules/scicos_blocks
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/modules/scinotes/Makefile.in b/modules/scinotes/Makefile.in
+index 23bfedd..b5dfa11 100644
+--- a/modules/scinotes/Makefile.in
++++ b/modules/scinotes/Makefile.in
+@@ -69,9 +69,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ subdir = modules/scinotes
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/modules/shell/Makefile.in b/modules/shell/Makefile.in
+index b07de70..6817423 100644
+--- a/modules/shell/Makefile.in
++++ b/modules/shell/Makefile.in
+@@ -67,9 +67,10 @@ DIST_COMMON = $(libscishell_la_include_HEADERS) $(srcdir)/Makefile.am \
+ subdir = modules/shell
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/modules/signal_processing/Makefile.in b/modules/signal_processing/Makefile.in
+index ba3ea5e..144ac32 100644
+--- a/modules/signal_processing/Makefile.in
++++ b/modules/signal_processing/Makefile.in
+@@ -62,9 +62,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ subdir = modules/signal_processing
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/modules/simulated_annealing/Makefile.in b/modules/simulated_annealing/Makefile.in
+index bc3fe41..23d93fe 100644
+--- a/modules/simulated_annealing/Makefile.in
++++ b/modules/simulated_annealing/Makefile.in
+@@ -65,9 +65,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ subdir = modules/simulated_annealing
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/modules/sound/Makefile.in b/modules/sound/Makefile.in
+index 33cbaa1..2707fc2 100644
+--- a/modules/sound/Makefile.in
++++ b/modules/sound/Makefile.in
+@@ -62,9 +62,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ subdir = modules/sound
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/modules/sparse/Makefile.in b/modules/sparse/Makefile.in
+index 1a5b933..81cf13e 100644
+--- a/modules/sparse/Makefile.in
++++ b/modules/sparse/Makefile.in
+@@ -62,9 +62,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ subdir = modules/sparse
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/modules/special_functions/Makefile.in b/modules/special_functions/Makefile.in
+index c414e74..127af19 100644
+--- a/modules/special_functions/Makefile.in
++++ b/modules/special_functions/Makefile.in
+@@ -62,9 +62,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ subdir = modules/special_functions
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/modules/spreadsheet/Makefile.in b/modules/spreadsheet/Makefile.in
+index c8f474c..0cfbff7 100644
+--- a/modules/spreadsheet/Makefile.in
++++ b/modules/spreadsheet/Makefile.in
+@@ -62,9 +62,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ subdir = modules/spreadsheet
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/modules/statistics/Makefile.in b/modules/statistics/Makefile.in
+index 233a8d9..4042f6e 100644
+--- a/modules/statistics/Makefile.in
++++ b/modules/statistics/Makefile.in
+@@ -62,9 +62,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ subdir = modules/statistics
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/modules/string/Makefile.in b/modules/string/Makefile.in
+index fc6837d..a9cf65b 100644
+--- a/modules/string/Makefile.in
++++ b/modules/string/Makefile.in
+@@ -62,9 +62,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ subdir = modules/string
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/modules/symbolic/Makefile.in b/modules/symbolic/Makefile.in
+index 59cf2c0..a04cda6 100644
+--- a/modules/symbolic/Makefile.in
++++ b/modules/symbolic/Makefile.in
+@@ -66,9 +66,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ subdir = modules/symbolic
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/modules/tclsci/Makefile.in b/modules/tclsci/Makefile.in
+index 9baebdf..c060cb2 100644
+--- a/modules/tclsci/Makefile.in
++++ b/modules/tclsci/Makefile.in
+@@ -62,9 +62,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ subdir = modules/tclsci
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/modules/texmacs/Makefile.in b/modules/texmacs/Makefile.in
+index 4baddb6..4af080d 100644
+--- a/modules/texmacs/Makefile.in
++++ b/modules/texmacs/Makefile.in
+@@ -61,9 +61,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ subdir = modules/texmacs
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/modules/time/Makefile.in b/modules/time/Makefile.in
+index 777244f..284ee92 100644
+--- a/modules/time/Makefile.in
++++ b/modules/time/Makefile.in
+@@ -63,9 +63,10 @@ DIST_COMMON = $(libscitime_la_include_HEADERS) $(srcdir)/Makefile.am \
+ subdir = modules/time
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/modules/types/Makefile.in b/modules/types/Makefile.in
+index f805bad..4fdb52e 100644
+--- a/modules/types/Makefile.in
++++ b/modules/types/Makefile.in
+@@ -69,9 +69,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ subdir = modules/types
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/modules/ui_data/Makefile.in b/modules/ui_data/Makefile.in
+index d02c4e0..4985de8 100644
+--- a/modules/ui_data/Makefile.in
++++ b/modules/ui_data/Makefile.in
+@@ -69,9 +69,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ subdir = modules/ui_data
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/modules/umfpack/Makefile.in b/modules/umfpack/Makefile.in
+index 4ae34ae..f87856a 100644
+--- a/modules/umfpack/Makefile.in
++++ b/modules/umfpack/Makefile.in
+@@ -68,9 +68,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ subdir = modules/umfpack
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/modules/windows_tools/Makefile.in b/modules/windows_tools/Makefile.in
+index 67b918c..da67301 100644
+--- a/modules/windows_tools/Makefile.in
++++ b/modules/windows_tools/Makefile.in
+@@ -62,9 +62,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ subdir = modules/windows_tools
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+diff --git a/modules/xcos/Makefile.in b/modules/xcos/Makefile.in
+index fa505ac..91c1bb5 100644
+--- a/modules/xcos/Makefile.in
++++ b/modules/xcos/Makefile.in
+@@ -70,9 +70,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ subdir = modules/xcos
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
+-	$(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/fftw.m4 \
+-	$(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
+-	$(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
++	$(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/docbook.m4 \
++	$(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
++	$(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
++	$(top_srcdir)/m4/intel_compiler.m4 \
+ 	$(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
+ 	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ 	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+-- 
+1.7.7
+
diff --git a/0006-fix-incorrect-fsf-adress.patch b/0006-fix-incorrect-fsf-adress.patch
new file mode 100644
index 0000000..7884e1b
--- /dev/null
+++ b/0006-fix-incorrect-fsf-adress.patch
@@ -0,0 +1,21353 @@
+From 3bedf7dc4f352ebf2880ecd7e32ea4acdb8f9024 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Cl=C3=A9ment=20DAVID?= <clement.david at scilab-enterprises.com>
+Date: Mon, 31 Oct 2011 16:58:11 +0100
+Subject: [PATCH 6/8] fix incorrect fsf adress
+
+---
+ modules/optimization/src/fortran/qpgen2.f          |    2 +-
+ modules/scicos/includes/gw_scicos.h                |    2 +-
+ modules/scicos/includes/import.h                   |    2 +-
+ modules/scicos/includes/scicos.h                   |    2 +-
+ modules/scicos/includes/scicos_free.h              |    2 +-
+ modules/scicos/includes/scicos_malloc.h            |    2 +-
+ modules/scicos/includes/scicos_math.h              |    2 +-
+ modules/scicos/macros/scicos_auto/lincos.sci       |    2 +-
+ modules/scicos/macros/scicos_auto/scicos.sci       |    2 +-
+ .../scicos/macros/scicos_auto/scicos_simulate.sci  |    2 +-
+ modules/scicos/macros/scicos_auto/steadycos.sci    |    2 +-
+ .../scicos/macros/scicos_menus/AboutScicos_.sci    |    2 +-
+ .../scicos/macros/scicos_menus/DisableAllMenus.sci |    2 +-
+ .../scicos/macros/scicos_menus/EnableAllMenus.sci  |    2 +-
+ .../macros/scicos_menus/XcosGetMenuLabel.sci       |    2 +-
+ .../scicos/macros/scicos_menus/XcosGetMenuType.sci |    2 +-
+ .../scicos/macros/scicos_menus/XcosMenuAbout.sci   |    2 +-
+ .../macros/scicos_menus/XcosMenuActivateScilab.sci |    2 +-
+ .../macros/scicos_menus/XcosMenuAddColor.sci       |    2 +-
+ .../macros/scicos_menus/XcosMenuAddNewBlock.sci    |    2 +-
+ .../scicos/macros/scicos_menus/XcosMenuAlign.sci   |    2 +-
+ .../macros/scicos_menus/XcosMenuAnalyzeDiagram.sci |    2 +-
+ .../scicos/macros/scicos_menus/XcosMenuAspect.sci  |    2 +-
+ .../scicos_menus/XcosMenuBackgroundColor.sci       |    2 +-
+ .../macros/scicos_menus/XcosMenuBlockDoc.sci       |    2 +-
+ .../macros/scicos_menus/XcosMenuBrowseTo.sci       |    2 +-
+ .../scicos/macros/scicos_menus/XcosMenuBrowser.sci |    2 +-
+ .../scicos/macros/scicos_menus/XcosMenuCalc.sci    |    2 +-
+ .../macros/scicos_menus/XcosMenuCodeGeneration.sci |    2 +-
+ .../scicos/macros/scicos_menus/XcosMenuColor.sci   |    2 +-
+ .../scicos/macros/scicos_menus/XcosMenuCompile.sci |    2 +-
+ .../scicos/macros/scicos_menus/XcosMenuContext.sci |    2 +-
+ .../scicos/macros/scicos_menus/XcosMenuCopy.sci    |    2 +-
+ .../macros/scicos_menus/XcosMenuCreateAtomic.sci   |    2 +-
+ .../macros/scicos_menus/XcosMenuCreateMask.sci     |    2 +-
+ .../macros/scicos_menus/XcosMenuCtrlSelect.sci     |    2 +-
+ .../macros/scicos_menus/XcosMenuCustomizeMask.sci  |    2 +-
+ modules/scicos/macros/scicos_menus/XcosMenuCut.sci |    2 +-
+ .../macros/scicos_menus/XcosMenuDebugLevel.sci     |    2 +-
+ .../scicos_menus/XcosMenuDefaultLinkCols.sci       |    2 +-
+ .../macros/scicos_menus/XcosMenuDefaultWindow.sci  |    2 +-
+ .../macros/scicos_menus/XcosMenuDefinedVars.sci    |    2 +-
+ .../scicos/macros/scicos_menus/XcosMenuDelete.sci  |    2 +-
+ .../scicos/macros/scicos_menus/XcosMenuDemos.sci   |    2 +-
+ .../scicos/macros/scicos_menus/XcosMenuDetails.sci |    2 +-
+ .../macros/scicos_menus/XcosMenuDocumentation.sci  |    2 +-
+ .../macros/scicos_menus/XcosMenuDuplicate.sci      |    2 +-
+ .../scicos/macros/scicos_menus/XcosMenuEval.sci    |    2 +-
+ .../macros/scicos_menus/XcosMenuExitScicos.sci     |    2 +-
+ .../scicos/macros/scicos_menus/XcosMenuExport.sci  |    2 +-
+ .../macros/scicos_menus/XcosMenuExportAll.sci      |    2 +-
+ .../macros/scicos_menus/XcosMenuFitToFigure.sci    |    2 +-
+ .../scicos/macros/scicos_menus/XcosMenuFlip.sci    |    2 +-
+ .../scicos/macros/scicos_menus/XcosMenuGetInfo.sci |    2 +-
+ .../scicos/macros/scicos_menus/XcosMenuGrid.sci    |    2 +-
+ .../scicos/macros/scicos_menus/XcosMenuHelp.sci    |    2 +-
+ .../scicos/macros/scicos_menus/XcosMenuIcon.sci    |    2 +-
+ .../macros/scicos_menus/XcosMenuIconEditor.sci     |    2 +-
+ .../macros/scicos_menus/XcosMenuIdentification.sci |    2 +-
+ .../scicos/macros/scicos_menus/XcosMenuLabel.sci   |    2 +-
+ .../scicos/macros/scicos_menus/XcosMenuLink.sci    |    2 +-
+ .../macros/scicos_menus/XcosMenuLoadAsPalette.sci  |    2 +-
+ .../macros/scicos_menus/XcosMenuModelica.sci       |    2 +-
+ .../macros/scicos_menus/XcosMenuModelicaInit.sci   |    2 +-
+ .../scicos/macros/scicos_menus/XcosMenuMove.sci    |    2 +-
+ .../macros/scicos_menus/XcosMenuMoveLink.sci       |    2 +-
+ .../macros/scicos_menus/XcosMenuNavigator.sci      |    2 +-
+ modules/scicos/macros/scicos_menus/XcosMenuNew.sci |    2 +-
+ .../scicos/macros/scicos_menus/XcosMenuNyquist.sci |    2 +-
+ .../scicos/macros/scicos_menus/XcosMenuOpen.sci    |    2 +-
+ .../scicos/macros/scicos_menus/XcosMenuOpenSet.sci |    2 +-
+ .../macros/scicos_menus/XcosMenuPalEditor.sci      |    2 +-
+ .../macros/scicos_menus/XcosMenuPalettes.sci       |    2 +-
+ .../macros/scicos_menus/XcosMenuPalettesTree.sci   |    2 +-
+ .../scicos/macros/scicos_menus/XcosMenuPaste.sci   |    2 +-
+ .../macros/scicos_menus/XcosMenuPlaceinBrowser.sci |    2 +-
+ .../macros/scicos_menus/XcosMenuPlaceinDiagram.sci |    2 +-
+ .../scicos/macros/scicos_menus/XcosMenuPopup.sci   |    2 +-
+ .../scicos/macros/scicos_menus/XcosMenuPurge.sci   |    2 +-
+ .../scicos_menus/XcosMenuRegionToPalette.sci       |    2 +-
+ .../macros/scicos_menus/XcosMenuRegionToSuper.sci  |    2 +-
+ .../macros/scicos_menus/XcosMenuRemoveAtomic.sci   |    2 +-
+ .../macros/scicos_menus/XcosMenuRemoveMask.sci     |    2 +-
+ .../scicos/macros/scicos_menus/XcosMenuRename.sci  |    2 +-
+ .../scicos/macros/scicos_menus/XcosMenuReplot.sci  |    2 +-
+ .../scicos/macros/scicos_menus/XcosMenuResize.sci  |    2 +-
+ .../macros/scicos_menus/XcosMenuRotateLeft.sci     |    2 +-
+ .../macros/scicos_menus/XcosMenuRotateRight.sci    |    2 +-
+ modules/scicos/macros/scicos_menus/XcosMenuRun.sci |    2 +-
+ .../scicos/macros/scicos_menus/XcosMenuSave.sci    |    2 +-
+ .../scicos/macros/scicos_menus/XcosMenuSaveAs.sci  |    2 +-
+ .../scicos_menus/XcosMenuSaveAsInterfFunc.sci      |    2 +-
+ .../macros/scicos_menus/XcosMenuSaveAsPalette.sci  |    2 +-
+ .../macros/scicos_menus/XcosMenuSaveBlockGUI.sci   |    2 +-
+ .../macros/scicos_menus/XcosMenuScicosDoc.sci      |    2 +-
+ .../macros/scicos_menus/XcosMenuSelectAll.sci      |    2 +-
+ .../macros/scicos_menus/XcosMenuSelectLink.sci     |    2 +-
+ .../macros/scicos_menus/XcosMenuSelectRegion.sci   |    2 +-
+ .../macros/scicos_menus/XcosMenuSetDiagramInfo.sci |    2 +-
+ .../scicos/macros/scicos_menus/XcosMenuSetGrid.sci |    2 +-
+ .../macros/scicos_menus/XcosMenuSetIDFonts.sci     |    2 +-
+ .../macros/scicos_menus/XcosMenuSetLinkMode.sci    |    2 +-
+ .../scicos/macros/scicos_menus/XcosMenuSetup.sci   |    2 +-
+ .../macros/scicos_menus/XcosMenuShortcuts.sci      |    2 +-
+ .../scicos_menus/XcosMenuShowBlockShadow.sci       |    2 +-
+ .../macros/scicos_menus/XcosMenuSmartLink.sci      |    2 +-
+ .../macros/scicos_menus/XcosMenuSmartMove.sci      |    2 +-
+ .../scicos/macros/scicos_menus/XcosMenuTkPopup.sci |    2 +-
+ .../scicos/macros/scicos_menus/XcosMenuUndo.sci    |    2 +-
+ .../macros/scicos_menus/XcosMenuUpToMain.sci       |    2 +-
+ .../scicos/macros/scicos_menus/XcosMenuZoomIn.sci  |    2 +-
+ .../scicos/macros/scicos_menus/XcosMenuZoomOut.sci |    2 +-
+ .../scicos/macros/scicos_menus/scicos_menubar.sci  |    2 +-
+ .../macros/scicos_menus/set_initial_xcos_menus.sci |    2 +-
+ modules/scicos/macros/scicos_scicos/%Block_e.sci   |    2 +-
+ modules/scicos/macros/scicos_scicos/%Block_p.sci   |    2 +-
+ .../scicos/macros/scicos_scicos/%b_i_graphics.sci  |    2 +-
+ modules/scicos/macros/scicos_scicos/%b_i_model.sci |    2 +-
+ modules/scicos/macros/scicos_scicos/%c_i_block.sci |    2 +-
+ .../scicos/macros/scicos_scicos/%c_i_graphics.sci  |    2 +-
+ modules/scicos/macros/scicos_scicos/%c_i_model.sci |    2 +-
+ .../scicos/macros/scicos_scicos/%debug_scicos.sci  |    2 +-
+ modules/scicos/macros/scicos_scicos/%diagram_p.sci |    2 +-
+ .../scicos/macros/scicos_scicos/%graphics_e.sci    |    2 +-
+ .../macros/scicos_scicos/%graphics_i_Block.sci     |    2 +-
+ .../scicos/macros/scicos_scicos/%graphics_p.sci    |    2 +-
+ modules/scicos/macros/scicos_scicos/%l_i_block.sci |    2 +-
+ .../scicos/macros/scicos_scicos/%l_i_graphics.sci  |    2 +-
+ modules/scicos/macros/scicos_scicos/%l_i_model.sci |    2 +-
+ modules/scicos/macros/scicos_scicos/%model_e.sci   |    2 +-
+ .../scicos/macros/scicos_scicos/%model_i_Block.sci |    2 +-
+ modules/scicos/macros/scicos_scicos/%model_p.sci   |    2 +-
+ modules/scicos/macros/scicos_scicos/%params_p.sci  |    2 +-
+ modules/scicos/macros/scicos_scicos/%s_i_block.sci |    2 +-
+ .../scicos/macros/scicos_scicos/%s_i_graphics.sci  |    2 +-
+ modules/scicos/macros/scicos_scicos/%s_i_model.sci |    2 +-
+ modules/scicos/macros/scicos_scicos/CC4.sci        |    2 +-
+ modules/scicos/macros/scicos_scicos/CFORTR.sci     |    2 +-
+ modules/scicos/macros/scicos_scicos/CFORTR2.sci    |    2 +-
+ .../macros/scicos_scicos/CodeGeneration_.sci       |    2 +-
+ .../scicos/macros/scicos_scicos/Compute_cic.sci    |    2 +-
+ modules/scicos/macros/scicos_scicos/FORTR.sci      |    2 +-
+ .../scicos/macros/scicos_scicos/FindSBParams.sci   |    2 +-
+ .../scicos/macros/scicos_scicos/Find_Next_Step.sci |    2 +-
+ .../macros/scicos_scicos/Link_modelica_C.sci       |    2 +-
+ modules/scicos/macros/scicos_scicos/MODCOM.sci     |    2 +-
+ .../scicos/macros/scicos_scicos/Modelica_execs.sci |    2 +-
+ modules/scicos/macros/scicos_scicos/SetString.sci  |    2 +-
+ modules/scicos/macros/scicos_scicos/Window_.sci    |    2 +-
+ .../scicos/macros/scicos_scicos/add_palette.sci    |    2 +-
+ modules/scicos/macros/scicos_scicos/adjust.sci     |    2 +-
+ .../macros/scicos_scicos/adjust_all_scs_m.sci      |    2 +-
+ .../scicos/macros/scicos_scicos/adjust_in2out2.sci |    2 +-
+ .../scicos/macros/scicos_scicos/adjust_s_ports.sci |    2 +-
+ .../macros/scicos_scicos/adjust_scs_m_temp.sci     |    2 +-
+ modules/scicos/macros/scicos_scicos/analyse.sci    |    2 +-
+ .../scicos/macros/scicos_scicos/bad_connection.sci |    2 +-
+ .../scicos/macros/scicos_scicos/build_block.sci    |    2 +-
+ .../macros/scicos_scicos/build_modelica_block.sci  |    2 +-
+ .../scicos/macros/scicos_scicos/build_scs_tree.sci |    2 +-
+ .../scicos/macros/scicos_scicos/buildnewblock.sci  |    2 +-
+ modules/scicos/macros/scicos_scicos/c_pass1.sci    |    2 +-
+ modules/scicos/macros/scicos_scicos/c_pass2.sci    |    2 +-
+ modules/scicos/macros/scicos_scicos/c_pass3.sci    |    2 +-
+ .../macros/scicos_scicos/change_tree_elt.sci       |    2 +-
+ .../scicos/macros/scicos_scicos/changeports.sci    |    2 +-
+ modules/scicos/macros/scicos_scicos/check_edge.sci |    2 +-
+ modules/scicos/macros/scicos_scicos/check_io.sci   |    2 +-
+ modules/scicos/macros/scicos_scicos/check_mac.sci  |    2 +-
+ modules/scicos/macros/scicos_scicos/choosefile.sci |    2 +-
+ modules/scicos/macros/scicos_scicos/clickin.sci    |    2 +-
+ .../scicos_scicos/close_inactive_windows.sci       |    2 +-
+ modules/scicos/macros/scicos_scicos/color.tst      |    2 +-
+ .../macros/scicos_scicos/compile_init_modelica.sci |    2 +-
+ .../macros/scicos_scicos/compile_modelica.sci      |    2 +-
+ .../macros/scicos_scicos/connected_links.sci       |    2 +-
+ .../scicos/macros/scicos_scicos/context_evstr.sci  |    2 +-
+ modules/scicos/macros/scicos_scicos/cos2cosf.sci   |    2 +-
+ modules/scicos/macros/scicos_scicos/cos2xml.sci    |    2 +-
+ modules/scicos/macros/scicos_scicos/cosclick.sci   |    2 +-
+ .../scicos/macros/scicos_scicos/countblocks.sci    |    2 +-
+ .../macros/scicos_scicos/create_modelica.sci       |    2 +-
+ .../macros/scicos_scicos/create_modelica1.sci      |    2 +-
+ modules/scicos/macros/scicos_scicos/ctree.sci      |    2 +-
+ .../scicos/macros/scicos_scicos/default_color.sci  |    2 +-
+ .../macros/scicos_scicos/default_options.sci       |    2 +-
+ .../macros/scicos_scicos/delete_unconnected.sci    |    2 +-
+ modules/scicos/macros/scicos_scicos/dialog.sci     |    2 +-
+ modules/scicos/macros/scicos_scicos/dig_bound.sci  |    2 +-
+ .../macros/scicos_scicos/dig_bound_compound.sci    |    2 +-
+ .../macros/scicos_scicos/disconnect_ports.sci      |    2 +-
+ .../scicos/macros/scicos_scicos/dist2polyline.sci  |    2 +-
+ modules/scicos/macros/scicos_scicos/do_CodeGen.sci |    2 +-
+ .../macros/scicos_scicos/do_CreateAtomic.sci       |    2 +-
+ .../macros/scicos_scicos/do_RemoveAtomic.sci       |    2 +-
+ modules/scicos/macros/scicos_scicos/do_SaveAs.sci  |    2 +-
+ modules/scicos/macros/scicos_scicos/do_addnew.sci  |    2 +-
+ .../macros/scicos_scicos/do_analyze_diagram.sci    |    2 +-
+ modules/scicos/macros/scicos_scicos/do_block.sci   |    2 +-
+ .../scicos/macros/scicos_scicos/do_block_info.sci  |    2 +-
+ modules/scicos/macros/scicos_scicos/do_browser.sci |    2 +-
+ modules/scicos/macros/scicos_scicos/do_color.sci   |    2 +-
+ modules/scicos/macros/scicos_scicos/do_compile.sci |    2 +-
+ .../scicos_scicos/do_compile_superblock42.sci      |    2 +-
+ modules/scicos/macros/scicos_scicos/do_delete.sci  |    2 +-
+ modules/scicos/macros/scicos_scicos/do_delete1.sci |    2 +-
+ modules/scicos/macros/scicos_scicos/do_delete2.sci |    2 +-
+ modules/scicos/macros/scicos_scicos/do_details.sci |    2 +-
+ modules/scicos/macros/scicos_scicos/do_doc.sci     |    2 +-
+ .../scicos/macros/scicos_scicos/do_duplicate.sci   |    2 +-
+ .../scicos/macros/scicos_scicos/do_edit_pal.sci    |    2 +-
+ modules/scicos/macros/scicos_scicos/do_eval.sci    |    2 +-
+ modules/scicos/macros/scicos_scicos/do_exit.sci    |    2 +-
+ modules/scicos/macros/scicos_scicos/do_export.sci  |    2 +-
+ modules/scicos/macros/scicos_scicos/do_focus.sci   |    2 +-
+ modules/scicos/macros/scicos_scicos/do_grid.sci    |    2 +-
+ modules/scicos/macros/scicos_scicos/do_help.sci    |    2 +-
+ .../scicos/macros/scicos_scicos/do_icon_edit.sci   |    2 +-
+ modules/scicos/macros/scicos_scicos/do_ident.sci   |    2 +-
+ modules/scicos/macros/scicos_scicos/do_label.sci   |    2 +-
+ modules/scicos/macros/scicos_scicos/do_load.sci    |    2 +-
+ .../macros/scicos_scicos/do_load_as_palette.sci    |    2 +-
+ .../scicos/macros/scicos_scicos/do_navigator.sci   |    2 +-
+ modules/scicos/macros/scicos_scicos/do_newblk.sci  |    2 +-
+ modules/scicos/macros/scicos_scicos/do_options.sci |    2 +-
+ .../scicos/macros/scicos_scicos/do_pal_tree.sci    |    2 +-
+ .../scicos/macros/scicos_scicos/do_palettes.sci    |    2 +-
+ .../macros/scicos_scicos/do_placeindiagram.sci     |    2 +-
+ modules/scicos/macros/scicos_scicos/do_purge.sci   |    2 +-
+ .../macros/scicos_scicos/do_region2block.sci       |    2 +-
+ .../scicos/macros/scicos_scicos/do_region2pal.sci  |    2 +-
+ modules/scicos/macros/scicos_scicos/do_rename.sci  |    2 +-
+ modules/scicos/macros/scicos_scicos/do_replace.sci |    2 +-
+ modules/scicos/macros/scicos_scicos/do_resize.sci  |    2 +-
+ modules/scicos/macros/scicos_scicos/do_run.sci     |    2 +-
+ modules/scicos/macros/scicos_scicos/do_save.sci    |    2 +-
+ .../macros/scicos_scicos/do_saveblockgui.sci       |    2 +-
+ .../scicos/macros/scicos_scicos/do_scsm_tree.sci   |    2 +-
+ .../macros/scicos_scicos/do_select2block.sci       |    2 +-
+ .../scicos/macros/scicos_scicos/do_select2pal.sci  |    2 +-
+ .../scicos/macros/scicos_scicos/do_set_info.sci    |    2 +-
+ modules/scicos/macros/scicos_scicos/do_setup.sci   |    2 +-
+ .../scicos/macros/scicos_scicos/do_smart_move.sci  |    2 +-
+ .../macros/scicos_scicos/do_stupidMultimove.sci    |    2 +-
+ .../macros/scicos_scicos/do_stupidmove_corner.sci  |    2 +-
+ .../scicos/macros/scicos_scicos/do_terminate.sci   |    2 +-
+ modules/scicos/macros/scicos_scicos/do_tild.sci    |    2 +-
+ modules/scicos/macros/scicos_scicos/do_turn.sci    |    2 +-
+ modules/scicos/macros/scicos_scicos/do_update.sci  |    2 +-
+ modules/scicos/macros/scicos_scicos/do_version.sci |    2 +-
+ modules/scicos/macros/scicos_scicos/do_view.sci    |    2 +-
+ modules/scicos/macros/scicos_scicos/do_window.sci  |    2 +-
+ modules/scicos/macros/scicos_scicos/do_xsetech.sci |    2 +-
+ modules/scicos/macros/scicos_scicos/do_zoomin.sci  |    2 +-
+ modules/scicos/macros/scicos_scicos/do_zoomout.sci |    2 +-
+ modules/scicos/macros/scicos_scicos/drawblock.sci  |    2 +-
+ modules/scicos/macros/scicos_scicos/drawgrid.sci   |    2 +-
+ modules/scicos/macros/scicos_scicos/drawobj.sci    |    2 +-
+ modules/scicos/macros/scicos_scicos/drawobjs.sci   |    2 +-
+ modules/scicos/macros/scicos_scicos/drawtitle.sci  |    2 +-
+ .../scicos/macros/scicos_scicos/enablemenus.sci    |    2 +-
+ .../scicos/macros/scicos_scicos/entity_menu.sce    |    2 +-
+ .../macros/scicos_scicos/extract_implicit.sci      |    2 +-
+ modules/scicos/macros/scicos_scicos/findinlist.sci |    2 +-
+ .../scicos/macros/scicos_scicos/findinlistcmd.sci  |    2 +-
+ .../macros/scicos_scicos/findopenchildren.sci      |    2 +-
+ .../scicos/macros/scicos_scicos/gen_modelica.sci   |    2 +-
+ modules/scicos/macros/scicos_scicos/genfunc.sci    |    2 +-
+ modules/scicos/macros/scicos_scicos/genfunc1.sci   |    2 +-
+ modules/scicos/macros/scicos_scicos/genfunc2.sci   |    2 +-
+ modules/scicos/macros/scicos_scicos/genmac.sci     |    2 +-
+ modules/scicos/macros/scicos_scicos/genmoc.sci     |    2 +-
+ modules/scicos/macros/scicos_scicos/get2index.sci  |    2 +-
+ .../scicos/macros/scicos_scicos/get_block_info.sci |    2 +-
+ .../macros/scicos_scicos/get_blocks_in_rect.sci    |    2 +-
+ .../scicos/macros/scicos_scicos/get_connected.sci  |    2 +-
+ .../macros/scicos_scicos/get_dynamic_lib_dir.sci   |    2 +-
+ .../scicos/macros/scicos_scicos/get_errorcmd.sci   |    2 +-
+ modules/scicos/macros/scicos_scicos/get_gri.sci    |    2 +-
+ modules/scicos/macros/scicos_scicos/get_info.sci   |    2 +-
+ modules/scicos/macros/scicos_scicos/get_inside.sci |    2 +-
+ .../scicos/macros/scicos_scicos/get_inside2.sci    |    2 +-
+ .../scicos/macros/scicos_scicos/get_model_name.sci |    2 +-
+ .../scicos_scicos/get_multiple_selection.sci       |    2 +-
+ .../scicos/macros/scicos_scicos/get_new_scs_m.sci  |    2 +-
+ .../scicos/macros/scicos_scicos/get_new_window.sci |    2 +-
+ modules/scicos/macros/scicos_scicos/get_objs.sci   |    2 +-
+ .../macros/scicos_scicos/get_objs_in_rect.sci      |    2 +-
+ .../scicos/macros/scicos_scicos/get_param_name.sci |    2 +-
+ .../scicos/macros/scicos_scicos/get_rectangle.sci  |    2 +-
+ modules/scicos/macros/scicos_scicos/get_region.sci |    2 +-
+ .../scicos/macros/scicos_scicos/get_region2.sci    |    2 +-
+ .../scicos/macros/scicos_scicos/get_selection.sci  |    2 +-
+ .../macros/scicos_scicos/get_subobj_path.sci       |    2 +-
+ .../scicos/macros/scicos_scicos/get_tree_elt.sci   |    2 +-
+ modules/scicos/macros/scicos_scicos/getblock.sci   |    2 +-
+ .../scicos/macros/scicos_scicos/getblocklink.sci   |    2 +-
+ .../scicos/macros/scicos_scicos/getblocktext.sci   |    2 +-
+ modules/scicos/macros/scicos_scicos/getgeom.sci    |    2 +-
+ .../scicos/macros/scicos_scicos/getinputports.sci  |    2 +-
+ modules/scicos/macros/scicos_scicos/getinputs.sci  |    2 +-
+ modules/scicos/macros/scicos_scicos/getlink.sci    |    2 +-
+ modules/scicos/macros/scicos_scicos/getlink_qd.sci |    2 +-
+ modules/scicos/macros/scicos_scicos/getobj.sci     |    2 +-
+ modules/scicos/macros/scicos_scicos/getorigin.sci  |    2 +-
+ .../scicos/macros/scicos_scicos/getoutputports.sci |    2 +-
+ modules/scicos/macros/scicos_scicos/getoutputs.sci |    2 +-
+ modules/scicos/macros/scicos_scicos/getparpath.sci |    2 +-
+ modules/scicos/macros/scicos_scicos/getportsiz.sci |    2 +-
+ modules/scicos/macros/scicos_scicos/getporttyp.sci |    2 +-
+ .../scicos/macros/scicos_scicos/global_case.sci    |    2 +-
+ modules/scicos/macros/scicos_scicos/gridpoint.sci  |    2 +-
+ modules/scicos/macros/scicos_scicos/haltscicos.sci |    2 +-
+ .../macros/scicos_scicos/hilite_modelica_block.sci |    2 +-
+ .../macros/scicos_scicos/hilite_mult_objs.sci      |    2 +-
+ modules/scicos/macros/scicos_scicos/hilite_obj.sci |    2 +-
+ .../scicos/macros/scicos_scicos/hilite_path.sci    |    2 +-
+ .../scicos/macros/scicos_scicos/init_agenda.sci    |    2 +-
+ .../macros/scicos_scicos/is_modelica_block.sci     |    2 +-
+ modules/scicos/macros/scicos_scicos/is_split.sci   |    2 +-
+ modules/scicos/macros/scicos_scicos/link_olibs.sci |    2 +-
+ modules/scicos/macros/scicos_scicos/lnkptrcomp.sci |    2 +-
+ .../scicos/macros/scicos_scicos/loadpallibs.sci    |    2 +-
+ .../scicos/macros/scicos_scicos/mark_newpars.sci   |    2 +-
+ modules/scicos/macros/scicos_scicos/mark_prt.sci   |    2 +-
+ modules/scicos/macros/scicos_scicos/menu_stuff.sci |    2 +-
+ modules/scicos/macros/scicos_scicos/message.sci    |    2 +-
+ modules/scicos/macros/scicos_scicos/mfrequ_clk.sci |    2 +-
+ modules/scicos/macros/scicos_scicos/mkvect.sci     |    2 +-
+ modules/scicos/macros/scicos_scicos/modelica.sci   |    2 +-
+ .../scicos_scicos/modelica_cind_from_name.sci      |    2 +-
+ modules/scicos/macros/scicos_scicos/modelicac.sci  |    2 +-
+ modules/scicos/macros/scicos_scicos/modipar.sci    |    2 +-
+ .../macros/scicos_scicos/navigatorexport.sci       |    2 +-
+ modules/scicos/macros/scicos_scicos/newc_pass2.sci |    2 +-
+ .../scicos/macros/scicos_scicos/point2pixel.sci    |    2 +-
+ modules/scicos/macros/scicos_scicos/prt_align.sci  |    2 +-
+ .../macros/scicos_scicos/pwindow_read_size.sci     |    2 +-
+ .../macros/scicos_scicos/pwindow_set_size.sci      |    2 +-
+ .../macros/scicos_scicos/reading_incidence.sci     |    2 +-
+ .../scicos_scicos/recur_scicos_block_link.sci      |    2 +-
+ .../macros/scicos_scicos/replayifnecessary.sci     |    2 +-
+ modules/scicos/macros/scicos_scicos/restore.sci    |    2 +-
+ .../scicos/macros/scicos_scicos/restore_scs_gc.sci |    2 +-
+ .../macros/scicos_scicos/rotate_compound.sci       |    2 +-
+ .../scicos/macros/scicos_scicos/s_port_names.sci   |    2 +-
+ modules/scicos/macros/scicos_scicos/sample_clk.sci |    2 +-
+ .../scicos/macros/scicos_scicos/save_csuper.sci    |    2 +-
+ modules/scicos/macros/scicos_scicos/save_super.sci |    2 +-
+ modules/scicos/macros/scicos_scicos/sci2tcl.sci    |    2 +-
+ .../scicos/macros/scicos_scicos/scicos_block.sci   |    2 +-
+ .../macros/scicos_scicos/scicos_block_link.sci     |    2 +-
+ modules/scicos/macros/scicos_scicos/scicos_cpr.sci |    2 +-
+ .../scicos/macros/scicos_scicos/scicos_diagram.sci |    2 +-
+ .../scicos/macros/scicos_scicos/scicos_flat.sci    |    2 +-
+ .../macros/scicos_scicos/scicos_graphics.sci       |    2 +-
+ .../macros/scicos_scicos/scicos_include_paths.sci  |    2 +-
+ .../scicos/macros/scicos_scicos/scicos_link.sci    |    2 +-
+ .../scicos/macros/scicos_scicos/scicos_model.sci   |    2 +-
+ .../scicos/macros/scicos_scicos/scicos_params.sci  |    2 +-
+ .../scicos/macros/scicos_scicos/scicos_route.sci   |    2 +-
+ .../macros/scicos_scicos/scicos_rubberbox.sci      |    2 +-
+ modules/scicos/macros/scicos_scicos/scicos_sim.sci |    2 +-
+ .../scicos/macros/scicos_scicos/scicos_state.sci   |    2 +-
+ .../scicos/macros/scicos_scicos/scicos_txtedit.sci |    2 +-
+ modules/scicos/macros/scicos_scicos/script2var.sci |    2 +-
+ .../scicos/macros/scicos_scicos/scs_full_path.sci  |    2 +-
+ modules/scicos/macros/scicos_scicos/scs_show.sci   |    2 +-
+ modules/scicos/macros/scicos_scicos/scstxtedit.sci |    2 +-
+ .../scicos/macros/scicos_scicos/scstxtedit_tk.sci  |    2 +-
+ .../scicos/macros/scicos_scicos/selecthilite.sci   |    2 +-
+ .../scicos/macros/scicos_scicos/set_background.sci |    2 +-
+ modules/scicos/macros/scicos_scicos/set_cmap.sci   |    2 +-
+ modules/scicos/macros/scicos_scicos/set_io.sci     |    2 +-
+ .../scicos/macros/scicos_scicos/set_viewport.sci   |    2 +-
+ modules/scicos/macros/scicos_scicos/setvalue.sci   |    2 +-
+ modules/scicos/macros/scicos_scicos/shiftcors.sci  |    2 +-
+ modules/scicos/macros/scicos_scicos/show_info.sci  |    2 +-
+ .../macros/scicos_scicos/split_lasterror.sci       |    2 +-
+ .../macros/scicos_scicos/splitfilepath_cos.sci     |    2 +-
+ .../scicos/macros/scicos_scicos/splitted_links.sci |    2 +-
+ .../macros/scicos_scicos/standard_define.sci       |    2 +-
+ .../macros/scicos_scicos/standard_define_old.sci   |    2 +-
+ .../macros/scicos_scicos/standard_document.sci     |    2 +-
+ .../scicos/macros/scicos_scicos/standard_draw.sci  |    2 +-
+ .../macros/scicos_scicos/standard_draw_ports.sci   |    2 +-
+ .../scicos_scicos/standard_draw_ports_up.sci       |    2 +-
+ .../macros/scicos_scicos/standard_etiquette.sci    |    2 +-
+ .../macros/scicos_scicos/standard_inputs.sci       |    2 +-
+ .../macros/scicos_scicos/standard_origin.sci       |    2 +-
+ .../macros/scicos_scicos/standard_outputs.sci      |    2 +-
+ .../macros/scicos_scicos/stupid_dist2polyline.sci  |    2 +-
+ .../scicos/macros/scicos_scicos/stupid_getobj.sci  |    2 +-
+ modules/scicos/macros/scicos_scicos/systexport.sci |    2 +-
+ modules/scicos/macros/scicos_scicos/systshow.sci   |    2 +-
+ modules/scicos/macros/scicos_scicos/tabule.sci     |    2 +-
+ .../macros/scicos_scicos/tk_getfile_scicos.sci     |    2 +-
+ modules/scicos/macros/scicos_scicos/tk_mdialog.sci |    2 +-
+ .../macros/scicos_scicos/tk_message_modeless.sci   |    2 +-
+ .../macros/scicos_scicos/tk_savefile_scicos.sci    |    2 +-
+ .../macros/scicos_scicos/tk_scicos_choose.sci      |    2 +-
+ modules/scicos/macros/scicos_scicos/translator.sci |    2 +-
+ modules/scicos/macros/scicos_scicos/tree_show.sci  |    2 +-
+ .../scicos/macros/scicos_scicos/unhilite_obj.sci   |    2 +-
+ modules/scicos/macros/scicos_scicos/update_gr.sci  |    2 +-
+ .../macros/scicos_scicos/update_redraw_obj.sci     |    2 +-
+ .../macros/scicos_scicos/update_scicos_pal.sci     |    2 +-
+ .../scicos/macros/scicos_scicos/update_scs_m.sci   |    2 +-
+ .../scicos/macros/scicos_scicos/update_version.sci |    2 +-
+ modules/scicos/macros/scicos_scicos/validvar.sci   |    2 +-
+ .../scicos/macros/scicos_scicos/value2modelica.sci |    2 +-
+ .../scicos/macros/scicos_scicos/whereintree.sci    |    2 +-
+ .../scicos/macros/scicos_scicos/width2pixel.sci    |    2 +-
+ .../macros/scicos_scicos/window_read_size.sci      |    2 +-
+ .../macros/scicos_scicos/window_set_size.sci       |    2 +-
+ modules/scicos/macros/scicos_scicos/x_getvalue.sci |    2 +-
+ modules/scicos/macros/scicos_scicos/xml2cos.sci    |    2 +-
+ .../scicos/macros/scicos_scicos/xml2modelica.sci   |    2 +-
+ modules/scicos/macros/scicos_utils/create_gif.sci  |    2 +-
+ .../scicos/macros/scicos_utils/create_palette.sci  |    2 +-
+ .../macros/scicos_utils/find_scicos_version.sci    |    2 +-
+ .../macros/scicos_utils/get_scicos_version.sci     |    2 +-
+ .../scicos/macros/scicos_utils/returntoscilab.sci  |    2 +-
+ .../scicos/macros/scicos_utils/scicos_getvalue.sci |    2 +-
+ .../macros/scicos_utils/scicos_workspace_init.sci  |    2 +-
+ .../scicos/macros/scicos_utils/scilab2scicos.sci   |    2 +-
+ .../macros/scicos_utils/with_modelica_compiler.sci |    2 +-
+ modules/scicos/sci_gateway/c/gw_scicos.c           |    2 +-
+ modules/scicos/sci_gateway/c/sci_buildouttb.c      |    2 +-
+ modules/scicos/sci_gateway/c/sci_callblk.c         |    2 +-
+ modules/scicos/sci_gateway/c/sci_coserror.c        |    2 +-
+ modules/scicos/sci_gateway/c/sci_ctree2.c          |    2 +-
+ modules/scicos/sci_gateway/c/sci_ctree3.c          |    2 +-
+ modules/scicos/sci_gateway/c/sci_ctree4.c          |    2 +-
+ modules/scicos/sci_gateway/c/sci_curblock.c        |    2 +-
+ modules/scicos/sci_gateway/c/sci_curblockc.c       |    2 +-
+ modules/scicos/sci_gateway/c/sci_data2sig.c        |    2 +-
+ modules/scicos/sci_gateway/c/sci_diffobjs.c        |    2 +-
+ modules/scicos/sci_gateway/c/sci_duplicate.c       |    2 +-
+ modules/scicos/sci_gateway/c/sci_end_scicosim.c    |    2 +-
+ modules/scicos/sci_gateway/c/sci_ftree2.c          |    2 +-
+ modules/scicos/sci_gateway/c/sci_ftree3.c          |    2 +-
+ modules/scicos/sci_gateway/c/sci_ftree4.c          |    2 +-
+ modules/scicos/sci_gateway/c/sci_getblocklabel.c   |    2 +-
+ modules/scicos/sci_gateway/c/sci_getscicosvars.c   |    2 +-
+ modules/scicos/sci_gateway/c/sci_haltscicos.c      |    2 +-
+ modules/scicos/sci_gateway/c/sci_model2blk.c       |    2 +-
+ modules/scicos/sci_gateway/c/sci_permutobj.c       |    2 +-
+ .../scicos/sci_gateway/c/sci_phase_simulation.c    |    2 +-
+ .../scicos/sci_gateway/c/sci_pointer_xproperty.c   |    2 +-
+ modules/scicos/sci_gateway/c/sci_scicos_debug.c    |    2 +-
+ .../scicos/sci_gateway/c/sci_scicos_debug_count.c  |    2 +-
+ modules/scicos/sci_gateway/c/sci_scicos_time.c     |    2 +-
+ modules/scicos/sci_gateway/c/sci_scicosim.c        |    2 +-
+ modules/scicos/sci_gateway/c/sci_sctree.c          |    2 +-
+ modules/scicos/sci_gateway/c/sci_set_blockerror.c  |    2 +-
+ modules/scicos/sci_gateway/c/sci_set_xproperty.c   |    2 +-
+ modules/scicos/sci_gateway/c/sci_sig2data.c        |    2 +-
+ modules/scicos/sci_gateway/c/sci_var2vec.c         |    2 +-
+ modules/scicos/sci_gateway/c/sci_vec2var.c         |    2 +-
+ modules/scicos/sci_gateway/fortran/sci_ctree.f     |    2 +-
+ modules/scicos/sci_gateway/fortran/sci_curblock.f  |    2 +-
+ .../scicos/sci_gateway/fortran/sci_debug_count.f   |    2 +-
+ .../scicos/sci_gateway/fortran/sci_getblocklabel.f |    2 +-
+ .../scicos/sci_gateway/fortran/sci_scicos_debug.f  |    2 +-
+ modules/scicos/sci_gateway/fortran/sci_tree2.f     |    2 +-
+ modules/scicos/sci_gateway/fortran/sci_tree3.f     |    2 +-
+ modules/scicos/sci_gateway/fortran/sci_tree4.f     |    2 +-
+ modules/scicos/sci_gateway/fortran/sci_var2vec.f   |    2 +-
+ modules/scicos/sci_gateway/fortran/sci_vec2var.f   |    2 +-
+ modules/scicos/src/c/MlistGetFieldNumber.c         |    2 +-
+ modules/scicos/src/c/MlistGetFieldNumber.h         |    2 +-
+ modules/scicos/src/c/copyvarfromlistentry.c        |    2 +-
+ modules/scicos/src/c/copyvarfromlistentry.h        |    2 +-
+ modules/scicos/src/c/createblklist.c               |    2 +-
+ modules/scicos/src/c/createblklist.h               |    2 +-
+ modules/scicos/src/c/extractblklist.c              |    2 +-
+ modules/scicos/src/c/extractblklist.h              |    2 +-
+ modules/scicos/src/c/il_sim.c                      |    2 +-
+ modules/scicos/src/c/il_sim.h                      |    2 +-
+ modules/scicos/src/c/il_state.c                    |    2 +-
+ modules/scicos/src/c/il_state.h                    |    2 +-
+ modules/scicos/src/c/import.c                      |    2 +-
+ modules/scicos/src/c/sciblk2.c                     |    2 +-
+ modules/scicos/src/c/sciblk2.h                     |    2 +-
+ modules/scicos/src/c/sciblk4.c                     |    2 +-
+ modules/scicos/src/c/sciblk4.h                     |    2 +-
+ modules/scicos/src/c/scicos.c                      |    2 +-
+ modules/scicos/src/c/scicos_free.c                 |    2 +-
+ modules/scicos/src/c/scicos_malloc.c               |    2 +-
+ modules/scicos/src/c/scicosclip.c                  |    2 +-
+ modules/scicos/src/c/slider.c                      |    2 +-
+ modules/scicos/src/c/tree.c                        |    2 +-
+ modules/scicos/src/c/tree.h                        |    2 +-
+ modules/scicos/src/c/var2sci.c                     |    2 +-
+ modules/scicos/src/c/var2sci.h                     |    2 +-
+ modules/scicos/src/fortran/coselm.f                |    2 +-
+ modules/scicos/src/fortran/ftree2.f                |    2 +-
+ modules/scicos/src/fortran/ftree3.f                |    2 +-
+ modules/scicos/src/fortran/ftree4.f                |    2 +-
+ modules/scicos/src/fortran/list2vars.f             |    2 +-
+ modules/scicos/src/fortran/scierr.f                |    2 +-
+ modules/scicos/src/fortran/scifunc.f               |    2 +-
+ modules/scicos/src/fortran/scitod.f                |    2 +-
+ modules/scicos/src/fortran/scitoi.f                |    2 +-
+ modules/scicos/src/fortran/scitovv.f               |    2 +-
+ modules/scicos/src/fortran/sctree.f                |    2 +-
+ modules/scicos/src/fortran/skipvars.f              |    2 +-
+ modules/scicos/src/fortran/vvtosci.f               |    2 +-
+ modules/scicos/src/modelica_compiler/makefile.mak  |    2 +-
+ modules/scicos/src/translator/makefile.mak         |    2 +-
+ modules/scicos/src/xml2modelica/makefile.mak       |    2 +-
+ modules/scicos/tests/unit_tests/scicos.dia.ref     |    2 +-
+ modules/scicos_blocks/includes/blocks.h.vc         |    2 +-
+ modules/scicos_blocks/includes/scicos_block.h      |    2 +-
+ modules/scicos_blocks/includes/scicos_block4.h     |    2 +-
+ modules/scicos_blocks/includes/scoBase.h           |    2 +-
+ modules/scicos_blocks/includes/scoGetProperty.h    |    2 +-
+ modules/scicos_blocks/includes/scoMemoryScope.h    |    2 +-
+ modules/scicos_blocks/includes/scoMisc.h           |    2 +-
+ modules/scicos_blocks/includes/scoSetProperty.h    |    2 +-
+ modules/scicos_blocks/includes/scoWindowScope.h    |    2 +-
+ modules/scicos_blocks/macros/Branching/CLKFROM.sci |    2 +-
+ modules/scicos_blocks/macros/Branching/CLKGOTO.sci |    2 +-
+ .../macros/Branching/CLKGotoTagVisibility.sci      |    2 +-
+ modules/scicos_blocks/macros/Branching/DEMUX.sci   |    2 +-
+ modules/scicos_blocks/macros/Branching/DEMUX_f.sci |    2 +-
+ .../scicos_blocks/macros/Branching/ESELECT_f.sci   |    2 +-
+ .../scicos_blocks/macros/Branching/EXTRACTOR.sci   |    2 +-
+ modules/scicos_blocks/macros/Branching/FROM.sci    |    2 +-
+ modules/scicos_blocks/macros/Branching/FROMMO.sci  |    2 +-
+ modules/scicos_blocks/macros/Branching/GOTO.sci    |    2 +-
+ modules/scicos_blocks/macros/Branching/GOTOMO.sci  |    2 +-
+ .../macros/Branching/GotoTagVisibility.sci         |    2 +-
+ .../macros/Branching/GotoTagVisibilityMO.sci       |    2 +-
+ .../scicos_blocks/macros/Branching/ISELECT_f.sci   |    2 +-
+ .../scicos_blocks/macros/Branching/ISELECT_m.sci   |    2 +-
+ modules/scicos_blocks/macros/Branching/MUX.sci     |    2 +-
+ modules/scicos_blocks/macros/Branching/MUX_f.sci   |    2 +-
+ .../scicos_blocks/macros/Branching/M_SWITCH.sci    |    2 +-
+ .../scicos_blocks/macros/Branching/NRMSOM_f.sci    |    2 +-
+ modules/scicos_blocks/macros/Branching/RELAY_f.sci |    2 +-
+ .../macros/Branching/SCALAR2VECTOR.sci             |    2 +-
+ .../scicos_blocks/macros/Branching/SELECT_f.sci    |    2 +-
+ .../scicos_blocks/macros/Branching/SELECT_m.sci    |    2 +-
+ modules/scicos_blocks/macros/Branching/SWITCH2.sci |    2 +-
+ .../scicos_blocks/macros/Branching/SWITCH2_m.sci   |    2 +-
+ .../scicos_blocks/macros/Branching/SWITCH_f.sci    |    2 +-
+ .../scicos_blocks/macros/Branching/buildmacros.sce |    2 +-
+ modules/scicos_blocks/macros/Electrical/CCS.sci    |    2 +-
+ modules/scicos_blocks/macros/Electrical/CVS.sci    |    2 +-
+ .../scicos_blocks/macros/Electrical/Capacitor.sci  |    2 +-
+ .../macros/Electrical/ConstantVoltage.sci          |    2 +-
+ .../macros/Electrical/CurrentSensor.sci            |    2 +-
+ modules/scicos_blocks/macros/Electrical/Diode.sci  |    2 +-
+ modules/scicos_blocks/macros/Electrical/Ground.sci |    2 +-
+ .../scicos_blocks/macros/Electrical/Gyrator.sci    |    2 +-
+ .../macros/Electrical/IdealTransformer.sci         |    2 +-
+ .../scicos_blocks/macros/Electrical/Inductor.sci   |    2 +-
+ modules/scicos_blocks/macros/Electrical/MOTOR.sci  |    2 +-
+ modules/scicos_blocks/macros/Electrical/NMOS.sci   |    2 +-
+ modules/scicos_blocks/macros/Electrical/NPN.sci    |    2 +-
+ modules/scicos_blocks/macros/Electrical/OpAmp.sci  |    2 +-
+ modules/scicos_blocks/macros/Electrical/PMOS.sci   |    2 +-
+ modules/scicos_blocks/macros/Electrical/PNP.sci    |    2 +-
+ .../macros/Electrical/PotentialSensor.sci          |    2 +-
+ .../scicos_blocks/macros/Electrical/Resistor.sci   |    2 +-
+ .../macros/Electrical/SineVoltage.sci              |    2 +-
+ modules/scicos_blocks/macros/Electrical/Switch.sci |    2 +-
+ .../scicos_blocks/macros/Electrical/VVsourceAC.sci |    2 +-
+ .../macros/Electrical/VariableResistor.sci         |    2 +-
+ .../macros/Electrical/VoltageSensor.sci            |    2 +-
+ .../scicos_blocks/macros/Electrical/VsourceAC.sci  |    2 +-
+ .../macros/Electrical/buildmacros.sce              |    2 +-
+ modules/scicos_blocks/macros/Events/ANDBLK.sci     |    2 +-
+ modules/scicos_blocks/macros/Events/ANDLOG_f.sci   |    2 +-
+ modules/scicos_blocks/macros/Events/CLKSOMV_f.sci  |    2 +-
+ modules/scicos_blocks/macros/Events/CLKSOM_f.sci   |    2 +-
+ modules/scicos_blocks/macros/Events/CLKSPLIT_f.sci |    2 +-
+ modules/scicos_blocks/macros/Events/END_c.sci      |    2 +-
+ modules/scicos_blocks/macros/Events/EVTDLY_c.sci   |    2 +-
+ modules/scicos_blocks/macros/Events/EVTDLY_f.sci   |    2 +-
+ modules/scicos_blocks/macros/Events/EVTGEN_f.sci   |    2 +-
+ modules/scicos_blocks/macros/Events/EVTVARDLY.sci  |    2 +-
+ modules/scicos_blocks/macros/Events/HALT_f.sci     |    2 +-
+ modules/scicos_blocks/macros/Events/IFTHEL_f.sci   |    2 +-
+ modules/scicos_blocks/macros/Events/MCLOCK_f.sci   |    2 +-
+ modules/scicos_blocks/macros/Events/MFCLCK_f.sci   |    2 +-
+ modules/scicos_blocks/macros/Events/M_freq.sci     |    2 +-
+ .../scicos_blocks/macros/Events/VirtualCLK0.sci    |    2 +-
+ .../scicos_blocks/macros/Events/buildmacros.sce    |    2 +-
+ modules/scicos_blocks/macros/Events/freq_div.sci   |    2 +-
+ modules/scicos_blocks/macros/Hydraulics/Bache.sci  |    2 +-
+ .../scicos_blocks/macros/Hydraulics/Flowmeter.sci  |    2 +-
+ .../scicos_blocks/macros/Hydraulics/PerteDP.sci    |    2 +-
+ modules/scicos_blocks/macros/Hydraulics/PuitsP.sci |    2 +-
+ .../scicos_blocks/macros/Hydraulics/SourceP.sci    |    2 +-
+ .../macros/Hydraulics/VanneReglante.sci            |    2 +-
+ .../macros/Hydraulics/bache_draw_ports.sci         |    2 +-
+ .../macros/Hydraulics/bache_inputs.sci             |    2 +-
+ .../macros/Hydraulics/bache_outputs.sci            |    2 +-
+ .../macros/Hydraulics/buildmacros.sce              |    2 +-
+ .../macros/Hydraulics/puit_draw_ports.sci          |    2 +-
+ .../macros/Hydraulics/puit_inputs.sci              |    2 +-
+ .../macros/Hydraulics/source_draw_ports.sci        |    2 +-
+ .../macros/Hydraulics/source_inputs.sci            |    2 +-
+ .../macros/Hydraulics/vanne_draw_ports.sci         |    2 +-
+ .../macros/Hydraulics/vanne_inputs.sci             |    2 +-
+ .../macros/Hydraulics/vanne_outputs.sci            |    2 +-
+ .../scicos_blocks/macros/IntegerOp/BITCLEAR.sci    |    2 +-
+ modules/scicos_blocks/macros/IntegerOp/BITSET.sci  |    2 +-
+ modules/scicos_blocks/macros/IntegerOp/CONVERT.sci |    2 +-
+ .../scicos_blocks/macros/IntegerOp/DFLIPFLOP.sci   |    2 +-
+ modules/scicos_blocks/macros/IntegerOp/DLATCH.sci  |    2 +-
+ .../scicos_blocks/macros/IntegerOp/EXTRACTBITS.sci |    2 +-
+ modules/scicos_blocks/macros/IntegerOp/INTMUL.sci  |    2 +-
+ .../scicos_blocks/macros/IntegerOp/JKFLIPFLOP.sci  |    2 +-
+ modules/scicos_blocks/macros/IntegerOp/LOGIC.sci   |    2 +-
+ modules/scicos_blocks/macros/IntegerOp/SHIFT.sci   |    2 +-
+ .../scicos_blocks/macros/IntegerOp/SRFLIPFLOP.sci  |    2 +-
+ .../scicos_blocks/macros/IntegerOp/buildmacros.sce |    2 +-
+ modules/scicos_blocks/macros/Linear/BIGSOM_f.sci   |    2 +-
+ .../scicos_blocks/macros/Linear/CLINDUMMY_f.sci    |    2 +-
+ modules/scicos_blocks/macros/Linear/CLR.sci        |    2 +-
+ modules/scicos_blocks/macros/Linear/CLR_f.sci      |    2 +-
+ modules/scicos_blocks/macros/Linear/CLSS.sci       |    2 +-
+ modules/scicos_blocks/macros/Linear/CLSS_f.sci     |    2 +-
+ modules/scicos_blocks/macros/Linear/DELAYV_f.sci   |    2 +-
+ modules/scicos_blocks/macros/Linear/DELAY_f.sci    |    2 +-
+ modules/scicos_blocks/macros/Linear/DERIV.sci      |    2 +-
+ modules/scicos_blocks/macros/Linear/DIFF_c.sci     |    2 +-
+ modules/scicos_blocks/macros/Linear/DLR.sci        |    2 +-
+ modules/scicos_blocks/macros/Linear/DLR_f.sci      |    2 +-
+ modules/scicos_blocks/macros/Linear/DLSS.sci       |    2 +-
+ modules/scicos_blocks/macros/Linear/DLSS_f.sci     |    2 +-
+ modules/scicos_blocks/macros/Linear/DOLLAR.sci     |    2 +-
+ modules/scicos_blocks/macros/Linear/DOLLAR_f.sci   |    2 +-
+ modules/scicos_blocks/macros/Linear/DOLLAR_m.sci   |    2 +-
+ modules/scicos_blocks/macros/Linear/GAINBLK.sci    |    2 +-
+ modules/scicos_blocks/macros/Linear/GAINBLK_f.sci  |    2 +-
+ modules/scicos_blocks/macros/Linear/GAIN_f.sci     |    2 +-
+ modules/scicos_blocks/macros/Linear/INTEGRAL.sci   |    2 +-
+ modules/scicos_blocks/macros/Linear/INTEGRAL_f.sci |    2 +-
+ modules/scicos_blocks/macros/Linear/INTEGRAL_m.sci |    2 +-
+ modules/scicos_blocks/macros/Linear/PID.sci        |    2 +-
+ modules/scicos_blocks/macros/Linear/REGISTER.sci   |    2 +-
+ modules/scicos_blocks/macros/Linear/REGISTER_f.sci |    2 +-
+ modules/scicos_blocks/macros/Linear/SAMPHOLD.sci   |    2 +-
+ modules/scicos_blocks/macros/Linear/SAMPHOLD_m.sci |    2 +-
+ .../scicos_blocks/macros/Linear/SAMPLEHOLD_f.sci   |    2 +-
+ modules/scicos_blocks/macros/Linear/SOM_f.sci      |    2 +-
+ modules/scicos_blocks/macros/Linear/SUMMATION.sci  |    2 +-
+ modules/scicos_blocks/macros/Linear/SUM_f.sci      |    2 +-
+ modules/scicos_blocks/macros/Linear/TCLSS.sci      |    2 +-
+ modules/scicos_blocks/macros/Linear/TCLSS_f.sci    |    2 +-
+ modules/scicos_blocks/macros/Linear/TIME_DELAY.sci |    2 +-
+ .../scicos_blocks/macros/Linear/VARIABLE_DELAY.sci |    2 +-
+ .../scicos_blocks/macros/Linear/buildmacros.sce    |    2 +-
+ modules/scicos_blocks/macros/MatrixOp/CUMSUM.sci   |    2 +-
+ modules/scicos_blocks/macros/MatrixOp/EXTRACT.sci  |    2 +-
+ modules/scicos_blocks/macros/MatrixOp/EXTTRI.sci   |    2 +-
+ modules/scicos_blocks/macros/MatrixOp/MATBKSL.sci  |    2 +-
+ modules/scicos_blocks/macros/MatrixOp/MATCATH.sci  |    2 +-
+ modules/scicos_blocks/macros/MatrixOp/MATCATV.sci  |    2 +-
+ modules/scicos_blocks/macros/MatrixOp/MATDET.sci   |    2 +-
+ modules/scicos_blocks/macros/MatrixOp/MATDIAG.sci  |    2 +-
+ modules/scicos_blocks/macros/MatrixOp/MATDIV.sci   |    2 +-
+ modules/scicos_blocks/macros/MatrixOp/MATEIG.sci   |    2 +-
+ modules/scicos_blocks/macros/MatrixOp/MATEXPM.sci  |    2 +-
+ modules/scicos_blocks/macros/MatrixOp/MATINV.sci   |    2 +-
+ modules/scicos_blocks/macros/MatrixOp/MATLU.sci    |    2 +-
+ .../scicos_blocks/macros/MatrixOp/MATMAGPHI.sci    |    2 +-
+ modules/scicos_blocks/macros/MatrixOp/MATMUL.sci   |    2 +-
+ modules/scicos_blocks/macros/MatrixOp/MATPINV.sci  |    2 +-
+ modules/scicos_blocks/macros/MatrixOp/MATRESH.sci  |    2 +-
+ modules/scicos_blocks/macros/MatrixOp/MATSING.sci  |    2 +-
+ modules/scicos_blocks/macros/MatrixOp/MATSUM.sci   |    2 +-
+ modules/scicos_blocks/macros/MatrixOp/MATTRAN.sci  |    2 +-
+ modules/scicos_blocks/macros/MatrixOp/MATZCONJ.sci |    2 +-
+ modules/scicos_blocks/macros/MatrixOp/MATZREIM.sci |    2 +-
+ modules/scicos_blocks/macros/MatrixOp/RICC.sci     |    2 +-
+ modules/scicos_blocks/macros/MatrixOp/ROOTCOEF.sci |    2 +-
+ modules/scicos_blocks/macros/MatrixOp/SQRT.sci     |    2 +-
+ modules/scicos_blocks/macros/MatrixOp/SUBMAT.sci   |    2 +-
+ .../scicos_blocks/macros/MatrixOp/buildmacros.sce  |    2 +-
+ modules/scicos_blocks/macros/Misc/AUTOMAT.sci      |    2 +-
+ modules/scicos_blocks/macros/Misc/BACKLASH.sci     |    2 +-
+ modules/scicos_blocks/macros/Misc/BOUNCE.sci       |    2 +-
+ modules/scicos_blocks/macros/Misc/BOUNCEXY.sci     |    2 +-
+ modules/scicos_blocks/macros/Misc/BPLATFORM.sci    |    2 +-
+ modules/scicos_blocks/macros/Misc/CBLOCK.sci       |    2 +-
+ modules/scicos_blocks/macros/Misc/CBLOCK4.sci      |    2 +-
+ .../scicos_blocks/macros/Misc/CONSTRAINT2_c.sci    |    2 +-
+ modules/scicos_blocks/macros/Misc/CONSTRAINT_c.sci |    2 +-
+ modules/scicos_blocks/macros/Misc/DEADBAND.sci     |    2 +-
+ modules/scicos_blocks/macros/Misc/DEBUG_SCICOS.sci |    2 +-
+ modules/scicos_blocks/macros/Misc/DIFF_f.sci       |    2 +-
+ modules/scicos_blocks/macros/Misc/DSUPER.sci       |    2 +-
+ modules/scicos_blocks/macros/Misc/EDGETRIGGER.sci  |    2 +-
+ modules/scicos_blocks/macros/Misc/EDGE_TRIGGER.sci |    2 +-
+ modules/scicos_blocks/macros/Misc/ENDBLK.sci       |    2 +-
+ modules/scicos_blocks/macros/Misc/EXPRESSION.sci   |    2 +-
+ .../macros/Misc/Extract_Activation.sci             |    2 +-
+ modules/scicos_blocks/macros/Misc/HYSTHERESIS.sci  |    2 +-
+ modules/scicos_blocks/macros/Misc/IMPSPLIT_f.sci   |    2 +-
+ modules/scicos_blocks/macros/Misc/LOGICAL_OP.sci   |    2 +-
+ modules/scicos_blocks/macros/Misc/MBLOCK.sci       |    2 +-
+ modules/scicos_blocks/macros/Misc/MEMORY_f.sci     |    2 +-
+ modules/scicos_blocks/macros/Misc/MPBLOCK.sci      |    2 +-
+ modules/scicos_blocks/macros/Misc/PAL_f.sci        |    2 +-
+ .../scicos_blocks/macros/Misc/PENDULUM_ANIM.sci    |    2 +-
+ modules/scicos_blocks/macros/Misc/RATELIMITER.sci  |    2 +-
+ modules/scicos_blocks/macros/Misc/RELATIONALOP.sci |    2 +-
+ modules/scicos_blocks/macros/Misc/SPLIT_f.sci      |    2 +-
+ modules/scicos_blocks/macros/Misc/SUPER_f.sci      |    2 +-
+ modules/scicos_blocks/macros/Misc/TEXT_f.sci       |    2 +-
+ modules/scicos_blocks/macros/Misc/anim_pen.sci     |    2 +-
+ modules/scicos_blocks/macros/Misc/bplatform2.sci   |    2 +-
+ modules/scicos_blocks/macros/Misc/buildmacros.sce  |    2 +-
+ modules/scicos_blocks/macros/Misc/c_block.sci      |    2 +-
+ .../scicos_blocks/macros/Misc/fortran_block.sci    |    2 +-
+ modules/scicos_blocks/macros/Misc/func_block.sci   |    2 +-
+ .../scicos_blocks/macros/Misc/generic_block.sci    |    2 +-
+ .../scicos_blocks/macros/Misc/generic_block2.sci   |    2 +-
+ .../scicos_blocks/macros/Misc/generic_block3.sci   |    2 +-
+ modules/scicos_blocks/macros/Misc/m_sin.sci        |    2 +-
+ .../scicos_blocks/macros/Misc/scifunc_block.sci    |    2 +-
+ .../scicos_blocks/macros/Misc/scifunc_block_m.sci  |    2 +-
+ .../scicos_blocks/macros/NonLinear/ABSBLK_f.sci    |    2 +-
+ .../scicos_blocks/macros/NonLinear/ABS_VALUE.sci   |    2 +-
+ .../scicos_blocks/macros/NonLinear/COSBLK_f.sci    |    2 +-
+ .../scicos_blocks/macros/NonLinear/DLRADAPT_f.sci  |    2 +-
+ .../scicos_blocks/macros/NonLinear/EXPBLK_f.sci    |    2 +-
+ .../scicos_blocks/macros/NonLinear/EXPBLK_m.sci    |    2 +-
+ modules/scicos_blocks/macros/NonLinear/FSV_f.sci   |    2 +-
+ .../scicos_blocks/macros/NonLinear/INTRP2BLK_f.sci |    2 +-
+ .../scicos_blocks/macros/NonLinear/INTRPLBLK_f.sci |    2 +-
+ modules/scicos_blocks/macros/NonLinear/INVBLK.sci  |    2 +-
+ .../scicos_blocks/macros/NonLinear/INVBLK_f.sci    |    2 +-
+ .../scicos_blocks/macros/NonLinear/LOGBLK_f.sci    |    2 +-
+ .../scicos_blocks/macros/NonLinear/LOOKUP2D.sci    |    2 +-
+ .../scicos_blocks/macros/NonLinear/LOOKUP_c.sci    |    2 +-
+ .../scicos_blocks/macros/NonLinear/LOOKUP_f.sci    |    2 +-
+ modules/scicos_blocks/macros/NonLinear/MAXMIN.sci  |    2 +-
+ modules/scicos_blocks/macros/NonLinear/MAX_f.sci   |    2 +-
+ modules/scicos_blocks/macros/NonLinear/MIN_f.sci   |    2 +-
+ .../scicos_blocks/macros/NonLinear/POWBLK_f.sci    |    2 +-
+ modules/scicos_blocks/macros/NonLinear/PRODUCT.sci |    2 +-
+ modules/scicos_blocks/macros/NonLinear/PROD_f.sci  |    2 +-
+ modules/scicos_blocks/macros/NonLinear/QUANT_f.sci |    2 +-
+ .../scicos_blocks/macros/NonLinear/SATURATION.sci  |    2 +-
+ modules/scicos_blocks/macros/NonLinear/SAT_f.sci   |    2 +-
+ modules/scicos_blocks/macros/NonLinear/SIGNUM.sci  |    2 +-
+ .../scicos_blocks/macros/NonLinear/SINBLK_f.sci    |    2 +-
+ .../scicos_blocks/macros/NonLinear/TANBLK_f.sci    |    2 +-
+ modules/scicos_blocks/macros/NonLinear/TrigFun.sci |    2 +-
+ .../scicos_blocks/macros/NonLinear/buildmacros.sce |    2 +-
+ modules/scicos_blocks/macros/PDE/CFORTREDP.sci     |    2 +-
+ modules/scicos_blocks/macros/PDE/Disc2_5_FVM1d.sci |    2 +-
+ .../scicos_blocks/macros/PDE/Disc_diff_oper2.sci   |    2 +-
+ .../scicos_blocks/macros/PDE/Disc_diff_oper45.sci  |    2 +-
+ modules/scicos_blocks/macros/PDE/IHM_EDP.sci       |    2 +-
+ modules/scicos_blocks/macros/PDE/PDE.sci           |    2 +-
+ modules/scicos_blocks/macros/PDE/addf_mat.sci      |    2 +-
+ modules/scicos_blocks/macros/PDE/addfv.sci         |    2 +-
+ .../scicos_blocks/macros/PDE/arbre_decision.sci    |    2 +-
+ modules/scicos_blocks/macros/PDE/assemb.sci        |    2 +-
+ .../scicos_blocks/macros/PDE/assemblage_FE1D.sci   |    2 +-
+ modules/scicos_blocks/macros/PDE/buildmacros.sce   |    2 +-
+ modules/scicos_blocks/macros/PDE/cb_IHM_EDP.sci    |    2 +-
+ modules/scicos_blocks/macros/PDE/cformatlinedp.sci |    2 +-
+ .../scicos_blocks/macros/PDE/code_generation.sci   |    2 +-
+ modules/scicos_blocks/macros/PDE/coef_FEM1d.sci    |    2 +-
+ modules/scicos_blocks/macros/PDE/elemoper.sci      |    2 +-
+ modules/scicos_blocks/macros/PDE/eval_pts_EF.sci   |    2 +-
+ modules/scicos_blocks/macros/PDE/eval_pts_df.sci   |    2 +-
+ modules/scicos_blocks/macros/PDE/eval_pts_vf.sci   |    2 +-
+ .../scicos_blocks/macros/PDE/extraction_infos.sci  |    2 +-
+ modules/scicos_blocks/macros/PDE/formkf.sci        |    2 +-
+ modules/scicos_blocks/macros/PDE/gen_code_FDM.sci  |    2 +-
+ modules/scicos_blocks/macros/PDE/gen_code_FEM.sci  |    2 +-
+ modules/scicos_blocks/macros/PDE/gen_code_FVM.sci  |    2 +-
+ modules/scicos_blocks/macros/PDE/lecture_xml.sci   |    2 +-
+ modules/scicos_blocks/macros/PDE/maillage_FE1D.sci |    2 +-
+ modules/scicos_blocks/macros/PDE/meth.xml          |    2 +-
+ modules/scicos_blocks/macros/PDE/msprintfv.sci     |    2 +-
+ modules/scicos_blocks/macros/PDE/mulf3.sci         |    2 +-
+ modules/scicos_blocks/macros/PDE/mulf3v.sci        |    2 +-
+ modules/scicos_blocks/macros/PDE/mulf_string.sci   |    2 +-
+ modules/scicos_blocks/macros/PDE/mulfstring.sci    |    2 +-
+ modules/scicos_blocks/macros/PDE/mulfv.sci         |    2 +-
+ modules/scicos_blocks/macros/PDE/multMatVect.sci   |    2 +-
+ modules/scicos_blocks/macros/PDE/multVectStr.sci   |    2 +-
+ modules/scicos_blocks/macros/PDE/nombre_etats.sci  |    2 +-
+ modules/scicos_blocks/macros/PDE/setint.sci        |    2 +-
+ .../scicos_blocks/macros/PDE/setvalue_IHM-PDE.sci  |    2 +-
+ .../scicos_blocks/macros/PDE/setvalue_IHM_EDP.sci  |    2 +-
+ modules/scicos_blocks/macros/PDE/shape.sci         |    2 +-
+ modules/scicos_blocks/macros/PDE/subf_mat.sci      |    2 +-
+ modules/scicos_blocks/macros/PDE/subfv.sci         |    2 +-
+ modules/scicos_blocks/macros/PDE/translate.sci     |    2 +-
+ modules/scicos_blocks/macros/PDE/unimesh1D.sci     |    2 +-
+ modules/scicos_blocks/macros/Sinks/AFFICH_m.sci    |    2 +-
+ modules/scicos_blocks/macros/Sinks/CANIMXY.sci     |    2 +-
+ modules/scicos_blocks/macros/Sinks/CANIMXY3D.sci   |    2 +-
+ modules/scicos_blocks/macros/Sinks/CEVENTSCOPE.sci |    2 +-
+ modules/scicos_blocks/macros/Sinks/CFSCOPE.sci     |    2 +-
+ modules/scicos_blocks/macros/Sinks/CLKOUTV_f.sci   |    2 +-
+ modules/scicos_blocks/macros/Sinks/CLKOUT_f.sci    |    2 +-
+ modules/scicos_blocks/macros/Sinks/CMAT3D.sci      |    2 +-
+ modules/scicos_blocks/macros/Sinks/CMATVIEW.sci    |    2 +-
+ modules/scicos_blocks/macros/Sinks/CMSCOPE.sci     |    2 +-
+ modules/scicos_blocks/macros/Sinks/CSCOPE.sci      |    2 +-
+ modules/scicos_blocks/macros/Sinks/CSCOPXY.sci     |    2 +-
+ modules/scicos_blocks/macros/Sinks/CSCOPXY3D.sci   |    2 +-
+ modules/scicos_blocks/macros/Sinks/OUTIMPL_f.sci   |    2 +-
+ modules/scicos_blocks/macros/Sinks/OUT_f.sci       |    2 +-
+ modules/scicos_blocks/macros/Sinks/TOWS_c.sci      |    2 +-
+ modules/scicos_blocks/macros/Sinks/TRASH_f.sci     |    2 +-
+ modules/scicos_blocks/macros/Sinks/WFILE_f.sci     |    2 +-
+ modules/scicos_blocks/macros/Sinks/WRITEAU_f.sci   |    2 +-
+ modules/scicos_blocks/macros/Sinks/WRITEC_f.sci    |    2 +-
+ modules/scicos_blocks/macros/Sinks/buildmacros.sce |    2 +-
+ modules/scicos_blocks/macros/Sources/CLKINV_f.sci  |    2 +-
+ modules/scicos_blocks/macros/Sources/CLKIN_f.sci   |    2 +-
+ modules/scicos_blocks/macros/Sources/CLOCK_c.sci   |    2 +-
+ modules/scicos_blocks/macros/Sources/CLOCK_f.sci   |    2 +-
+ modules/scicos_blocks/macros/Sources/CONST.sci     |    2 +-
+ modules/scicos_blocks/macros/Sources/CONST_f.sci   |    2 +-
+ modules/scicos_blocks/macros/Sources/CONST_m.sci   |    2 +-
+ modules/scicos_blocks/macros/Sources/CURVE_c.sci   |    2 +-
+ modules/scicos_blocks/macros/Sources/CURV_f.sci    |    2 +-
+ modules/scicos_blocks/macros/Sources/Counter.sci   |    2 +-
+ modules/scicos_blocks/macros/Sources/FROMWSB.sci   |    2 +-
+ modules/scicos_blocks/macros/Sources/FROMWS_c.sci  |    2 +-
+ modules/scicos_blocks/macros/Sources/GENSIN_f.sci  |    2 +-
+ modules/scicos_blocks/macros/Sources/GENSQR_f.sci  |    2 +-
+ modules/scicos_blocks/macros/Sources/GEN_SQR.sci   |    2 +-
+ modules/scicos_blocks/macros/Sources/Ground_g.sci  |    2 +-
+ modules/scicos_blocks/macros/Sources/INIMPL_f.sci  |    2 +-
+ modules/scicos_blocks/macros/Sources/IN_f.sci      |    2 +-
+ .../scicos_blocks/macros/Sources/Modulo_Count.sci  |    2 +-
+ modules/scicos_blocks/macros/Sources/PULSE_SC.sci  |    2 +-
+ modules/scicos_blocks/macros/Sources/RAMP.sci      |    2 +-
+ modules/scicos_blocks/macros/Sources/RAND_f.sci    |    2 +-
+ modules/scicos_blocks/macros/Sources/RAND_m.sci    |    2 +-
+ modules/scicos_blocks/macros/Sources/READAU_f.sci  |    2 +-
+ modules/scicos_blocks/macros/Sources/READC_f.sci   |    2 +-
+ modules/scicos_blocks/macros/Sources/RFILE_f.sci   |    2 +-
+ .../scicos_blocks/macros/Sources/SAWTOOTH_f.sci    |    2 +-
+ modules/scicos_blocks/macros/Sources/STEP.sci      |    2 +-
+ .../scicos_blocks/macros/Sources/STEP_FUNCTION.sci |    2 +-
+ modules/scicos_blocks/macros/Sources/SampleCLK.sci |    2 +-
+ .../scicos_blocks/macros/Sources/Sigbuilder.sci    |    2 +-
+ modules/scicos_blocks/macros/Sources/TIME_f.sci    |    2 +-
+ modules/scicos_blocks/macros/Sources/TKSCALE.sci   |    2 +-
+ .../scicos_blocks/macros/Sources/buildmacros.sce   |    2 +-
+ .../scicos_blocks/macros/Sources/tkscaleblk.sci    |    2 +-
+ .../scicos_blocks/macros/Threshold/GENERAL_f.sci   |    2 +-
+ .../scicos_blocks/macros/Threshold/NEGTOPOS_f.sci  |    2 +-
+ .../scicos_blocks/macros/Threshold/POSTONEG_f.sci  |    2 +-
+ .../scicos_blocks/macros/Threshold/ZCROSS_f.sci    |    2 +-
+ .../scicos_blocks/macros/Threshold/buildmacros.sce |    2 +-
+ modules/scicos_blocks/macros/buildmacros.sce       |    2 +-
+ modules/scicos_blocks/src/c/DllmainScicos_blocks.c |    2 +-
+ modules/scicos_blocks/src/c/absblk.c               |    2 +-
+ modules/scicos_blocks/src/c/absolute_value.c       |    2 +-
+ modules/scicos_blocks/src/c/acos_blk.c             |    2 +-
+ modules/scicos_blocks/src/c/acosh_blk.c            |    2 +-
+ modules/scicos_blocks/src/c/andlog.c               |    2 +-
+ modules/scicos_blocks/src/c/asin_blk.c             |    2 +-
+ modules/scicos_blocks/src/c/asinh_blk.c            |    2 +-
+ modules/scicos_blocks/src/c/assignment.c           |    2 +-
+ modules/scicos_blocks/src/c/atan_blk.c             |    2 +-
+ modules/scicos_blocks/src/c/atanh_blk.c            |    2 +-
+ modules/scicos_blocks/src/c/automat.c              |    2 +-
+ modules/scicos_blocks/src/c/backlash.c             |    2 +-
+ modules/scicos_blocks/src/c/bidon.c                |    2 +-
+ modules/scicos_blocks/src/c/bit_clear_16.c         |    2 +-
+ modules/scicos_blocks/src/c/bit_clear_32.c         |    2 +-
+ modules/scicos_blocks/src/c/bit_clear_8.c          |    2 +-
+ modules/scicos_blocks/src/c/bit_set_16.c           |    2 +-
+ modules/scicos_blocks/src/c/bit_set_32.c           |    2 +-
+ modules/scicos_blocks/src/c/bit_set_8.c            |    2 +-
+ modules/scicos_blocks/src/c/bounce_ball.c          |    2 +-
+ modules/scicos_blocks/src/c/bouncexy.c             |    2 +-
+ modules/scicos_blocks/src/c/canimxy.c              |    2 +-
+ modules/scicos_blocks/src/c/canimxy3d.c            |    2 +-
+ modules/scicos_blocks/src/c/cdummy.c               |    2 +-
+ modules/scicos_blocks/src/c/cevscpe.c              |    2 +-
+ modules/scicos_blocks/src/c/cfscope.c              |    2 +-
+ modules/scicos_blocks/src/c/cmat3d.c               |    2 +-
+ modules/scicos_blocks/src/c/cmatview.c             |    2 +-
+ modules/scicos_blocks/src/c/cmscope.c              |    2 +-
+ modules/scicos_blocks/src/c/constraint_c.c         |    2 +-
+ modules/scicos_blocks/src/c/convert.c              |    2 +-
+ modules/scicos_blocks/src/c/cos_blk.c              |    2 +-
+ modules/scicos_blocks/src/c/cosblk.c               |    2 +-
+ modules/scicos_blocks/src/c/cosh_blk.c             |    2 +-
+ modules/scicos_blocks/src/c/counter.c              |    2 +-
+ modules/scicos_blocks/src/c/cscope.c               |    2 +-
+ modules/scicos_blocks/src/c/cscopxy.c              |    2 +-
+ modules/scicos_blocks/src/c/cscopxy3d.c            |    2 +-
+ modules/scicos_blocks/src/c/csslti4.c              |    2 +-
+ modules/scicos_blocks/src/c/cstblk4.c              |    2 +-
+ modules/scicos_blocks/src/c/cstblk4_m.c            |    2 +-
+ modules/scicos_blocks/src/c/cumsum_c.c             |    2 +-
+ modules/scicos_blocks/src/c/cumsum_m.c             |    2 +-
+ modules/scicos_blocks/src/c/cumsum_r.c             |    2 +-
+ modules/scicos_blocks/src/c/cumsumz_c.c            |    2 +-
+ modules/scicos_blocks/src/c/cumsumz_m.c            |    2 +-
+ modules/scicos_blocks/src/c/cumsumz_r.c            |    2 +-
+ modules/scicos_blocks/src/c/curve_c.c              |    2 +-
+ modules/scicos_blocks/src/c/dband.c                |    2 +-
+ modules/scicos_blocks/src/c/deadband.c             |    2 +-
+ modules/scicos_blocks/src/c/delay4.c               |    2 +-
+ modules/scicos_blocks/src/c/delay4_i16.c           |    2 +-
+ modules/scicos_blocks/src/c/delay4_i32.c           |    2 +-
+ modules/scicos_blocks/src/c/delay4_i8.c            |    2 +-
+ modules/scicos_blocks/src/c/delay4_ui16.c          |    2 +-
+ modules/scicos_blocks/src/c/delay4_ui32.c          |    2 +-
+ modules/scicos_blocks/src/c/delay4_ui8.c           |    2 +-
+ modules/scicos_blocks/src/c/deriv.c                |    2 +-
+ modules/scicos_blocks/src/c/diffblk_c.c            |    2 +-
+ modules/scicos_blocks/src/c/dmmul.c                |    2 +-
+ modules/scicos_blocks/src/c/dmmul1.c               |    2 +-
+ modules/scicos_blocks/src/c/dollar4.c              |    2 +-
+ modules/scicos_blocks/src/c/dollar4_m.c            |    2 +-
+ modules/scicos_blocks/src/c/dsslti4.c              |    2 +-
+ modules/scicos_blocks/src/c/edgetrig.c             |    2 +-
+ modules/scicos_blocks/src/c/evaluate_expr.c        |    2 +-
+ modules/scicos_blocks/src/c/evtdly4.c              |    2 +-
+ modules/scicos_blocks/src/c/evtvardly.c            |    2 +-
+ modules/scicos_blocks/src/c/expblk_m.c             |    2 +-
+ modules/scicos_blocks/src/c/extdiag.c              |    2 +-
+ modules/scicos_blocks/src/c/extdiagz.c             |    2 +-
+ modules/scicos_blocks/src/c/extract.c              |    2 +-
+ modules/scicos_blocks/src/c/extract_bit_16_LH.c    |    2 +-
+ modules/scicos_blocks/src/c/extract_bit_16_LSB.c   |    2 +-
+ modules/scicos_blocks/src/c/extract_bit_16_MSB0.c  |    2 +-
+ modules/scicos_blocks/src/c/extract_bit_16_MSB1.c  |    2 +-
+ modules/scicos_blocks/src/c/extract_bit_16_RB0.c   |    2 +-
+ modules/scicos_blocks/src/c/extract_bit_16_RB1.c   |    2 +-
+ modules/scicos_blocks/src/c/extract_bit_16_UH0.c   |    2 +-
+ modules/scicos_blocks/src/c/extract_bit_16_UH1.c   |    2 +-
+ modules/scicos_blocks/src/c/extract_bit_32_LH.c    |    2 +-
+ modules/scicos_blocks/src/c/extract_bit_32_LSB.c   |    2 +-
+ modules/scicos_blocks/src/c/extract_bit_32_MSB0.c  |    2 +-
+ modules/scicos_blocks/src/c/extract_bit_32_MSB1.c  |    2 +-
+ modules/scicos_blocks/src/c/extract_bit_32_RB0.c   |    2 +-
+ modules/scicos_blocks/src/c/extract_bit_32_RB1.c   |    2 +-
+ modules/scicos_blocks/src/c/extract_bit_32_UH0.c   |    2 +-
+ modules/scicos_blocks/src/c/extract_bit_32_UH1.c   |    2 +-
+ modules/scicos_blocks/src/c/extract_bit_8_LH.c     |    2 +-
+ modules/scicos_blocks/src/c/extract_bit_8_LSB.c    |    2 +-
+ modules/scicos_blocks/src/c/extract_bit_8_MSB0.c   |    2 +-
+ modules/scicos_blocks/src/c/extract_bit_8_MSB1.c   |    2 +-
+ modules/scicos_blocks/src/c/extract_bit_8_RB0.c    |    2 +-
+ modules/scicos_blocks/src/c/extract_bit_8_RB1.c    |    2 +-
+ modules/scicos_blocks/src/c/extract_bit_8_UH0.c    |    2 +-
+ modules/scicos_blocks/src/c/extract_bit_8_UH1.c    |    2 +-
+ modules/scicos_blocks/src/c/extract_bit_u16_MSB1.c |    2 +-
+ modules/scicos_blocks/src/c/extract_bit_u16_RB1.c  |    2 +-
+ modules/scicos_blocks/src/c/extract_bit_u16_UH1.c  |    2 +-
+ modules/scicos_blocks/src/c/extract_bit_u32_MSB1.c |    2 +-
+ modules/scicos_blocks/src/c/extract_bit_u32_RB1.c  |    2 +-
+ modules/scicos_blocks/src/c/extract_bit_u32_UH1.c  |    2 +-
+ modules/scicos_blocks/src/c/extract_bit_u8_MSB1.c  |    2 +-
+ modules/scicos_blocks/src/c/extract_bit_u8_RB1.c   |    2 +-
+ modules/scicos_blocks/src/c/extract_bit_u8_UH1.c   |    2 +-
+ modules/scicos_blocks/src/c/extractor.c            |    2 +-
+ modules/scicos_blocks/src/c/extractz.c             |    2 +-
+ modules/scicos_blocks/src/c/exttril.c              |    2 +-
+ modules/scicos_blocks/src/c/exttrilz.c             |    2 +-
+ modules/scicos_blocks/src/c/exttriu.c              |    2 +-
+ modules/scicos_blocks/src/c/exttriuz.c             |    2 +-
+ modules/scicos_blocks/src/c/foriterator.c          |    2 +-
+ modules/scicos_blocks/src/c/fromws_c.c             |    2 +-
+ modules/scicos_blocks/src/c/gain.c                 |    2 +-
+ modules/scicos_blocks/src/c/gainblk.c              |    2 +-
+ modules/scicos_blocks/src/c/gainblk_i16e.c         |    2 +-
+ modules/scicos_blocks/src/c/gainblk_i16n.c         |    2 +-
+ modules/scicos_blocks/src/c/gainblk_i16s.c         |    2 +-
+ modules/scicos_blocks/src/c/gainblk_i32e.c         |    2 +-
+ modules/scicos_blocks/src/c/gainblk_i32n.c         |    2 +-
+ modules/scicos_blocks/src/c/gainblk_i32s.c         |    2 +-
+ modules/scicos_blocks/src/c/gainblk_i8e.c          |    2 +-
+ modules/scicos_blocks/src/c/gainblk_i8n.c          |    2 +-
+ modules/scicos_blocks/src/c/gainblk_i8s.c          |    2 +-
+ modules/scicos_blocks/src/c/gainblk_ui16e.c        |    2 +-
+ modules/scicos_blocks/src/c/gainblk_ui16n.c        |    2 +-
+ modules/scicos_blocks/src/c/gainblk_ui16s.c        |    2 +-
+ modules/scicos_blocks/src/c/gainblk_ui32e.c        |    2 +-
+ modules/scicos_blocks/src/c/gainblk_ui32n.c        |    2 +-
+ modules/scicos_blocks/src/c/gainblk_ui32s.c        |    2 +-
+ modules/scicos_blocks/src/c/gainblk_ui8e.c         |    2 +-
+ modules/scicos_blocks/src/c/gainblk_ui8n.c         |    2 +-
+ modules/scicos_blocks/src/c/gainblk_ui8s.c         |    2 +-
+ modules/scicos_blocks/src/c/hystheresis.c          |    2 +-
+ modules/scicos_blocks/src/c/integral_func.c        |    2 +-
+ modules/scicos_blocks/src/c/integralz_func.c       |    2 +-
+ modules/scicos_blocks/src/c/invblk4.c              |    2 +-
+ modules/scicos_blocks/src/c/logic.c                |    2 +-
+ modules/scicos_blocks/src/c/logicalop.c            |    2 +-
+ modules/scicos_blocks/src/c/logicalop_i16.c        |    2 +-
+ modules/scicos_blocks/src/c/logicalop_i32.c        |    2 +-
+ modules/scicos_blocks/src/c/logicalop_i8.c         |    2 +-
+ modules/scicos_blocks/src/c/logicalop_m.c          |    2 +-
+ modules/scicos_blocks/src/c/logicalop_ui16.c       |    2 +-
+ modules/scicos_blocks/src/c/logicalop_ui32.c       |    2 +-
+ modules/scicos_blocks/src/c/logicalop_ui8.c        |    2 +-
+ modules/scicos_blocks/src/c/lookup2d.c             |    2 +-
+ modules/scicos_blocks/src/c/lookup_c.c             |    2 +-
+ modules/scicos_blocks/src/c/m_frequ.c              |    2 +-
+ modules/scicos_blocks/src/c/mat_bksl.c             |    2 +-
+ modules/scicos_blocks/src/c/mat_cath.c             |    2 +-
+ modules/scicos_blocks/src/c/mat_catv.c             |    2 +-
+ modules/scicos_blocks/src/c/mat_det.c              |    2 +-
+ modules/scicos_blocks/src/c/mat_diag.c             |    2 +-
+ modules/scicos_blocks/src/c/mat_div.c              |    2 +-
+ modules/scicos_blocks/src/c/mat_expm.c             |    2 +-
+ modules/scicos_blocks/src/c/mat_inv.c              |    2 +-
+ modules/scicos_blocks/src/c/mat_lu.c               |    2 +-
+ modules/scicos_blocks/src/c/mat_pinv.c             |    2 +-
+ modules/scicos_blocks/src/c/mat_reshape.c          |    2 +-
+ modules/scicos_blocks/src/c/mat_sing.c             |    2 +-
+ modules/scicos_blocks/src/c/mat_sqrt.c             |    2 +-
+ modules/scicos_blocks/src/c/mat_sum.c              |    2 +-
+ modules/scicos_blocks/src/c/mat_sumc.c             |    2 +-
+ modules/scicos_blocks/src/c/mat_suml.c             |    2 +-
+ modules/scicos_blocks/src/c/mat_svd.c              |    2 +-
+ modules/scicos_blocks/src/c/mat_vps.c              |    2 +-
+ modules/scicos_blocks/src/c/mat_vpv.c              |    2 +-
+ modules/scicos_blocks/src/c/matbyscal.c            |    2 +-
+ modules/scicos_blocks/src/c/matbyscal_e.c          |    2 +-
+ modules/scicos_blocks/src/c/matbyscal_s.c          |    2 +-
+ modules/scicos_blocks/src/c/mathermit_m.c          |    2 +-
+ modules/scicos_blocks/src/c/matmul2_e.c            |    2 +-
+ modules/scicos_blocks/src/c/matmul2_m.c            |    2 +-
+ modules/scicos_blocks/src/c/matmul2_s.c            |    2 +-
+ modules/scicos_blocks/src/c/matmul_i16e.c          |    2 +-
+ modules/scicos_blocks/src/c/matmul_i16n.c          |    2 +-
+ modules/scicos_blocks/src/c/matmul_i16s.c          |    2 +-
+ modules/scicos_blocks/src/c/matmul_i32e.c          |    2 +-
+ modules/scicos_blocks/src/c/matmul_i32n.c          |    2 +-
+ modules/scicos_blocks/src/c/matmul_i32s.c          |    2 +-
+ modules/scicos_blocks/src/c/matmul_i8e.c           |    2 +-
+ modules/scicos_blocks/src/c/matmul_i8n.c           |    2 +-
+ modules/scicos_blocks/src/c/matmul_i8s.c           |    2 +-
+ modules/scicos_blocks/src/c/matmul_m.c             |    2 +-
+ modules/scicos_blocks/src/c/matmul_ui16e.c         |    2 +-
+ modules/scicos_blocks/src/c/matmul_ui16n.c         |    2 +-
+ modules/scicos_blocks/src/c/matmul_ui16s.c         |    2 +-
+ modules/scicos_blocks/src/c/matmul_ui32e.c         |    2 +-
+ modules/scicos_blocks/src/c/matmul_ui32n.c         |    2 +-
+ modules/scicos_blocks/src/c/matmul_ui32s.c         |    2 +-
+ modules/scicos_blocks/src/c/matmul_ui8e.c          |    2 +-
+ modules/scicos_blocks/src/c/matmul_ui8n.c          |    2 +-
+ modules/scicos_blocks/src/c/matmul_ui8s.c          |    2 +-
+ modules/scicos_blocks/src/c/mattran_m.c            |    2 +-
+ modules/scicos_blocks/src/c/matz_abs.c             |    2 +-
+ modules/scicos_blocks/src/c/matz_absc.c            |    2 +-
+ modules/scicos_blocks/src/c/matz_bksl.c            |    2 +-
+ modules/scicos_blocks/src/c/matz_cath.c            |    2 +-
+ modules/scicos_blocks/src/c/matz_cath.h            |    2 +-
+ modules/scicos_blocks/src/c/matz_catv.c            |    2 +-
+ modules/scicos_blocks/src/c/matz_conj.c            |    2 +-
+ modules/scicos_blocks/src/c/matz_det.c             |    2 +-
+ modules/scicos_blocks/src/c/matz_diag.c            |    2 +-
+ modules/scicos_blocks/src/c/matz_div.c             |    2 +-
+ modules/scicos_blocks/src/c/matz_expm.c            |    2 +-
+ modules/scicos_blocks/src/c/matz_inv.c             |    2 +-
+ modules/scicos_blocks/src/c/matz_lu.c              |    2 +-
+ modules/scicos_blocks/src/c/matz_pinv.c            |    2 +-
+ modules/scicos_blocks/src/c/matz_reim.c            |    2 +-
+ modules/scicos_blocks/src/c/matz_reimc.c           |    2 +-
+ modules/scicos_blocks/src/c/matz_reshape.c         |    2 +-
+ modules/scicos_blocks/src/c/matz_sing.c            |    2 +-
+ modules/scicos_blocks/src/c/matz_sqrt.c            |    2 +-
+ modules/scicos_blocks/src/c/matz_sum.c             |    2 +-
+ modules/scicos_blocks/src/c/matz_sumc.c            |    2 +-
+ modules/scicos_blocks/src/c/matz_suml.c            |    2 +-
+ modules/scicos_blocks/src/c/matz_svd.c             |    2 +-
+ modules/scicos_blocks/src/c/matz_vps.c             |    2 +-
+ modules/scicos_blocks/src/c/matz_vpv.c             |    2 +-
+ modules/scicos_blocks/src/c/matzmul2_m.c           |    2 +-
+ modules/scicos_blocks/src/c/matzmul_m.c            |    2 +-
+ modules/scicos_blocks/src/c/matztran_m.c           |    2 +-
+ modules/scicos_blocks/src/c/minmax.c               |    2 +-
+ modules/scicos_blocks/src/c/modulo_count.c         |    2 +-
+ modules/scicos_blocks/src/c/mswitch.c              |    2 +-
+ modules/scicos_blocks/src/c/multiplex.c            |    2 +-
+ modules/scicos_blocks/src/c/plusblk.c              |    2 +-
+ modules/scicos_blocks/src/c/prod.c                 |    2 +-
+ modules/scicos_blocks/src/c/product.c              |    2 +-
+ modules/scicos_blocks/src/c/ramp.c                 |    2 +-
+ modules/scicos_blocks/src/c/ratelimiter.c          |    2 +-
+ modules/scicos_blocks/src/c/readau.c               |    2 +-
+ modules/scicos_blocks/src/c/readc.c                |    2 +-
+ modules/scicos_blocks/src/c/relational_op.c        |    2 +-
+ modules/scicos_blocks/src/c/relational_op_i16.c    |    2 +-
+ modules/scicos_blocks/src/c/relational_op_i32.c    |    2 +-
+ modules/scicos_blocks/src/c/relational_op_i8.c     |    2 +-
+ modules/scicos_blocks/src/c/relational_op_ui16.c   |    2 +-
+ modules/scicos_blocks/src/c/relational_op_ui32.c   |    2 +-
+ modules/scicos_blocks/src/c/relational_op_ui8.c    |    2 +-
+ modules/scicos_blocks/src/c/relationalop.c         |    2 +-
+ modules/scicos_blocks/src/c/relay.c                |    2 +-
+ modules/scicos_blocks/src/c/ricc_m.c               |    2 +-
+ modules/scicos_blocks/src/c/rndblk_m.c             |    2 +-
+ modules/scicos_blocks/src/c/rndblkz_m.c            |    2 +-
+ modules/scicos_blocks/src/c/root_coef.c            |    2 +-
+ modules/scicos_blocks/src/c/rootz_coef.c           |    2 +-
+ modules/scicos_blocks/src/c/samphold4.c            |    2 +-
+ modules/scicos_blocks/src/c/samphold4_m.c          |    2 +-
+ modules/scicos_blocks/src/c/satur.c                |    2 +-
+ modules/scicos_blocks/src/c/scalar2vector.c        |    2 +-
+ modules/scicos_blocks/src/c/scicos_evalhermite.c   |    2 +-
+ modules/scicos_blocks/src/c/scicos_evalhermite.h   |    2 +-
+ modules/scicos_blocks/src/c/scicos_indexfinder.c   |    2 +-
+ modules/scicos_blocks/src/c/scicos_indexfinder.h   |    2 +-
+ modules/scicos_blocks/src/c/scicosexit.c           |    2 +-
+ modules/scicos_blocks/src/c/scoGetProperty.c       |    2 +-
+ modules/scicos_blocks/src/c/scoMemoryScope.c       |    2 +-
+ modules/scicos_blocks/src/c/scoMisc.c              |    2 +-
+ modules/scicos_blocks/src/c/scoSetProperty.c       |    2 +-
+ modules/scicos_blocks/src/c/scoWindowScope.c       |    2 +-
+ modules/scicos_blocks/src/c/selector.c             |    2 +-
+ modules/scicos_blocks/src/c/selector_m.c           |    2 +-
+ modules/scicos_blocks/src/c/shift_16_LA.c          |    2 +-
+ modules/scicos_blocks/src/c/shift_16_LC.c          |    2 +-
+ modules/scicos_blocks/src/c/shift_16_RA.c          |    2 +-
+ modules/scicos_blocks/src/c/shift_16_RC.c          |    2 +-
+ modules/scicos_blocks/src/c/shift_32_LA.c          |    2 +-
+ modules/scicos_blocks/src/c/shift_32_LC.c          |    2 +-
+ modules/scicos_blocks/src/c/shift_32_RA.c          |    2 +-
+ modules/scicos_blocks/src/c/shift_32_RC.c          |    2 +-
+ modules/scicos_blocks/src/c/shift_8_LA.c           |    2 +-
+ modules/scicos_blocks/src/c/shift_8_LC.c           |    2 +-
+ modules/scicos_blocks/src/c/shift_8_RA.c           |    2 +-
+ modules/scicos_blocks/src/c/shift_8_RC.c           |    2 +-
+ modules/scicos_blocks/src/c/shift_u16_RA.c         |    2 +-
+ modules/scicos_blocks/src/c/shift_u32_RA.c         |    2 +-
+ modules/scicos_blocks/src/c/shift_u8_RA.c          |    2 +-
+ modules/scicos_blocks/src/c/signum.c               |    2 +-
+ modules/scicos_blocks/src/c/sin_blk.c              |    2 +-
+ modules/scicos_blocks/src/c/sinh_blk.c             |    2 +-
+ modules/scicos_blocks/src/c/step_func.c            |    2 +-
+ modules/scicos_blocks/src/c/submat.c               |    2 +-
+ modules/scicos_blocks/src/c/submatz.c              |    2 +-
+ modules/scicos_blocks/src/c/sum.c                  |    2 +-
+ modules/scicos_blocks/src/c/summation.c            |    2 +-
+ modules/scicos_blocks/src/c/summation_i16e.c       |    2 +-
+ modules/scicos_blocks/src/c/summation_i16n.c       |    2 +-
+ modules/scicos_blocks/src/c/summation_i16s.c       |    2 +-
+ modules/scicos_blocks/src/c/summation_i32e.c       |    2 +-
+ modules/scicos_blocks/src/c/summation_i32n.c       |    2 +-
+ modules/scicos_blocks/src/c/summation_i32s.c       |    2 +-
+ modules/scicos_blocks/src/c/summation_i8e.c        |    2 +-
+ modules/scicos_blocks/src/c/summation_i8n.c        |    2 +-
+ modules/scicos_blocks/src/c/summation_i8s.c        |    2 +-
+ modules/scicos_blocks/src/c/summation_ui16e.c      |    2 +-
+ modules/scicos_blocks/src/c/summation_ui16n.c      |    2 +-
+ modules/scicos_blocks/src/c/summation_ui16s.c      |    2 +-
+ modules/scicos_blocks/src/c/summation_ui32e.c      |    2 +-
+ modules/scicos_blocks/src/c/summation_ui32n.c      |    2 +-
+ modules/scicos_blocks/src/c/summation_ui32s.c      |    2 +-
+ modules/scicos_blocks/src/c/summation_ui8e.c       |    2 +-
+ modules/scicos_blocks/src/c/summation_ui8n.c       |    2 +-
+ modules/scicos_blocks/src/c/summation_ui8s.c       |    2 +-
+ modules/scicos_blocks/src/c/summation_z.c          |    2 +-
+ modules/scicos_blocks/src/c/switch2.c              |    2 +-
+ modules/scicos_blocks/src/c/switch2_m.c            |    2 +-
+ modules/scicos_blocks/src/c/switchn.c              |    2 +-
+ modules/scicos_blocks/src/c/tablex2d_c.c           |    2 +-
+ modules/scicos_blocks/src/c/tan_blk.c              |    2 +-
+ modules/scicos_blocks/src/c/tanh_blk.c             |    2 +-
+ modules/scicos_blocks/src/c/tcslti4.c              |    2 +-
+ modules/scicos_blocks/src/c/tcsltj4.c              |    2 +-
+ modules/scicos_blocks/src/c/time_delay.c           |    2 +-
+ modules/scicos_blocks/src/c/tows_c.c               |    2 +-
+ modules/scicos_blocks/src/c/variable_delay.c       |    2 +-
+ modules/scicos_blocks/src/c/whileiterator.c        |    2 +-
+ modules/scicos_blocks/src/c/writeau.c              |    2 +-
+ modules/scicos_blocks/src/c/writec.c               |    2 +-
+ modules/scicos_blocks/src/c/zcross2.c              |    2 +-
+ modules/scicos_blocks/src/fortran/csslti.f         |    2 +-
+ modules/scicos_blocks/src/fortran/cstblk.f         |    2 +-
+ modules/scicos_blocks/src/fortran/delay.f          |    2 +-
+ modules/scicos_blocks/src/fortran/delayv.f         |    2 +-
+ modules/scicos_blocks/src/fortran/demux.f          |    2 +-
+ modules/scicos_blocks/src/fortran/diffblk.f        |    2 +-
+ modules/scicos_blocks/src/fortran/dlradp.f         |    2 +-
+ modules/scicos_blocks/src/fortran/dollar.f         |    2 +-
+ modules/scicos_blocks/src/fortran/dsslti.f         |    2 +-
+ modules/scicos_blocks/src/fortran/eselect.f        |    2 +-
+ modules/scicos_blocks/src/fortran/evtdly.f         |    2 +-
+ modules/scicos_blocks/src/fortran/expblk.f         |    2 +-
+ modules/scicos_blocks/src/fortran/forblk.f         |    2 +-
+ modules/scicos_blocks/src/fortran/fsv.f            |    2 +-
+ modules/scicos_blocks/src/fortran/gensin.f         |    2 +-
+ modules/scicos_blocks/src/fortran/gensqr.f         |    2 +-
+ modules/scicos_blocks/src/fortran/hltblk.f         |    2 +-
+ modules/scicos_blocks/src/fortran/ifthel.f         |    2 +-
+ modules/scicos_blocks/src/fortran/integr.f         |    2 +-
+ modules/scicos_blocks/src/fortran/intplt.f         |    2 +-
+ modules/scicos_blocks/src/fortran/intpol.f         |    2 +-
+ modules/scicos_blocks/src/fortran/intrp2.f         |    2 +-
+ modules/scicos_blocks/src/fortran/intrpl.f         |    2 +-
+ modules/scicos_blocks/src/fortran/invblk.f         |    2 +-
+ modules/scicos_blocks/src/fortran/iocopy.f         |    2 +-
+ modules/scicos_blocks/src/fortran/logblk.f         |    2 +-
+ modules/scicos_blocks/src/fortran/lookup.f         |    2 +-
+ modules/scicos_blocks/src/fortran/lsplit.f         |    2 +-
+ modules/scicos_blocks/src/fortran/lusat.f          |    2 +-
+ modules/scicos_blocks/src/fortran/maxblk.f         |    2 +-
+ modules/scicos_blocks/src/fortran/memo.f           |    2 +-
+ modules/scicos_blocks/src/fortran/mfclck.f         |    2 +-
+ modules/scicos_blocks/src/fortran/minblk.f         |    2 +-
+ modules/scicos_blocks/src/fortran/mux.f            |    2 +-
+ modules/scicos_blocks/src/fortran/pload.f          |    2 +-
+ modules/scicos_blocks/src/fortran/powblk.f         |    2 +-
+ modules/scicos_blocks/src/fortran/qzcel.f          |    2 +-
+ modules/scicos_blocks/src/fortran/qzflr.f          |    2 +-
+ modules/scicos_blocks/src/fortran/qzrnd.f          |    2 +-
+ modules/scicos_blocks/src/fortran/qztrn.f          |    2 +-
+ modules/scicos_blocks/src/fortran/readf.f          |    2 +-
+ modules/scicos_blocks/src/fortran/rndblk.f         |    2 +-
+ modules/scicos_blocks/src/fortran/samphold.f       |    2 +-
+ modules/scicos_blocks/src/fortran/sawtth.f         |    2 +-
+ modules/scicos_blocks/src/fortran/sciblk.f         |    2 +-
+ modules/scicos_blocks/src/fortran/selblk.f         |    2 +-
+ modules/scicos_blocks/src/fortran/sinblk.f         |    2 +-
+ modules/scicos_blocks/src/fortran/sqrblk.f         |    2 +-
+ modules/scicos_blocks/src/fortran/sum2.f           |    2 +-
+ modules/scicos_blocks/src/fortran/sum3.f           |    2 +-
+ modules/scicos_blocks/src/fortran/tanblk.f         |    2 +-
+ modules/scicos_blocks/src/fortran/tcslti.f         |    2 +-
+ modules/scicos_blocks/src/fortran/tcsltj.f         |    2 +-
+ modules/scicos_blocks/src/fortran/timblk.f         |    2 +-
+ modules/scicos_blocks/src/fortran/trash.f          |    2 +-
+ modules/scicos_blocks/src/fortran/writef.f         |    2 +-
+ modules/scicos_blocks/src/fortran/zcross.f         |    2 +-
+ modules/scicos_blocks/src/scripts/GenBlocks.sh     |    2 +-
+ .../src/scripts/generateblocksheader.sce           |    4 ++--
+ modules/scicos_blocks/src/scripts/genmoc.sce       |    2 +-
+ modules/tclsci/tcl/sciGUI/license.txt              |    2 +-
+ modules/tclsci/tcl/utils/Balloon.tcl               |    2 +-
+ modules/xcos/help/en_US/batch_functions/lincos.xml |    2 +-
+ modules/xcos/help/en_US/batch_functions/scicos.xml |    2 +-
+ .../help/en_US/batch_functions/scicos_simulate.xml |    2 +-
+ .../xcos/help/en_US/batch_functions/scicosim.xml   |    2 +-
+ .../xcos/help/en_US/batch_functions/steadycos.xml  |    2 +-
+ .../Annotations_pal/AA_Annotations_pal.xml         |    2 +-
+ .../help/en_US/palettes/Annotations_pal/TEXT_f.xml |    2 +-
+ .../AA_Commonlyusedblocks_pal.xml                  |    2 +-
+ .../palettes/Commonlyusedblocks_pal/LOGICAL_OP.xml |    2 +-
+ .../Commonlyusedblocks_pal/RELATIONALOP.xml        |    2 +-
+ .../palettes/Continuous_pal/AA_Continuous_pal.xml  |    2 +-
+ .../en_US/palettes/Continuous_pal/CLINDUMMY_f.xml  |    2 +-
+ .../help/en_US/palettes/Continuous_pal/CLR.xml     |    2 +-
+ .../help/en_US/palettes/Continuous_pal/CLSS.xml    |    2 +-
+ .../help/en_US/palettes/Continuous_pal/DERIV.xml   |    2 +-
+ .../en_US/palettes/Continuous_pal/INTEGRAL_f.xml   |    2 +-
+ .../en_US/palettes/Continuous_pal/INTEGRAL_m.xml   |    2 +-
+ .../help/en_US/palettes/Continuous_pal/PID.xml     |    2 +-
+ .../help/en_US/palettes/Continuous_pal/TCLSS.xml   |    2 +-
+ .../en_US/palettes/Continuous_pal/TIME_DELAY.xml   |    2 +-
+ .../palettes/Continuous_pal/VARIABLE_DELAY.xml     |    2 +-
+ .../AA_Demonstrationsblocks_pal.xml                |    2 +-
+ .../palettes/Demonstrationsblocks_pal/AUTOMAT.xml  |    2 +-
+ .../palettes/Demonstrationsblocks_pal/BOUNCE.xml   |    2 +-
+ .../palettes/Demonstrationsblocks_pal/BOUNCEXY.xml |    2 +-
+ .../Demonstrationsblocks_pal/BPLATFORM.xml         |    2 +-
+ .../palettes/Demonstrationsblocks_pal/PDE.xml      |    2 +-
+ .../Discontinuities_pal/AA_Discontinuous_pal.xml   |    2 +-
+ .../palettes/Discontinuities_pal/BACKLASH.xml      |    2 +-
+ .../palettes/Discontinuities_pal/DEADBAND.xml      |    2 +-
+ .../palettes/Discontinuities_pal/HYSTHERESIS.xml   |    2 +-
+ .../palettes/Discontinuities_pal/RATELIMITER.xml   |    2 +-
+ .../palettes/Discontinuities_pal/SATURATION.xml    |    2 +-
+ .../palettes/Discrete_pal/AA_Discrete_pal.xml      |    2 +-
+ .../help/en_US/palettes/Discrete_pal/DELAYV_f.xml  |    2 +-
+ .../help/en_US/palettes/Discrete_pal/DELAY_f.xml   |    2 +-
+ .../xcos/help/en_US/palettes/Discrete_pal/DLR.xml  |    2 +-
+ .../en_US/palettes/Discrete_pal/DLRADAPT_f.xml     |    2 +-
+ .../xcos/help/en_US/palettes/Discrete_pal/DLSS.xml |    2 +-
+ .../help/en_US/palettes/Discrete_pal/DOLLAR_f.xml  |    2 +-
+ .../help/en_US/palettes/Discrete_pal/REGISTER.xml  |    2 +-
+ .../palettes/Electrical_pal/AA_Electrical_pal.xml  |    2 +-
+ .../help/en_US/palettes/Electrical_pal/CCS.xml     |    2 +-
+ .../help/en_US/palettes/Electrical_pal/CVS.xml     |    2 +-
+ .../en_US/palettes/Electrical_pal/Capacitor.xml    |    2 +-
+ .../palettes/Electrical_pal/ConstantVoltage.xml    |    2 +-
+ .../palettes/Electrical_pal/CurrentSensor.xml      |    2 +-
+ .../help/en_US/palettes/Electrical_pal/Diode.xml   |    2 +-
+ .../help/en_US/palettes/Electrical_pal/Ground.xml  |    2 +-
+ .../help/en_US/palettes/Electrical_pal/Gyrator.xml |    2 +-
+ .../palettes/Electrical_pal/IdealTransformer.xml   |    2 +-
+ .../en_US/palettes/Electrical_pal/Inductor.xml     |    2 +-
+ .../help/en_US/palettes/Electrical_pal/NMOS.xml    |    2 +-
+ .../help/en_US/palettes/Electrical_pal/NPN.xml     |    2 +-
+ .../help/en_US/palettes/Electrical_pal/OpAmp.xml   |    2 +-
+ .../help/en_US/palettes/Electrical_pal/PMOS.xml    |    2 +-
+ .../help/en_US/palettes/Electrical_pal/PNP.xml     |    2 +-
+ .../palettes/Electrical_pal/PotentialSensor.xml    |    2 +-
+ .../en_US/palettes/Electrical_pal/Resistor.xml     |    2 +-
+ .../en_US/palettes/Electrical_pal/SineVoltage.xml  |    2 +-
+ .../help/en_US/palettes/Electrical_pal/Switch.xml  |    2 +-
+ .../en_US/palettes/Electrical_pal/VVsourceAC.xml   |    2 +-
+ .../palettes/Electrical_pal/VariableResistor.xml   |    2 +-
+ .../palettes/Electrical_pal/VoltageSensor.xml      |    2 +-
+ .../en_US/palettes/Electrical_pal/VsourceAC.xml    |    2 +-
+ .../en_US/palettes/Events_pal/AA_Events_pal.xml    |    2 +-
+ .../xcos/help/en_US/palettes/Events_pal/ANDBLK.xml |    2 +-
+ .../help/en_US/palettes/Events_pal/ANDLOG_f.xml    |    2 +-
+ .../help/en_US/palettes/Events_pal/CEVENTSCOPE.xml |    2 +-
+ .../help/en_US/palettes/Events_pal/CLKFROM.xml     |    2 +-
+ .../help/en_US/palettes/Events_pal/CLKGOTO.xml     |    2 +-
+ .../palettes/Events_pal/CLKGotoTagVisibility.xml   |    2 +-
+ .../help/en_US/palettes/Events_pal/CLKSOMV_f.xml   |    2 +-
+ .../en_US/palettes/Events_pal/EDGE_TRIGGER.xml     |    2 +-
+ .../help/en_US/palettes/Events_pal/ESELECT_f.xml   |    2 +-
+ .../help/en_US/palettes/Events_pal/EVTDLY_c.xml    |    2 +-
+ .../help/en_US/palettes/Events_pal/EVTGEN_f.xml    |    2 +-
+ .../help/en_US/palettes/Events_pal/EVTVARDLY.xml   |    2 +-
+ .../palettes/Events_pal/Extract_Activation.xml     |    2 +-
+ .../xcos/help/en_US/palettes/Events_pal/HALT_f.xml |    2 +-
+ .../help/en_US/palettes/Events_pal/IFTHEL_f.xml    |    2 +-
+ .../help/en_US/palettes/Events_pal/MCLOCK_f.xml    |    2 +-
+ .../help/en_US/palettes/Events_pal/MFCLCK_f.xml    |    2 +-
+ .../xcos/help/en_US/palettes/Events_pal/M_freq.xml |    2 +-
+ .../help/en_US/palettes/Events_pal/freq_div.xml    |    2 +-
+ .../palettes/Implicit_pal/AA_Implicit_pal.xml      |    2 +-
+ .../en_US/palettes/Implicit_pal/CONSTRAINT_c.xml   |    2 +-
+ .../help/en_US/palettes/Implicit_pal/DIFF_f.xml    |    2 +-
+ .../en_US/palettes/Integer_pal/AA_Integer_pal.xml  |    2 +-
+ .../help/en_US/palettes/Integer_pal/BITCLEAR.xml   |    2 +-
+ .../help/en_US/palettes/Integer_pal/BITSET.xml     |    2 +-
+ .../help/en_US/palettes/Integer_pal/CONVERT.xml    |    2 +-
+ .../help/en_US/palettes/Integer_pal/DFLIPFLOP.xml  |    2 +-
+ .../help/en_US/palettes/Integer_pal/DLATCH.xml     |    2 +-
+ .../en_US/palettes/Integer_pal/EXTRACTBITS.xml     |    2 +-
+ .../help/en_US/palettes/Integer_pal/INTMUL.xml     |    2 +-
+ .../help/en_US/palettes/Integer_pal/JKFLIPFLOP.xml |    2 +-
+ .../xcos/help/en_US/palettes/Integer_pal/LOGIC.xml |    2 +-
+ .../xcos/help/en_US/palettes/Integer_pal/SHIFT.xml |    2 +-
+ .../help/en_US/palettes/Integer_pal/SRFLIPFLOP.xml |    2 +-
+ .../Lookuptables_pal/AA_Lookuptables_pal.xml       |    2 +-
+ .../palettes/Lookuptables_pal/INTRP2BLK_f.xml      |    2 +-
+ .../palettes/Lookuptables_pal/INTRPLBLK_f.xml      |    2 +-
+ .../en_US/palettes/Lookuptables_pal/LOOKUP_f.xml   |    2 +-
+ .../Mathoperations_pal/AA_Mathoperations_pal.xml   |    2 +-
+ .../palettes/Mathoperations_pal/ABS_VALUE.xml      |    2 +-
+ .../en_US/palettes/Mathoperations_pal/BIGSOM_f.xml |    2 +-
+ .../en_US/palettes/Mathoperations_pal/COSBLK_f.xml |    2 +-
+ .../en_US/palettes/Mathoperations_pal/EXPBLK_m.xml |    2 +-
+ .../palettes/Mathoperations_pal/GAINBLK_f.xml      |    2 +-
+ .../en_US/palettes/Mathoperations_pal/INVBLK.xml   |    2 +-
+ .../en_US/palettes/Mathoperations_pal/LOGBLK_f.xml |    2 +-
+ .../palettes/Mathoperations_pal/MATMAGPHI.xml      |    2 +-
+ .../en_US/palettes/Mathoperations_pal/MATZREIM.xml |    2 +-
+ .../en_US/palettes/Mathoperations_pal/MAXMIN.xml   |    2 +-
+ .../en_US/palettes/Mathoperations_pal/MAX_f.xml    |    2 +-
+ .../en_US/palettes/Mathoperations_pal/MIN_f.xml    |    2 +-
+ .../en_US/palettes/Mathoperations_pal/POWBLK_f.xml |    2 +-
+ .../en_US/palettes/Mathoperations_pal/PRODUCT.xml  |    2 +-
+ .../en_US/palettes/Mathoperations_pal/PROD_f.xml   |    2 +-
+ .../en_US/palettes/Mathoperations_pal/SIGNUM.xml   |    2 +-
+ .../en_US/palettes/Mathoperations_pal/SINBLK_f.xml |    2 +-
+ .../en_US/palettes/Mathoperations_pal/SQRT.xml     |    2 +-
+ .../palettes/Mathoperations_pal/SUMMATION.xml      |    2 +-
+ .../en_US/palettes/Mathoperations_pal/SUM_f.xml    |    2 +-
+ .../en_US/palettes/Mathoperations_pal/TANBLK_f.xml |    2 +-
+ .../en_US/palettes/Mathoperations_pal/TrigFun.xml  |    2 +-
+ .../en_US/palettes/Matrix_pal/AA_Matrix_pal.xml    |    2 +-
+ .../xcos/help/en_US/palettes/Matrix_pal/CUMSUM.xml |    2 +-
+ .../help/en_US/palettes/Matrix_pal/EXTRACT.xml     |    2 +-
+ .../xcos/help/en_US/palettes/Matrix_pal/EXTTRI.xml |    2 +-
+ .../help/en_US/palettes/Matrix_pal/MATBKSL.xml     |    2 +-
+ .../help/en_US/palettes/Matrix_pal/MATCATH.xml     |    2 +-
+ .../help/en_US/palettes/Matrix_pal/MATCATV.xml     |    2 +-
+ .../xcos/help/en_US/palettes/Matrix_pal/MATDET.xml |    2 +-
+ .../help/en_US/palettes/Matrix_pal/MATDIAG.xml     |    2 +-
+ .../xcos/help/en_US/palettes/Matrix_pal/MATDIV.xml |    2 +-
+ .../xcos/help/en_US/palettes/Matrix_pal/MATEIG.xml |    2 +-
+ .../help/en_US/palettes/Matrix_pal/MATEXPM.xml     |    2 +-
+ .../xcos/help/en_US/palettes/Matrix_pal/MATINV.xml |    2 +-
+ .../xcos/help/en_US/palettes/Matrix_pal/MATLU.xml  |    2 +-
+ .../xcos/help/en_US/palettes/Matrix_pal/MATMUL.xml |    2 +-
+ .../help/en_US/palettes/Matrix_pal/MATPINV.xml     |    2 +-
+ .../help/en_US/palettes/Matrix_pal/MATRESH.xml     |    2 +-
+ .../help/en_US/palettes/Matrix_pal/MATSING.xml     |    2 +-
+ .../xcos/help/en_US/palettes/Matrix_pal/MATSUM.xml |    2 +-
+ .../help/en_US/palettes/Matrix_pal/MATTRAN.xml     |    2 +-
+ .../help/en_US/palettes/Matrix_pal/MATZCONJ.xml    |    2 +-
+ .../xcos/help/en_US/palettes/Matrix_pal/RICC.xml   |    2 +-
+ .../help/en_US/palettes/Matrix_pal/ROOTCOEF.xml    |    2 +-
+ .../xcos/help/en_US/palettes/Matrix_pal/SUBMAT.xml |    2 +-
+ .../palettes/Portaction_pal/AA_Portaction_pal.xml  |    2 +-
+ .../en_US/palettes/Portaction_pal/CLKINV_f.xml     |    2 +-
+ .../en_US/palettes/Portaction_pal/CLKOUTV_f.xml    |    2 +-
+ .../en_US/palettes/Portaction_pal/INIMPL_f.xml     |    2 +-
+ .../help/en_US/palettes/Portaction_pal/IN_f.xml    |    2 +-
+ .../en_US/palettes/Portaction_pal/OUTIMPL_f.xml    |    2 +-
+ .../help/en_US/palettes/Portaction_pal/OUT_f.xml   |    2 +-
+ .../AA_Signalprocessing_pal.xml                    |    2 +-
+ .../palettes/Signalprocessing_pal/QUANT_f.xml      |    2 +-
+ .../palettes/Signalprocessing_pal/SAMPHOLD_m.xml   |    2 +-
+ .../Signalrouting_pal/AA_Signalrouting_pal.xml     |    2 +-
+ .../en_US/palettes/Signalrouting_pal/DEMUX.xml     |    2 +-
+ .../en_US/palettes/Signalrouting_pal/EXTRACTOR.xml |    2 +-
+ .../help/en_US/palettes/Signalrouting_pal/FROM.xml |    2 +-
+ .../en_US/palettes/Signalrouting_pal/FROMMO.xml    |    2 +-
+ .../help/en_US/palettes/Signalrouting_pal/GOTO.xml |    2 +-
+ .../en_US/palettes/Signalrouting_pal/GOTOMO.xml    |    2 +-
+ .../Signalrouting_pal/GotoTagVisibility.xml        |    2 +-
+ .../Signalrouting_pal/GotoTagVisibilityMO.xml      |    2 +-
+ .../en_US/palettes/Signalrouting_pal/ISELECT_m.xml |    2 +-
+ .../help/en_US/palettes/Signalrouting_pal/MUX.xml  |    2 +-
+ .../en_US/palettes/Signalrouting_pal/M_SWITCH.xml  |    2 +-
+ .../en_US/palettes/Signalrouting_pal/NRMSOM_f.xml  |    2 +-
+ .../en_US/palettes/Signalrouting_pal/RELAY_f.xml   |    2 +-
+ .../en_US/palettes/Signalrouting_pal/SELECT_m.xml  |    2 +-
+ .../en_US/palettes/Signalrouting_pal/SWITCH2_m.xml |    2 +-
+ .../en_US/palettes/Signalrouting_pal/SWITCH_f.xml  |    2 +-
+ .../help/en_US/palettes/Sinks_pal/AA_Sinks_pal.xml |    2 +-
+ .../help/en_US/palettes/Sinks_pal/AFFICH_m.xml     |    2 +-
+ .../xcos/help/en_US/palettes/Sinks_pal/CANIMXY.xml |    2 +-
+ .../help/en_US/palettes/Sinks_pal/CANIMXY3D.xml    |    2 +-
+ .../xcos/help/en_US/palettes/Sinks_pal/CFSCOPE.xml |    2 +-
+ .../xcos/help/en_US/palettes/Sinks_pal/CMAT3D.xml  |    2 +-
+ .../help/en_US/palettes/Sinks_pal/CMATVIEW.xml     |    2 +-
+ .../xcos/help/en_US/palettes/Sinks_pal/CMSCOPE.xml |    2 +-
+ .../xcos/help/en_US/palettes/Sinks_pal/CSCOPE.xml  |    2 +-
+ .../xcos/help/en_US/palettes/Sinks_pal/CSCOPXY.xml |    2 +-
+ .../help/en_US/palettes/Sinks_pal/CSCOPXY3D.xml    |    2 +-
+ .../xcos/help/en_US/palettes/Sinks_pal/ENDBLK.xml  |    2 +-
+ .../xcos/help/en_US/palettes/Sinks_pal/END_c.xml   |    2 +-
+ .../xcos/help/en_US/palettes/Sinks_pal/TOWS_c.xml  |    2 +-
+ .../xcos/help/en_US/palettes/Sinks_pal/TRASH_f.xml |    2 +-
+ .../xcos/help/en_US/palettes/Sinks_pal/WFILE_f.xml |    2 +-
+ .../help/en_US/palettes/Sinks_pal/WRITEAU_f.xml    |    2 +-
+ .../help/en_US/palettes/Sinks_pal/WRITEC_f.xml     |    2 +-
+ .../en_US/palettes/Sources_pal/AA_Sources_pal.xml  |    2 +-
+ .../help/en_US/palettes/Sources_pal/CLOCK_c.xml    |    2 +-
+ .../help/en_US/palettes/Sources_pal/CONST_m.xml    |    2 +-
+ .../help/en_US/palettes/Sources_pal/CURV_f.xml     |    2 +-
+ .../help/en_US/palettes/Sources_pal/Counter.xml    |    2 +-
+ .../help/en_US/palettes/Sources_pal/FROMWSB.xml    |    2 +-
+ .../help/en_US/palettes/Sources_pal/GENSIN_f.xml   |    2 +-
+ .../help/en_US/palettes/Sources_pal/GENSQR_f.xml   |    2 +-
+ .../en_US/palettes/Sources_pal/Modulo_Count.xml    |    2 +-
+ .../xcos/help/en_US/palettes/Sources_pal/RAMP.xml  |    2 +-
+ .../help/en_US/palettes/Sources_pal/RAND_m.xml     |    2 +-
+ .../help/en_US/palettes/Sources_pal/READAU_f.xml   |    2 +-
+ .../help/en_US/palettes/Sources_pal/READC_f.xml    |    2 +-
+ .../help/en_US/palettes/Sources_pal/RFILE_f.xml    |    2 +-
+ .../help/en_US/palettes/Sources_pal/SAWTOOTH_f.xml |    2 +-
+ .../en_US/palettes/Sources_pal/STEP_FUNCTION.xml   |    2 +-
+ .../help/en_US/palettes/Sources_pal/SampleCLK.xml  |    2 +-
+ .../help/en_US/palettes/Sources_pal/Sigbuilder.xml |    2 +-
+ .../help/en_US/palettes/Sources_pal/TIME_f.xml     |    2 +-
+ .../help/en_US/palettes/Sources_pal/TKSCALE.xml    |    2 +-
+ .../AA_ThermoHydraulics_pal.xml                    |    2 +-
+ .../en_US/palettes/Thermohydraulics_pal/Bache.xml  |    2 +-
+ .../palettes/Thermohydraulics_pal/PerteDP.xml      |    2 +-
+ .../en_US/palettes/Thermohydraulics_pal/PuitsP.xml |    2 +-
+ .../palettes/Thermohydraulics_pal/SourceP.xml      |    2 +-
+ .../Thermohydraulics_pal/VanneReglante.xml         |    2 +-
+ .../AA_Userdefinedfunctions_pal.xml                |    2 +-
+ .../palettes/Userdefinedfunctions_pal/CBLOCK.xml   |    2 +-
+ .../Userdefinedfunctions_pal/EXPRESSION.xml        |    2 +-
+ .../palettes/Userdefinedfunctions_pal/MBLOCK.xml   |    2 +-
+ .../palettes/Userdefinedfunctions_pal/SUPER_f.xml  |    2 +-
+ .../palettes/Userdefinedfunctions_pal/c_block.xml  |    2 +-
+ .../Userdefinedfunctions_pal/fortran_block.xml     |    2 +-
+ .../Userdefinedfunctions_pal/generic_block3.xml    |    2 +-
+ .../Userdefinedfunctions_pal/scifunc_block_m.xml   |    2 +-
+ .../AA_Zerocrossingdetection_pal.xml               |    2 +-
+ .../Zerocrossingdetection_pal/GENERAL_f.xml        |    2 +-
+ .../Zerocrossingdetection_pal/NEGTOPOS_f.xml       |    2 +-
+ .../Zerocrossingdetection_pal/POSTONEG_f.xml       |    2 +-
+ .../Zerocrossingdetection_pal/ZCROSS_f.xml         |    2 +-
+ .../c_computational_functions/C_macros.xml         |    2 +-
+ .../c_computational_functions/C_struct.xml         |    2 +-
+ .../c_computational_functions/C_utils.xml          |    2 +-
+ .../scilab_computational_functions/sci_struct.xml  |    2 +-
+ .../utilities_functions/curblock.xml               |    2 +-
+ .../utilities_functions/getblocklabel.xml          |    2 +-
+ .../utilities_functions/getscicosvars.xml          |    2 +-
+ .../utilities_functions/phase_simulation.xml       |    2 +-
+ .../utilities_functions/pointer_xproperty.xml      |    2 +-
+ .../utilities_functions/scicos_time.xml            |    2 +-
+ .../utilities_functions/set_blockerror.xml         |    2 +-
+ .../utilities_functions/set_xproperty.xml          |    2 +-
+ .../scilab_data_structures/blocks/scicos_block.xml |    2 +-
+ .../blocks/scicos_graphics.xml                     |    2 +-
+ .../scilab_data_structures/blocks/scicos_model.xml |    2 +-
+ .../compilation_simulation/scicos_cpr.xml          |    2 +-
+ .../compilation_simulation/scicos_sim.xml          |    2 +-
+ .../compilation_simulation/scicos_state.xml        |    2 +-
+ .../diagram/scicos_diagram.xml                     |    2 +-
+ .../diagram/scicos_params.xml                      |    2 +-
+ .../scilab_data_structures/links/scicos_link.xml   |    2 +-
+ .../scilab_utilities_functions/buildouttb.xml      |    2 +-
+ .../scilab_utilities_functions/create_palette.xml  |    2 +-
+ .../get_scicos_version.xml                         |    2 +-
+ .../scilab_utilities_functions/loadScicos.xml      |    2 +-
+ .../scilab_utilities_functions/scicos_debug.xml    |    2 +-
+ .../en_US/scilab_utilities_functions/var2vec.xml   |    2 +-
+ .../en_US/scilab_utilities_functions/vec2var.xml   |    2 +-
+ modules/xcos/help/en_US/xcos.xml                   |    2 +-
+ modules/xcos/help/en_US/xcos_menu_entries.xml      |    2 +-
+ .../help/fr_FR/palettes/Discrete_pal/DELAY_f.xml   |    2 +-
+ modules/xcos/help/ja_JP/batch_functions/lincos.xml |    2 +-
+ modules/xcos/help/ja_JP/batch_functions/scicos.xml |    2 +-
+ .../help/ja_JP/batch_functions/scicos_simulate.xml |    2 +-
+ .../xcos/help/ja_JP/batch_functions/scicosim.xml   |    2 +-
+ .../xcos/help/ja_JP/batch_functions/steadycos.xml  |    2 +-
+ modules/xcos/help/ja_JP/xcos.xml                   |    2 +-
+ modules/xcos/help/ja_JP/xcos_menu_entries.xml      |    2 +-
+ modules/xcos/macros/xcos_compile.sci               |    2 +-
+ modules/xcos/macros/xcos_workspace_init.sci        |    2 +-
+ 1524 files changed, 1525 insertions(+), 1525 deletions(-)
+
+diff --git a/modules/optimization/src/fortran/qpgen2.f b/modules/optimization/src/fortran/qpgen2.f
+index 32cb435..aa28f65 100644
+--- a/modules/optimization/src/fortran/qpgen2.f
++++ b/modules/optimization/src/fortran/qpgen2.f
+@@ -13,7 +13,7 @@ c  GNU General Public License for more details.
+ c
+ c  You should have received a copy of the GNU General Public License
+ c  along with this program; if not, write to the Free Software
+-c  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
++c  Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335,
+ c  USA.
+ c
+ c  this routine uses the Goldfarb/Idnani algorithm to solve the
+diff --git a/modules/scicos/includes/gw_scicos.h b/modules/scicos/includes/gw_scicos.h
+index 8ccd258..67b2b77 100644
+--- a/modules/scicos/includes/gw_scicos.h
++++ b/modules/scicos/includes/gw_scicos.h
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos/includes/import.h b/modules/scicos/includes/import.h
+index 7192fb8..1df0994 100644
+--- a/modules/scicos/includes/import.h
++++ b/modules/scicos/includes/import.h
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos/includes/scicos.h b/modules/scicos/includes/scicos.h
+index 721d9dc..e07a006 100644
+--- a/modules/scicos/includes/scicos.h
++++ b/modules/scicos/includes/scicos.h
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos/includes/scicos_free.h b/modules/scicos/includes/scicos_free.h
+index 3bf0cfe..96814dc 100644
+--- a/modules/scicos/includes/scicos_free.h
++++ b/modules/scicos/includes/scicos_free.h
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos/includes/scicos_malloc.h b/modules/scicos/includes/scicos_malloc.h
+index 5e8b3fa..e4d4b6e 100644
+--- a/modules/scicos/includes/scicos_malloc.h
++++ b/modules/scicos/includes/scicos_malloc.h
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos/includes/scicos_math.h b/modules/scicos/includes/scicos_math.h
+index 4c9ce67..e789183 100644
+--- a/modules/scicos/includes/scicos_math.h
++++ b/modules/scicos/includes/scicos_math.h
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos/macros/scicos_auto/lincos.sci b/modules/scicos/macros/scicos_auto/lincos.sci
+index b197b71..ce095b9 100644
+--- a/modules/scicos/macros/scicos_auto/lincos.sci
++++ b/modules/scicos/macros/scicos_auto/lincos.sci
+@@ -15,7 +15,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ./license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_auto/scicos.sci b/modules/scicos/macros/scicos_auto/scicos.sci
+index 81d0d6d..ece05ef 100644
+--- a/modules/scicos/macros/scicos_auto/scicos.sci
++++ b/modules/scicos/macros/scicos_auto/scicos.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ./license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_auto/scicos_simulate.sci b/modules/scicos/macros/scicos_auto/scicos_simulate.sci
+index 4c83aa8..70b8f3f 100644
+--- a/modules/scicos/macros/scicos_auto/scicos_simulate.sci
++++ b/modules/scicos/macros/scicos_auto/scicos_simulate.sci
+@@ -16,7 +16,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ./license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_auto/steadycos.sci b/modules/scicos/macros/scicos_auto/steadycos.sci
+index 18cdccf..8d081a6 100644
+--- a/modules/scicos/macros/scicos_auto/steadycos.sci
++++ b/modules/scicos/macros/scicos_auto/steadycos.sci
+@@ -15,7 +15,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ./license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/AboutScicos_.sci b/modules/scicos/macros/scicos_menus/AboutScicos_.sci
+index 8003d1c..94dce3f 100644
+--- a/modules/scicos/macros/scicos_menus/AboutScicos_.sci
++++ b/modules/scicos/macros/scicos_menus/AboutScicos_.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/DisableAllMenus.sci b/modules/scicos/macros/scicos_menus/DisableAllMenus.sci
+index 7ce0ad2..e1f39d4 100644
+--- a/modules/scicos/macros/scicos_menus/DisableAllMenus.sci
++++ b/modules/scicos/macros/scicos_menus/DisableAllMenus.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/EnableAllMenus.sci b/modules/scicos/macros/scicos_menus/EnableAllMenus.sci
+index 65b22b3..3f70591 100644
+--- a/modules/scicos/macros/scicos_menus/EnableAllMenus.sci
++++ b/modules/scicos/macros/scicos_menus/EnableAllMenus.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosGetMenuLabel.sci b/modules/scicos/macros/scicos_menus/XcosGetMenuLabel.sci
+index 060f1c2..845f2cc 100644
+--- a/modules/scicos/macros/scicos_menus/XcosGetMenuLabel.sci
++++ b/modules/scicos/macros/scicos_menus/XcosGetMenuLabel.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosGetMenuType.sci b/modules/scicos/macros/scicos_menus/XcosGetMenuType.sci
+index 2747fb1..f2a7414 100644
+--- a/modules/scicos/macros/scicos_menus/XcosGetMenuType.sci
++++ b/modules/scicos/macros/scicos_menus/XcosGetMenuType.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuAbout.sci b/modules/scicos/macros/scicos_menus/XcosMenuAbout.sci
+index d87033c..926d3cd 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuAbout.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuAbout.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuActivateScilab.sci b/modules/scicos/macros/scicos_menus/XcosMenuActivateScilab.sci
+index 0016ae2..088445d 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuActivateScilab.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuActivateScilab.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuAddColor.sci b/modules/scicos/macros/scicos_menus/XcosMenuAddColor.sci
+index c4454e3..08f4461 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuAddColor.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuAddColor.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuAddNewBlock.sci b/modules/scicos/macros/scicos_menus/XcosMenuAddNewBlock.sci
+index dfa2996..2608f10 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuAddNewBlock.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuAddNewBlock.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuAlign.sci b/modules/scicos/macros/scicos_menus/XcosMenuAlign.sci
+index 02b1361..288602d 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuAlign.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuAlign.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuAnalyzeDiagram.sci b/modules/scicos/macros/scicos_menus/XcosMenuAnalyzeDiagram.sci
+index e790641..5fb6d48 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuAnalyzeDiagram.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuAnalyzeDiagram.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuAspect.sci b/modules/scicos/macros/scicos_menus/XcosMenuAspect.sci
+index 685fea2..0825990 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuAspect.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuAspect.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuBackgroundColor.sci b/modules/scicos/macros/scicos_menus/XcosMenuBackgroundColor.sci
+index d81eacc..965d1a6 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuBackgroundColor.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuBackgroundColor.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuBlockDoc.sci b/modules/scicos/macros/scicos_menus/XcosMenuBlockDoc.sci
+index 2cbaa2d..688e133 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuBlockDoc.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuBlockDoc.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuBrowseTo.sci b/modules/scicos/macros/scicos_menus/XcosMenuBrowseTo.sci
+index 87f6710..786451f 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuBrowseTo.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuBrowseTo.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuBrowser.sci b/modules/scicos/macros/scicos_menus/XcosMenuBrowser.sci
+index 7cf88b9..b508698 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuBrowser.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuBrowser.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuCalc.sci b/modules/scicos/macros/scicos_menus/XcosMenuCalc.sci
+index f3df3fe..beea5ef 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuCalc.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuCalc.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuCodeGeneration.sci b/modules/scicos/macros/scicos_menus/XcosMenuCodeGeneration.sci
+index 37842f5..d6ebe38 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuCodeGeneration.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuCodeGeneration.sci
+@@ -19,7 +19,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuColor.sci b/modules/scicos/macros/scicos_menus/XcosMenuColor.sci
+index 2663ee2..d2be41b 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuColor.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuColor.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuCompile.sci b/modules/scicos/macros/scicos_menus/XcosMenuCompile.sci
+index a3d8726..fb73cda 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuCompile.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuCompile.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuContext.sci b/modules/scicos/macros/scicos_menus/XcosMenuContext.sci
+index b4507e9..cc9333e 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuContext.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuContext.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuCopy.sci b/modules/scicos/macros/scicos_menus/XcosMenuCopy.sci
+index dc33fc6..8d80958 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuCopy.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuCopy.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuCreateAtomic.sci b/modules/scicos/macros/scicos_menus/XcosMenuCreateAtomic.sci
+index fb37c26..7e0358e 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuCreateAtomic.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuCreateAtomic.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuCreateMask.sci b/modules/scicos/macros/scicos_menus/XcosMenuCreateMask.sci
+index f800031..07620e8 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuCreateMask.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuCreateMask.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuCtrlSelect.sci b/modules/scicos/macros/scicos_menus/XcosMenuCtrlSelect.sci
+index 58ae136..50bdc99 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuCtrlSelect.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuCtrlSelect.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuCustomizeMask.sci b/modules/scicos/macros/scicos_menus/XcosMenuCustomizeMask.sci
+index 002f5f1..46abe1f 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuCustomizeMask.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuCustomizeMask.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuCut.sci b/modules/scicos/macros/scicos_menus/XcosMenuCut.sci
+index a5ad28e..c688879 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuCut.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuCut.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuDebugLevel.sci b/modules/scicos/macros/scicos_menus/XcosMenuDebugLevel.sci
+index 8df299b..a5987ee 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuDebugLevel.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuDebugLevel.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuDefaultLinkCols.sci b/modules/scicos/macros/scicos_menus/XcosMenuDefaultLinkCols.sci
+index 39314e1..e7df4e1 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuDefaultLinkCols.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuDefaultLinkCols.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuDefaultWindow.sci b/modules/scicos/macros/scicos_menus/XcosMenuDefaultWindow.sci
+index 2438066..d99a874 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuDefaultWindow.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuDefaultWindow.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuDefinedVars.sci b/modules/scicos/macros/scicos_menus/XcosMenuDefinedVars.sci
+index 30907da..3d55cfb 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuDefinedVars.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuDefinedVars.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuDelete.sci b/modules/scicos/macros/scicos_menus/XcosMenuDelete.sci
+index 96364da..bc0b728 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuDelete.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuDelete.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuDemos.sci b/modules/scicos/macros/scicos_menus/XcosMenuDemos.sci
+index f52b664..70f28a4 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuDemos.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuDemos.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuDetails.sci b/modules/scicos/macros/scicos_menus/XcosMenuDetails.sci
+index eec28a1..26bdbd0 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuDetails.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuDetails.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuDocumentation.sci b/modules/scicos/macros/scicos_menus/XcosMenuDocumentation.sci
+index b1677cd..a8a4666 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuDocumentation.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuDocumentation.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuDuplicate.sci b/modules/scicos/macros/scicos_menus/XcosMenuDuplicate.sci
+index b014dc0..70695c5 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuDuplicate.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuDuplicate.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuEval.sci b/modules/scicos/macros/scicos_menus/XcosMenuEval.sci
+index c9d1037..2c885db 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuEval.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuEval.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuExitScicos.sci b/modules/scicos/macros/scicos_menus/XcosMenuExitScicos.sci
+index f69da37..075d4bc 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuExitScicos.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuExitScicos.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuExport.sci b/modules/scicos/macros/scicos_menus/XcosMenuExport.sci
+index 0f9fd9d..b46fa3b 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuExport.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuExport.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuExportAll.sci b/modules/scicos/macros/scicos_menus/XcosMenuExportAll.sci
+index 90e265c..8824604 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuExportAll.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuExportAll.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuFitToFigure.sci b/modules/scicos/macros/scicos_menus/XcosMenuFitToFigure.sci
+index aa46613..bd5aec7 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuFitToFigure.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuFitToFigure.sci
+@@ -15,7 +15,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuFlip.sci b/modules/scicos/macros/scicos_menus/XcosMenuFlip.sci
+index 13cc723..09bb56c 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuFlip.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuFlip.sci
+@@ -16,7 +16,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuGetInfo.sci b/modules/scicos/macros/scicos_menus/XcosMenuGetInfo.sci
+index f92d333..1443343 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuGetInfo.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuGetInfo.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuGrid.sci b/modules/scicos/macros/scicos_menus/XcosMenuGrid.sci
+index 01306d1..2bf45c8 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuGrid.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuGrid.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuHelp.sci b/modules/scicos/macros/scicos_menus/XcosMenuHelp.sci
+index f5caa70..c509c80 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuHelp.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuHelp.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuIcon.sci b/modules/scicos/macros/scicos_menus/XcosMenuIcon.sci
+index 4c2538b..3b0f907 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuIcon.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuIcon.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuIconEditor.sci b/modules/scicos/macros/scicos_menus/XcosMenuIconEditor.sci
+index b64bc79..baeacf2 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuIconEditor.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuIconEditor.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuIdentification.sci b/modules/scicos/macros/scicos_menus/XcosMenuIdentification.sci
+index 3d217d4..a17a11e 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuIdentification.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuIdentification.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuLabel.sci b/modules/scicos/macros/scicos_menus/XcosMenuLabel.sci
+index 1bc60e2..9f849e3 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuLabel.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuLabel.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuLink.sci b/modules/scicos/macros/scicos_menus/XcosMenuLink.sci
+index 711fad2..b73033e 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuLink.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuLink.sci
+@@ -15,7 +15,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuLoadAsPalette.sci b/modules/scicos/macros/scicos_menus/XcosMenuLoadAsPalette.sci
+index 4a956ae..00f2b7a 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuLoadAsPalette.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuLoadAsPalette.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuModelica.sci b/modules/scicos/macros/scicos_menus/XcosMenuModelica.sci
+index cc29985..0e67f52 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuModelica.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuModelica.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuModelicaInit.sci b/modules/scicos/macros/scicos_menus/XcosMenuModelicaInit.sci
+index 4ad391d..8a344a2 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuModelicaInit.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuModelicaInit.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuMove.sci b/modules/scicos/macros/scicos_menus/XcosMenuMove.sci
+index 9cddc40..7a19cbc 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuMove.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuMove.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuMoveLink.sci b/modules/scicos/macros/scicos_menus/XcosMenuMoveLink.sci
+index 5bfd85a..b08b3c8 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuMoveLink.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuMoveLink.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuNavigator.sci b/modules/scicos/macros/scicos_menus/XcosMenuNavigator.sci
+index 22b5b72..a13dcb2 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuNavigator.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuNavigator.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuNew.sci b/modules/scicos/macros/scicos_menus/XcosMenuNew.sci
+index 2fb023b..a36ba1e 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuNew.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuNew.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuNyquist.sci b/modules/scicos/macros/scicos_menus/XcosMenuNyquist.sci
+index cbff633..2583927 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuNyquist.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuNyquist.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuOpen.sci b/modules/scicos/macros/scicos_menus/XcosMenuOpen.sci
+index e2cb857..5a02c5e 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuOpen.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuOpen.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuOpenSet.sci b/modules/scicos/macros/scicos_menus/XcosMenuOpenSet.sci
+index 2a17b78..1b14101 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuOpenSet.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuOpenSet.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuPalEditor.sci b/modules/scicos/macros/scicos_menus/XcosMenuPalEditor.sci
+index 14d9107..20bd20a 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuPalEditor.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuPalEditor.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuPalettes.sci b/modules/scicos/macros/scicos_menus/XcosMenuPalettes.sci
+index 721a9df..59c7c43 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuPalettes.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuPalettes.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuPalettesTree.sci b/modules/scicos/macros/scicos_menus/XcosMenuPalettesTree.sci
+index c7133f1..31cb197 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuPalettesTree.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuPalettesTree.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuPaste.sci b/modules/scicos/macros/scicos_menus/XcosMenuPaste.sci
+index 3283359..c2a6ac6 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuPaste.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuPaste.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuPlaceinBrowser.sci b/modules/scicos/macros/scicos_menus/XcosMenuPlaceinBrowser.sci
+index 2702588..1b67f15 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuPlaceinBrowser.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuPlaceinBrowser.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuPlaceinDiagram.sci b/modules/scicos/macros/scicos_menus/XcosMenuPlaceinDiagram.sci
+index fc96e80..82597f5 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuPlaceinDiagram.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuPlaceinDiagram.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuPopup.sci b/modules/scicos/macros/scicos_menus/XcosMenuPopup.sci
+index 27e2884..43f8df3 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuPopup.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuPopup.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuPurge.sci b/modules/scicos/macros/scicos_menus/XcosMenuPurge.sci
+index 669433d..c8f8b46 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuPurge.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuPurge.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuRegionToPalette.sci b/modules/scicos/macros/scicos_menus/XcosMenuRegionToPalette.sci
+index 2ade2dc..d025813 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuRegionToPalette.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuRegionToPalette.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuRegionToSuper.sci b/modules/scicos/macros/scicos_menus/XcosMenuRegionToSuper.sci
+index 9ec2c33..941b60f 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuRegionToSuper.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuRegionToSuper.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuRemoveAtomic.sci b/modules/scicos/macros/scicos_menus/XcosMenuRemoveAtomic.sci
+index 49e534c..c8a518d 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuRemoveAtomic.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuRemoveAtomic.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuRemoveMask.sci b/modules/scicos/macros/scicos_menus/XcosMenuRemoveMask.sci
+index 810f250..2c3f9be 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuRemoveMask.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuRemoveMask.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuRename.sci b/modules/scicos/macros/scicos_menus/XcosMenuRename.sci
+index 826926a..aaf5e3e 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuRename.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuRename.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuReplot.sci b/modules/scicos/macros/scicos_menus/XcosMenuReplot.sci
+index c33e171..5f7cd8a 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuReplot.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuReplot.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuResize.sci b/modules/scicos/macros/scicos_menus/XcosMenuResize.sci
+index 63281a3..513a603 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuResize.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuResize.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuRotateLeft.sci b/modules/scicos/macros/scicos_menus/XcosMenuRotateLeft.sci
+index 12aaa1c..45e8851 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuRotateLeft.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuRotateLeft.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuRotateRight.sci b/modules/scicos/macros/scicos_menus/XcosMenuRotateRight.sci
+index 4aa67a1..b305ea6 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuRotateRight.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuRotateRight.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuRun.sci b/modules/scicos/macros/scicos_menus/XcosMenuRun.sci
+index 4b259e1..82ee86e 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuRun.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuRun.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuSave.sci b/modules/scicos/macros/scicos_menus/XcosMenuSave.sci
+index bcdb61a..ac635c4 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuSave.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuSave.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuSaveAs.sci b/modules/scicos/macros/scicos_menus/XcosMenuSaveAs.sci
+index 760bb5b..5c7d4b4 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuSaveAs.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuSaveAs.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuSaveAsInterfFunc.sci b/modules/scicos/macros/scicos_menus/XcosMenuSaveAsInterfFunc.sci
+index 7f427e0..3154c74 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuSaveAsInterfFunc.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuSaveAsInterfFunc.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuSaveAsPalette.sci b/modules/scicos/macros/scicos_menus/XcosMenuSaveAsPalette.sci
+index a1df05b..d34e850 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuSaveAsPalette.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuSaveAsPalette.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuSaveBlockGUI.sci b/modules/scicos/macros/scicos_menus/XcosMenuSaveBlockGUI.sci
+index 1318737..7fea518 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuSaveBlockGUI.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuSaveBlockGUI.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuScicosDoc.sci b/modules/scicos/macros/scicos_menus/XcosMenuScicosDoc.sci
+index 5aad774..72faaa1 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuScicosDoc.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuScicosDoc.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuSelectAll.sci b/modules/scicos/macros/scicos_menus/XcosMenuSelectAll.sci
+index 5b984c9..f4eefe8 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuSelectAll.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuSelectAll.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuSelectLink.sci b/modules/scicos/macros/scicos_menus/XcosMenuSelectLink.sci
+index d9ea2d4..ef0f6ee 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuSelectLink.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuSelectLink.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuSelectRegion.sci b/modules/scicos/macros/scicos_menus/XcosMenuSelectRegion.sci
+index 3bca2ad..321f24c 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuSelectRegion.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuSelectRegion.sci
+@@ -15,7 +15,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuSetDiagramInfo.sci b/modules/scicos/macros/scicos_menus/XcosMenuSetDiagramInfo.sci
+index 34196bb..45dedd3 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuSetDiagramInfo.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuSetDiagramInfo.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuSetGrid.sci b/modules/scicos/macros/scicos_menus/XcosMenuSetGrid.sci
+index 4d14a9e..3343e3d 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuSetGrid.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuSetGrid.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuSetIDFonts.sci b/modules/scicos/macros/scicos_menus/XcosMenuSetIDFonts.sci
+index 2ee9016..da14fc9 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuSetIDFonts.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuSetIDFonts.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuSetLinkMode.sci b/modules/scicos/macros/scicos_menus/XcosMenuSetLinkMode.sci
+index 451dcc5..1d149c4 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuSetLinkMode.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuSetLinkMode.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuSetup.sci b/modules/scicos/macros/scicos_menus/XcosMenuSetup.sci
+index a14cd94..11f1583 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuSetup.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuSetup.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuShortcuts.sci b/modules/scicos/macros/scicos_menus/XcosMenuShortcuts.sci
+index 85deeac..18b1c43 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuShortcuts.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuShortcuts.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuShowBlockShadow.sci b/modules/scicos/macros/scicos_menus/XcosMenuShowBlockShadow.sci
+index 2a1ec1a..b78cc23 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuShowBlockShadow.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuShowBlockShadow.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuSmartLink.sci b/modules/scicos/macros/scicos_menus/XcosMenuSmartLink.sci
+index 8cd6c28..7a31239 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuSmartLink.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuSmartLink.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuSmartMove.sci b/modules/scicos/macros/scicos_menus/XcosMenuSmartMove.sci
+index defdf87..e9724f6 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuSmartMove.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuSmartMove.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuTkPopup.sci b/modules/scicos/macros/scicos_menus/XcosMenuTkPopup.sci
+index 9bd79df..a2fe034 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuTkPopup.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuTkPopup.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuUndo.sci b/modules/scicos/macros/scicos_menus/XcosMenuUndo.sci
+index 1475636..e54635a 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuUndo.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuUndo.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuUpToMain.sci b/modules/scicos/macros/scicos_menus/XcosMenuUpToMain.sci
+index 5d3573a..8a900ac 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuUpToMain.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuUpToMain.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuZoomIn.sci b/modules/scicos/macros/scicos_menus/XcosMenuZoomIn.sci
+index 67fb672..a1d0973 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuZoomIn.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuZoomIn.sci
+@@ -18,7 +18,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/XcosMenuZoomOut.sci b/modules/scicos/macros/scicos_menus/XcosMenuZoomOut.sci
+index 674e5de..d1a3918 100644
+--- a/modules/scicos/macros/scicos_menus/XcosMenuZoomOut.sci
++++ b/modules/scicos/macros/scicos_menus/XcosMenuZoomOut.sci
+@@ -18,7 +18,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/scicos_menubar.sci b/modules/scicos/macros/scicos_menus/scicos_menubar.sci
+index 1a8c9f1..bca978a 100644
+--- a/modules/scicos/macros/scicos_menus/scicos_menubar.sci
++++ b/modules/scicos/macros/scicos_menus/scicos_menubar.sci
+@@ -15,7 +15,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ./license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_menus/set_initial_xcos_menus.sci b/modules/scicos/macros/scicos_menus/set_initial_xcos_menus.sci
+index 8363f1e..57e01f3 100644
+--- a/modules/scicos/macros/scicos_menus/set_initial_xcos_menus.sci
++++ b/modules/scicos/macros/scicos_menus/set_initial_xcos_menus.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/%Block_e.sci b/modules/scicos/macros/scicos_scicos/%Block_e.sci
+index 122af84..4074350 100644
+--- a/modules/scicos/macros/scicos_scicos/%Block_e.sci
++++ b/modules/scicos/macros/scicos_scicos/%Block_e.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/%Block_p.sci b/modules/scicos/macros/scicos_scicos/%Block_p.sci
+index b8a9fec..0a16e83 100644
+--- a/modules/scicos/macros/scicos_scicos/%Block_p.sci
++++ b/modules/scicos/macros/scicos_scicos/%Block_p.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/%b_i_graphics.sci b/modules/scicos/macros/scicos_scicos/%b_i_graphics.sci
+index 88b9fb4..9e27114 100644
+--- a/modules/scicos/macros/scicos_scicos/%b_i_graphics.sci
++++ b/modules/scicos/macros/scicos_scicos/%b_i_graphics.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/%b_i_model.sci b/modules/scicos/macros/scicos_scicos/%b_i_model.sci
+index 23e9ede..4eb733b 100644
+--- a/modules/scicos/macros/scicos_scicos/%b_i_model.sci
++++ b/modules/scicos/macros/scicos_scicos/%b_i_model.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/%c_i_block.sci b/modules/scicos/macros/scicos_scicos/%c_i_block.sci
+index b0678eb..e5a4ab8 100644
+--- a/modules/scicos/macros/scicos_scicos/%c_i_block.sci
++++ b/modules/scicos/macros/scicos_scicos/%c_i_block.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/%c_i_graphics.sci b/modules/scicos/macros/scicos_scicos/%c_i_graphics.sci
+index 1d53244..9768aa4 100644
+--- a/modules/scicos/macros/scicos_scicos/%c_i_graphics.sci
++++ b/modules/scicos/macros/scicos_scicos/%c_i_graphics.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/%c_i_model.sci b/modules/scicos/macros/scicos_scicos/%c_i_model.sci
+index d1bb4ac..d203d51 100644
+--- a/modules/scicos/macros/scicos_scicos/%c_i_model.sci
++++ b/modules/scicos/macros/scicos_scicos/%c_i_model.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/%debug_scicos.sci b/modules/scicos/macros/scicos_scicos/%debug_scicos.sci
+index 8340ce7..616eb5b 100644
+--- a/modules/scicos/macros/scicos_scicos/%debug_scicos.sci
++++ b/modules/scicos/macros/scicos_scicos/%debug_scicos.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/%diagram_p.sci b/modules/scicos/macros/scicos_scicos/%diagram_p.sci
+index a022baf..2bd23d8 100644
+--- a/modules/scicos/macros/scicos_scicos/%diagram_p.sci
++++ b/modules/scicos/macros/scicos_scicos/%diagram_p.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/%graphics_e.sci b/modules/scicos/macros/scicos_scicos/%graphics_e.sci
+index d02b474..3e4b83f 100644
+--- a/modules/scicos/macros/scicos_scicos/%graphics_e.sci
++++ b/modules/scicos/macros/scicos_scicos/%graphics_e.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/%graphics_i_Block.sci b/modules/scicos/macros/scicos_scicos/%graphics_i_Block.sci
+index 565b566..e4b4166 100644
+--- a/modules/scicos/macros/scicos_scicos/%graphics_i_Block.sci
++++ b/modules/scicos/macros/scicos_scicos/%graphics_i_Block.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/%graphics_p.sci b/modules/scicos/macros/scicos_scicos/%graphics_p.sci
+index 23a3de2..007c708 100644
+--- a/modules/scicos/macros/scicos_scicos/%graphics_p.sci
++++ b/modules/scicos/macros/scicos_scicos/%graphics_p.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/%l_i_block.sci b/modules/scicos/macros/scicos_scicos/%l_i_block.sci
+index f2d9066..26991f6 100644
+--- a/modules/scicos/macros/scicos_scicos/%l_i_block.sci
++++ b/modules/scicos/macros/scicos_scicos/%l_i_block.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/%l_i_graphics.sci b/modules/scicos/macros/scicos_scicos/%l_i_graphics.sci
+index 2a66441..bbcacd7 100644
+--- a/modules/scicos/macros/scicos_scicos/%l_i_graphics.sci
++++ b/modules/scicos/macros/scicos_scicos/%l_i_graphics.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/%l_i_model.sci b/modules/scicos/macros/scicos_scicos/%l_i_model.sci
+index 35dd696..dbf5590 100644
+--- a/modules/scicos/macros/scicos_scicos/%l_i_model.sci
++++ b/modules/scicos/macros/scicos_scicos/%l_i_model.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/%model_e.sci b/modules/scicos/macros/scicos_scicos/%model_e.sci
+index 84db437..3abef68 100644
+--- a/modules/scicos/macros/scicos_scicos/%model_e.sci
++++ b/modules/scicos/macros/scicos_scicos/%model_e.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/%model_i_Block.sci b/modules/scicos/macros/scicos_scicos/%model_i_Block.sci
+index be259eb..1a7d91c 100644
+--- a/modules/scicos/macros/scicos_scicos/%model_i_Block.sci
++++ b/modules/scicos/macros/scicos_scicos/%model_i_Block.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/%model_p.sci b/modules/scicos/macros/scicos_scicos/%model_p.sci
+index cd0efb3..d490046 100644
+--- a/modules/scicos/macros/scicos_scicos/%model_p.sci
++++ b/modules/scicos/macros/scicos_scicos/%model_p.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/%params_p.sci b/modules/scicos/macros/scicos_scicos/%params_p.sci
+index b07bb37..1eda3da 100644
+--- a/modules/scicos/macros/scicos_scicos/%params_p.sci
++++ b/modules/scicos/macros/scicos_scicos/%params_p.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/%s_i_block.sci b/modules/scicos/macros/scicos_scicos/%s_i_block.sci
+index f908102..a38dcc9 100644
+--- a/modules/scicos/macros/scicos_scicos/%s_i_block.sci
++++ b/modules/scicos/macros/scicos_scicos/%s_i_block.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/%s_i_graphics.sci b/modules/scicos/macros/scicos_scicos/%s_i_graphics.sci
+index fe41890..2cdf610 100644
+--- a/modules/scicos/macros/scicos_scicos/%s_i_graphics.sci
++++ b/modules/scicos/macros/scicos_scicos/%s_i_graphics.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/%s_i_model.sci b/modules/scicos/macros/scicos_scicos/%s_i_model.sci
+index dd45caf..93c681c 100644
+--- a/modules/scicos/macros/scicos_scicos/%s_i_model.sci
++++ b/modules/scicos/macros/scicos_scicos/%s_i_model.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/CC4.sci b/modules/scicos/macros/scicos_scicos/CC4.sci
+index a6871b4..ee55f1b 100644
+--- a/modules/scicos/macros/scicos_scicos/CC4.sci
++++ b/modules/scicos/macros/scicos_scicos/CC4.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/CFORTR.sci b/modules/scicos/macros/scicos_scicos/CFORTR.sci
+index 059c345..8c19283 100644
+--- a/modules/scicos/macros/scicos_scicos/CFORTR.sci
++++ b/modules/scicos/macros/scicos_scicos/CFORTR.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/CFORTR2.sci b/modules/scicos/macros/scicos_scicos/CFORTR2.sci
+index e99a054..c5e4608 100644
+--- a/modules/scicos/macros/scicos_scicos/CFORTR2.sci
++++ b/modules/scicos/macros/scicos_scicos/CFORTR2.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/CodeGeneration_.sci b/modules/scicos/macros/scicos_scicos/CodeGeneration_.sci
+index 1608ee6..a7a2c7f 100644
+--- a/modules/scicos/macros/scicos_scicos/CodeGeneration_.sci
++++ b/modules/scicos/macros/scicos_scicos/CodeGeneration_.sci
+@@ -19,7 +19,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/Compute_cic.sci b/modules/scicos/macros/scicos_scicos/Compute_cic.sci
+index 9940a25..223e6cc 100644
+--- a/modules/scicos/macros/scicos_scicos/Compute_cic.sci
++++ b/modules/scicos/macros/scicos_scicos/Compute_cic.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/FORTR.sci b/modules/scicos/macros/scicos_scicos/FORTR.sci
+index e5654e3..0dc1ad2 100644
+--- a/modules/scicos/macros/scicos_scicos/FORTR.sci
++++ b/modules/scicos/macros/scicos_scicos/FORTR.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/FindSBParams.sci b/modules/scicos/macros/scicos_scicos/FindSBParams.sci
+index f4e40c5..734b86a 100644
+--- a/modules/scicos/macros/scicos_scicos/FindSBParams.sci
++++ b/modules/scicos/macros/scicos_scicos/FindSBParams.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/Find_Next_Step.sci b/modules/scicos/macros/scicos_scicos/Find_Next_Step.sci
+index 76f066f..87dbdf7 100644
+--- a/modules/scicos/macros/scicos_scicos/Find_Next_Step.sci
++++ b/modules/scicos/macros/scicos_scicos/Find_Next_Step.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/Link_modelica_C.sci b/modules/scicos/macros/scicos_scicos/Link_modelica_C.sci
+index b50fdf0..c76a4a4 100644
+--- a/modules/scicos/macros/scicos_scicos/Link_modelica_C.sci
++++ b/modules/scicos/macros/scicos_scicos/Link_modelica_C.sci
+@@ -15,7 +15,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/MODCOM.sci b/modules/scicos/macros/scicos_scicos/MODCOM.sci
+index 3e29fff..cd42797 100644
+--- a/modules/scicos/macros/scicos_scicos/MODCOM.sci
++++ b/modules/scicos/macros/scicos_scicos/MODCOM.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/Modelica_execs.sci b/modules/scicos/macros/scicos_scicos/Modelica_execs.sci
+index 9126954..52a0af8 100644
+--- a/modules/scicos/macros/scicos_scicos/Modelica_execs.sci
++++ b/modules/scicos/macros/scicos_scicos/Modelica_execs.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/SetString.sci b/modules/scicos/macros/scicos_scicos/SetString.sci
+index f19ddcc..05fb699 100644
+--- a/modules/scicos/macros/scicos_scicos/SetString.sci
++++ b/modules/scicos/macros/scicos_scicos/SetString.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/Window_.sci b/modules/scicos/macros/scicos_scicos/Window_.sci
+index 48e0de5..d2a86f6 100644
+--- a/modules/scicos/macros/scicos_scicos/Window_.sci
++++ b/modules/scicos/macros/scicos_scicos/Window_.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/add_palette.sci b/modules/scicos/macros/scicos_scicos/add_palette.sci
+index e5a1227..151e412 100644
+--- a/modules/scicos/macros/scicos_scicos/add_palette.sci
++++ b/modules/scicos/macros/scicos_scicos/add_palette.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/adjust.sci b/modules/scicos/macros/scicos_scicos/adjust.sci
+index b92ba4f..f42df75 100644
+--- a/modules/scicos/macros/scicos_scicos/adjust.sci
++++ b/modules/scicos/macros/scicos_scicos/adjust.sci
+@@ -16,7 +16,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/adjust_all_scs_m.sci b/modules/scicos/macros/scicos_scicos/adjust_all_scs_m.sci
+index 4de0805..c8d7e05 100644
+--- a/modules/scicos/macros/scicos_scicos/adjust_all_scs_m.sci
++++ b/modules/scicos/macros/scicos_scicos/adjust_all_scs_m.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/adjust_in2out2.sci b/modules/scicos/macros/scicos_scicos/adjust_in2out2.sci
+index 917539c..14d8b96 100644
+--- a/modules/scicos/macros/scicos_scicos/adjust_in2out2.sci
++++ b/modules/scicos/macros/scicos_scicos/adjust_in2out2.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/adjust_s_ports.sci b/modules/scicos/macros/scicos_scicos/adjust_s_ports.sci
+index c2940bc..ea319b6 100644
+--- a/modules/scicos/macros/scicos_scicos/adjust_s_ports.sci
++++ b/modules/scicos/macros/scicos_scicos/adjust_s_ports.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/adjust_scs_m_temp.sci b/modules/scicos/macros/scicos_scicos/adjust_scs_m_temp.sci
+index 5542130..ddeb416 100644
+--- a/modules/scicos/macros/scicos_scicos/adjust_scs_m_temp.sci
++++ b/modules/scicos/macros/scicos_scicos/adjust_scs_m_temp.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/analyse.sci b/modules/scicos/macros/scicos_scicos/analyse.sci
+index aa70de9..08b0911 100644
+--- a/modules/scicos/macros/scicos_scicos/analyse.sci
++++ b/modules/scicos/macros/scicos_scicos/analyse.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/bad_connection.sci b/modules/scicos/macros/scicos_scicos/bad_connection.sci
+index eb6d37d..debf8c0 100644
+--- a/modules/scicos/macros/scicos_scicos/bad_connection.sci
++++ b/modules/scicos/macros/scicos_scicos/bad_connection.sci
+@@ -16,7 +16,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/build_block.sci b/modules/scicos/macros/scicos_scicos/build_block.sci
+index 8d48bbe..6cbdd2e 100644
+--- a/modules/scicos/macros/scicos_scicos/build_block.sci
++++ b/modules/scicos/macros/scicos_scicos/build_block.sci
+@@ -15,7 +15,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/build_modelica_block.sci b/modules/scicos/macros/scicos_scicos/build_modelica_block.sci
+index bc8baa2..b957c33 100644
+--- a/modules/scicos/macros/scicos_scicos/build_modelica_block.sci
++++ b/modules/scicos/macros/scicos_scicos/build_modelica_block.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/build_scs_tree.sci b/modules/scicos/macros/scicos_scicos/build_scs_tree.sci
+index 504de6a..dbd84ef 100644
+--- a/modules/scicos/macros/scicos_scicos/build_scs_tree.sci
++++ b/modules/scicos/macros/scicos_scicos/build_scs_tree.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/buildnewblock.sci b/modules/scicos/macros/scicos_scicos/buildnewblock.sci
+index bb437c5..85e30c2 100644
+--- a/modules/scicos/macros/scicos_scicos/buildnewblock.sci
++++ b/modules/scicos/macros/scicos_scicos/buildnewblock.sci
+@@ -20,7 +20,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/c_pass1.sci b/modules/scicos/macros/scicos_scicos/c_pass1.sci
+index 14eaa16..49dea18 100644
+--- a/modules/scicos/macros/scicos_scicos/c_pass1.sci
++++ b/modules/scicos/macros/scicos_scicos/c_pass1.sci
+@@ -15,7 +15,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/c_pass2.sci b/modules/scicos/macros/scicos_scicos/c_pass2.sci
+index dccf58e..de6d6ea 100644
+--- a/modules/scicos/macros/scicos_scicos/c_pass2.sci
++++ b/modules/scicos/macros/scicos_scicos/c_pass2.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/c_pass3.sci b/modules/scicos/macros/scicos_scicos/c_pass3.sci
+index cd00751..65a813e 100644
+--- a/modules/scicos/macros/scicos_scicos/c_pass3.sci
++++ b/modules/scicos/macros/scicos_scicos/c_pass3.sci
+@@ -16,7 +16,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/change_tree_elt.sci b/modules/scicos/macros/scicos_scicos/change_tree_elt.sci
+index e2f7bc6..1a37b0f 100644
+--- a/modules/scicos/macros/scicos_scicos/change_tree_elt.sci
++++ b/modules/scicos/macros/scicos_scicos/change_tree_elt.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/changeports.sci b/modules/scicos/macros/scicos_scicos/changeports.sci
+index 718ac2d..5f46479 100644
+--- a/modules/scicos/macros/scicos_scicos/changeports.sci
++++ b/modules/scicos/macros/scicos_scicos/changeports.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/check_edge.sci b/modules/scicos/macros/scicos_scicos/check_edge.sci
+index 345c85a..0f0ccb6 100644
+--- a/modules/scicos/macros/scicos_scicos/check_edge.sci
++++ b/modules/scicos/macros/scicos_scicos/check_edge.sci
+@@ -15,7 +15,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/check_io.sci b/modules/scicos/macros/scicos_scicos/check_io.sci
+index 90e3482..2bca3ab 100644
+--- a/modules/scicos/macros/scicos_scicos/check_io.sci
++++ b/modules/scicos/macros/scicos_scicos/check_io.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/check_mac.sci b/modules/scicos/macros/scicos_scicos/check_mac.sci
+index cf6326f..24d024a 100644
+--- a/modules/scicos/macros/scicos_scicos/check_mac.sci
++++ b/modules/scicos/macros/scicos_scicos/check_mac.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/choosefile.sci b/modules/scicos/macros/scicos_scicos/choosefile.sci
+index fd0b943..614e023 100644
+--- a/modules/scicos/macros/scicos_scicos/choosefile.sci
++++ b/modules/scicos/macros/scicos_scicos/choosefile.sci
+@@ -15,7 +15,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/clickin.sci b/modules/scicos/macros/scicos_scicos/clickin.sci
+index 3182f34..652d7c2 100644
+--- a/modules/scicos/macros/scicos_scicos/clickin.sci
++++ b/modules/scicos/macros/scicos_scicos/clickin.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/close_inactive_windows.sci b/modules/scicos/macros/scicos_scicos/close_inactive_windows.sci
+index c0fa7df..274aa91 100644
+--- a/modules/scicos/macros/scicos_scicos/close_inactive_windows.sci
++++ b/modules/scicos/macros/scicos_scicos/close_inactive_windows.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/color.tst b/modules/scicos/macros/scicos_scicos/color.tst
+index b1076b0..0392712 100644
+--- a/modules/scicos/macros/scicos_scicos/color.tst
++++ b/modules/scicos/macros/scicos_scicos/color.tst
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/compile_init_modelica.sci b/modules/scicos/macros/scicos_scicos/compile_init_modelica.sci
+index 94d19bb..f945d95 100644
+--- a/modules/scicos/macros/scicos_scicos/compile_init_modelica.sci
++++ b/modules/scicos/macros/scicos_scicos/compile_init_modelica.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/compile_modelica.sci b/modules/scicos/macros/scicos_scicos/compile_modelica.sci
+index c9661db..0fe258b 100644
+--- a/modules/scicos/macros/scicos_scicos/compile_modelica.sci
++++ b/modules/scicos/macros/scicos_scicos/compile_modelica.sci
+@@ -15,7 +15,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/connected_links.sci b/modules/scicos/macros/scicos_scicos/connected_links.sci
+index 70582a4..e424982 100644
+--- a/modules/scicos/macros/scicos_scicos/connected_links.sci
++++ b/modules/scicos/macros/scicos_scicos/connected_links.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/context_evstr.sci b/modules/scicos/macros/scicos_scicos/context_evstr.sci
+index b8d1d8e..ef1195e 100644
+--- a/modules/scicos/macros/scicos_scicos/context_evstr.sci
++++ b/modules/scicos/macros/scicos_scicos/context_evstr.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/cos2cosf.sci b/modules/scicos/macros/scicos_scicos/cos2cosf.sci
+index 7884cfe..54f0242 100644
+--- a/modules/scicos/macros/scicos_scicos/cos2cosf.sci
++++ b/modules/scicos/macros/scicos_scicos/cos2cosf.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/cos2xml.sci b/modules/scicos/macros/scicos_scicos/cos2xml.sci
+index 4058cc2..c5956ed 100644
+--- a/modules/scicos/macros/scicos_scicos/cos2xml.sci
++++ b/modules/scicos/macros/scicos_scicos/cos2xml.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/cosclick.sci b/modules/scicos/macros/scicos_scicos/cosclick.sci
+index be0f35a..7c25e2d 100644
+--- a/modules/scicos/macros/scicos_scicos/cosclick.sci
++++ b/modules/scicos/macros/scicos_scicos/cosclick.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/countblocks.sci b/modules/scicos/macros/scicos_scicos/countblocks.sci
+index 04175a9..556c775 100644
+--- a/modules/scicos/macros/scicos_scicos/countblocks.sci
++++ b/modules/scicos/macros/scicos_scicos/countblocks.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/create_modelica.sci b/modules/scicos/macros/scicos_scicos/create_modelica.sci
+index dcd2beb..5b01183 100644
+--- a/modules/scicos/macros/scicos_scicos/create_modelica.sci
++++ b/modules/scicos/macros/scicos_scicos/create_modelica.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/create_modelica1.sci b/modules/scicos/macros/scicos_scicos/create_modelica1.sci
+index 120c669..2f45118 100644
+--- a/modules/scicos/macros/scicos_scicos/create_modelica1.sci
++++ b/modules/scicos/macros/scicos_scicos/create_modelica1.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/ctree.sci b/modules/scicos/macros/scicos_scicos/ctree.sci
+index 4f18b3e..5554077 100644
+--- a/modules/scicos/macros/scicos_scicos/ctree.sci
++++ b/modules/scicos/macros/scicos_scicos/ctree.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/default_color.sci b/modules/scicos/macros/scicos_scicos/default_color.sci
+index c85248e..96f4411 100644
+--- a/modules/scicos/macros/scicos_scicos/default_color.sci
++++ b/modules/scicos/macros/scicos_scicos/default_color.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/default_options.sci b/modules/scicos/macros/scicos_scicos/default_options.sci
+index 88d7adf..1c9f5fe 100644
+--- a/modules/scicos/macros/scicos_scicos/default_options.sci
++++ b/modules/scicos/macros/scicos_scicos/default_options.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/delete_unconnected.sci b/modules/scicos/macros/scicos_scicos/delete_unconnected.sci
+index 6c5e8b7..6dc5a3c 100644
+--- a/modules/scicos/macros/scicos_scicos/delete_unconnected.sci
++++ b/modules/scicos/macros/scicos_scicos/delete_unconnected.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/dialog.sci b/modules/scicos/macros/scicos_scicos/dialog.sci
+index 3e85bb6..952b883 100644
+--- a/modules/scicos/macros/scicos_scicos/dialog.sci
++++ b/modules/scicos/macros/scicos_scicos/dialog.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/dig_bound.sci b/modules/scicos/macros/scicos_scicos/dig_bound.sci
+index abcccfc..98bc7f6 100644
+--- a/modules/scicos/macros/scicos_scicos/dig_bound.sci
++++ b/modules/scicos/macros/scicos_scicos/dig_bound.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/dig_bound_compound.sci b/modules/scicos/macros/scicos_scicos/dig_bound_compound.sci
+index 6aa8cda..6247058 100644
+--- a/modules/scicos/macros/scicos_scicos/dig_bound_compound.sci
++++ b/modules/scicos/macros/scicos_scicos/dig_bound_compound.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/disconnect_ports.sci b/modules/scicos/macros/scicos_scicos/disconnect_ports.sci
+index 0e7dc9c..5609d81 100644
+--- a/modules/scicos/macros/scicos_scicos/disconnect_ports.sci
++++ b/modules/scicos/macros/scicos_scicos/disconnect_ports.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/dist2polyline.sci b/modules/scicos/macros/scicos_scicos/dist2polyline.sci
+index 9a3ae04..3e04d13 100644
+--- a/modules/scicos/macros/scicos_scicos/dist2polyline.sci
++++ b/modules/scicos/macros/scicos_scicos/dist2polyline.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/do_CodeGen.sci b/modules/scicos/macros/scicos_scicos/do_CodeGen.sci
+index 02255f9..eb79a03 100644
+--- a/modules/scicos/macros/scicos_scicos/do_CodeGen.sci
++++ b/modules/scicos/macros/scicos_scicos/do_CodeGen.sci
+@@ -19,7 +19,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/do_CreateAtomic.sci b/modules/scicos/macros/scicos_scicos/do_CreateAtomic.sci
+index b3fd0d4..91a2e53 100644
+--- a/modules/scicos/macros/scicos_scicos/do_CreateAtomic.sci
++++ b/modules/scicos/macros/scicos_scicos/do_CreateAtomic.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/do_RemoveAtomic.sci b/modules/scicos/macros/scicos_scicos/do_RemoveAtomic.sci
+index f7b4aa7..3dc2f28 100644
+--- a/modules/scicos/macros/scicos_scicos/do_RemoveAtomic.sci
++++ b/modules/scicos/macros/scicos_scicos/do_RemoveAtomic.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/do_SaveAs.sci b/modules/scicos/macros/scicos_scicos/do_SaveAs.sci
+index 72d9763..b86aabd 100644
+--- a/modules/scicos/macros/scicos_scicos/do_SaveAs.sci
++++ b/modules/scicos/macros/scicos_scicos/do_SaveAs.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/do_addnew.sci b/modules/scicos/macros/scicos_scicos/do_addnew.sci
+index 9c15191..80b08b6 100644
+--- a/modules/scicos/macros/scicos_scicos/do_addnew.sci
++++ b/modules/scicos/macros/scicos_scicos/do_addnew.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/do_analyze_diagram.sci b/modules/scicos/macros/scicos_scicos/do_analyze_diagram.sci
+index 72d79ac..91e7ffe 100644
+--- a/modules/scicos/macros/scicos_scicos/do_analyze_diagram.sci
++++ b/modules/scicos/macros/scicos_scicos/do_analyze_diagram.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/do_block.sci b/modules/scicos/macros/scicos_scicos/do_block.sci
+index c887531..3f9b002 100644
+--- a/modules/scicos/macros/scicos_scicos/do_block.sci
++++ b/modules/scicos/macros/scicos_scicos/do_block.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/do_block_info.sci b/modules/scicos/macros/scicos_scicos/do_block_info.sci
+index 9cbc73a..c4909b0 100644
+--- a/modules/scicos/macros/scicos_scicos/do_block_info.sci
++++ b/modules/scicos/macros/scicos_scicos/do_block_info.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/do_browser.sci b/modules/scicos/macros/scicos_scicos/do_browser.sci
+index d939068..0655a4a 100644
+--- a/modules/scicos/macros/scicos_scicos/do_browser.sci
++++ b/modules/scicos/macros/scicos_scicos/do_browser.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/do_color.sci b/modules/scicos/macros/scicos_scicos/do_color.sci
+index f509c5b..62355e0 100644
+--- a/modules/scicos/macros/scicos_scicos/do_color.sci
++++ b/modules/scicos/macros/scicos_scicos/do_color.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/do_compile.sci b/modules/scicos/macros/scicos_scicos/do_compile.sci
+index e43e1dd..a0af835 100644
+--- a/modules/scicos/macros/scicos_scicos/do_compile.sci
++++ b/modules/scicos/macros/scicos_scicos/do_compile.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/do_compile_superblock42.sci b/modules/scicos/macros/scicos_scicos/do_compile_superblock42.sci
+index f98d9d5..4a73817 100644
+--- a/modules/scicos/macros/scicos_scicos/do_compile_superblock42.sci
++++ b/modules/scicos/macros/scicos_scicos/do_compile_superblock42.sci
+@@ -21,7 +21,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/do_delete.sci b/modules/scicos/macros/scicos_scicos/do_delete.sci
+index 05cafbd..92cf081 100644
+--- a/modules/scicos/macros/scicos_scicos/do_delete.sci
++++ b/modules/scicos/macros/scicos_scicos/do_delete.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/do_delete1.sci b/modules/scicos/macros/scicos_scicos/do_delete1.sci
+index 9301f62..44ca88c 100644
+--- a/modules/scicos/macros/scicos_scicos/do_delete1.sci
++++ b/modules/scicos/macros/scicos_scicos/do_delete1.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/do_delete2.sci b/modules/scicos/macros/scicos_scicos/do_delete2.sci
+index 6343d68..e762d56 100644
+--- a/modules/scicos/macros/scicos_scicos/do_delete2.sci
++++ b/modules/scicos/macros/scicos_scicos/do_delete2.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/do_details.sci b/modules/scicos/macros/scicos_scicos/do_details.sci
+index e547152..f4f085c 100644
+--- a/modules/scicos/macros/scicos_scicos/do_details.sci
++++ b/modules/scicos/macros/scicos_scicos/do_details.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/do_doc.sci b/modules/scicos/macros/scicos_scicos/do_doc.sci
+index d5e9de2..bfc852b 100644
+--- a/modules/scicos/macros/scicos_scicos/do_doc.sci
++++ b/modules/scicos/macros/scicos_scicos/do_doc.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/do_duplicate.sci b/modules/scicos/macros/scicos_scicos/do_duplicate.sci
+index f4e9729..11f5337 100644
+--- a/modules/scicos/macros/scicos_scicos/do_duplicate.sci
++++ b/modules/scicos/macros/scicos_scicos/do_duplicate.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/do_edit_pal.sci b/modules/scicos/macros/scicos_scicos/do_edit_pal.sci
+index c9f3afd..e47a658 100644
+--- a/modules/scicos/macros/scicos_scicos/do_edit_pal.sci
++++ b/modules/scicos/macros/scicos_scicos/do_edit_pal.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/do_eval.sci b/modules/scicos/macros/scicos_scicos/do_eval.sci
+index 4247bbf..abdd535 100644
+--- a/modules/scicos/macros/scicos_scicos/do_eval.sci
++++ b/modules/scicos/macros/scicos_scicos/do_eval.sci
+@@ -15,7 +15,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/do_exit.sci b/modules/scicos/macros/scicos_scicos/do_exit.sci
+index 54a0358..265809f 100644
+--- a/modules/scicos/macros/scicos_scicos/do_exit.sci
++++ b/modules/scicos/macros/scicos_scicos/do_exit.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/do_export.sci b/modules/scicos/macros/scicos_scicos/do_export.sci
+index 6c384c6..c2b4466 100644
+--- a/modules/scicos/macros/scicos_scicos/do_export.sci
++++ b/modules/scicos/macros/scicos_scicos/do_export.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/do_focus.sci b/modules/scicos/macros/scicos_scicos/do_focus.sci
+index 8e97ae4..dd30a51 100644
+--- a/modules/scicos/macros/scicos_scicos/do_focus.sci
++++ b/modules/scicos/macros/scicos_scicos/do_focus.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/do_grid.sci b/modules/scicos/macros/scicos_scicos/do_grid.sci
+index b71bb8d..97785e1 100644
+--- a/modules/scicos/macros/scicos_scicos/do_grid.sci
++++ b/modules/scicos/macros/scicos_scicos/do_grid.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/do_help.sci b/modules/scicos/macros/scicos_scicos/do_help.sci
+index e79f49d..b601031 100644
+--- a/modules/scicos/macros/scicos_scicos/do_help.sci
++++ b/modules/scicos/macros/scicos_scicos/do_help.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/do_icon_edit.sci b/modules/scicos/macros/scicos_scicos/do_icon_edit.sci
+index 74ac6ba..28d747e 100644
+--- a/modules/scicos/macros/scicos_scicos/do_icon_edit.sci
++++ b/modules/scicos/macros/scicos_scicos/do_icon_edit.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/do_ident.sci b/modules/scicos/macros/scicos_scicos/do_ident.sci
+index 1666108..ba0776e 100644
+--- a/modules/scicos/macros/scicos_scicos/do_ident.sci
++++ b/modules/scicos/macros/scicos_scicos/do_ident.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/do_label.sci b/modules/scicos/macros/scicos_scicos/do_label.sci
+index 2ee648c..e177e55 100644
+--- a/modules/scicos/macros/scicos_scicos/do_label.sci
++++ b/modules/scicos/macros/scicos_scicos/do_label.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/do_load.sci b/modules/scicos/macros/scicos_scicos/do_load.sci
+index 87b72e7..ecec119 100644
+--- a/modules/scicos/macros/scicos_scicos/do_load.sci
++++ b/modules/scicos/macros/scicos_scicos/do_load.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/do_load_as_palette.sci b/modules/scicos/macros/scicos_scicos/do_load_as_palette.sci
+index e43ec05..5b372ef 100644
+--- a/modules/scicos/macros/scicos_scicos/do_load_as_palette.sci
++++ b/modules/scicos/macros/scicos_scicos/do_load_as_palette.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/do_navigator.sci b/modules/scicos/macros/scicos_scicos/do_navigator.sci
+index 7007eec..dff3015 100644
+--- a/modules/scicos/macros/scicos_scicos/do_navigator.sci
++++ b/modules/scicos/macros/scicos_scicos/do_navigator.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/do_newblk.sci b/modules/scicos/macros/scicos_scicos/do_newblk.sci
+index 3b1cd71..a88c737 100644
+--- a/modules/scicos/macros/scicos_scicos/do_newblk.sci
++++ b/modules/scicos/macros/scicos_scicos/do_newblk.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/do_options.sci b/modules/scicos/macros/scicos_scicos/do_options.sci
+index 0359ec1..4136723 100644
+--- a/modules/scicos/macros/scicos_scicos/do_options.sci
++++ b/modules/scicos/macros/scicos_scicos/do_options.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/do_pal_tree.sci b/modules/scicos/macros/scicos_scicos/do_pal_tree.sci
+index 008a4fe..515883b 100644
+--- a/modules/scicos/macros/scicos_scicos/do_pal_tree.sci
++++ b/modules/scicos/macros/scicos_scicos/do_pal_tree.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/do_palettes.sci b/modules/scicos/macros/scicos_scicos/do_palettes.sci
+index 125bf80..e04fd2f 100644
+--- a/modules/scicos/macros/scicos_scicos/do_palettes.sci
++++ b/modules/scicos/macros/scicos_scicos/do_palettes.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/do_placeindiagram.sci b/modules/scicos/macros/scicos_scicos/do_placeindiagram.sci
+index ebc03c5..ffcf3f9 100644
+--- a/modules/scicos/macros/scicos_scicos/do_placeindiagram.sci
++++ b/modules/scicos/macros/scicos_scicos/do_placeindiagram.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/do_purge.sci b/modules/scicos/macros/scicos_scicos/do_purge.sci
+index d695222..b1344e9 100644
+--- a/modules/scicos/macros/scicos_scicos/do_purge.sci
++++ b/modules/scicos/macros/scicos_scicos/do_purge.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/do_region2block.sci b/modules/scicos/macros/scicos_scicos/do_region2block.sci
+index 337c4f3..a325b3f 100644
+--- a/modules/scicos/macros/scicos_scicos/do_region2block.sci
++++ b/modules/scicos/macros/scicos_scicos/do_region2block.sci
+@@ -15,7 +15,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/do_region2pal.sci b/modules/scicos/macros/scicos_scicos/do_region2pal.sci
+index a223d1f..4075bca 100644
+--- a/modules/scicos/macros/scicos_scicos/do_region2pal.sci
++++ b/modules/scicos/macros/scicos_scicos/do_region2pal.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/do_rename.sci b/modules/scicos/macros/scicos_scicos/do_rename.sci
+index aea5e6e..66d2919 100644
+--- a/modules/scicos/macros/scicos_scicos/do_rename.sci
++++ b/modules/scicos/macros/scicos_scicos/do_rename.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/do_replace.sci b/modules/scicos/macros/scicos_scicos/do_replace.sci
+index 9d1423e..ab8e140 100644
+--- a/modules/scicos/macros/scicos_scicos/do_replace.sci
++++ b/modules/scicos/macros/scicos_scicos/do_replace.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/do_resize.sci b/modules/scicos/macros/scicos_scicos/do_resize.sci
+index 85d639f..4bb5fc5 100644
+--- a/modules/scicos/macros/scicos_scicos/do_resize.sci
++++ b/modules/scicos/macros/scicos_scicos/do_resize.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/do_run.sci b/modules/scicos/macros/scicos_scicos/do_run.sci
+index 326f1f2..bbe080d 100644
+--- a/modules/scicos/macros/scicos_scicos/do_run.sci
++++ b/modules/scicos/macros/scicos_scicos/do_run.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/do_save.sci b/modules/scicos/macros/scicos_scicos/do_save.sci
+index d3a4467..eb90c4c 100644
+--- a/modules/scicos/macros/scicos_scicos/do_save.sci
++++ b/modules/scicos/macros/scicos_scicos/do_save.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/do_saveblockgui.sci b/modules/scicos/macros/scicos_scicos/do_saveblockgui.sci
+index b54cfcb..9b92097 100644
+--- a/modules/scicos/macros/scicos_scicos/do_saveblockgui.sci
++++ b/modules/scicos/macros/scicos_scicos/do_saveblockgui.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/do_scsm_tree.sci b/modules/scicos/macros/scicos_scicos/do_scsm_tree.sci
+index 2c5f62e..abc5196 100644
+--- a/modules/scicos/macros/scicos_scicos/do_scsm_tree.sci
++++ b/modules/scicos/macros/scicos_scicos/do_scsm_tree.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/do_select2block.sci b/modules/scicos/macros/scicos_scicos/do_select2block.sci
+index 0623e80..929d365 100644
+--- a/modules/scicos/macros/scicos_scicos/do_select2block.sci
++++ b/modules/scicos/macros/scicos_scicos/do_select2block.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/do_select2pal.sci b/modules/scicos/macros/scicos_scicos/do_select2pal.sci
+index e79ed8a..af6a6f5 100644
+--- a/modules/scicos/macros/scicos_scicos/do_select2pal.sci
++++ b/modules/scicos/macros/scicos_scicos/do_select2pal.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/do_set_info.sci b/modules/scicos/macros/scicos_scicos/do_set_info.sci
+index aa338a6..2243806 100644
+--- a/modules/scicos/macros/scicos_scicos/do_set_info.sci
++++ b/modules/scicos/macros/scicos_scicos/do_set_info.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/do_setup.sci b/modules/scicos/macros/scicos_scicos/do_setup.sci
+index 8cdf495..047cad7 100644
+--- a/modules/scicos/macros/scicos_scicos/do_setup.sci
++++ b/modules/scicos/macros/scicos_scicos/do_setup.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/do_smart_move.sci b/modules/scicos/macros/scicos_scicos/do_smart_move.sci
+index dc530e6..dfdcf21 100644
+--- a/modules/scicos/macros/scicos_scicos/do_smart_move.sci
++++ b/modules/scicos/macros/scicos_scicos/do_smart_move.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/do_stupidMultimove.sci b/modules/scicos/macros/scicos_scicos/do_stupidMultimove.sci
+index f01ef81..ebd08c3 100644
+--- a/modules/scicos/macros/scicos_scicos/do_stupidMultimove.sci
++++ b/modules/scicos/macros/scicos_scicos/do_stupidMultimove.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/do_stupidmove_corner.sci b/modules/scicos/macros/scicos_scicos/do_stupidmove_corner.sci
+index b696205..c5c4d0d 100644
+--- a/modules/scicos/macros/scicos_scicos/do_stupidmove_corner.sci
++++ b/modules/scicos/macros/scicos_scicos/do_stupidmove_corner.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/do_terminate.sci b/modules/scicos/macros/scicos_scicos/do_terminate.sci
+index 971c945..4a3ece9 100644
+--- a/modules/scicos/macros/scicos_scicos/do_terminate.sci
++++ b/modules/scicos/macros/scicos_scicos/do_terminate.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/do_tild.sci b/modules/scicos/macros/scicos_scicos/do_tild.sci
+index 1bfb429..2541654 100644
+--- a/modules/scicos/macros/scicos_scicos/do_tild.sci
++++ b/modules/scicos/macros/scicos_scicos/do_tild.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/do_turn.sci b/modules/scicos/macros/scicos_scicos/do_turn.sci
+index 7cc0584..5e7f12f 100644
+--- a/modules/scicos/macros/scicos_scicos/do_turn.sci
++++ b/modules/scicos/macros/scicos_scicos/do_turn.sci
+@@ -15,7 +15,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/do_update.sci b/modules/scicos/macros/scicos_scicos/do_update.sci
+index 9a69d80..f825387 100644
+--- a/modules/scicos/macros/scicos_scicos/do_update.sci
++++ b/modules/scicos/macros/scicos_scicos/do_update.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/do_version.sci b/modules/scicos/macros/scicos_scicos/do_version.sci
+index 2088291..8b44558 100644
+--- a/modules/scicos/macros/scicos_scicos/do_version.sci
++++ b/modules/scicos/macros/scicos_scicos/do_version.sci
+@@ -15,7 +15,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/do_view.sci b/modules/scicos/macros/scicos_scicos/do_view.sci
+index cda4ba6..3da72c6 100644
+--- a/modules/scicos/macros/scicos_scicos/do_view.sci
++++ b/modules/scicos/macros/scicos_scicos/do_view.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/do_window.sci b/modules/scicos/macros/scicos_scicos/do_window.sci
+index 6a4b94c..8dc0628 100644
+--- a/modules/scicos/macros/scicos_scicos/do_window.sci
++++ b/modules/scicos/macros/scicos_scicos/do_window.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/do_xsetech.sci b/modules/scicos/macros/scicos_scicos/do_xsetech.sci
+index 4f783b6..5805c97 100644
+--- a/modules/scicos/macros/scicos_scicos/do_xsetech.sci
++++ b/modules/scicos/macros/scicos_scicos/do_xsetech.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/do_zoomin.sci b/modules/scicos/macros/scicos_scicos/do_zoomin.sci
+index c49686c..ca432b1 100644
+--- a/modules/scicos/macros/scicos_scicos/do_zoomin.sci
++++ b/modules/scicos/macros/scicos_scicos/do_zoomin.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/do_zoomout.sci b/modules/scicos/macros/scicos_scicos/do_zoomout.sci
+index 9513e15..013024d 100644
+--- a/modules/scicos/macros/scicos_scicos/do_zoomout.sci
++++ b/modules/scicos/macros/scicos_scicos/do_zoomout.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/drawblock.sci b/modules/scicos/macros/scicos_scicos/drawblock.sci
+index 57dac50..25c9488 100644
+--- a/modules/scicos/macros/scicos_scicos/drawblock.sci
++++ b/modules/scicos/macros/scicos_scicos/drawblock.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/drawgrid.sci b/modules/scicos/macros/scicos_scicos/drawgrid.sci
+index 9531595..e8490c1 100644
+--- a/modules/scicos/macros/scicos_scicos/drawgrid.sci
++++ b/modules/scicos/macros/scicos_scicos/drawgrid.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/drawobj.sci b/modules/scicos/macros/scicos_scicos/drawobj.sci
+index f8e181b..87688e1 100644
+--- a/modules/scicos/macros/scicos_scicos/drawobj.sci
++++ b/modules/scicos/macros/scicos_scicos/drawobj.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/drawobjs.sci b/modules/scicos/macros/scicos_scicos/drawobjs.sci
+index 488f66e..464ceed 100644
+--- a/modules/scicos/macros/scicos_scicos/drawobjs.sci
++++ b/modules/scicos/macros/scicos_scicos/drawobjs.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/drawtitle.sci b/modules/scicos/macros/scicos_scicos/drawtitle.sci
+index c1cae5e..5641f6a 100644
+--- a/modules/scicos/macros/scicos_scicos/drawtitle.sci
++++ b/modules/scicos/macros/scicos_scicos/drawtitle.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/enablemenus.sci b/modules/scicos/macros/scicos_scicos/enablemenus.sci
+index 1dfb8d3..632acfb 100644
+--- a/modules/scicos/macros/scicos_scicos/enablemenus.sci
++++ b/modules/scicos/macros/scicos_scicos/enablemenus.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/entity_menu.sce b/modules/scicos/macros/scicos_scicos/entity_menu.sce
+index 715d040..a18b738 100644
+--- a/modules/scicos/macros/scicos_scicos/entity_menu.sce
++++ b/modules/scicos/macros/scicos_scicos/entity_menu.sce
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/extract_implicit.sci b/modules/scicos/macros/scicos_scicos/extract_implicit.sci
+index 3046998..5a5d678 100644
+--- a/modules/scicos/macros/scicos_scicos/extract_implicit.sci
++++ b/modules/scicos/macros/scicos_scicos/extract_implicit.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/findinlist.sci b/modules/scicos/macros/scicos_scicos/findinlist.sci
+index d503180..1079b90 100644
+--- a/modules/scicos/macros/scicos_scicos/findinlist.sci
++++ b/modules/scicos/macros/scicos_scicos/findinlist.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/findinlistcmd.sci b/modules/scicos/macros/scicos_scicos/findinlistcmd.sci
+index c366a54..bd332b9 100644
+--- a/modules/scicos/macros/scicos_scicos/findinlistcmd.sci
++++ b/modules/scicos/macros/scicos_scicos/findinlistcmd.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/findopenchildren.sci b/modules/scicos/macros/scicos_scicos/findopenchildren.sci
+index 6d0888c..63b8d30 100644
+--- a/modules/scicos/macros/scicos_scicos/findopenchildren.sci
++++ b/modules/scicos/macros/scicos_scicos/findopenchildren.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/gen_modelica.sci b/modules/scicos/macros/scicos_scicos/gen_modelica.sci
+index bde16d2..b6c0fa2 100644
+--- a/modules/scicos/macros/scicos_scicos/gen_modelica.sci
++++ b/modules/scicos/macros/scicos_scicos/gen_modelica.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/genfunc.sci b/modules/scicos/macros/scicos_scicos/genfunc.sci
+index ab6e1f3..d121c48 100644
+--- a/modules/scicos/macros/scicos_scicos/genfunc.sci
++++ b/modules/scicos/macros/scicos_scicos/genfunc.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/genfunc1.sci b/modules/scicos/macros/scicos_scicos/genfunc1.sci
+index da275b9..f0e6f1a 100644
+--- a/modules/scicos/macros/scicos_scicos/genfunc1.sci
++++ b/modules/scicos/macros/scicos_scicos/genfunc1.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/genfunc2.sci b/modules/scicos/macros/scicos_scicos/genfunc2.sci
+index 873be7b..04b5968 100644
+--- a/modules/scicos/macros/scicos_scicos/genfunc2.sci
++++ b/modules/scicos/macros/scicos_scicos/genfunc2.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/genmac.sci b/modules/scicos/macros/scicos_scicos/genmac.sci
+index 4bf9117..fe211f2 100644
+--- a/modules/scicos/macros/scicos_scicos/genmac.sci
++++ b/modules/scicos/macros/scicos_scicos/genmac.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/genmoc.sci b/modules/scicos/macros/scicos_scicos/genmoc.sci
+index 1ad338b..cc4c06d 100644
+--- a/modules/scicos/macros/scicos_scicos/genmoc.sci
++++ b/modules/scicos/macros/scicos_scicos/genmoc.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/get2index.sci b/modules/scicos/macros/scicos_scicos/get2index.sci
+index 7e33039..5658eb7 100644
+--- a/modules/scicos/macros/scicos_scicos/get2index.sci
++++ b/modules/scicos/macros/scicos_scicos/get2index.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/get_block_info.sci b/modules/scicos/macros/scicos_scicos/get_block_info.sci
+index 120a13c..13ae4d6 100644
+--- a/modules/scicos/macros/scicos_scicos/get_block_info.sci
++++ b/modules/scicos/macros/scicos_scicos/get_block_info.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/get_blocks_in_rect.sci b/modules/scicos/macros/scicos_scicos/get_blocks_in_rect.sci
+index 1272f49..fb24ca4 100644
+--- a/modules/scicos/macros/scicos_scicos/get_blocks_in_rect.sci
++++ b/modules/scicos/macros/scicos_scicos/get_blocks_in_rect.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/get_connected.sci b/modules/scicos/macros/scicos_scicos/get_connected.sci
+index d6394c3..b122305 100644
+--- a/modules/scicos/macros/scicos_scicos/get_connected.sci
++++ b/modules/scicos/macros/scicos_scicos/get_connected.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/get_dynamic_lib_dir.sci b/modules/scicos/macros/scicos_scicos/get_dynamic_lib_dir.sci
+index 4f4045d..877d64d 100644
+--- a/modules/scicos/macros/scicos_scicos/get_dynamic_lib_dir.sci
++++ b/modules/scicos/macros/scicos_scicos/get_dynamic_lib_dir.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/get_errorcmd.sci b/modules/scicos/macros/scicos_scicos/get_errorcmd.sci
+index fcf9bbd..4e48517 100644
+--- a/modules/scicos/macros/scicos_scicos/get_errorcmd.sci
++++ b/modules/scicos/macros/scicos_scicos/get_errorcmd.sci
+@@ -15,7 +15,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/get_gri.sci b/modules/scicos/macros/scicos_scicos/get_gri.sci
+index 4044295..cdd9eef 100644
+--- a/modules/scicos/macros/scicos_scicos/get_gri.sci
++++ b/modules/scicos/macros/scicos_scicos/get_gri.sci
+@@ -15,7 +15,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/get_info.sci b/modules/scicos/macros/scicos_scicos/get_info.sci
+index c9afafb..2934709 100644
+--- a/modules/scicos/macros/scicos_scicos/get_info.sci
++++ b/modules/scicos/macros/scicos_scicos/get_info.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/get_inside.sci b/modules/scicos/macros/scicos_scicos/get_inside.sci
+index 02156ea..024c5ac 100644
+--- a/modules/scicos/macros/scicos_scicos/get_inside.sci
++++ b/modules/scicos/macros/scicos_scicos/get_inside.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/get_inside2.sci b/modules/scicos/macros/scicos_scicos/get_inside2.sci
+index b2a8abe..701427c 100644
+--- a/modules/scicos/macros/scicos_scicos/get_inside2.sci
++++ b/modules/scicos/macros/scicos_scicos/get_inside2.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/get_model_name.sci b/modules/scicos/macros/scicos_scicos/get_model_name.sci
+index 891bfa6..2f92c15 100644
+--- a/modules/scicos/macros/scicos_scicos/get_model_name.sci
++++ b/modules/scicos/macros/scicos_scicos/get_model_name.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/get_multiple_selection.sci b/modules/scicos/macros/scicos_scicos/get_multiple_selection.sci
+index b250de9..d5bbd1c 100644
+--- a/modules/scicos/macros/scicos_scicos/get_multiple_selection.sci
++++ b/modules/scicos/macros/scicos_scicos/get_multiple_selection.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/get_new_scs_m.sci b/modules/scicos/macros/scicos_scicos/get_new_scs_m.sci
+index 7c029ac..aa87be7 100644
+--- a/modules/scicos/macros/scicos_scicos/get_new_scs_m.sci
++++ b/modules/scicos/macros/scicos_scicos/get_new_scs_m.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/get_new_window.sci b/modules/scicos/macros/scicos_scicos/get_new_window.sci
+index 1d2b5b2..0bdf183 100644
+--- a/modules/scicos/macros/scicos_scicos/get_new_window.sci
++++ b/modules/scicos/macros/scicos_scicos/get_new_window.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/get_objs.sci b/modules/scicos/macros/scicos_scicos/get_objs.sci
+index 4b1d5b4..e22980c 100644
+--- a/modules/scicos/macros/scicos_scicos/get_objs.sci
++++ b/modules/scicos/macros/scicos_scicos/get_objs.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/get_objs_in_rect.sci b/modules/scicos/macros/scicos_scicos/get_objs_in_rect.sci
+index 2ac705d..ee3b4e9 100644
+--- a/modules/scicos/macros/scicos_scicos/get_objs_in_rect.sci
++++ b/modules/scicos/macros/scicos_scicos/get_objs_in_rect.sci
+@@ -15,7 +15,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/get_param_name.sci b/modules/scicos/macros/scicos_scicos/get_param_name.sci
+index 359d09b..2d50910 100644
+--- a/modules/scicos/macros/scicos_scicos/get_param_name.sci
++++ b/modules/scicos/macros/scicos_scicos/get_param_name.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/get_rectangle.sci b/modules/scicos/macros/scicos_scicos/get_rectangle.sci
+index dca07e8..b3d9b2a 100644
+--- a/modules/scicos/macros/scicos_scicos/get_rectangle.sci
++++ b/modules/scicos/macros/scicos_scicos/get_rectangle.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/get_region.sci b/modules/scicos/macros/scicos_scicos/get_region.sci
+index 8c5f30f..e167d7b 100644
+--- a/modules/scicos/macros/scicos_scicos/get_region.sci
++++ b/modules/scicos/macros/scicos_scicos/get_region.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/get_region2.sci b/modules/scicos/macros/scicos_scicos/get_region2.sci
+index 5bffdf1..fc6814c 100644
+--- a/modules/scicos/macros/scicos_scicos/get_region2.sci
++++ b/modules/scicos/macros/scicos_scicos/get_region2.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/get_selection.sci b/modules/scicos/macros/scicos_scicos/get_selection.sci
+index 6663a7f..b8c55ea 100644
+--- a/modules/scicos/macros/scicos_scicos/get_selection.sci
++++ b/modules/scicos/macros/scicos_scicos/get_selection.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/get_subobj_path.sci b/modules/scicos/macros/scicos_scicos/get_subobj_path.sci
+index 7808221..91e8d51 100644
+--- a/modules/scicos/macros/scicos_scicos/get_subobj_path.sci
++++ b/modules/scicos/macros/scicos_scicos/get_subobj_path.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/get_tree_elt.sci b/modules/scicos/macros/scicos_scicos/get_tree_elt.sci
+index 3982346..8af262a 100644
+--- a/modules/scicos/macros/scicos_scicos/get_tree_elt.sci
++++ b/modules/scicos/macros/scicos_scicos/get_tree_elt.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/getblock.sci b/modules/scicos/macros/scicos_scicos/getblock.sci
+index 3710e38..76841dc 100644
+--- a/modules/scicos/macros/scicos_scicos/getblock.sci
++++ b/modules/scicos/macros/scicos_scicos/getblock.sci
+@@ -15,7 +15,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/getblocklink.sci b/modules/scicos/macros/scicos_scicos/getblocklink.sci
+index 1698e8b..e8608c3 100644
+--- a/modules/scicos/macros/scicos_scicos/getblocklink.sci
++++ b/modules/scicos/macros/scicos_scicos/getblocklink.sci
+@@ -15,7 +15,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/getblocktext.sci b/modules/scicos/macros/scicos_scicos/getblocktext.sci
+index a5b3138..9e78bbc 100644
+--- a/modules/scicos/macros/scicos_scicos/getblocktext.sci
++++ b/modules/scicos/macros/scicos_scicos/getblocktext.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/getgeom.sci b/modules/scicos/macros/scicos_scicos/getgeom.sci
+index c975061..61f33b2 100644
+--- a/modules/scicos/macros/scicos_scicos/getgeom.sci
++++ b/modules/scicos/macros/scicos_scicos/getgeom.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/getinputports.sci b/modules/scicos/macros/scicos_scicos/getinputports.sci
+index 9c85a72..0578b85 100644
+--- a/modules/scicos/macros/scicos_scicos/getinputports.sci
++++ b/modules/scicos/macros/scicos_scicos/getinputports.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/getinputs.sci b/modules/scicos/macros/scicos_scicos/getinputs.sci
+index c499590..879c8c9 100644
+--- a/modules/scicos/macros/scicos_scicos/getinputs.sci
++++ b/modules/scicos/macros/scicos_scicos/getinputs.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/getlink.sci b/modules/scicos/macros/scicos_scicos/getlink.sci
+index 96f3c32..162a616 100644
+--- a/modules/scicos/macros/scicos_scicos/getlink.sci
++++ b/modules/scicos/macros/scicos_scicos/getlink.sci
+@@ -16,7 +16,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/getlink_qd.sci b/modules/scicos/macros/scicos_scicos/getlink_qd.sci
+index 354ce0d..a5127ed 100644
+--- a/modules/scicos/macros/scicos_scicos/getlink_qd.sci
++++ b/modules/scicos/macros/scicos_scicos/getlink_qd.sci
+@@ -16,7 +16,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/getobj.sci b/modules/scicos/macros/scicos_scicos/getobj.sci
+index 5644fb2..f9ce53b 100644
+--- a/modules/scicos/macros/scicos_scicos/getobj.sci
++++ b/modules/scicos/macros/scicos_scicos/getobj.sci
+@@ -15,7 +15,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/getorigin.sci b/modules/scicos/macros/scicos_scicos/getorigin.sci
+index 9d864a8..ab03e3a 100644
+--- a/modules/scicos/macros/scicos_scicos/getorigin.sci
++++ b/modules/scicos/macros/scicos_scicos/getorigin.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/getoutputports.sci b/modules/scicos/macros/scicos_scicos/getoutputports.sci
+index 78989b9..7b5b787 100644
+--- a/modules/scicos/macros/scicos_scicos/getoutputports.sci
++++ b/modules/scicos/macros/scicos_scicos/getoutputports.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/getoutputs.sci b/modules/scicos/macros/scicos_scicos/getoutputs.sci
+index 0192104..0e9872c 100644
+--- a/modules/scicos/macros/scicos_scicos/getoutputs.sci
++++ b/modules/scicos/macros/scicos_scicos/getoutputs.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/getparpath.sci b/modules/scicos/macros/scicos_scicos/getparpath.sci
+index 55d8cd9..dd5e027 100644
+--- a/modules/scicos/macros/scicos_scicos/getparpath.sci
++++ b/modules/scicos/macros/scicos_scicos/getparpath.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/getportsiz.sci b/modules/scicos/macros/scicos_scicos/getportsiz.sci
+index ebdf1fc..a77bb42 100644
+--- a/modules/scicos/macros/scicos_scicos/getportsiz.sci
++++ b/modules/scicos/macros/scicos_scicos/getportsiz.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/getporttyp.sci b/modules/scicos/macros/scicos_scicos/getporttyp.sci
+index 952d28a..ab4562a 100644
+--- a/modules/scicos/macros/scicos_scicos/getporttyp.sci
++++ b/modules/scicos/macros/scicos_scicos/getporttyp.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/global_case.sci b/modules/scicos/macros/scicos_scicos/global_case.sci
+index 6aa1d01..7bd0429 100644
+--- a/modules/scicos/macros/scicos_scicos/global_case.sci
++++ b/modules/scicos/macros/scicos_scicos/global_case.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/gridpoint.sci b/modules/scicos/macros/scicos_scicos/gridpoint.sci
+index 08b7afe..9d32d9d 100644
+--- a/modules/scicos/macros/scicos_scicos/gridpoint.sci
++++ b/modules/scicos/macros/scicos_scicos/gridpoint.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/haltscicos.sci b/modules/scicos/macros/scicos_scicos/haltscicos.sci
+index 870c76e..c568d95 100644
+--- a/modules/scicos/macros/scicos_scicos/haltscicos.sci
++++ b/modules/scicos/macros/scicos_scicos/haltscicos.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/hilite_modelica_block.sci b/modules/scicos/macros/scicos_scicos/hilite_modelica_block.sci
+index 7e79d56..f09d6ba 100644
+--- a/modules/scicos/macros/scicos_scicos/hilite_modelica_block.sci
++++ b/modules/scicos/macros/scicos_scicos/hilite_modelica_block.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/hilite_mult_objs.sci b/modules/scicos/macros/scicos_scicos/hilite_mult_objs.sci
+index e25780e..287d719 100644
+--- a/modules/scicos/macros/scicos_scicos/hilite_mult_objs.sci
++++ b/modules/scicos/macros/scicos_scicos/hilite_mult_objs.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/hilite_obj.sci b/modules/scicos/macros/scicos_scicos/hilite_obj.sci
+index fc99aa1..5a4a641 100644
+--- a/modules/scicos/macros/scicos_scicos/hilite_obj.sci
++++ b/modules/scicos/macros/scicos_scicos/hilite_obj.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/hilite_path.sci b/modules/scicos/macros/scicos_scicos/hilite_path.sci
+index b3bc1c9..31e0b12 100644
+--- a/modules/scicos/macros/scicos_scicos/hilite_path.sci
++++ b/modules/scicos/macros/scicos_scicos/hilite_path.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/init_agenda.sci b/modules/scicos/macros/scicos_scicos/init_agenda.sci
+index 8832a61..a9f3f0c 100644
+--- a/modules/scicos/macros/scicos_scicos/init_agenda.sci
++++ b/modules/scicos/macros/scicos_scicos/init_agenda.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/is_modelica_block.sci b/modules/scicos/macros/scicos_scicos/is_modelica_block.sci
+index 3ec1c48..3641af9 100644
+--- a/modules/scicos/macros/scicos_scicos/is_modelica_block.sci
++++ b/modules/scicos/macros/scicos_scicos/is_modelica_block.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/is_split.sci b/modules/scicos/macros/scicos_scicos/is_split.sci
+index 08ea5a7..d4c5c1e 100644
+--- a/modules/scicos/macros/scicos_scicos/is_split.sci
++++ b/modules/scicos/macros/scicos_scicos/is_split.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/link_olibs.sci b/modules/scicos/macros/scicos_scicos/link_olibs.sci
+index 0a5fcf3..65817da 100644
+--- a/modules/scicos/macros/scicos_scicos/link_olibs.sci
++++ b/modules/scicos/macros/scicos_scicos/link_olibs.sci
+@@ -20,7 +20,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/lnkptrcomp.sci b/modules/scicos/macros/scicos_scicos/lnkptrcomp.sci
+index f9aac1e..5b96d12 100644
+--- a/modules/scicos/macros/scicos_scicos/lnkptrcomp.sci
++++ b/modules/scicos/macros/scicos_scicos/lnkptrcomp.sci
+@@ -15,7 +15,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/loadpallibs.sci b/modules/scicos/macros/scicos_scicos/loadpallibs.sci
+index 6464699..400e708 100644
+--- a/modules/scicos/macros/scicos_scicos/loadpallibs.sci
++++ b/modules/scicos/macros/scicos_scicos/loadpallibs.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/mark_newpars.sci b/modules/scicos/macros/scicos_scicos/mark_newpars.sci
+index fa7a1bb..0c1c608 100644
+--- a/modules/scicos/macros/scicos_scicos/mark_newpars.sci
++++ b/modules/scicos/macros/scicos_scicos/mark_newpars.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/mark_prt.sci b/modules/scicos/macros/scicos_scicos/mark_prt.sci
+index 96df48c..ed094b7 100644
+--- a/modules/scicos/macros/scicos_scicos/mark_prt.sci
++++ b/modules/scicos/macros/scicos_scicos/mark_prt.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/menu_stuff.sci b/modules/scicos/macros/scicos_scicos/menu_stuff.sci
+index 53803b2..c7a08ed 100644
+--- a/modules/scicos/macros/scicos_scicos/menu_stuff.sci
++++ b/modules/scicos/macros/scicos_scicos/menu_stuff.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/message.sci b/modules/scicos/macros/scicos_scicos/message.sci
+index 5369227..46fe3e6 100644
+--- a/modules/scicos/macros/scicos_scicos/message.sci
++++ b/modules/scicos/macros/scicos_scicos/message.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/mfrequ_clk.sci b/modules/scicos/macros/scicos_scicos/mfrequ_clk.sci
+index be7c5b6..8ff24c0 100644
+--- a/modules/scicos/macros/scicos_scicos/mfrequ_clk.sci
++++ b/modules/scicos/macros/scicos_scicos/mfrequ_clk.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/mkvect.sci b/modules/scicos/macros/scicos_scicos/mkvect.sci
+index 75ca732..1a77e85 100644
+--- a/modules/scicos/macros/scicos_scicos/mkvect.sci
++++ b/modules/scicos/macros/scicos_scicos/mkvect.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/modelica.sci b/modules/scicos/macros/scicos_scicos/modelica.sci
+index 1a78773..a715ab7 100644
+--- a/modules/scicos/macros/scicos_scicos/modelica.sci
++++ b/modules/scicos/macros/scicos_scicos/modelica.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/modelica_cind_from_name.sci b/modules/scicos/macros/scicos_scicos/modelica_cind_from_name.sci
+index 79b4402..00ca145 100644
+--- a/modules/scicos/macros/scicos_scicos/modelica_cind_from_name.sci
++++ b/modules/scicos/macros/scicos_scicos/modelica_cind_from_name.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/modelicac.sci b/modules/scicos/macros/scicos_scicos/modelicac.sci
+index a270a3b..f44872c 100644
+--- a/modules/scicos/macros/scicos_scicos/modelicac.sci
++++ b/modules/scicos/macros/scicos_scicos/modelicac.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/modipar.sci b/modules/scicos/macros/scicos_scicos/modipar.sci
+index 6281628..fee2d90 100644
+--- a/modules/scicos/macros/scicos_scicos/modipar.sci
++++ b/modules/scicos/macros/scicos_scicos/modipar.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/navigatorexport.sci b/modules/scicos/macros/scicos_scicos/navigatorexport.sci
+index 824e18e..ef00784 100644
+--- a/modules/scicos/macros/scicos_scicos/navigatorexport.sci
++++ b/modules/scicos/macros/scicos_scicos/navigatorexport.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/newc_pass2.sci b/modules/scicos/macros/scicos_scicos/newc_pass2.sci
+index 1d7ba70..f929d3d 100644
+--- a/modules/scicos/macros/scicos_scicos/newc_pass2.sci
++++ b/modules/scicos/macros/scicos_scicos/newc_pass2.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/point2pixel.sci b/modules/scicos/macros/scicos_scicos/point2pixel.sci
+index d138eb8..d078a9a 100644
+--- a/modules/scicos/macros/scicos_scicos/point2pixel.sci
++++ b/modules/scicos/macros/scicos_scicos/point2pixel.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/prt_align.sci b/modules/scicos/macros/scicos_scicos/prt_align.sci
+index 6c57b3d..70c592e 100644
+--- a/modules/scicos/macros/scicos_scicos/prt_align.sci
++++ b/modules/scicos/macros/scicos_scicos/prt_align.sci
+@@ -15,7 +15,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/pwindow_read_size.sci b/modules/scicos/macros/scicos_scicos/pwindow_read_size.sci
+index 1a449c9..be90bbb 100644
+--- a/modules/scicos/macros/scicos_scicos/pwindow_read_size.sci
++++ b/modules/scicos/macros/scicos_scicos/pwindow_read_size.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/pwindow_set_size.sci b/modules/scicos/macros/scicos_scicos/pwindow_set_size.sci
+index cb8db7e..18193e9 100644
+--- a/modules/scicos/macros/scicos_scicos/pwindow_set_size.sci
++++ b/modules/scicos/macros/scicos_scicos/pwindow_set_size.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/reading_incidence.sci b/modules/scicos/macros/scicos_scicos/reading_incidence.sci
+index 3020835..5004c11 100644
+--- a/modules/scicos/macros/scicos_scicos/reading_incidence.sci
++++ b/modules/scicos/macros/scicos_scicos/reading_incidence.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/recur_scicos_block_link.sci b/modules/scicos/macros/scicos_scicos/recur_scicos_block_link.sci
+index 2140f46..26f90d8 100644
+--- a/modules/scicos/macros/scicos_scicos/recur_scicos_block_link.sci
++++ b/modules/scicos/macros/scicos_scicos/recur_scicos_block_link.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/replayifnecessary.sci b/modules/scicos/macros/scicos_scicos/replayifnecessary.sci
+index 02466ec..779735e 100644
+--- a/modules/scicos/macros/scicos_scicos/replayifnecessary.sci
++++ b/modules/scicos/macros/scicos_scicos/replayifnecessary.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/restore.sci b/modules/scicos/macros/scicos_scicos/restore.sci
+index f11699f..bd06ae0 100644
+--- a/modules/scicos/macros/scicos_scicos/restore.sci
++++ b/modules/scicos/macros/scicos_scicos/restore.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/restore_scs_gc.sci b/modules/scicos/macros/scicos_scicos/restore_scs_gc.sci
+index 6e3a369..4dc186b 100644
+--- a/modules/scicos/macros/scicos_scicos/restore_scs_gc.sci
++++ b/modules/scicos/macros/scicos_scicos/restore_scs_gc.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/rotate_compound.sci b/modules/scicos/macros/scicos_scicos/rotate_compound.sci
+index 55bb3db..d36e7f2 100644
+--- a/modules/scicos/macros/scicos_scicos/rotate_compound.sci
++++ b/modules/scicos/macros/scicos_scicos/rotate_compound.sci
+@@ -15,7 +15,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/s_port_names.sci b/modules/scicos/macros/scicos_scicos/s_port_names.sci
+index bac32e8..825b329 100644
+--- a/modules/scicos/macros/scicos_scicos/s_port_names.sci
++++ b/modules/scicos/macros/scicos_scicos/s_port_names.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/sample_clk.sci b/modules/scicos/macros/scicos_scicos/sample_clk.sci
+index 2e8763f..3a6e46c 100644
+--- a/modules/scicos/macros/scicos_scicos/sample_clk.sci
++++ b/modules/scicos/macros/scicos_scicos/sample_clk.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/save_csuper.sci b/modules/scicos/macros/scicos_scicos/save_csuper.sci
+index d68c5ab..0383521 100644
+--- a/modules/scicos/macros/scicos_scicos/save_csuper.sci
++++ b/modules/scicos/macros/scicos_scicos/save_csuper.sci
+@@ -15,7 +15,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/save_super.sci b/modules/scicos/macros/scicos_scicos/save_super.sci
+index f02f025..992b38d 100644
+--- a/modules/scicos/macros/scicos_scicos/save_super.sci
++++ b/modules/scicos/macros/scicos_scicos/save_super.sci
+@@ -15,7 +15,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/sci2tcl.sci b/modules/scicos/macros/scicos_scicos/sci2tcl.sci
+index 8fe5d4e..7799abc 100644
+--- a/modules/scicos/macros/scicos_scicos/sci2tcl.sci
++++ b/modules/scicos/macros/scicos_scicos/sci2tcl.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/scicos_block.sci b/modules/scicos/macros/scicos_scicos/scicos_block.sci
+index d7bd29d..8fbf758 100644
+--- a/modules/scicos/macros/scicos_scicos/scicos_block.sci
++++ b/modules/scicos/macros/scicos_scicos/scicos_block.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/scicos_block_link.sci b/modules/scicos/macros/scicos_scicos/scicos_block_link.sci
+index a44008a..699ea0c 100644
+--- a/modules/scicos/macros/scicos_scicos/scicos_block_link.sci
++++ b/modules/scicos/macros/scicos_scicos/scicos_block_link.sci
+@@ -15,7 +15,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/scicos_cpr.sci b/modules/scicos/macros/scicos_scicos/scicos_cpr.sci
+index 33a3aa5..af9098f 100644
+--- a/modules/scicos/macros/scicos_scicos/scicos_cpr.sci
++++ b/modules/scicos/macros/scicos_scicos/scicos_cpr.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/scicos_diagram.sci b/modules/scicos/macros/scicos_scicos/scicos_diagram.sci
+index a46d48b..1fe4e8e 100644
+--- a/modules/scicos/macros/scicos_scicos/scicos_diagram.sci
++++ b/modules/scicos/macros/scicos_scicos/scicos_diagram.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/scicos_flat.sci b/modules/scicos/macros/scicos_scicos/scicos_flat.sci
+index c9c75b5..2751c65 100644
+--- a/modules/scicos/macros/scicos_scicos/scicos_flat.sci
++++ b/modules/scicos/macros/scicos_scicos/scicos_flat.sci
+@@ -17,7 +17,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/scicos_graphics.sci b/modules/scicos/macros/scicos_scicos/scicos_graphics.sci
+index dacd16d..5d90736 100644
+--- a/modules/scicos/macros/scicos_scicos/scicos_graphics.sci
++++ b/modules/scicos/macros/scicos_scicos/scicos_graphics.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/scicos_include_paths.sci b/modules/scicos/macros/scicos_scicos/scicos_include_paths.sci
+index 6152076..5cff8b5 100644
+--- a/modules/scicos/macros/scicos_scicos/scicos_include_paths.sci
++++ b/modules/scicos/macros/scicos_scicos/scicos_include_paths.sci
+@@ -13,7 +13,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/scicos_link.sci b/modules/scicos/macros/scicos_scicos/scicos_link.sci
+index eae3163..f4b0765 100644
+--- a/modules/scicos/macros/scicos_scicos/scicos_link.sci
++++ b/modules/scicos/macros/scicos_scicos/scicos_link.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/scicos_model.sci b/modules/scicos/macros/scicos_scicos/scicos_model.sci
+index d989c17..29355c3 100644
+--- a/modules/scicos/macros/scicos_scicos/scicos_model.sci
++++ b/modules/scicos/macros/scicos_scicos/scicos_model.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/scicos_params.sci b/modules/scicos/macros/scicos_scicos/scicos_params.sci
+index 42bca9c..ba32d83 100644
+--- a/modules/scicos/macros/scicos_scicos/scicos_params.sci
++++ b/modules/scicos/macros/scicos_scicos/scicos_params.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/scicos_route.sci b/modules/scicos/macros/scicos_scicos/scicos_route.sci
+index 12ff674..c84312f 100644
+--- a/modules/scicos/macros/scicos_scicos/scicos_route.sci
++++ b/modules/scicos/macros/scicos_scicos/scicos_route.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/scicos_rubberbox.sci b/modules/scicos/macros/scicos_scicos/scicos_rubberbox.sci
+index 5f22afe..de4fe34 100644
+--- a/modules/scicos/macros/scicos_scicos/scicos_rubberbox.sci
++++ b/modules/scicos/macros/scicos_scicos/scicos_rubberbox.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/scicos_sim.sci b/modules/scicos/macros/scicos_scicos/scicos_sim.sci
+index 93d8df6..997a7c2 100644
+--- a/modules/scicos/macros/scicos_scicos/scicos_sim.sci
++++ b/modules/scicos/macros/scicos_scicos/scicos_sim.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/scicos_state.sci b/modules/scicos/macros/scicos_scicos/scicos_state.sci
+index f5359c6..617e054 100644
+--- a/modules/scicos/macros/scicos_scicos/scicos_state.sci
++++ b/modules/scicos/macros/scicos_scicos/scicos_state.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/scicos_txtedit.sci b/modules/scicos/macros/scicos_scicos/scicos_txtedit.sci
+index 5222e53..4c42237 100644
+--- a/modules/scicos/macros/scicos_scicos/scicos_txtedit.sci
++++ b/modules/scicos/macros/scicos_scicos/scicos_txtedit.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/script2var.sci b/modules/scicos/macros/scicos_scicos/script2var.sci
+index 52406f6..87eb889 100644
+--- a/modules/scicos/macros/scicos_scicos/script2var.sci
++++ b/modules/scicos/macros/scicos_scicos/script2var.sci
+@@ -16,7 +16,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/scs_full_path.sci b/modules/scicos/macros/scicos_scicos/scs_full_path.sci
+index cde385f..6a38b19 100644
+--- a/modules/scicos/macros/scicos_scicos/scs_full_path.sci
++++ b/modules/scicos/macros/scicos_scicos/scs_full_path.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/scs_show.sci b/modules/scicos/macros/scicos_scicos/scs_show.sci
+index d802739..03d89a2 100644
+--- a/modules/scicos/macros/scicos_scicos/scs_show.sci
++++ b/modules/scicos/macros/scicos_scicos/scs_show.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/scstxtedit.sci b/modules/scicos/macros/scicos_scicos/scstxtedit.sci
+index 25cc184..ed831b3 100644
+--- a/modules/scicos/macros/scicos_scicos/scstxtedit.sci
++++ b/modules/scicos/macros/scicos_scicos/scstxtedit.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/scstxtedit_tk.sci b/modules/scicos/macros/scicos_scicos/scstxtedit_tk.sci
+index de31dfb..22d0b2d 100644
+--- a/modules/scicos/macros/scicos_scicos/scstxtedit_tk.sci
++++ b/modules/scicos/macros/scicos_scicos/scstxtedit_tk.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/selecthilite.sci b/modules/scicos/macros/scicos_scicos/selecthilite.sci
+index 75fef27..7f5f045 100644
+--- a/modules/scicos/macros/scicos_scicos/selecthilite.sci
++++ b/modules/scicos/macros/scicos_scicos/selecthilite.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/set_background.sci b/modules/scicos/macros/scicos_scicos/set_background.sci
+index 77302bc..5a2aed2 100644
+--- a/modules/scicos/macros/scicos_scicos/set_background.sci
++++ b/modules/scicos/macros/scicos_scicos/set_background.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/set_cmap.sci b/modules/scicos/macros/scicos_scicos/set_cmap.sci
+index 4686080..f657c0f 100644
+--- a/modules/scicos/macros/scicos_scicos/set_cmap.sci
++++ b/modules/scicos/macros/scicos_scicos/set_cmap.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/set_io.sci b/modules/scicos/macros/scicos_scicos/set_io.sci
+index e97ee12..8eab0bf 100644
+--- a/modules/scicos/macros/scicos_scicos/set_io.sci
++++ b/modules/scicos/macros/scicos_scicos/set_io.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/set_viewport.sci b/modules/scicos/macros/scicos_scicos/set_viewport.sci
+index 59f4468..94023aa 100644
+--- a/modules/scicos/macros/scicos_scicos/set_viewport.sci
++++ b/modules/scicos/macros/scicos_scicos/set_viewport.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/setvalue.sci b/modules/scicos/macros/scicos_scicos/setvalue.sci
+index ee0d787..2ffac49 100644
+--- a/modules/scicos/macros/scicos_scicos/setvalue.sci
++++ b/modules/scicos/macros/scicos_scicos/setvalue.sci
+@@ -16,7 +16,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/shiftcors.sci b/modules/scicos/macros/scicos_scicos/shiftcors.sci
+index d9ea39f..22d46ac 100644
+--- a/modules/scicos/macros/scicos_scicos/shiftcors.sci
++++ b/modules/scicos/macros/scicos_scicos/shiftcors.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/show_info.sci b/modules/scicos/macros/scicos_scicos/show_info.sci
+index aeeca84..137db35 100644
+--- a/modules/scicos/macros/scicos_scicos/show_info.sci
++++ b/modules/scicos/macros/scicos_scicos/show_info.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/split_lasterror.sci b/modules/scicos/macros/scicos_scicos/split_lasterror.sci
+index 3d59cfe..509db49 100644
+--- a/modules/scicos/macros/scicos_scicos/split_lasterror.sci
++++ b/modules/scicos/macros/scicos_scicos/split_lasterror.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/splitfilepath_cos.sci b/modules/scicos/macros/scicos_scicos/splitfilepath_cos.sci
+index 88a341a..6f0f508 100644
+--- a/modules/scicos/macros/scicos_scicos/splitfilepath_cos.sci
++++ b/modules/scicos/macros/scicos_scicos/splitfilepath_cos.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/splitted_links.sci b/modules/scicos/macros/scicos_scicos/splitted_links.sci
+index ff9f933..c5edcea 100644
+--- a/modules/scicos/macros/scicos_scicos/splitted_links.sci
++++ b/modules/scicos/macros/scicos_scicos/splitted_links.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/standard_define.sci b/modules/scicos/macros/scicos_scicos/standard_define.sci
+index 0cfa60c..ed548a9 100644
+--- a/modules/scicos/macros/scicos_scicos/standard_define.sci
++++ b/modules/scicos/macros/scicos_scicos/standard_define.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/standard_define_old.sci b/modules/scicos/macros/scicos_scicos/standard_define_old.sci
+index 24105af..f85c044 100644
+--- a/modules/scicos/macros/scicos_scicos/standard_define_old.sci
++++ b/modules/scicos/macros/scicos_scicos/standard_define_old.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/standard_document.sci b/modules/scicos/macros/scicos_scicos/standard_document.sci
+index 2425999..e1b0635 100644
+--- a/modules/scicos/macros/scicos_scicos/standard_document.sci
++++ b/modules/scicos/macros/scicos_scicos/standard_document.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/standard_draw.sci b/modules/scicos/macros/scicos_scicos/standard_draw.sci
+index fd15130..0ea12d0 100644
+--- a/modules/scicos/macros/scicos_scicos/standard_draw.sci
++++ b/modules/scicos/macros/scicos_scicos/standard_draw.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/standard_draw_ports.sci b/modules/scicos/macros/scicos_scicos/standard_draw_ports.sci
+index d53a24f..a5fb910 100644
+--- a/modules/scicos/macros/scicos_scicos/standard_draw_ports.sci
++++ b/modules/scicos/macros/scicos_scicos/standard_draw_ports.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/standard_draw_ports_up.sci b/modules/scicos/macros/scicos_scicos/standard_draw_ports_up.sci
+index edf0fd6..27fa8ce 100644
+--- a/modules/scicos/macros/scicos_scicos/standard_draw_ports_up.sci
++++ b/modules/scicos/macros/scicos_scicos/standard_draw_ports_up.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/standard_etiquette.sci b/modules/scicos/macros/scicos_scicos/standard_etiquette.sci
+index d9e7a31..afedde1 100644
+--- a/modules/scicos/macros/scicos_scicos/standard_etiquette.sci
++++ b/modules/scicos/macros/scicos_scicos/standard_etiquette.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/standard_inputs.sci b/modules/scicos/macros/scicos_scicos/standard_inputs.sci
+index 74c0e87..2f0b6ec 100644
+--- a/modules/scicos/macros/scicos_scicos/standard_inputs.sci
++++ b/modules/scicos/macros/scicos_scicos/standard_inputs.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/standard_origin.sci b/modules/scicos/macros/scicos_scicos/standard_origin.sci
+index 5d3fc12..d2bc363 100644
+--- a/modules/scicos/macros/scicos_scicos/standard_origin.sci
++++ b/modules/scicos/macros/scicos_scicos/standard_origin.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/standard_outputs.sci b/modules/scicos/macros/scicos_scicos/standard_outputs.sci
+index ea0a68a..3e4eaab 100644
+--- a/modules/scicos/macros/scicos_scicos/standard_outputs.sci
++++ b/modules/scicos/macros/scicos_scicos/standard_outputs.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/stupid_dist2polyline.sci b/modules/scicos/macros/scicos_scicos/stupid_dist2polyline.sci
+index 80e926b..20883ab 100644
+--- a/modules/scicos/macros/scicos_scicos/stupid_dist2polyline.sci
++++ b/modules/scicos/macros/scicos_scicos/stupid_dist2polyline.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/stupid_getobj.sci b/modules/scicos/macros/scicos_scicos/stupid_getobj.sci
+index d528fc1..4f20a5c 100644
+--- a/modules/scicos/macros/scicos_scicos/stupid_getobj.sci
++++ b/modules/scicos/macros/scicos_scicos/stupid_getobj.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/systexport.sci b/modules/scicos/macros/scicos_scicos/systexport.sci
+index 4ff3b54..ee3d706 100644
+--- a/modules/scicos/macros/scicos_scicos/systexport.sci
++++ b/modules/scicos/macros/scicos_scicos/systexport.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/systshow.sci b/modules/scicos/macros/scicos_scicos/systshow.sci
+index afae0cd..b27ef40 100644
+--- a/modules/scicos/macros/scicos_scicos/systshow.sci
++++ b/modules/scicos/macros/scicos_scicos/systshow.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/tabule.sci b/modules/scicos/macros/scicos_scicos/tabule.sci
+index f375f71..a783a20 100644
+--- a/modules/scicos/macros/scicos_scicos/tabule.sci
++++ b/modules/scicos/macros/scicos_scicos/tabule.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/tk_getfile_scicos.sci b/modules/scicos/macros/scicos_scicos/tk_getfile_scicos.sci
+index 46a724e..4b31c7e 100644
+--- a/modules/scicos/macros/scicos_scicos/tk_getfile_scicos.sci
++++ b/modules/scicos/macros/scicos_scicos/tk_getfile_scicos.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/tk_mdialog.sci b/modules/scicos/macros/scicos_scicos/tk_mdialog.sci
+index 10aa2a1..3e738d7 100644
+--- a/modules/scicos/macros/scicos_scicos/tk_mdialog.sci
++++ b/modules/scicos/macros/scicos_scicos/tk_mdialog.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/tk_message_modeless.sci b/modules/scicos/macros/scicos_scicos/tk_message_modeless.sci
+index 2a2da1e..3ab71ee 100644
+--- a/modules/scicos/macros/scicos_scicos/tk_message_modeless.sci
++++ b/modules/scicos/macros/scicos_scicos/tk_message_modeless.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/tk_savefile_scicos.sci b/modules/scicos/macros/scicos_scicos/tk_savefile_scicos.sci
+index b324fb2..a817452 100644
+--- a/modules/scicos/macros/scicos_scicos/tk_savefile_scicos.sci
++++ b/modules/scicos/macros/scicos_scicos/tk_savefile_scicos.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/tk_scicos_choose.sci b/modules/scicos/macros/scicos_scicos/tk_scicos_choose.sci
+index 38d11eb..72151fc 100644
+--- a/modules/scicos/macros/scicos_scicos/tk_scicos_choose.sci
++++ b/modules/scicos/macros/scicos_scicos/tk_scicos_choose.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/translator.sci b/modules/scicos/macros/scicos_scicos/translator.sci
+index 5dad10e..775f4ce 100644
+--- a/modules/scicos/macros/scicos_scicos/translator.sci
++++ b/modules/scicos/macros/scicos_scicos/translator.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/tree_show.sci b/modules/scicos/macros/scicos_scicos/tree_show.sci
+index d959a4e..031d13a 100644
+--- a/modules/scicos/macros/scicos_scicos/tree_show.sci
++++ b/modules/scicos/macros/scicos_scicos/tree_show.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/unhilite_obj.sci b/modules/scicos/macros/scicos_scicos/unhilite_obj.sci
+index ebf8ce2..b824ebc 100644
+--- a/modules/scicos/macros/scicos_scicos/unhilite_obj.sci
++++ b/modules/scicos/macros/scicos_scicos/unhilite_obj.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/update_gr.sci b/modules/scicos/macros/scicos_scicos/update_gr.sci
+index 386a47e..261c3c9 100644
+--- a/modules/scicos/macros/scicos_scicos/update_gr.sci
++++ b/modules/scicos/macros/scicos_scicos/update_gr.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/update_redraw_obj.sci b/modules/scicos/macros/scicos_scicos/update_redraw_obj.sci
+index 1d6d0ae..aea1744 100644
+--- a/modules/scicos/macros/scicos_scicos/update_redraw_obj.sci
++++ b/modules/scicos/macros/scicos_scicos/update_redraw_obj.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/update_scicos_pal.sci b/modules/scicos/macros/scicos_scicos/update_scicos_pal.sci
+index b456bd4..8359468 100644
+--- a/modules/scicos/macros/scicos_scicos/update_scicos_pal.sci
++++ b/modules/scicos/macros/scicos_scicos/update_scicos_pal.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/update_scs_m.sci b/modules/scicos/macros/scicos_scicos/update_scs_m.sci
+index 9b51d9c..d91b94b 100644
+--- a/modules/scicos/macros/scicos_scicos/update_scs_m.sci
++++ b/modules/scicos/macros/scicos_scicos/update_scs_m.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/update_version.sci b/modules/scicos/macros/scicos_scicos/update_version.sci
+index 2b4bb90..d077d06 100644
+--- a/modules/scicos/macros/scicos_scicos/update_version.sci
++++ b/modules/scicos/macros/scicos_scicos/update_version.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/validvar.sci b/modules/scicos/macros/scicos_scicos/validvar.sci
+index ad13c4b..8a67ac5 100644
+--- a/modules/scicos/macros/scicos_scicos/validvar.sci
++++ b/modules/scicos/macros/scicos_scicos/validvar.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/value2modelica.sci b/modules/scicos/macros/scicos_scicos/value2modelica.sci
+index c0e7866..2e0d5ae 100644
+--- a/modules/scicos/macros/scicos_scicos/value2modelica.sci
++++ b/modules/scicos/macros/scicos_scicos/value2modelica.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/whereintree.sci b/modules/scicos/macros/scicos_scicos/whereintree.sci
+index fe5c97b..d971036 100644
+--- a/modules/scicos/macros/scicos_scicos/whereintree.sci
++++ b/modules/scicos/macros/scicos_scicos/whereintree.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/width2pixel.sci b/modules/scicos/macros/scicos_scicos/width2pixel.sci
+index 9ce6616..b4a181f 100644
+--- a/modules/scicos/macros/scicos_scicos/width2pixel.sci
++++ b/modules/scicos/macros/scicos_scicos/width2pixel.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/window_read_size.sci b/modules/scicos/macros/scicos_scicos/window_read_size.sci
+index 2b608be..0af7116 100644
+--- a/modules/scicos/macros/scicos_scicos/window_read_size.sci
++++ b/modules/scicos/macros/scicos_scicos/window_read_size.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/window_set_size.sci b/modules/scicos/macros/scicos_scicos/window_set_size.sci
+index 24f8682..a04f024 100644
+--- a/modules/scicos/macros/scicos_scicos/window_set_size.sci
++++ b/modules/scicos/macros/scicos_scicos/window_set_size.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/x_getvalue.sci b/modules/scicos/macros/scicos_scicos/x_getvalue.sci
+index fe42d8a..6eadb96 100644
+--- a/modules/scicos/macros/scicos_scicos/x_getvalue.sci
++++ b/modules/scicos/macros/scicos_scicos/x_getvalue.sci
+@@ -15,7 +15,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/xml2cos.sci b/modules/scicos/macros/scicos_scicos/xml2cos.sci
+index 78cc58b..e140535 100644
+--- a/modules/scicos/macros/scicos_scicos/xml2cos.sci
++++ b/modules/scicos/macros/scicos_scicos/xml2cos.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_scicos/xml2modelica.sci b/modules/scicos/macros/scicos_scicos/xml2modelica.sci
+index 3cc88a2..0883339 100644
+--- a/modules/scicos/macros/scicos_scicos/xml2modelica.sci
++++ b/modules/scicos/macros/scicos_scicos/xml2modelica.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_utils/create_gif.sci b/modules/scicos/macros/scicos_utils/create_gif.sci
+index 3c2a649..25f3776 100644
+--- a/modules/scicos/macros/scicos_utils/create_gif.sci
++++ b/modules/scicos/macros/scicos_utils/create_gif.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ./license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_utils/create_palette.sci b/modules/scicos/macros/scicos_utils/create_palette.sci
+index 968d4e9..4d7324c 100644
+--- a/modules/scicos/macros/scicos_utils/create_palette.sci
++++ b/modules/scicos/macros/scicos_utils/create_palette.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ./license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_utils/find_scicos_version.sci b/modules/scicos/macros/scicos_utils/find_scicos_version.sci
+index 0ab1bac..0744454 100644
+--- a/modules/scicos/macros/scicos_utils/find_scicos_version.sci
++++ b/modules/scicos/macros/scicos_utils/find_scicos_version.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ./license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_utils/get_scicos_version.sci b/modules/scicos/macros/scicos_utils/get_scicos_version.sci
+index c094877..abdf119 100644
+--- a/modules/scicos/macros/scicos_utils/get_scicos_version.sci
++++ b/modules/scicos/macros/scicos_utils/get_scicos_version.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ./license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_utils/returntoscilab.sci b/modules/scicos/macros/scicos_utils/returntoscilab.sci
+index efdd272..4115111 100644
+--- a/modules/scicos/macros/scicos_utils/returntoscilab.sci
++++ b/modules/scicos/macros/scicos_utils/returntoscilab.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ./license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_utils/scicos_getvalue.sci b/modules/scicos/macros/scicos_utils/scicos_getvalue.sci
+index 62ae85e..1225baf 100644
+--- a/modules/scicos/macros/scicos_utils/scicos_getvalue.sci
++++ b/modules/scicos/macros/scicos_utils/scicos_getvalue.sci
+@@ -15,7 +15,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ./license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_utils/scicos_workspace_init.sci b/modules/scicos/macros/scicos_utils/scicos_workspace_init.sci
+index c8f2823..e417312 100644
+--- a/modules/scicos/macros/scicos_utils/scicos_workspace_init.sci
++++ b/modules/scicos/macros/scicos_utils/scicos_workspace_init.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ./license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_utils/scilab2scicos.sci b/modules/scicos/macros/scicos_utils/scilab2scicos.sci
+index d3c1ce1..2215081 100644
+--- a/modules/scicos/macros/scicos_utils/scilab2scicos.sci
++++ b/modules/scicos/macros/scicos_utils/scilab2scicos.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ./license.txt
+ //
+diff --git a/modules/scicos/macros/scicos_utils/with_modelica_compiler.sci b/modules/scicos/macros/scicos_utils/with_modelica_compiler.sci
+index c35445c..2856338 100644
+--- a/modules/scicos/macros/scicos_utils/with_modelica_compiler.sci
++++ b/modules/scicos/macros/scicos_utils/with_modelica_compiler.sci
+@@ -15,7 +15,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ./license.txt
+ //
+diff --git a/modules/scicos/sci_gateway/c/gw_scicos.c b/modules/scicos/sci_gateway/c/gw_scicos.c
+index c4b1028..9494cb7 100644
+--- a/modules/scicos/sci_gateway/c/gw_scicos.c
++++ b/modules/scicos/sci_gateway/c/gw_scicos.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos/sci_gateway/c/sci_buildouttb.c b/modules/scicos/sci_gateway/c/sci_buildouttb.c
+index 0b853d7..86e3809 100644
+--- a/modules/scicos/sci_gateway/c/sci_buildouttb.c
++++ b/modules/scicos/sci_gateway/c/sci_buildouttb.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos/sci_gateway/c/sci_callblk.c b/modules/scicos/sci_gateway/c/sci_callblk.c
+index c2d2ee3..626be38 100644
+--- a/modules/scicos/sci_gateway/c/sci_callblk.c
++++ b/modules/scicos/sci_gateway/c/sci_callblk.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos/sci_gateway/c/sci_coserror.c b/modules/scicos/sci_gateway/c/sci_coserror.c
+index 3ed0e57..300e0fd 100644
+--- a/modules/scicos/sci_gateway/c/sci_coserror.c
++++ b/modules/scicos/sci_gateway/c/sci_coserror.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos/sci_gateway/c/sci_ctree2.c b/modules/scicos/sci_gateway/c/sci_ctree2.c
+index bf63209..cdd04e0 100644
+--- a/modules/scicos/sci_gateway/c/sci_ctree2.c
++++ b/modules/scicos/sci_gateway/c/sci_ctree2.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos/sci_gateway/c/sci_ctree3.c b/modules/scicos/sci_gateway/c/sci_ctree3.c
+index 7227bc0..b5b0971 100644
+--- a/modules/scicos/sci_gateway/c/sci_ctree3.c
++++ b/modules/scicos/sci_gateway/c/sci_ctree3.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos/sci_gateway/c/sci_ctree4.c b/modules/scicos/sci_gateway/c/sci_ctree4.c
+index b45f215..819fd57 100644
+--- a/modules/scicos/sci_gateway/c/sci_ctree4.c
++++ b/modules/scicos/sci_gateway/c/sci_ctree4.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos/sci_gateway/c/sci_curblock.c b/modules/scicos/sci_gateway/c/sci_curblock.c
+index 35578d5..e292456 100644
+--- a/modules/scicos/sci_gateway/c/sci_curblock.c
++++ b/modules/scicos/sci_gateway/c/sci_curblock.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos/sci_gateway/c/sci_curblockc.c b/modules/scicos/sci_gateway/c/sci_curblockc.c
+index d876c2c..6857470 100644
+--- a/modules/scicos/sci_gateway/c/sci_curblockc.c
++++ b/modules/scicos/sci_gateway/c/sci_curblockc.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos/sci_gateway/c/sci_data2sig.c b/modules/scicos/sci_gateway/c/sci_data2sig.c
+index 15fe2dc..238c6a3 100644
+--- a/modules/scicos/sci_gateway/c/sci_data2sig.c
++++ b/modules/scicos/sci_gateway/c/sci_data2sig.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos/sci_gateway/c/sci_diffobjs.c b/modules/scicos/sci_gateway/c/sci_diffobjs.c
+index e58d0e5..ce0e17e 100644
+--- a/modules/scicos/sci_gateway/c/sci_diffobjs.c
++++ b/modules/scicos/sci_gateway/c/sci_diffobjs.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos/sci_gateway/c/sci_duplicate.c b/modules/scicos/sci_gateway/c/sci_duplicate.c
+index 8cd8321..97e45af 100644
+--- a/modules/scicos/sci_gateway/c/sci_duplicate.c
++++ b/modules/scicos/sci_gateway/c/sci_duplicate.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos/sci_gateway/c/sci_end_scicosim.c b/modules/scicos/sci_gateway/c/sci_end_scicosim.c
+index bb8e1ec..44d9a81 100644
+--- a/modules/scicos/sci_gateway/c/sci_end_scicosim.c
++++ b/modules/scicos/sci_gateway/c/sci_end_scicosim.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos/sci_gateway/c/sci_ftree2.c b/modules/scicos/sci_gateway/c/sci_ftree2.c
+index 16f09b7..ea81a9a 100644
+--- a/modules/scicos/sci_gateway/c/sci_ftree2.c
++++ b/modules/scicos/sci_gateway/c/sci_ftree2.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos/sci_gateway/c/sci_ftree3.c b/modules/scicos/sci_gateway/c/sci_ftree3.c
+index 6682f52..bca29f5 100644
+--- a/modules/scicos/sci_gateway/c/sci_ftree3.c
++++ b/modules/scicos/sci_gateway/c/sci_ftree3.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos/sci_gateway/c/sci_ftree4.c b/modules/scicos/sci_gateway/c/sci_ftree4.c
+index 8fab1f9..6aab52b 100644
+--- a/modules/scicos/sci_gateway/c/sci_ftree4.c
++++ b/modules/scicos/sci_gateway/c/sci_ftree4.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos/sci_gateway/c/sci_getblocklabel.c b/modules/scicos/sci_gateway/c/sci_getblocklabel.c
+index 091a458..4ffc1a8 100644
+--- a/modules/scicos/sci_gateway/c/sci_getblocklabel.c
++++ b/modules/scicos/sci_gateway/c/sci_getblocklabel.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos/sci_gateway/c/sci_getscicosvars.c b/modules/scicos/sci_gateway/c/sci_getscicosvars.c
+index c72589a..90ea279 100644
+--- a/modules/scicos/sci_gateway/c/sci_getscicosvars.c
++++ b/modules/scicos/sci_gateway/c/sci_getscicosvars.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos/sci_gateway/c/sci_haltscicos.c b/modules/scicos/sci_gateway/c/sci_haltscicos.c
+index 992b5fa..c6b9eaa 100644
+--- a/modules/scicos/sci_gateway/c/sci_haltscicos.c
++++ b/modules/scicos/sci_gateway/c/sci_haltscicos.c
+@@ -14,7 +14,7 @@
+  *
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  *
+  * See the file ./license.txt
+  */
+diff --git a/modules/scicos/sci_gateway/c/sci_model2blk.c b/modules/scicos/sci_gateway/c/sci_model2blk.c
+index 99baf20..36153a5 100644
+--- a/modules/scicos/sci_gateway/c/sci_model2blk.c
++++ b/modules/scicos/sci_gateway/c/sci_model2blk.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos/sci_gateway/c/sci_permutobj.c b/modules/scicos/sci_gateway/c/sci_permutobj.c
+index 532960b..3dab22a 100644
+--- a/modules/scicos/sci_gateway/c/sci_permutobj.c
++++ b/modules/scicos/sci_gateway/c/sci_permutobj.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos/sci_gateway/c/sci_phase_simulation.c b/modules/scicos/sci_gateway/c/sci_phase_simulation.c
+index cb52dd4..fdb8488 100644
+--- a/modules/scicos/sci_gateway/c/sci_phase_simulation.c
++++ b/modules/scicos/sci_gateway/c/sci_phase_simulation.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos/sci_gateway/c/sci_pointer_xproperty.c b/modules/scicos/sci_gateway/c/sci_pointer_xproperty.c
+index f487715..f93ef91 100644
+--- a/modules/scicos/sci_gateway/c/sci_pointer_xproperty.c
++++ b/modules/scicos/sci_gateway/c/sci_pointer_xproperty.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos/sci_gateway/c/sci_scicos_debug.c b/modules/scicos/sci_gateway/c/sci_scicos_debug.c
+index 2728a43..485fbeb 100644
+--- a/modules/scicos/sci_gateway/c/sci_scicos_debug.c
++++ b/modules/scicos/sci_gateway/c/sci_scicos_debug.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos/sci_gateway/c/sci_scicos_debug_count.c b/modules/scicos/sci_gateway/c/sci_scicos_debug_count.c
+index faa6e4b..79e8025 100644
+--- a/modules/scicos/sci_gateway/c/sci_scicos_debug_count.c
++++ b/modules/scicos/sci_gateway/c/sci_scicos_debug_count.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos/sci_gateway/c/sci_scicos_time.c b/modules/scicos/sci_gateway/c/sci_scicos_time.c
+index d892fe6..fe1c9ea 100644
+--- a/modules/scicos/sci_gateway/c/sci_scicos_time.c
++++ b/modules/scicos/sci_gateway/c/sci_scicos_time.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos/sci_gateway/c/sci_scicosim.c b/modules/scicos/sci_gateway/c/sci_scicosim.c
+index 1187ae4..85ddf2b 100644
+--- a/modules/scicos/sci_gateway/c/sci_scicosim.c
++++ b/modules/scicos/sci_gateway/c/sci_scicosim.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos/sci_gateway/c/sci_sctree.c b/modules/scicos/sci_gateway/c/sci_sctree.c
+index 02731af..c0816c3 100644
+--- a/modules/scicos/sci_gateway/c/sci_sctree.c
++++ b/modules/scicos/sci_gateway/c/sci_sctree.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos/sci_gateway/c/sci_set_blockerror.c b/modules/scicos/sci_gateway/c/sci_set_blockerror.c
+index e8358f1..82861cf 100644
+--- a/modules/scicos/sci_gateway/c/sci_set_blockerror.c
++++ b/modules/scicos/sci_gateway/c/sci_set_blockerror.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos/sci_gateway/c/sci_set_xproperty.c b/modules/scicos/sci_gateway/c/sci_set_xproperty.c
+index d8c20ef..d8cbdde 100644
+--- a/modules/scicos/sci_gateway/c/sci_set_xproperty.c
++++ b/modules/scicos/sci_gateway/c/sci_set_xproperty.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos/sci_gateway/c/sci_sig2data.c b/modules/scicos/sci_gateway/c/sci_sig2data.c
+index eb09ea2..fc42d14 100644
+--- a/modules/scicos/sci_gateway/c/sci_sig2data.c
++++ b/modules/scicos/sci_gateway/c/sci_sig2data.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos/sci_gateway/c/sci_var2vec.c b/modules/scicos/sci_gateway/c/sci_var2vec.c
+index 6199373..6636828 100644
+--- a/modules/scicos/sci_gateway/c/sci_var2vec.c
++++ b/modules/scicos/sci_gateway/c/sci_var2vec.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos/sci_gateway/c/sci_vec2var.c b/modules/scicos/sci_gateway/c/sci_vec2var.c
+index a5f4826..6c0bbe7 100644
+--- a/modules/scicos/sci_gateway/c/sci_vec2var.c
++++ b/modules/scicos/sci_gateway/c/sci_vec2var.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos/sci_gateway/fortran/sci_ctree.f b/modules/scicos/sci_gateway/fortran/sci_ctree.f
+index 050726d..7679ff0 100644
+--- a/modules/scicos/sci_gateway/fortran/sci_ctree.f
++++ b/modules/scicos/sci_gateway/fortran/sci_ctree.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c     
+ c     You should have received a copy of the GNU General Public License
+ c     along with this program; if not, write to the Free Software
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ c     
+ c     See the file ./license.txt
+ c 
+diff --git a/modules/scicos/sci_gateway/fortran/sci_curblock.f b/modules/scicos/sci_gateway/fortran/sci_curblock.f
+index b882996..330ba0e 100644
+--- a/modules/scicos/sci_gateway/fortran/sci_curblock.f
++++ b/modules/scicos/sci_gateway/fortran/sci_curblock.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c     
+ c     You should have received a copy of the GNU General Public License
+ c     along with this program; if not, write to the Free Software
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ c     
+ c     See the file ./license.txt
+ c 
+diff --git a/modules/scicos/sci_gateway/fortran/sci_debug_count.f b/modules/scicos/sci_gateway/fortran/sci_debug_count.f
+index b2b2282..ed4cd31 100644
+--- a/modules/scicos/sci_gateway/fortran/sci_debug_count.f
++++ b/modules/scicos/sci_gateway/fortran/sci_debug_count.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c     
+ c     You should have received a copy of the GNU General Public License
+ c     along with this program; if not, write to the Free Software
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ c     
+ c     See the file ./license.txt
+ c 
+diff --git a/modules/scicos/sci_gateway/fortran/sci_getblocklabel.f b/modules/scicos/sci_gateway/fortran/sci_getblocklabel.f
+index a1f00f6..42d9bd4 100644
+--- a/modules/scicos/sci_gateway/fortran/sci_getblocklabel.f
++++ b/modules/scicos/sci_gateway/fortran/sci_getblocklabel.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c     
+ c     You should have received a copy of the GNU General Public License
+ c     along with this program; if not, write to the Free Software
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ c     
+ c     See the file ./license.txt
+ c 
+diff --git a/modules/scicos/sci_gateway/fortran/sci_scicos_debug.f b/modules/scicos/sci_gateway/fortran/sci_scicos_debug.f
+index 784673d..840323c 100644
+--- a/modules/scicos/sci_gateway/fortran/sci_scicos_debug.f
++++ b/modules/scicos/sci_gateway/fortran/sci_scicos_debug.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c     
+ c     You should have received a copy of the GNU General Public License
+ c     along with this program; if not, write to the Free Software
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ c     
+ c     See the file ./license.txt
+ c 
+diff --git a/modules/scicos/sci_gateway/fortran/sci_tree2.f b/modules/scicos/sci_gateway/fortran/sci_tree2.f
+index 67c868e..42afd5a 100644
+--- a/modules/scicos/sci_gateway/fortran/sci_tree2.f
++++ b/modules/scicos/sci_gateway/fortran/sci_tree2.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c     
+ c     You should have received a copy of the GNU General Public License
+ c     along with this program; if not, write to the Free Software
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ c     
+ c     See the file ./license.txt
+ c 
+diff --git a/modules/scicos/sci_gateway/fortran/sci_tree3.f b/modules/scicos/sci_gateway/fortran/sci_tree3.f
+index ff1f109..539d799 100644
+--- a/modules/scicos/sci_gateway/fortran/sci_tree3.f
++++ b/modules/scicos/sci_gateway/fortran/sci_tree3.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c     
+ c     You should have received a copy of the GNU General Public License
+ c     along with this program; if not, write to the Free Software
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ c     
+ c     See the file ./license.txt
+ c
+diff --git a/modules/scicos/sci_gateway/fortran/sci_tree4.f b/modules/scicos/sci_gateway/fortran/sci_tree4.f
+index 3015642..0d3f1fe 100644
+--- a/modules/scicos/sci_gateway/fortran/sci_tree4.f
++++ b/modules/scicos/sci_gateway/fortran/sci_tree4.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c     
+ c     You should have received a copy of the GNU General Public License
+ c     along with this program; if not, write to the Free Software
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ c     
+ c     See the file ./license.txt
+ c 
+diff --git a/modules/scicos/sci_gateway/fortran/sci_var2vec.f b/modules/scicos/sci_gateway/fortran/sci_var2vec.f
+index f1fd950..482f6b8 100644
+--- a/modules/scicos/sci_gateway/fortran/sci_var2vec.f
++++ b/modules/scicos/sci_gateway/fortran/sci_var2vec.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c     
+ c     You should have received a copy of the GNU General Public License
+ c     along with this program; if not, write to the Free Software
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ c     
+ c     See the file ./license.txt
+ c 
+diff --git a/modules/scicos/sci_gateway/fortran/sci_vec2var.f b/modules/scicos/sci_gateway/fortran/sci_vec2var.f
+index c3cb64e..f6e167c 100644
+--- a/modules/scicos/sci_gateway/fortran/sci_vec2var.f
++++ b/modules/scicos/sci_gateway/fortran/sci_vec2var.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c     
+ c     You should have received a copy of the GNU General Public License
+ c     along with this program; if not, write to the Free Software
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ c     
+ c     See the file ./license.txt
+ c 
+diff --git a/modules/scicos/src/c/MlistGetFieldNumber.c b/modules/scicos/src/c/MlistGetFieldNumber.c
+index 5e5420e..6c3a80a 100644
+--- a/modules/scicos/src/c/MlistGetFieldNumber.c
++++ b/modules/scicos/src/c/MlistGetFieldNumber.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos/src/c/MlistGetFieldNumber.h b/modules/scicos/src/c/MlistGetFieldNumber.h
+index ea26390..84d20ab 100644
+--- a/modules/scicos/src/c/MlistGetFieldNumber.h
++++ b/modules/scicos/src/c/MlistGetFieldNumber.h
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos/src/c/copyvarfromlistentry.c b/modules/scicos/src/c/copyvarfromlistentry.c
+index e637bab..39c5865 100644
+--- a/modules/scicos/src/c/copyvarfromlistentry.c
++++ b/modules/scicos/src/c/copyvarfromlistentry.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos/src/c/copyvarfromlistentry.h b/modules/scicos/src/c/copyvarfromlistentry.h
+index de0c8c1..f64ca4c 100644
+--- a/modules/scicos/src/c/copyvarfromlistentry.h
++++ b/modules/scicos/src/c/copyvarfromlistentry.h
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos/src/c/createblklist.c b/modules/scicos/src/c/createblklist.c
+index caa8edd..a215420 100644
+--- a/modules/scicos/src/c/createblklist.c
++++ b/modules/scicos/src/c/createblklist.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos/src/c/createblklist.h b/modules/scicos/src/c/createblklist.h
+index f46683c..6fa84f3 100644
+--- a/modules/scicos/src/c/createblklist.h
++++ b/modules/scicos/src/c/createblklist.h
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos/src/c/extractblklist.c b/modules/scicos/src/c/extractblklist.c
+index 56b7c0b..9707a8c 100644
+--- a/modules/scicos/src/c/extractblklist.c
++++ b/modules/scicos/src/c/extractblklist.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos/src/c/extractblklist.h b/modules/scicos/src/c/extractblklist.h
+index 5df8c2a..ad2e5ee 100644
+--- a/modules/scicos/src/c/extractblklist.h
++++ b/modules/scicos/src/c/extractblklist.h
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos/src/c/il_sim.c b/modules/scicos/src/c/il_sim.c
+index b4d8305..b6e2273 100644
+--- a/modules/scicos/src/c/il_sim.c
++++ b/modules/scicos/src/c/il_sim.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos/src/c/il_sim.h b/modules/scicos/src/c/il_sim.h
+index f107118..6c0e861 100644
+--- a/modules/scicos/src/c/il_sim.h
++++ b/modules/scicos/src/c/il_sim.h
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos/src/c/il_state.c b/modules/scicos/src/c/il_state.c
+index a582924..cb5e1ce 100644
+--- a/modules/scicos/src/c/il_state.c
++++ b/modules/scicos/src/c/il_state.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos/src/c/il_state.h b/modules/scicos/src/c/il_state.h
+index 8e6487c..59dd351 100644
+--- a/modules/scicos/src/c/il_state.h
++++ b/modules/scicos/src/c/il_state.h
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos/src/c/import.c b/modules/scicos/src/c/import.c
+index f9423c8..015159e 100644
+--- a/modules/scicos/src/c/import.c
++++ b/modules/scicos/src/c/import.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos/src/c/sciblk2.c b/modules/scicos/src/c/sciblk2.c
+index 9db7320..76c0d06 100644
+--- a/modules/scicos/src/c/sciblk2.c
++++ b/modules/scicos/src/c/sciblk2.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos/src/c/sciblk2.h b/modules/scicos/src/c/sciblk2.h
+index d2ea4e0..c740802 100644
+--- a/modules/scicos/src/c/sciblk2.h
++++ b/modules/scicos/src/c/sciblk2.h
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos/src/c/sciblk4.c b/modules/scicos/src/c/sciblk4.c
+index 6877830..67fa8d7 100644
+--- a/modules/scicos/src/c/sciblk4.c
++++ b/modules/scicos/src/c/sciblk4.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos/src/c/sciblk4.h b/modules/scicos/src/c/sciblk4.h
+index 8102829..5b55f6b 100644
+--- a/modules/scicos/src/c/sciblk4.h
++++ b/modules/scicos/src/c/sciblk4.h
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos/src/c/scicos.c b/modules/scicos/src/c/scicos.c
+index 4783fc2..7b43c0b 100644
+--- a/modules/scicos/src/c/scicos.c
++++ b/modules/scicos/src/c/scicos.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos/src/c/scicos_free.c b/modules/scicos/src/c/scicos_free.c
+index ed08461..d962433 100644
+--- a/modules/scicos/src/c/scicos_free.c
++++ b/modules/scicos/src/c/scicos_free.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos/src/c/scicos_malloc.c b/modules/scicos/src/c/scicos_malloc.c
+index 6eb33e8..782d356 100644
+--- a/modules/scicos/src/c/scicos_malloc.c
++++ b/modules/scicos/src/c/scicos_malloc.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos/src/c/scicosclip.c b/modules/scicos/src/c/scicosclip.c
+index 793a8cd..ceb24c3 100644
+--- a/modules/scicos/src/c/scicosclip.c
++++ b/modules/scicos/src/c/scicosclip.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos/src/c/slider.c b/modules/scicos/src/c/slider.c
+index 60c517b..f4f491d 100644
+--- a/modules/scicos/src/c/slider.c
++++ b/modules/scicos/src/c/slider.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos/src/c/tree.c b/modules/scicos/src/c/tree.c
+index 8448e9c..9a7bc8d 100644
+--- a/modules/scicos/src/c/tree.c
++++ b/modules/scicos/src/c/tree.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos/src/c/tree.h b/modules/scicos/src/c/tree.h
+index f5c39b9..242733d 100644
+--- a/modules/scicos/src/c/tree.h
++++ b/modules/scicos/src/c/tree.h
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos/src/c/var2sci.c b/modules/scicos/src/c/var2sci.c
+index e14cf2d..85188e7 100644
+--- a/modules/scicos/src/c/var2sci.c
++++ b/modules/scicos/src/c/var2sci.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos/src/c/var2sci.h b/modules/scicos/src/c/var2sci.h
+index 407e61b..b3acca0 100644
+--- a/modules/scicos/src/c/var2sci.h
++++ b/modules/scicos/src/c/var2sci.h
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos/src/fortran/coselm.f b/modules/scicos/src/fortran/coselm.f
+index 9e049c9..767f5c6 100644
+--- a/modules/scicos/src/fortran/coselm.f
++++ b/modules/scicos/src/fortran/coselm.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c     
+ c     You should have received a copy of the GNU General Public License
+ c     along with this program; if not, write to the Free Software
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ c     
+ c     See the file ./license.txt
+ c     
+diff --git a/modules/scicos/src/fortran/ftree2.f b/modules/scicos/src/fortran/ftree2.f
+index 271524e..80edf5f 100644
+--- a/modules/scicos/src/fortran/ftree2.f
++++ b/modules/scicos/src/fortran/ftree2.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c     
+ c     You should have received a copy of the GNU General Public License
+ c     along with this program; if not, write to the Free Software
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ c     
+ c     See the file ./license.txt
+ c     
+diff --git a/modules/scicos/src/fortran/ftree3.f b/modules/scicos/src/fortran/ftree3.f
+index 5fc8008..89203ae 100644
+--- a/modules/scicos/src/fortran/ftree3.f
++++ b/modules/scicos/src/fortran/ftree3.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c     
+ c     You should have received a copy of the GNU General Public License
+ c     along with this program; if not, write to the Free Software
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ c     
+ c     See the file ./license.txt
+ c     
+diff --git a/modules/scicos/src/fortran/ftree4.f b/modules/scicos/src/fortran/ftree4.f
+index 973cb8d..f549af5 100644
+--- a/modules/scicos/src/fortran/ftree4.f
++++ b/modules/scicos/src/fortran/ftree4.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c     
+ c     You should have received a copy of the GNU General Public License
+ c     along with this program; if not, write to the Free Software
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ c     
+ c     See the file ./license.txt
+ c     
+diff --git a/modules/scicos/src/fortran/list2vars.f b/modules/scicos/src/fortran/list2vars.f
+index a722e20..8cc5606 100644
+--- a/modules/scicos/src/fortran/list2vars.f
++++ b/modules/scicos/src/fortran/list2vars.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c     
+ c     You should have received a copy of the GNU General Public License
+ c     along with this program; if not, write to the Free Software
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ c     
+ c     See the file ./license.txt
+ c     
+diff --git a/modules/scicos/src/fortran/scierr.f b/modules/scicos/src/fortran/scierr.f
+index 43927a8..b76c8b1 100644
+--- a/modules/scicos/src/fortran/scierr.f
++++ b/modules/scicos/src/fortran/scierr.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c 
+ c     You should have received a copy of the GNU General Public License 
+ c     along with this program; if not, write to the Free Software 
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 
+ c 
+ c     See the file ./license.txt 
+ c 
+diff --git a/modules/scicos/src/fortran/scifunc.f b/modules/scicos/src/fortran/scifunc.f
+index 7995a0c..64149d3 100644
+--- a/modules/scicos/src/fortran/scifunc.f
++++ b/modules/scicos/src/fortran/scifunc.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c 
+ c     You should have received a copy of the GNU General Public License 
+ c     along with this program; if not, write to the Free Software 
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 
+ c 
+ c     See the file ./license.txt 
+ c 
+diff --git a/modules/scicos/src/fortran/scitod.f b/modules/scicos/src/fortran/scitod.f
+index 23b8ca4..e7c592c 100644
+--- a/modules/scicos/src/fortran/scitod.f
++++ b/modules/scicos/src/fortran/scitod.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c 
+ c     You should have received a copy of the GNU General Public License 
+ c     along with this program; if not, write to the Free Software 
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 
+ c 
+ c     See the file ./license.txt 
+ c 
+diff --git a/modules/scicos/src/fortran/scitoi.f b/modules/scicos/src/fortran/scitoi.f
+index 2c95189..e44c8ce 100644
+--- a/modules/scicos/src/fortran/scitoi.f
++++ b/modules/scicos/src/fortran/scitoi.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c 
+ c     You should have received a copy of the GNU General Public License 
+ c     along with this program; if not, write to the Free Software 
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 
+ c 
+ c     See the file ./license.txt 
+ c 
+diff --git a/modules/scicos/src/fortran/scitovv.f b/modules/scicos/src/fortran/scitovv.f
+index f140d6c..791f15a 100644
+--- a/modules/scicos/src/fortran/scitovv.f
++++ b/modules/scicos/src/fortran/scitovv.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c 
+ c     You should have received a copy of the GNU General Public License 
+ c     along with this program; if not, write to the Free Software 
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 
+ c 
+ c     See the file ./license.txt 
+ c 
+diff --git a/modules/scicos/src/fortran/sctree.f b/modules/scicos/src/fortran/sctree.f
+index eefd572..9c8d68f 100644
+--- a/modules/scicos/src/fortran/sctree.f
++++ b/modules/scicos/src/fortran/sctree.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c 
+ c     You should have received a copy of the GNU General Public License 
+ c     along with this program; if not, write to the Free Software 
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 
+ c 
+ c     See the file ./license.txt 
+ c 
+diff --git a/modules/scicos/src/fortran/skipvars.f b/modules/scicos/src/fortran/skipvars.f
+index 7c9cbf7..4c6303e 100644
+--- a/modules/scicos/src/fortran/skipvars.f
++++ b/modules/scicos/src/fortran/skipvars.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c 
+ c     You should have received a copy of the GNU General Public License 
+ c     along with this program; if not, write to the Free Software 
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 
+ c 
+ c     See the file ./license.txt 
+ c 
+diff --git a/modules/scicos/src/fortran/vvtosci.f b/modules/scicos/src/fortran/vvtosci.f
+index a1daefa..a839f39 100644
+--- a/modules/scicos/src/fortran/vvtosci.f
++++ b/modules/scicos/src/fortran/vvtosci.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c 
+ c     You should have received a copy of the GNU General Public License 
+ c     along with this program; if not, write to the Free Software 
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 
+ c 
+ c     See the file ./license.txt 
+ c 
+diff --git a/modules/scicos/src/modelica_compiler/makefile.mak b/modules/scicos/src/modelica_compiler/makefile.mak
+index a792f14..a89b239 100644
+--- a/modules/scicos/src/modelica_compiler/makefile.mak
++++ b/modules/scicos/src/modelica_compiler/makefile.mak
+@@ -15,7 +15,7 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ #
+ # See the file ./license.txt
+ 
+diff --git a/modules/scicos/src/translator/makefile.mak b/modules/scicos/src/translator/makefile.mak
+index c3d0821..73cc773 100644
+--- a/modules/scicos/src/translator/makefile.mak
++++ b/modules/scicos/src/translator/makefile.mak
+@@ -14,7 +14,7 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ #
+ # See the file ./license.txt
+ 
+diff --git a/modules/scicos/src/xml2modelica/makefile.mak b/modules/scicos/src/xml2modelica/makefile.mak
+index 64b41e7..4807652 100644
+--- a/modules/scicos/src/xml2modelica/makefile.mak
++++ b/modules/scicos/src/xml2modelica/makefile.mak
+@@ -15,7 +15,7 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ #
+ # See the file ./license.txt
+ 
+diff --git a/modules/scicos/tests/unit_tests/scicos.dia.ref b/modules/scicos/tests/unit_tests/scicos.dia.ref
+index aefa4c2..51dbdce 100644
+--- a/modules/scicos/tests/unit_tests/scicos.dia.ref
++++ b/modules/scicos/tests/unit_tests/scicos.dia.ref
+@@ -73,7 +73,7 @@ if check_set_ports() then bugmes();quit;end
+  
+ // along with this program; if not, write to the Free Software
+  
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  
+ //
+  
+diff --git a/modules/scicos_blocks/includes/blocks.h.vc b/modules/scicos_blocks/includes/blocks.h.vc
+index a6e7a1b..f71b1f2 100644
+--- a/modules/scicos_blocks/includes/blocks.h.vc
++++ b/modules/scicos_blocks/includes/blocks.h.vc
+@@ -16,7 +16,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/includes/scicos_block.h b/modules/scicos_blocks/includes/scicos_block.h
+index 56b66ab..45400e7 100644
+--- a/modules/scicos_blocks/includes/scicos_block.h
++++ b/modules/scicos_blocks/includes/scicos_block.h
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/includes/scicos_block4.h b/modules/scicos_blocks/includes/scicos_block4.h
+index 5643761..eae9c33 100755
+--- a/modules/scicos_blocks/includes/scicos_block4.h
++++ b/modules/scicos_blocks/includes/scicos_block4.h
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/includes/scoBase.h b/modules/scicos_blocks/includes/scoBase.h
+index 39ca11b..018cdc8 100755
+--- a/modules/scicos_blocks/includes/scoBase.h
++++ b/modules/scicos_blocks/includes/scoBase.h
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/includes/scoGetProperty.h b/modules/scicos_blocks/includes/scoGetProperty.h
+index 3e6c74b..729f265 100755
+--- a/modules/scicos_blocks/includes/scoGetProperty.h
++++ b/modules/scicos_blocks/includes/scoGetProperty.h
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/includes/scoMemoryScope.h b/modules/scicos_blocks/includes/scoMemoryScope.h
+index 4db45df..6755026 100644
+--- a/modules/scicos_blocks/includes/scoMemoryScope.h
++++ b/modules/scicos_blocks/includes/scoMemoryScope.h
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/includes/scoMisc.h b/modules/scicos_blocks/includes/scoMisc.h
+index 7df547a..e983ffd 100755
+--- a/modules/scicos_blocks/includes/scoMisc.h
++++ b/modules/scicos_blocks/includes/scoMisc.h
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/includes/scoSetProperty.h b/modules/scicos_blocks/includes/scoSetProperty.h
+index d04174e..aae7daa 100755
+--- a/modules/scicos_blocks/includes/scoSetProperty.h
++++ b/modules/scicos_blocks/includes/scoSetProperty.h
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/includes/scoWindowScope.h b/modules/scicos_blocks/includes/scoWindowScope.h
+index b6ae36c..08c1845 100644
+--- a/modules/scicos_blocks/includes/scoWindowScope.h
++++ b/modules/scicos_blocks/includes/scoWindowScope.h
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/macros/Branching/CLKFROM.sci b/modules/scicos_blocks/macros/Branching/CLKFROM.sci
+index 137cef3..76a2997 100644
+--- a/modules/scicos_blocks/macros/Branching/CLKFROM.sci
++++ b/modules/scicos_blocks/macros/Branching/CLKFROM.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Branching/CLKGOTO.sci b/modules/scicos_blocks/macros/Branching/CLKGOTO.sci
+index cf8bf9a..4a81be1 100644
+--- a/modules/scicos_blocks/macros/Branching/CLKGOTO.sci
++++ b/modules/scicos_blocks/macros/Branching/CLKGOTO.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Branching/CLKGotoTagVisibility.sci b/modules/scicos_blocks/macros/Branching/CLKGotoTagVisibility.sci
+index abd7190..8487730 100644
+--- a/modules/scicos_blocks/macros/Branching/CLKGotoTagVisibility.sci
++++ b/modules/scicos_blocks/macros/Branching/CLKGotoTagVisibility.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Branching/DEMUX.sci b/modules/scicos_blocks/macros/Branching/DEMUX.sci
+index 8376565..c4b3743 100644
+--- a/modules/scicos_blocks/macros/Branching/DEMUX.sci
++++ b/modules/scicos_blocks/macros/Branching/DEMUX.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Branching/DEMUX_f.sci b/modules/scicos_blocks/macros/Branching/DEMUX_f.sci
+index 84bebbe..918d58d 100644
+--- a/modules/scicos_blocks/macros/Branching/DEMUX_f.sci
++++ b/modules/scicos_blocks/macros/Branching/DEMUX_f.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Branching/ESELECT_f.sci b/modules/scicos_blocks/macros/Branching/ESELECT_f.sci
+index fc450e0..f723bfa 100644
+--- a/modules/scicos_blocks/macros/Branching/ESELECT_f.sci
++++ b/modules/scicos_blocks/macros/Branching/ESELECT_f.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Branching/EXTRACTOR.sci b/modules/scicos_blocks/macros/Branching/EXTRACTOR.sci
+index 7668ab0..62e411b 100644
+--- a/modules/scicos_blocks/macros/Branching/EXTRACTOR.sci
++++ b/modules/scicos_blocks/macros/Branching/EXTRACTOR.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Branching/FROM.sci b/modules/scicos_blocks/macros/Branching/FROM.sci
+index 5effbfa..d05a537 100644
+--- a/modules/scicos_blocks/macros/Branching/FROM.sci
++++ b/modules/scicos_blocks/macros/Branching/FROM.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Branching/FROMMO.sci b/modules/scicos_blocks/macros/Branching/FROMMO.sci
+index 7a688e2..c5ffa1b 100644
+--- a/modules/scicos_blocks/macros/Branching/FROMMO.sci
++++ b/modules/scicos_blocks/macros/Branching/FROMMO.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Branching/GOTO.sci b/modules/scicos_blocks/macros/Branching/GOTO.sci
+index d70df76..8bdd951 100644
+--- a/modules/scicos_blocks/macros/Branching/GOTO.sci
++++ b/modules/scicos_blocks/macros/Branching/GOTO.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Branching/GOTOMO.sci b/modules/scicos_blocks/macros/Branching/GOTOMO.sci
+index b3d09b1..053807b 100644
+--- a/modules/scicos_blocks/macros/Branching/GOTOMO.sci
++++ b/modules/scicos_blocks/macros/Branching/GOTOMO.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Branching/GotoTagVisibility.sci b/modules/scicos_blocks/macros/Branching/GotoTagVisibility.sci
+index 1447bdb..adbe80a 100644
+--- a/modules/scicos_blocks/macros/Branching/GotoTagVisibility.sci
++++ b/modules/scicos_blocks/macros/Branching/GotoTagVisibility.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Branching/GotoTagVisibilityMO.sci b/modules/scicos_blocks/macros/Branching/GotoTagVisibilityMO.sci
+index 797d9f0..23e8df0 100644
+--- a/modules/scicos_blocks/macros/Branching/GotoTagVisibilityMO.sci
++++ b/modules/scicos_blocks/macros/Branching/GotoTagVisibilityMO.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Branching/ISELECT_f.sci b/modules/scicos_blocks/macros/Branching/ISELECT_f.sci
+index 7bea52d..2d2a821 100644
+--- a/modules/scicos_blocks/macros/Branching/ISELECT_f.sci
++++ b/modules/scicos_blocks/macros/Branching/ISELECT_f.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Branching/ISELECT_m.sci b/modules/scicos_blocks/macros/Branching/ISELECT_m.sci
+index f6edd14..7949d52 100644
+--- a/modules/scicos_blocks/macros/Branching/ISELECT_m.sci
++++ b/modules/scicos_blocks/macros/Branching/ISELECT_m.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Branching/MUX.sci b/modules/scicos_blocks/macros/Branching/MUX.sci
+index 73dc286..8c9cc6d 100644
+--- a/modules/scicos_blocks/macros/Branching/MUX.sci
++++ b/modules/scicos_blocks/macros/Branching/MUX.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Branching/MUX_f.sci b/modules/scicos_blocks/macros/Branching/MUX_f.sci
+index fb2a1e5..7eea452 100644
+--- a/modules/scicos_blocks/macros/Branching/MUX_f.sci
++++ b/modules/scicos_blocks/macros/Branching/MUX_f.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Branching/M_SWITCH.sci b/modules/scicos_blocks/macros/Branching/M_SWITCH.sci
+index 3f44142..df4a9a7 100644
+--- a/modules/scicos_blocks/macros/Branching/M_SWITCH.sci
++++ b/modules/scicos_blocks/macros/Branching/M_SWITCH.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Branching/NRMSOM_f.sci b/modules/scicos_blocks/macros/Branching/NRMSOM_f.sci
+index 1eae713..82416c0 100644
+--- a/modules/scicos_blocks/macros/Branching/NRMSOM_f.sci
++++ b/modules/scicos_blocks/macros/Branching/NRMSOM_f.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Branching/RELAY_f.sci b/modules/scicos_blocks/macros/Branching/RELAY_f.sci
+index 7c51d04..4c0709e 100644
+--- a/modules/scicos_blocks/macros/Branching/RELAY_f.sci
++++ b/modules/scicos_blocks/macros/Branching/RELAY_f.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Branching/SCALAR2VECTOR.sci b/modules/scicos_blocks/macros/Branching/SCALAR2VECTOR.sci
+index 54fdb74..22c0ec5 100644
+--- a/modules/scicos_blocks/macros/Branching/SCALAR2VECTOR.sci
++++ b/modules/scicos_blocks/macros/Branching/SCALAR2VECTOR.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Branching/SELECT_f.sci b/modules/scicos_blocks/macros/Branching/SELECT_f.sci
+index d3216a2..30787bf 100644
+--- a/modules/scicos_blocks/macros/Branching/SELECT_f.sci
++++ b/modules/scicos_blocks/macros/Branching/SELECT_f.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Branching/SELECT_m.sci b/modules/scicos_blocks/macros/Branching/SELECT_m.sci
+index e9a7324..cc959be 100644
+--- a/modules/scicos_blocks/macros/Branching/SELECT_m.sci
++++ b/modules/scicos_blocks/macros/Branching/SELECT_m.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Branching/SWITCH2.sci b/modules/scicos_blocks/macros/Branching/SWITCH2.sci
+index 50dfe8a..d7da8af 100644
+--- a/modules/scicos_blocks/macros/Branching/SWITCH2.sci
++++ b/modules/scicos_blocks/macros/Branching/SWITCH2.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Branching/SWITCH2_m.sci b/modules/scicos_blocks/macros/Branching/SWITCH2_m.sci
+index 5437718..ef08955 100644
+--- a/modules/scicos_blocks/macros/Branching/SWITCH2_m.sci
++++ b/modules/scicos_blocks/macros/Branching/SWITCH2_m.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Branching/SWITCH_f.sci b/modules/scicos_blocks/macros/Branching/SWITCH_f.sci
+index 47ae660..09918f7 100644
+--- a/modules/scicos_blocks/macros/Branching/SWITCH_f.sci
++++ b/modules/scicos_blocks/macros/Branching/SWITCH_f.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Branching/buildmacros.sce b/modules/scicos_blocks/macros/Branching/buildmacros.sce
+index 7415db5..3cd84c9 100644
+--- a/modules/scicos_blocks/macros/Branching/buildmacros.sce
++++ b/modules/scicos_blocks/macros/Branching/buildmacros.sce
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Electrical/CCS.sci b/modules/scicos_blocks/macros/Electrical/CCS.sci
+index d1e871f..b7adde5 100644
+--- a/modules/scicos_blocks/macros/Electrical/CCS.sci
++++ b/modules/scicos_blocks/macros/Electrical/CCS.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Electrical/CVS.sci b/modules/scicos_blocks/macros/Electrical/CVS.sci
+index 0a1a416..344821c 100644
+--- a/modules/scicos_blocks/macros/Electrical/CVS.sci
++++ b/modules/scicos_blocks/macros/Electrical/CVS.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Electrical/Capacitor.sci b/modules/scicos_blocks/macros/Electrical/Capacitor.sci
+index 4865cc2..211106e 100644
+--- a/modules/scicos_blocks/macros/Electrical/Capacitor.sci
++++ b/modules/scicos_blocks/macros/Electrical/Capacitor.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Electrical/ConstantVoltage.sci b/modules/scicos_blocks/macros/Electrical/ConstantVoltage.sci
+index a213fce..f606b66 100644
+--- a/modules/scicos_blocks/macros/Electrical/ConstantVoltage.sci
++++ b/modules/scicos_blocks/macros/Electrical/ConstantVoltage.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Electrical/CurrentSensor.sci b/modules/scicos_blocks/macros/Electrical/CurrentSensor.sci
+index f6a88f2..34b8e2c 100644
+--- a/modules/scicos_blocks/macros/Electrical/CurrentSensor.sci
++++ b/modules/scicos_blocks/macros/Electrical/CurrentSensor.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Electrical/Diode.sci b/modules/scicos_blocks/macros/Electrical/Diode.sci
+index b6c52e2..2724869 100644
+--- a/modules/scicos_blocks/macros/Electrical/Diode.sci
++++ b/modules/scicos_blocks/macros/Electrical/Diode.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Electrical/Ground.sci b/modules/scicos_blocks/macros/Electrical/Ground.sci
+index d1ef5af..3e0daca 100644
+--- a/modules/scicos_blocks/macros/Electrical/Ground.sci
++++ b/modules/scicos_blocks/macros/Electrical/Ground.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Electrical/Gyrator.sci b/modules/scicos_blocks/macros/Electrical/Gyrator.sci
+index 153edd3..710a074 100644
+--- a/modules/scicos_blocks/macros/Electrical/Gyrator.sci
++++ b/modules/scicos_blocks/macros/Electrical/Gyrator.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Electrical/IdealTransformer.sci b/modules/scicos_blocks/macros/Electrical/IdealTransformer.sci
+index 8c3ab7b..4f6af80 100644
+--- a/modules/scicos_blocks/macros/Electrical/IdealTransformer.sci
++++ b/modules/scicos_blocks/macros/Electrical/IdealTransformer.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Electrical/Inductor.sci b/modules/scicos_blocks/macros/Electrical/Inductor.sci
+index f088c4e..9aade79 100644
+--- a/modules/scicos_blocks/macros/Electrical/Inductor.sci
++++ b/modules/scicos_blocks/macros/Electrical/Inductor.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Electrical/MOTOR.sci b/modules/scicos_blocks/macros/Electrical/MOTOR.sci
+index 5186dfe..855a0bc 100644
+--- a/modules/scicos_blocks/macros/Electrical/MOTOR.sci
++++ b/modules/scicos_blocks/macros/Electrical/MOTOR.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Electrical/NMOS.sci b/modules/scicos_blocks/macros/Electrical/NMOS.sci
+index 2a9cf93..2616d11 100644
+--- a/modules/scicos_blocks/macros/Electrical/NMOS.sci
++++ b/modules/scicos_blocks/macros/Electrical/NMOS.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Electrical/NPN.sci b/modules/scicos_blocks/macros/Electrical/NPN.sci
+index aedfd74..5fc4790 100644
+--- a/modules/scicos_blocks/macros/Electrical/NPN.sci
++++ b/modules/scicos_blocks/macros/Electrical/NPN.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Electrical/OpAmp.sci b/modules/scicos_blocks/macros/Electrical/OpAmp.sci
+index 7d05ddc..9701bbb 100644
+--- a/modules/scicos_blocks/macros/Electrical/OpAmp.sci
++++ b/modules/scicos_blocks/macros/Electrical/OpAmp.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Electrical/PMOS.sci b/modules/scicos_blocks/macros/Electrical/PMOS.sci
+index c988973..21f1c77 100644
+--- a/modules/scicos_blocks/macros/Electrical/PMOS.sci
++++ b/modules/scicos_blocks/macros/Electrical/PMOS.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Electrical/PNP.sci b/modules/scicos_blocks/macros/Electrical/PNP.sci
+index 27c2644..b295f66 100644
+--- a/modules/scicos_blocks/macros/Electrical/PNP.sci
++++ b/modules/scicos_blocks/macros/Electrical/PNP.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Electrical/PotentialSensor.sci b/modules/scicos_blocks/macros/Electrical/PotentialSensor.sci
+index 70fc7b3..9b23e69 100644
+--- a/modules/scicos_blocks/macros/Electrical/PotentialSensor.sci
++++ b/modules/scicos_blocks/macros/Electrical/PotentialSensor.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Electrical/Resistor.sci b/modules/scicos_blocks/macros/Electrical/Resistor.sci
+index 5fd38f4..0c04d57 100644
+--- a/modules/scicos_blocks/macros/Electrical/Resistor.sci
++++ b/modules/scicos_blocks/macros/Electrical/Resistor.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Electrical/SineVoltage.sci b/modules/scicos_blocks/macros/Electrical/SineVoltage.sci
+index e4dec7c..10baced 100644
+--- a/modules/scicos_blocks/macros/Electrical/SineVoltage.sci
++++ b/modules/scicos_blocks/macros/Electrical/SineVoltage.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Electrical/Switch.sci b/modules/scicos_blocks/macros/Electrical/Switch.sci
+index 4441ea9..a189d11 100644
+--- a/modules/scicos_blocks/macros/Electrical/Switch.sci
++++ b/modules/scicos_blocks/macros/Electrical/Switch.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Electrical/VVsourceAC.sci b/modules/scicos_blocks/macros/Electrical/VVsourceAC.sci
+index dd5a4c0..30bf6ae 100644
+--- a/modules/scicos_blocks/macros/Electrical/VVsourceAC.sci
++++ b/modules/scicos_blocks/macros/Electrical/VVsourceAC.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Electrical/VariableResistor.sci b/modules/scicos_blocks/macros/Electrical/VariableResistor.sci
+index b6aaa14..7836bd7 100644
+--- a/modules/scicos_blocks/macros/Electrical/VariableResistor.sci
++++ b/modules/scicos_blocks/macros/Electrical/VariableResistor.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Electrical/VoltageSensor.sci b/modules/scicos_blocks/macros/Electrical/VoltageSensor.sci
+index dd70055..0c5f6e0 100644
+--- a/modules/scicos_blocks/macros/Electrical/VoltageSensor.sci
++++ b/modules/scicos_blocks/macros/Electrical/VoltageSensor.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Electrical/VsourceAC.sci b/modules/scicos_blocks/macros/Electrical/VsourceAC.sci
+index 9ea4a81..9caccf1 100644
+--- a/modules/scicos_blocks/macros/Electrical/VsourceAC.sci
++++ b/modules/scicos_blocks/macros/Electrical/VsourceAC.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Electrical/buildmacros.sce b/modules/scicos_blocks/macros/Electrical/buildmacros.sce
+index f61c97e..d8e2c4f 100644
+--- a/modules/scicos_blocks/macros/Electrical/buildmacros.sce
++++ b/modules/scicos_blocks/macros/Electrical/buildmacros.sce
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Events/ANDBLK.sci b/modules/scicos_blocks/macros/Events/ANDBLK.sci
+index d148487..5823cdc 100644
+--- a/modules/scicos_blocks/macros/Events/ANDBLK.sci
++++ b/modules/scicos_blocks/macros/Events/ANDBLK.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Events/ANDLOG_f.sci b/modules/scicos_blocks/macros/Events/ANDLOG_f.sci
+index 4eef267..a533854 100644
+--- a/modules/scicos_blocks/macros/Events/ANDLOG_f.sci
++++ b/modules/scicos_blocks/macros/Events/ANDLOG_f.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Events/CLKSOMV_f.sci b/modules/scicos_blocks/macros/Events/CLKSOMV_f.sci
+index 24471fc..0d94aab 100644
+--- a/modules/scicos_blocks/macros/Events/CLKSOMV_f.sci
++++ b/modules/scicos_blocks/macros/Events/CLKSOMV_f.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Events/CLKSOM_f.sci b/modules/scicos_blocks/macros/Events/CLKSOM_f.sci
+index c653369..5514498 100644
+--- a/modules/scicos_blocks/macros/Events/CLKSOM_f.sci
++++ b/modules/scicos_blocks/macros/Events/CLKSOM_f.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Events/CLKSPLIT_f.sci b/modules/scicos_blocks/macros/Events/CLKSPLIT_f.sci
+index 1d84a2d..825fcb4 100644
+--- a/modules/scicos_blocks/macros/Events/CLKSPLIT_f.sci
++++ b/modules/scicos_blocks/macros/Events/CLKSPLIT_f.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Events/END_c.sci b/modules/scicos_blocks/macros/Events/END_c.sci
+index bb214e8..8def22f 100644
+--- a/modules/scicos_blocks/macros/Events/END_c.sci
++++ b/modules/scicos_blocks/macros/Events/END_c.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Events/EVTDLY_c.sci b/modules/scicos_blocks/macros/Events/EVTDLY_c.sci
+index 73021d5..4f68b7e 100644
+--- a/modules/scicos_blocks/macros/Events/EVTDLY_c.sci
++++ b/modules/scicos_blocks/macros/Events/EVTDLY_c.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Events/EVTDLY_f.sci b/modules/scicos_blocks/macros/Events/EVTDLY_f.sci
+index 374813a..5e9d1cb 100644
+--- a/modules/scicos_blocks/macros/Events/EVTDLY_f.sci
++++ b/modules/scicos_blocks/macros/Events/EVTDLY_f.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Events/EVTGEN_f.sci b/modules/scicos_blocks/macros/Events/EVTGEN_f.sci
+index 9c52e5b..585ac75 100644
+--- a/modules/scicos_blocks/macros/Events/EVTGEN_f.sci
++++ b/modules/scicos_blocks/macros/Events/EVTGEN_f.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Events/EVTVARDLY.sci b/modules/scicos_blocks/macros/Events/EVTVARDLY.sci
+index 9da4db4..bede0bb 100644
+--- a/modules/scicos_blocks/macros/Events/EVTVARDLY.sci
++++ b/modules/scicos_blocks/macros/Events/EVTVARDLY.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Events/HALT_f.sci b/modules/scicos_blocks/macros/Events/HALT_f.sci
+index 3eb776a..6e0cc72 100644
+--- a/modules/scicos_blocks/macros/Events/HALT_f.sci
++++ b/modules/scicos_blocks/macros/Events/HALT_f.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Events/IFTHEL_f.sci b/modules/scicos_blocks/macros/Events/IFTHEL_f.sci
+index dd2ebda..abcece3 100644
+--- a/modules/scicos_blocks/macros/Events/IFTHEL_f.sci
++++ b/modules/scicos_blocks/macros/Events/IFTHEL_f.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Events/MCLOCK_f.sci b/modules/scicos_blocks/macros/Events/MCLOCK_f.sci
+index b0d7c24..77a4ce2 100644
+--- a/modules/scicos_blocks/macros/Events/MCLOCK_f.sci
++++ b/modules/scicos_blocks/macros/Events/MCLOCK_f.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Events/MFCLCK_f.sci b/modules/scicos_blocks/macros/Events/MFCLCK_f.sci
+index fe87fb0..c207e96 100644
+--- a/modules/scicos_blocks/macros/Events/MFCLCK_f.sci
++++ b/modules/scicos_blocks/macros/Events/MFCLCK_f.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Events/M_freq.sci b/modules/scicos_blocks/macros/Events/M_freq.sci
+index 0a37374..acf14de 100644
+--- a/modules/scicos_blocks/macros/Events/M_freq.sci
++++ b/modules/scicos_blocks/macros/Events/M_freq.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Events/VirtualCLK0.sci b/modules/scicos_blocks/macros/Events/VirtualCLK0.sci
+index 3ae0fd1..14cc109 100644
+--- a/modules/scicos_blocks/macros/Events/VirtualCLK0.sci
++++ b/modules/scicos_blocks/macros/Events/VirtualCLK0.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Events/buildmacros.sce b/modules/scicos_blocks/macros/Events/buildmacros.sce
+index 1f4b92e..bdd895c 100644
+--- a/modules/scicos_blocks/macros/Events/buildmacros.sce
++++ b/modules/scicos_blocks/macros/Events/buildmacros.sce
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Events/freq_div.sci b/modules/scicos_blocks/macros/Events/freq_div.sci
+index f7a6bcb..873699a 100644
+--- a/modules/scicos_blocks/macros/Events/freq_div.sci
++++ b/modules/scicos_blocks/macros/Events/freq_div.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Hydraulics/Bache.sci b/modules/scicos_blocks/macros/Hydraulics/Bache.sci
+index 310ce83..abb5b11 100644
+--- a/modules/scicos_blocks/macros/Hydraulics/Bache.sci
++++ b/modules/scicos_blocks/macros/Hydraulics/Bache.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Hydraulics/Flowmeter.sci b/modules/scicos_blocks/macros/Hydraulics/Flowmeter.sci
+index be29ae7..ee80212 100644
+--- a/modules/scicos_blocks/macros/Hydraulics/Flowmeter.sci
++++ b/modules/scicos_blocks/macros/Hydraulics/Flowmeter.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Hydraulics/PerteDP.sci b/modules/scicos_blocks/macros/Hydraulics/PerteDP.sci
+index e7c55d4..f0068bc 100644
+--- a/modules/scicos_blocks/macros/Hydraulics/PerteDP.sci
++++ b/modules/scicos_blocks/macros/Hydraulics/PerteDP.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Hydraulics/PuitsP.sci b/modules/scicos_blocks/macros/Hydraulics/PuitsP.sci
+index 1898624..c8dd88c 100644
+--- a/modules/scicos_blocks/macros/Hydraulics/PuitsP.sci
++++ b/modules/scicos_blocks/macros/Hydraulics/PuitsP.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Hydraulics/SourceP.sci b/modules/scicos_blocks/macros/Hydraulics/SourceP.sci
+index fa71887..10060c2 100644
+--- a/modules/scicos_blocks/macros/Hydraulics/SourceP.sci
++++ b/modules/scicos_blocks/macros/Hydraulics/SourceP.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Hydraulics/VanneReglante.sci b/modules/scicos_blocks/macros/Hydraulics/VanneReglante.sci
+index 176fd8a..7032b89 100644
+--- a/modules/scicos_blocks/macros/Hydraulics/VanneReglante.sci
++++ b/modules/scicos_blocks/macros/Hydraulics/VanneReglante.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Hydraulics/bache_draw_ports.sci b/modules/scicos_blocks/macros/Hydraulics/bache_draw_ports.sci
+index 28d3a3e..8f91507 100644
+--- a/modules/scicos_blocks/macros/Hydraulics/bache_draw_ports.sci
++++ b/modules/scicos_blocks/macros/Hydraulics/bache_draw_ports.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Hydraulics/bache_inputs.sci b/modules/scicos_blocks/macros/Hydraulics/bache_inputs.sci
+index db6dfc8..6605e73 100644
+--- a/modules/scicos_blocks/macros/Hydraulics/bache_inputs.sci
++++ b/modules/scicos_blocks/macros/Hydraulics/bache_inputs.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Hydraulics/bache_outputs.sci b/modules/scicos_blocks/macros/Hydraulics/bache_outputs.sci
+index 58ccee5..54ea0df 100644
+--- a/modules/scicos_blocks/macros/Hydraulics/bache_outputs.sci
++++ b/modules/scicos_blocks/macros/Hydraulics/bache_outputs.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Hydraulics/buildmacros.sce b/modules/scicos_blocks/macros/Hydraulics/buildmacros.sce
+index 346153a..6536481 100644
+--- a/modules/scicos_blocks/macros/Hydraulics/buildmacros.sce
++++ b/modules/scicos_blocks/macros/Hydraulics/buildmacros.sce
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Hydraulics/puit_draw_ports.sci b/modules/scicos_blocks/macros/Hydraulics/puit_draw_ports.sci
+index 28c33f3..d309beb 100644
+--- a/modules/scicos_blocks/macros/Hydraulics/puit_draw_ports.sci
++++ b/modules/scicos_blocks/macros/Hydraulics/puit_draw_ports.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Hydraulics/puit_inputs.sci b/modules/scicos_blocks/macros/Hydraulics/puit_inputs.sci
+index cb95840..2f9a2b3 100644
+--- a/modules/scicos_blocks/macros/Hydraulics/puit_inputs.sci
++++ b/modules/scicos_blocks/macros/Hydraulics/puit_inputs.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Hydraulics/source_draw_ports.sci b/modules/scicos_blocks/macros/Hydraulics/source_draw_ports.sci
+index bfec9c0..18a9737 100644
+--- a/modules/scicos_blocks/macros/Hydraulics/source_draw_ports.sci
++++ b/modules/scicos_blocks/macros/Hydraulics/source_draw_ports.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Hydraulics/source_inputs.sci b/modules/scicos_blocks/macros/Hydraulics/source_inputs.sci
+index dbd2574..5f1a635 100644
+--- a/modules/scicos_blocks/macros/Hydraulics/source_inputs.sci
++++ b/modules/scicos_blocks/macros/Hydraulics/source_inputs.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Hydraulics/vanne_draw_ports.sci b/modules/scicos_blocks/macros/Hydraulics/vanne_draw_ports.sci
+index 7474176..9825be5 100644
+--- a/modules/scicos_blocks/macros/Hydraulics/vanne_draw_ports.sci
++++ b/modules/scicos_blocks/macros/Hydraulics/vanne_draw_ports.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Hydraulics/vanne_inputs.sci b/modules/scicos_blocks/macros/Hydraulics/vanne_inputs.sci
+index 6dc97d7..d2ca8f0 100644
+--- a/modules/scicos_blocks/macros/Hydraulics/vanne_inputs.sci
++++ b/modules/scicos_blocks/macros/Hydraulics/vanne_inputs.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Hydraulics/vanne_outputs.sci b/modules/scicos_blocks/macros/Hydraulics/vanne_outputs.sci
+index 54fde98..c7ef21e 100644
+--- a/modules/scicos_blocks/macros/Hydraulics/vanne_outputs.sci
++++ b/modules/scicos_blocks/macros/Hydraulics/vanne_outputs.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/IntegerOp/BITCLEAR.sci b/modules/scicos_blocks/macros/IntegerOp/BITCLEAR.sci
+index b6e102e..b1620f6 100644
+--- a/modules/scicos_blocks/macros/IntegerOp/BITCLEAR.sci
++++ b/modules/scicos_blocks/macros/IntegerOp/BITCLEAR.sci
+@@ -15,7 +15,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/IntegerOp/BITSET.sci b/modules/scicos_blocks/macros/IntegerOp/BITSET.sci
+index 6ae3766..bbd9c59 100644
+--- a/modules/scicos_blocks/macros/IntegerOp/BITSET.sci
++++ b/modules/scicos_blocks/macros/IntegerOp/BITSET.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/IntegerOp/CONVERT.sci b/modules/scicos_blocks/macros/IntegerOp/CONVERT.sci
+index eb59f5c..ca09651 100644
+--- a/modules/scicos_blocks/macros/IntegerOp/CONVERT.sci
++++ b/modules/scicos_blocks/macros/IntegerOp/CONVERT.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/IntegerOp/DFLIPFLOP.sci b/modules/scicos_blocks/macros/IntegerOp/DFLIPFLOP.sci
+index e50c0cf..fbdf9c1 100644
+--- a/modules/scicos_blocks/macros/IntegerOp/DFLIPFLOP.sci
++++ b/modules/scicos_blocks/macros/IntegerOp/DFLIPFLOP.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/IntegerOp/DLATCH.sci b/modules/scicos_blocks/macros/IntegerOp/DLATCH.sci
+index f2e7d29..24e0583 100644
+--- a/modules/scicos_blocks/macros/IntegerOp/DLATCH.sci
++++ b/modules/scicos_blocks/macros/IntegerOp/DLATCH.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/IntegerOp/EXTRACTBITS.sci b/modules/scicos_blocks/macros/IntegerOp/EXTRACTBITS.sci
+index 3ea7a7c..f5fa05b 100644
+--- a/modules/scicos_blocks/macros/IntegerOp/EXTRACTBITS.sci
++++ b/modules/scicos_blocks/macros/IntegerOp/EXTRACTBITS.sci
+@@ -15,7 +15,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/IntegerOp/INTMUL.sci b/modules/scicos_blocks/macros/IntegerOp/INTMUL.sci
+index dd22f48..dd62a9e 100644
+--- a/modules/scicos_blocks/macros/IntegerOp/INTMUL.sci
++++ b/modules/scicos_blocks/macros/IntegerOp/INTMUL.sci
+@@ -15,7 +15,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/IntegerOp/JKFLIPFLOP.sci b/modules/scicos_blocks/macros/IntegerOp/JKFLIPFLOP.sci
+index 53b3fcf..badde7c 100644
+--- a/modules/scicos_blocks/macros/IntegerOp/JKFLIPFLOP.sci
++++ b/modules/scicos_blocks/macros/IntegerOp/JKFLIPFLOP.sci
+@@ -15,7 +15,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/IntegerOp/LOGIC.sci b/modules/scicos_blocks/macros/IntegerOp/LOGIC.sci
+index a41a4b8..c2ca527 100644
+--- a/modules/scicos_blocks/macros/IntegerOp/LOGIC.sci
++++ b/modules/scicos_blocks/macros/IntegerOp/LOGIC.sci
+@@ -15,7 +15,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/IntegerOp/SHIFT.sci b/modules/scicos_blocks/macros/IntegerOp/SHIFT.sci
+index f96d51c..14addf8 100644
+--- a/modules/scicos_blocks/macros/IntegerOp/SHIFT.sci
++++ b/modules/scicos_blocks/macros/IntegerOp/SHIFT.sci
+@@ -15,7 +15,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/IntegerOp/SRFLIPFLOP.sci b/modules/scicos_blocks/macros/IntegerOp/SRFLIPFLOP.sci
+index b87c5df..96b0e87 100644
+--- a/modules/scicos_blocks/macros/IntegerOp/SRFLIPFLOP.sci
++++ b/modules/scicos_blocks/macros/IntegerOp/SRFLIPFLOP.sci
+@@ -15,7 +15,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/IntegerOp/buildmacros.sce b/modules/scicos_blocks/macros/IntegerOp/buildmacros.sce
+index 3471dba..959ba10 100644
+--- a/modules/scicos_blocks/macros/IntegerOp/buildmacros.sce
++++ b/modules/scicos_blocks/macros/IntegerOp/buildmacros.sce
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Linear/BIGSOM_f.sci b/modules/scicos_blocks/macros/Linear/BIGSOM_f.sci
+index c459e50..9ba9118 100644
+--- a/modules/scicos_blocks/macros/Linear/BIGSOM_f.sci
++++ b/modules/scicos_blocks/macros/Linear/BIGSOM_f.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Linear/CLINDUMMY_f.sci b/modules/scicos_blocks/macros/Linear/CLINDUMMY_f.sci
+index f7852ba..670e1cd 100644
+--- a/modules/scicos_blocks/macros/Linear/CLINDUMMY_f.sci
++++ b/modules/scicos_blocks/macros/Linear/CLINDUMMY_f.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Linear/CLR.sci b/modules/scicos_blocks/macros/Linear/CLR.sci
+index 30549db..95a5a1e 100644
+--- a/modules/scicos_blocks/macros/Linear/CLR.sci
++++ b/modules/scicos_blocks/macros/Linear/CLR.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Linear/CLR_f.sci b/modules/scicos_blocks/macros/Linear/CLR_f.sci
+index 97e088e..e31a840 100644
+--- a/modules/scicos_blocks/macros/Linear/CLR_f.sci
++++ b/modules/scicos_blocks/macros/Linear/CLR_f.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Linear/CLSS.sci b/modules/scicos_blocks/macros/Linear/CLSS.sci
+index d64736b..f85fbd6 100644
+--- a/modules/scicos_blocks/macros/Linear/CLSS.sci
++++ b/modules/scicos_blocks/macros/Linear/CLSS.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Linear/CLSS_f.sci b/modules/scicos_blocks/macros/Linear/CLSS_f.sci
+index f535724..6590c95 100644
+--- a/modules/scicos_blocks/macros/Linear/CLSS_f.sci
++++ b/modules/scicos_blocks/macros/Linear/CLSS_f.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Linear/DELAYV_f.sci b/modules/scicos_blocks/macros/Linear/DELAYV_f.sci
+index 8e2642b..6dd0381 100644
+--- a/modules/scicos_blocks/macros/Linear/DELAYV_f.sci
++++ b/modules/scicos_blocks/macros/Linear/DELAYV_f.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Linear/DELAY_f.sci b/modules/scicos_blocks/macros/Linear/DELAY_f.sci
+index 90b2578..3174c3e 100644
+--- a/modules/scicos_blocks/macros/Linear/DELAY_f.sci
++++ b/modules/scicos_blocks/macros/Linear/DELAY_f.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Linear/DERIV.sci b/modules/scicos_blocks/macros/Linear/DERIV.sci
+index c3b1a0f..5803148 100644
+--- a/modules/scicos_blocks/macros/Linear/DERIV.sci
++++ b/modules/scicos_blocks/macros/Linear/DERIV.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Linear/DIFF_c.sci b/modules/scicos_blocks/macros/Linear/DIFF_c.sci
+index 2ccec47..0f8e17c 100644
+--- a/modules/scicos_blocks/macros/Linear/DIFF_c.sci
++++ b/modules/scicos_blocks/macros/Linear/DIFF_c.sci
+@@ -16,7 +16,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Linear/DLR.sci b/modules/scicos_blocks/macros/Linear/DLR.sci
+index 28d8860..439654a 100644
+--- a/modules/scicos_blocks/macros/Linear/DLR.sci
++++ b/modules/scicos_blocks/macros/Linear/DLR.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Linear/DLR_f.sci b/modules/scicos_blocks/macros/Linear/DLR_f.sci
+index 3baff60..ce44556 100644
+--- a/modules/scicos_blocks/macros/Linear/DLR_f.sci
++++ b/modules/scicos_blocks/macros/Linear/DLR_f.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Linear/DLSS.sci b/modules/scicos_blocks/macros/Linear/DLSS.sci
+index b3b9efc..afd15dc 100644
+--- a/modules/scicos_blocks/macros/Linear/DLSS.sci
++++ b/modules/scicos_blocks/macros/Linear/DLSS.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Linear/DLSS_f.sci b/modules/scicos_blocks/macros/Linear/DLSS_f.sci
+index 3d56f4a..fc1a0f2 100644
+--- a/modules/scicos_blocks/macros/Linear/DLSS_f.sci
++++ b/modules/scicos_blocks/macros/Linear/DLSS_f.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Linear/DOLLAR.sci b/modules/scicos_blocks/macros/Linear/DOLLAR.sci
+index 683de62..796d101 100644
+--- a/modules/scicos_blocks/macros/Linear/DOLLAR.sci
++++ b/modules/scicos_blocks/macros/Linear/DOLLAR.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Linear/DOLLAR_f.sci b/modules/scicos_blocks/macros/Linear/DOLLAR_f.sci
+index 521f8a0..f81f33c 100644
+--- a/modules/scicos_blocks/macros/Linear/DOLLAR_f.sci
++++ b/modules/scicos_blocks/macros/Linear/DOLLAR_f.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Linear/DOLLAR_m.sci b/modules/scicos_blocks/macros/Linear/DOLLAR_m.sci
+index c813c83..9f4eec5 100644
+--- a/modules/scicos_blocks/macros/Linear/DOLLAR_m.sci
++++ b/modules/scicos_blocks/macros/Linear/DOLLAR_m.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Linear/GAINBLK.sci b/modules/scicos_blocks/macros/Linear/GAINBLK.sci
+index 1c6cbb7..b9a46c1 100644
+--- a/modules/scicos_blocks/macros/Linear/GAINBLK.sci
++++ b/modules/scicos_blocks/macros/Linear/GAINBLK.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Linear/GAINBLK_f.sci b/modules/scicos_blocks/macros/Linear/GAINBLK_f.sci
+index 6343895..63e79b3 100644
+--- a/modules/scicos_blocks/macros/Linear/GAINBLK_f.sci
++++ b/modules/scicos_blocks/macros/Linear/GAINBLK_f.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Linear/GAIN_f.sci b/modules/scicos_blocks/macros/Linear/GAIN_f.sci
+index 9c96e2e..e4534a2 100644
+--- a/modules/scicos_blocks/macros/Linear/GAIN_f.sci
++++ b/modules/scicos_blocks/macros/Linear/GAIN_f.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Linear/INTEGRAL.sci b/modules/scicos_blocks/macros/Linear/INTEGRAL.sci
+index 0954cc6..c038ddd 100644
+--- a/modules/scicos_blocks/macros/Linear/INTEGRAL.sci
++++ b/modules/scicos_blocks/macros/Linear/INTEGRAL.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Linear/INTEGRAL_f.sci b/modules/scicos_blocks/macros/Linear/INTEGRAL_f.sci
+index 61839ae..c2d0dc0 100644
+--- a/modules/scicos_blocks/macros/Linear/INTEGRAL_f.sci
++++ b/modules/scicos_blocks/macros/Linear/INTEGRAL_f.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Linear/INTEGRAL_m.sci b/modules/scicos_blocks/macros/Linear/INTEGRAL_m.sci
+index c00c407..da93074 100644
+--- a/modules/scicos_blocks/macros/Linear/INTEGRAL_m.sci
++++ b/modules/scicos_blocks/macros/Linear/INTEGRAL_m.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Linear/PID.sci b/modules/scicos_blocks/macros/Linear/PID.sci
+index d1f095e..87941f1 100644
+--- a/modules/scicos_blocks/macros/Linear/PID.sci
++++ b/modules/scicos_blocks/macros/Linear/PID.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Linear/REGISTER.sci b/modules/scicos_blocks/macros/Linear/REGISTER.sci
+index c052009..a74828a 100644
+--- a/modules/scicos_blocks/macros/Linear/REGISTER.sci
++++ b/modules/scicos_blocks/macros/Linear/REGISTER.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Linear/REGISTER_f.sci b/modules/scicos_blocks/macros/Linear/REGISTER_f.sci
+index 2a6582d..2434d01 100644
+--- a/modules/scicos_blocks/macros/Linear/REGISTER_f.sci
++++ b/modules/scicos_blocks/macros/Linear/REGISTER_f.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Linear/SAMPHOLD.sci b/modules/scicos_blocks/macros/Linear/SAMPHOLD.sci
+index 6666ce0..163ce5d 100644
+--- a/modules/scicos_blocks/macros/Linear/SAMPHOLD.sci
++++ b/modules/scicos_blocks/macros/Linear/SAMPHOLD.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Linear/SAMPHOLD_m.sci b/modules/scicos_blocks/macros/Linear/SAMPHOLD_m.sci
+index 9d89c83..7c693fd 100644
+--- a/modules/scicos_blocks/macros/Linear/SAMPHOLD_m.sci
++++ b/modules/scicos_blocks/macros/Linear/SAMPHOLD_m.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Linear/SAMPLEHOLD_f.sci b/modules/scicos_blocks/macros/Linear/SAMPLEHOLD_f.sci
+index cdf8059..3caa7b6 100644
+--- a/modules/scicos_blocks/macros/Linear/SAMPLEHOLD_f.sci
++++ b/modules/scicos_blocks/macros/Linear/SAMPLEHOLD_f.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Linear/SOM_f.sci b/modules/scicos_blocks/macros/Linear/SOM_f.sci
+index 9a5ca54..4d36076 100644
+--- a/modules/scicos_blocks/macros/Linear/SOM_f.sci
++++ b/modules/scicos_blocks/macros/Linear/SOM_f.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Linear/SUMMATION.sci b/modules/scicos_blocks/macros/Linear/SUMMATION.sci
+index d4a5b18..b6782bf 100644
+--- a/modules/scicos_blocks/macros/Linear/SUMMATION.sci
++++ b/modules/scicos_blocks/macros/Linear/SUMMATION.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Linear/SUM_f.sci b/modules/scicos_blocks/macros/Linear/SUM_f.sci
+index d21bb9e..a9dd762 100644
+--- a/modules/scicos_blocks/macros/Linear/SUM_f.sci
++++ b/modules/scicos_blocks/macros/Linear/SUM_f.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Linear/TCLSS.sci b/modules/scicos_blocks/macros/Linear/TCLSS.sci
+index c86a60b..5a9dc15 100644
+--- a/modules/scicos_blocks/macros/Linear/TCLSS.sci
++++ b/modules/scicos_blocks/macros/Linear/TCLSS.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Linear/TCLSS_f.sci b/modules/scicos_blocks/macros/Linear/TCLSS_f.sci
+index 3349c8d..b4a5954 100644
+--- a/modules/scicos_blocks/macros/Linear/TCLSS_f.sci
++++ b/modules/scicos_blocks/macros/Linear/TCLSS_f.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Linear/TIME_DELAY.sci b/modules/scicos_blocks/macros/Linear/TIME_DELAY.sci
+index 1f3e884..bd679ce 100644
+--- a/modules/scicos_blocks/macros/Linear/TIME_DELAY.sci
++++ b/modules/scicos_blocks/macros/Linear/TIME_DELAY.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Linear/VARIABLE_DELAY.sci b/modules/scicos_blocks/macros/Linear/VARIABLE_DELAY.sci
+index e265ef7..342b140 100644
+--- a/modules/scicos_blocks/macros/Linear/VARIABLE_DELAY.sci
++++ b/modules/scicos_blocks/macros/Linear/VARIABLE_DELAY.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Linear/buildmacros.sce b/modules/scicos_blocks/macros/Linear/buildmacros.sce
+index 82b8b46..7188ab4 100644
+--- a/modules/scicos_blocks/macros/Linear/buildmacros.sce
++++ b/modules/scicos_blocks/macros/Linear/buildmacros.sce
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/MatrixOp/CUMSUM.sci b/modules/scicos_blocks/macros/MatrixOp/CUMSUM.sci
+index c79d62d..cabc99d 100644
+--- a/modules/scicos_blocks/macros/MatrixOp/CUMSUM.sci
++++ b/modules/scicos_blocks/macros/MatrixOp/CUMSUM.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/MatrixOp/EXTRACT.sci b/modules/scicos_blocks/macros/MatrixOp/EXTRACT.sci
+index 850a2b0..2065b4b 100644
+--- a/modules/scicos_blocks/macros/MatrixOp/EXTRACT.sci
++++ b/modules/scicos_blocks/macros/MatrixOp/EXTRACT.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/MatrixOp/EXTTRI.sci b/modules/scicos_blocks/macros/MatrixOp/EXTTRI.sci
+index a49a366..e10e97a 100644
+--- a/modules/scicos_blocks/macros/MatrixOp/EXTTRI.sci
++++ b/modules/scicos_blocks/macros/MatrixOp/EXTTRI.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/MatrixOp/MATBKSL.sci b/modules/scicos_blocks/macros/MatrixOp/MATBKSL.sci
+index 37f0d08..5ada0a6 100644
+--- a/modules/scicos_blocks/macros/MatrixOp/MATBKSL.sci
++++ b/modules/scicos_blocks/macros/MatrixOp/MATBKSL.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/MatrixOp/MATCATH.sci b/modules/scicos_blocks/macros/MatrixOp/MATCATH.sci
+index fe09168..6e9c921 100644
+--- a/modules/scicos_blocks/macros/MatrixOp/MATCATH.sci
++++ b/modules/scicos_blocks/macros/MatrixOp/MATCATH.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/MatrixOp/MATCATV.sci b/modules/scicos_blocks/macros/MatrixOp/MATCATV.sci
+index f5adc23..08f649e 100644
+--- a/modules/scicos_blocks/macros/MatrixOp/MATCATV.sci
++++ b/modules/scicos_blocks/macros/MatrixOp/MATCATV.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/MatrixOp/MATDET.sci b/modules/scicos_blocks/macros/MatrixOp/MATDET.sci
+index eaaab47..c0874f0 100644
+--- a/modules/scicos_blocks/macros/MatrixOp/MATDET.sci
++++ b/modules/scicos_blocks/macros/MatrixOp/MATDET.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/MatrixOp/MATDIAG.sci b/modules/scicos_blocks/macros/MatrixOp/MATDIAG.sci
+index b79bfe2..2145797 100644
+--- a/modules/scicos_blocks/macros/MatrixOp/MATDIAG.sci
++++ b/modules/scicos_blocks/macros/MatrixOp/MATDIAG.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/MatrixOp/MATDIV.sci b/modules/scicos_blocks/macros/MatrixOp/MATDIV.sci
+index 6e9b95e..98c00f1 100644
+--- a/modules/scicos_blocks/macros/MatrixOp/MATDIV.sci
++++ b/modules/scicos_blocks/macros/MatrixOp/MATDIV.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/MatrixOp/MATEIG.sci b/modules/scicos_blocks/macros/MatrixOp/MATEIG.sci
+index 9943211..00763e9 100644
+--- a/modules/scicos_blocks/macros/MatrixOp/MATEIG.sci
++++ b/modules/scicos_blocks/macros/MatrixOp/MATEIG.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/MatrixOp/MATEXPM.sci b/modules/scicos_blocks/macros/MatrixOp/MATEXPM.sci
+index e2ed0e9..5786f8b 100644
+--- a/modules/scicos_blocks/macros/MatrixOp/MATEXPM.sci
++++ b/modules/scicos_blocks/macros/MatrixOp/MATEXPM.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/MatrixOp/MATINV.sci b/modules/scicos_blocks/macros/MatrixOp/MATINV.sci
+index 738eecf..c68aaf8 100644
+--- a/modules/scicos_blocks/macros/MatrixOp/MATINV.sci
++++ b/modules/scicos_blocks/macros/MatrixOp/MATINV.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/MatrixOp/MATLU.sci b/modules/scicos_blocks/macros/MatrixOp/MATLU.sci
+index a5fb00c..3ccd590 100644
+--- a/modules/scicos_blocks/macros/MatrixOp/MATLU.sci
++++ b/modules/scicos_blocks/macros/MatrixOp/MATLU.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/MatrixOp/MATMAGPHI.sci b/modules/scicos_blocks/macros/MatrixOp/MATMAGPHI.sci
+index 720d2b8..6744e93 100644
+--- a/modules/scicos_blocks/macros/MatrixOp/MATMAGPHI.sci
++++ b/modules/scicos_blocks/macros/MatrixOp/MATMAGPHI.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/MatrixOp/MATMUL.sci b/modules/scicos_blocks/macros/MatrixOp/MATMUL.sci
+index 8e908c0..5bdce3c 100644
+--- a/modules/scicos_blocks/macros/MatrixOp/MATMUL.sci
++++ b/modules/scicos_blocks/macros/MatrixOp/MATMUL.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/MatrixOp/MATPINV.sci b/modules/scicos_blocks/macros/MatrixOp/MATPINV.sci
+index 3be903a..08b4429 100644
+--- a/modules/scicos_blocks/macros/MatrixOp/MATPINV.sci
++++ b/modules/scicos_blocks/macros/MatrixOp/MATPINV.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/MatrixOp/MATRESH.sci b/modules/scicos_blocks/macros/MatrixOp/MATRESH.sci
+index 3f80d32..fb2892f 100644
+--- a/modules/scicos_blocks/macros/MatrixOp/MATRESH.sci
++++ b/modules/scicos_blocks/macros/MatrixOp/MATRESH.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/MatrixOp/MATSING.sci b/modules/scicos_blocks/macros/MatrixOp/MATSING.sci
+index aa3034e..2ef9209 100644
+--- a/modules/scicos_blocks/macros/MatrixOp/MATSING.sci
++++ b/modules/scicos_blocks/macros/MatrixOp/MATSING.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/MatrixOp/MATSUM.sci b/modules/scicos_blocks/macros/MatrixOp/MATSUM.sci
+index 3a930e0..550f158 100644
+--- a/modules/scicos_blocks/macros/MatrixOp/MATSUM.sci
++++ b/modules/scicos_blocks/macros/MatrixOp/MATSUM.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/MatrixOp/MATTRAN.sci b/modules/scicos_blocks/macros/MatrixOp/MATTRAN.sci
+index 73a511d..a9dec03 100644
+--- a/modules/scicos_blocks/macros/MatrixOp/MATTRAN.sci
++++ b/modules/scicos_blocks/macros/MatrixOp/MATTRAN.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/MatrixOp/MATZCONJ.sci b/modules/scicos_blocks/macros/MatrixOp/MATZCONJ.sci
+index 85e204d..f2130c7 100644
+--- a/modules/scicos_blocks/macros/MatrixOp/MATZCONJ.sci
++++ b/modules/scicos_blocks/macros/MatrixOp/MATZCONJ.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/MatrixOp/MATZREIM.sci b/modules/scicos_blocks/macros/MatrixOp/MATZREIM.sci
+index 96ff651..460c297 100644
+--- a/modules/scicos_blocks/macros/MatrixOp/MATZREIM.sci
++++ b/modules/scicos_blocks/macros/MatrixOp/MATZREIM.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/MatrixOp/RICC.sci b/modules/scicos_blocks/macros/MatrixOp/RICC.sci
+index 897a91c..4d1210b 100644
+--- a/modules/scicos_blocks/macros/MatrixOp/RICC.sci
++++ b/modules/scicos_blocks/macros/MatrixOp/RICC.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/MatrixOp/ROOTCOEF.sci b/modules/scicos_blocks/macros/MatrixOp/ROOTCOEF.sci
+index 9e85aaa..57bd0b2 100644
+--- a/modules/scicos_blocks/macros/MatrixOp/ROOTCOEF.sci
++++ b/modules/scicos_blocks/macros/MatrixOp/ROOTCOEF.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/MatrixOp/SQRT.sci b/modules/scicos_blocks/macros/MatrixOp/SQRT.sci
+index 16c7957..43bd360 100644
+--- a/modules/scicos_blocks/macros/MatrixOp/SQRT.sci
++++ b/modules/scicos_blocks/macros/MatrixOp/SQRT.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/MatrixOp/SUBMAT.sci b/modules/scicos_blocks/macros/MatrixOp/SUBMAT.sci
+index 27dfbcc..8152458 100644
+--- a/modules/scicos_blocks/macros/MatrixOp/SUBMAT.sci
++++ b/modules/scicos_blocks/macros/MatrixOp/SUBMAT.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/MatrixOp/buildmacros.sce b/modules/scicos_blocks/macros/MatrixOp/buildmacros.sce
+index a13e6ad..819fd7c 100644
+--- a/modules/scicos_blocks/macros/MatrixOp/buildmacros.sce
++++ b/modules/scicos_blocks/macros/MatrixOp/buildmacros.sce
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Misc/AUTOMAT.sci b/modules/scicos_blocks/macros/Misc/AUTOMAT.sci
+index a16896b..7a5748f 100644
+--- a/modules/scicos_blocks/macros/Misc/AUTOMAT.sci
++++ b/modules/scicos_blocks/macros/Misc/AUTOMAT.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Misc/BACKLASH.sci b/modules/scicos_blocks/macros/Misc/BACKLASH.sci
+index 76318e0..ebe357a 100644
+--- a/modules/scicos_blocks/macros/Misc/BACKLASH.sci
++++ b/modules/scicos_blocks/macros/Misc/BACKLASH.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Misc/BOUNCE.sci b/modules/scicos_blocks/macros/Misc/BOUNCE.sci
+index 03b9b4a..470825a 100644
+--- a/modules/scicos_blocks/macros/Misc/BOUNCE.sci
++++ b/modules/scicos_blocks/macros/Misc/BOUNCE.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Misc/BOUNCEXY.sci b/modules/scicos_blocks/macros/Misc/BOUNCEXY.sci
+index 6e9080b..aeecf57 100644
+--- a/modules/scicos_blocks/macros/Misc/BOUNCEXY.sci
++++ b/modules/scicos_blocks/macros/Misc/BOUNCEXY.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Misc/BPLATFORM.sci b/modules/scicos_blocks/macros/Misc/BPLATFORM.sci
+index 0a23ec3..2afc4bf 100644
+--- a/modules/scicos_blocks/macros/Misc/BPLATFORM.sci
++++ b/modules/scicos_blocks/macros/Misc/BPLATFORM.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Misc/CBLOCK.sci b/modules/scicos_blocks/macros/Misc/CBLOCK.sci
+index cfde15b..2a44448 100644
+--- a/modules/scicos_blocks/macros/Misc/CBLOCK.sci
++++ b/modules/scicos_blocks/macros/Misc/CBLOCK.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Misc/CBLOCK4.sci b/modules/scicos_blocks/macros/Misc/CBLOCK4.sci
+index 95ff7fd..2e9d30c 100644
+--- a/modules/scicos_blocks/macros/Misc/CBLOCK4.sci
++++ b/modules/scicos_blocks/macros/Misc/CBLOCK4.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Misc/CONSTRAINT2_c.sci b/modules/scicos_blocks/macros/Misc/CONSTRAINT2_c.sci
+index 208e2da..76d84cb 100644
+--- a/modules/scicos_blocks/macros/Misc/CONSTRAINT2_c.sci
++++ b/modules/scicos_blocks/macros/Misc/CONSTRAINT2_c.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Misc/CONSTRAINT_c.sci b/modules/scicos_blocks/macros/Misc/CONSTRAINT_c.sci
+index 81085a5..d43e62f 100644
+--- a/modules/scicos_blocks/macros/Misc/CONSTRAINT_c.sci
++++ b/modules/scicos_blocks/macros/Misc/CONSTRAINT_c.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Misc/DEADBAND.sci b/modules/scicos_blocks/macros/Misc/DEADBAND.sci
+index 722ee36..245065e 100644
+--- a/modules/scicos_blocks/macros/Misc/DEADBAND.sci
++++ b/modules/scicos_blocks/macros/Misc/DEADBAND.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Misc/DEBUG_SCICOS.sci b/modules/scicos_blocks/macros/Misc/DEBUG_SCICOS.sci
+index 7f4513b..0e872d1 100644
+--- a/modules/scicos_blocks/macros/Misc/DEBUG_SCICOS.sci
++++ b/modules/scicos_blocks/macros/Misc/DEBUG_SCICOS.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Misc/DIFF_f.sci b/modules/scicos_blocks/macros/Misc/DIFF_f.sci
+index 6182e81..55b0896 100644
+--- a/modules/scicos_blocks/macros/Misc/DIFF_f.sci
++++ b/modules/scicos_blocks/macros/Misc/DIFF_f.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Misc/DSUPER.sci b/modules/scicos_blocks/macros/Misc/DSUPER.sci
+index ed098a9..e1555e7 100644
+--- a/modules/scicos_blocks/macros/Misc/DSUPER.sci
++++ b/modules/scicos_blocks/macros/Misc/DSUPER.sci
+@@ -15,7 +15,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Misc/EDGETRIGGER.sci b/modules/scicos_blocks/macros/Misc/EDGETRIGGER.sci
+index cf4341f..38cef3f 100644
+--- a/modules/scicos_blocks/macros/Misc/EDGETRIGGER.sci
++++ b/modules/scicos_blocks/macros/Misc/EDGETRIGGER.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Misc/EDGE_TRIGGER.sci b/modules/scicos_blocks/macros/Misc/EDGE_TRIGGER.sci
+index a8cd333..089998f 100644
+--- a/modules/scicos_blocks/macros/Misc/EDGE_TRIGGER.sci
++++ b/modules/scicos_blocks/macros/Misc/EDGE_TRIGGER.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Misc/ENDBLK.sci b/modules/scicos_blocks/macros/Misc/ENDBLK.sci
+index 8d5e80d..e1d0b6f 100644
+--- a/modules/scicos_blocks/macros/Misc/ENDBLK.sci
++++ b/modules/scicos_blocks/macros/Misc/ENDBLK.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Misc/EXPRESSION.sci b/modules/scicos_blocks/macros/Misc/EXPRESSION.sci
+index 73400ff..a130812 100644
+--- a/modules/scicos_blocks/macros/Misc/EXPRESSION.sci
++++ b/modules/scicos_blocks/macros/Misc/EXPRESSION.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Misc/Extract_Activation.sci b/modules/scicos_blocks/macros/Misc/Extract_Activation.sci
+index 18a1947..bf0c79e 100644
+--- a/modules/scicos_blocks/macros/Misc/Extract_Activation.sci
++++ b/modules/scicos_blocks/macros/Misc/Extract_Activation.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Misc/HYSTHERESIS.sci b/modules/scicos_blocks/macros/Misc/HYSTHERESIS.sci
+index ffbc2bf..0c94b65 100644
+--- a/modules/scicos_blocks/macros/Misc/HYSTHERESIS.sci
++++ b/modules/scicos_blocks/macros/Misc/HYSTHERESIS.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Misc/IMPSPLIT_f.sci b/modules/scicos_blocks/macros/Misc/IMPSPLIT_f.sci
+index 6d3e23d..cf9ea71 100644
+--- a/modules/scicos_blocks/macros/Misc/IMPSPLIT_f.sci
++++ b/modules/scicos_blocks/macros/Misc/IMPSPLIT_f.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Misc/LOGICAL_OP.sci b/modules/scicos_blocks/macros/Misc/LOGICAL_OP.sci
+index f1112ce..78ea611 100644
+--- a/modules/scicos_blocks/macros/Misc/LOGICAL_OP.sci
++++ b/modules/scicos_blocks/macros/Misc/LOGICAL_OP.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Misc/MBLOCK.sci b/modules/scicos_blocks/macros/Misc/MBLOCK.sci
+index b11ad91..4666f7a 100644
+--- a/modules/scicos_blocks/macros/Misc/MBLOCK.sci
++++ b/modules/scicos_blocks/macros/Misc/MBLOCK.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Misc/MEMORY_f.sci b/modules/scicos_blocks/macros/Misc/MEMORY_f.sci
+index 52a6964..53d8e86 100644
+--- a/modules/scicos_blocks/macros/Misc/MEMORY_f.sci
++++ b/modules/scicos_blocks/macros/Misc/MEMORY_f.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Misc/MPBLOCK.sci b/modules/scicos_blocks/macros/Misc/MPBLOCK.sci
+index 6527c0b..e38cbb7 100644
+--- a/modules/scicos_blocks/macros/Misc/MPBLOCK.sci
++++ b/modules/scicos_blocks/macros/Misc/MPBLOCK.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Misc/PAL_f.sci b/modules/scicos_blocks/macros/Misc/PAL_f.sci
+index 10c211a..a1b4ed0 100644
+--- a/modules/scicos_blocks/macros/Misc/PAL_f.sci
++++ b/modules/scicos_blocks/macros/Misc/PAL_f.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Misc/PENDULUM_ANIM.sci b/modules/scicos_blocks/macros/Misc/PENDULUM_ANIM.sci
+index 32ae5da..19ff99a 100644
+--- a/modules/scicos_blocks/macros/Misc/PENDULUM_ANIM.sci
++++ b/modules/scicos_blocks/macros/Misc/PENDULUM_ANIM.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Misc/RATELIMITER.sci b/modules/scicos_blocks/macros/Misc/RATELIMITER.sci
+index c30d98e..9c0546d 100644
+--- a/modules/scicos_blocks/macros/Misc/RATELIMITER.sci
++++ b/modules/scicos_blocks/macros/Misc/RATELIMITER.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Misc/RELATIONALOP.sci b/modules/scicos_blocks/macros/Misc/RELATIONALOP.sci
+index e8ed511..915e3f5 100644
+--- a/modules/scicos_blocks/macros/Misc/RELATIONALOP.sci
++++ b/modules/scicos_blocks/macros/Misc/RELATIONALOP.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Misc/SPLIT_f.sci b/modules/scicos_blocks/macros/Misc/SPLIT_f.sci
+index 72894ff..ef61a92 100644
+--- a/modules/scicos_blocks/macros/Misc/SPLIT_f.sci
++++ b/modules/scicos_blocks/macros/Misc/SPLIT_f.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Misc/SUPER_f.sci b/modules/scicos_blocks/macros/Misc/SUPER_f.sci
+index c7aa3c2..87621f6 100644
+--- a/modules/scicos_blocks/macros/Misc/SUPER_f.sci
++++ b/modules/scicos_blocks/macros/Misc/SUPER_f.sci
+@@ -15,7 +15,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Misc/TEXT_f.sci b/modules/scicos_blocks/macros/Misc/TEXT_f.sci
+index 59ac9cf..d665f3c 100644
+--- a/modules/scicos_blocks/macros/Misc/TEXT_f.sci
++++ b/modules/scicos_blocks/macros/Misc/TEXT_f.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Misc/anim_pen.sci b/modules/scicos_blocks/macros/Misc/anim_pen.sci
+index 4b52180..05caad3 100644
+--- a/modules/scicos_blocks/macros/Misc/anim_pen.sci
++++ b/modules/scicos_blocks/macros/Misc/anim_pen.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Misc/bplatform2.sci b/modules/scicos_blocks/macros/Misc/bplatform2.sci
+index 98a13e4..dfc0608 100644
+--- a/modules/scicos_blocks/macros/Misc/bplatform2.sci
++++ b/modules/scicos_blocks/macros/Misc/bplatform2.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Misc/buildmacros.sce b/modules/scicos_blocks/macros/Misc/buildmacros.sce
+index bfdc8b4..6dcb922 100644
+--- a/modules/scicos_blocks/macros/Misc/buildmacros.sce
++++ b/modules/scicos_blocks/macros/Misc/buildmacros.sce
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Misc/c_block.sci b/modules/scicos_blocks/macros/Misc/c_block.sci
+index 843e775..dc56729 100644
+--- a/modules/scicos_blocks/macros/Misc/c_block.sci
++++ b/modules/scicos_blocks/macros/Misc/c_block.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Misc/fortran_block.sci b/modules/scicos_blocks/macros/Misc/fortran_block.sci
+index fe3af04..d3fc56b 100644
+--- a/modules/scicos_blocks/macros/Misc/fortran_block.sci
++++ b/modules/scicos_blocks/macros/Misc/fortran_block.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Misc/func_block.sci b/modules/scicos_blocks/macros/Misc/func_block.sci
+index 2693b76..b3a44bd 100644
+--- a/modules/scicos_blocks/macros/Misc/func_block.sci
++++ b/modules/scicos_blocks/macros/Misc/func_block.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Misc/generic_block.sci b/modules/scicos_blocks/macros/Misc/generic_block.sci
+index 7016529..2e2949b 100644
+--- a/modules/scicos_blocks/macros/Misc/generic_block.sci
++++ b/modules/scicos_blocks/macros/Misc/generic_block.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Misc/generic_block2.sci b/modules/scicos_blocks/macros/Misc/generic_block2.sci
+index 0d61fb2..5bfce11 100644
+--- a/modules/scicos_blocks/macros/Misc/generic_block2.sci
++++ b/modules/scicos_blocks/macros/Misc/generic_block2.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Misc/generic_block3.sci b/modules/scicos_blocks/macros/Misc/generic_block3.sci
+index a475d6f..2c06b37 100644
+--- a/modules/scicos_blocks/macros/Misc/generic_block3.sci
++++ b/modules/scicos_blocks/macros/Misc/generic_block3.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Misc/m_sin.sci b/modules/scicos_blocks/macros/Misc/m_sin.sci
+index cfb0152..fe53ee5 100644
+--- a/modules/scicos_blocks/macros/Misc/m_sin.sci
++++ b/modules/scicos_blocks/macros/Misc/m_sin.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Misc/scifunc_block.sci b/modules/scicos_blocks/macros/Misc/scifunc_block.sci
+index c42a25f..e85c1f2 100644
+--- a/modules/scicos_blocks/macros/Misc/scifunc_block.sci
++++ b/modules/scicos_blocks/macros/Misc/scifunc_block.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Misc/scifunc_block_m.sci b/modules/scicos_blocks/macros/Misc/scifunc_block_m.sci
+index 49d14d5..ce27555 100644
+--- a/modules/scicos_blocks/macros/Misc/scifunc_block_m.sci
++++ b/modules/scicos_blocks/macros/Misc/scifunc_block_m.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/NonLinear/ABSBLK_f.sci b/modules/scicos_blocks/macros/NonLinear/ABSBLK_f.sci
+index 75ceb0f..e3c56a5 100644
+--- a/modules/scicos_blocks/macros/NonLinear/ABSBLK_f.sci
++++ b/modules/scicos_blocks/macros/NonLinear/ABSBLK_f.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/NonLinear/ABS_VALUE.sci b/modules/scicos_blocks/macros/NonLinear/ABS_VALUE.sci
+index 47dc011..8abbfac 100644
+--- a/modules/scicos_blocks/macros/NonLinear/ABS_VALUE.sci
++++ b/modules/scicos_blocks/macros/NonLinear/ABS_VALUE.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/NonLinear/COSBLK_f.sci b/modules/scicos_blocks/macros/NonLinear/COSBLK_f.sci
+index 2398b0b..c650b94 100644
+--- a/modules/scicos_blocks/macros/NonLinear/COSBLK_f.sci
++++ b/modules/scicos_blocks/macros/NonLinear/COSBLK_f.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/NonLinear/DLRADAPT_f.sci b/modules/scicos_blocks/macros/NonLinear/DLRADAPT_f.sci
+index 845e683..93dba2e 100644
+--- a/modules/scicos_blocks/macros/NonLinear/DLRADAPT_f.sci
++++ b/modules/scicos_blocks/macros/NonLinear/DLRADAPT_f.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/NonLinear/EXPBLK_f.sci b/modules/scicos_blocks/macros/NonLinear/EXPBLK_f.sci
+index 3e6663a..44251b6 100644
+--- a/modules/scicos_blocks/macros/NonLinear/EXPBLK_f.sci
++++ b/modules/scicos_blocks/macros/NonLinear/EXPBLK_f.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/NonLinear/EXPBLK_m.sci b/modules/scicos_blocks/macros/NonLinear/EXPBLK_m.sci
+index a18f6b1..d045738 100644
+--- a/modules/scicos_blocks/macros/NonLinear/EXPBLK_m.sci
++++ b/modules/scicos_blocks/macros/NonLinear/EXPBLK_m.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/NonLinear/FSV_f.sci b/modules/scicos_blocks/macros/NonLinear/FSV_f.sci
+index d540ff6..d2dbe17 100644
+--- a/modules/scicos_blocks/macros/NonLinear/FSV_f.sci
++++ b/modules/scicos_blocks/macros/NonLinear/FSV_f.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/NonLinear/INTRP2BLK_f.sci b/modules/scicos_blocks/macros/NonLinear/INTRP2BLK_f.sci
+index dcd11bd..c177db7 100644
+--- a/modules/scicos_blocks/macros/NonLinear/INTRP2BLK_f.sci
++++ b/modules/scicos_blocks/macros/NonLinear/INTRP2BLK_f.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/NonLinear/INTRPLBLK_f.sci b/modules/scicos_blocks/macros/NonLinear/INTRPLBLK_f.sci
+index 2d67af3..b4b224b 100644
+--- a/modules/scicos_blocks/macros/NonLinear/INTRPLBLK_f.sci
++++ b/modules/scicos_blocks/macros/NonLinear/INTRPLBLK_f.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/NonLinear/INVBLK.sci b/modules/scicos_blocks/macros/NonLinear/INVBLK.sci
+index 7c41f5c..5101478 100644
+--- a/modules/scicos_blocks/macros/NonLinear/INVBLK.sci
++++ b/modules/scicos_blocks/macros/NonLinear/INVBLK.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/NonLinear/INVBLK_f.sci b/modules/scicos_blocks/macros/NonLinear/INVBLK_f.sci
+index 3fa6d91..b1f5333 100644
+--- a/modules/scicos_blocks/macros/NonLinear/INVBLK_f.sci
++++ b/modules/scicos_blocks/macros/NonLinear/INVBLK_f.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/NonLinear/LOGBLK_f.sci b/modules/scicos_blocks/macros/NonLinear/LOGBLK_f.sci
+index f2655db..d8d978e 100644
+--- a/modules/scicos_blocks/macros/NonLinear/LOGBLK_f.sci
++++ b/modules/scicos_blocks/macros/NonLinear/LOGBLK_f.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/NonLinear/LOOKUP2D.sci b/modules/scicos_blocks/macros/NonLinear/LOOKUP2D.sci
+index ea75b67..6668095 100644
+--- a/modules/scicos_blocks/macros/NonLinear/LOOKUP2D.sci
++++ b/modules/scicos_blocks/macros/NonLinear/LOOKUP2D.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/NonLinear/LOOKUP_c.sci b/modules/scicos_blocks/macros/NonLinear/LOOKUP_c.sci
+index 45dc9d4..e3f0228 100644
+--- a/modules/scicos_blocks/macros/NonLinear/LOOKUP_c.sci
++++ b/modules/scicos_blocks/macros/NonLinear/LOOKUP_c.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/NonLinear/LOOKUP_f.sci b/modules/scicos_blocks/macros/NonLinear/LOOKUP_f.sci
+index ef07bd3..2299486 100644
+--- a/modules/scicos_blocks/macros/NonLinear/LOOKUP_f.sci
++++ b/modules/scicos_blocks/macros/NonLinear/LOOKUP_f.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/NonLinear/MAXMIN.sci b/modules/scicos_blocks/macros/NonLinear/MAXMIN.sci
+index c4bf700..3a228b7 100644
+--- a/modules/scicos_blocks/macros/NonLinear/MAXMIN.sci
++++ b/modules/scicos_blocks/macros/NonLinear/MAXMIN.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/NonLinear/MAX_f.sci b/modules/scicos_blocks/macros/NonLinear/MAX_f.sci
+index 1f55bc9..80dde6d 100644
+--- a/modules/scicos_blocks/macros/NonLinear/MAX_f.sci
++++ b/modules/scicos_blocks/macros/NonLinear/MAX_f.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/NonLinear/MIN_f.sci b/modules/scicos_blocks/macros/NonLinear/MIN_f.sci
+index 7fab9a0..de1f78f 100644
+--- a/modules/scicos_blocks/macros/NonLinear/MIN_f.sci
++++ b/modules/scicos_blocks/macros/NonLinear/MIN_f.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/NonLinear/POWBLK_f.sci b/modules/scicos_blocks/macros/NonLinear/POWBLK_f.sci
+index a125ca6..f07502c 100644
+--- a/modules/scicos_blocks/macros/NonLinear/POWBLK_f.sci
++++ b/modules/scicos_blocks/macros/NonLinear/POWBLK_f.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/NonLinear/PRODUCT.sci b/modules/scicos_blocks/macros/NonLinear/PRODUCT.sci
+index 7918d4f..b4733d9 100644
+--- a/modules/scicos_blocks/macros/NonLinear/PRODUCT.sci
++++ b/modules/scicos_blocks/macros/NonLinear/PRODUCT.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/NonLinear/PROD_f.sci b/modules/scicos_blocks/macros/NonLinear/PROD_f.sci
+index 3cb0f17..8f06f08 100644
+--- a/modules/scicos_blocks/macros/NonLinear/PROD_f.sci
++++ b/modules/scicos_blocks/macros/NonLinear/PROD_f.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/NonLinear/QUANT_f.sci b/modules/scicos_blocks/macros/NonLinear/QUANT_f.sci
+index bdcac4d..7d46cb5 100644
+--- a/modules/scicos_blocks/macros/NonLinear/QUANT_f.sci
++++ b/modules/scicos_blocks/macros/NonLinear/QUANT_f.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/NonLinear/SATURATION.sci b/modules/scicos_blocks/macros/NonLinear/SATURATION.sci
+index c296d13..869a96f 100644
+--- a/modules/scicos_blocks/macros/NonLinear/SATURATION.sci
++++ b/modules/scicos_blocks/macros/NonLinear/SATURATION.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/NonLinear/SAT_f.sci b/modules/scicos_blocks/macros/NonLinear/SAT_f.sci
+index b1625e1..6892f70 100644
+--- a/modules/scicos_blocks/macros/NonLinear/SAT_f.sci
++++ b/modules/scicos_blocks/macros/NonLinear/SAT_f.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/NonLinear/SIGNUM.sci b/modules/scicos_blocks/macros/NonLinear/SIGNUM.sci
+index 50e03aa..82bcb12 100644
+--- a/modules/scicos_blocks/macros/NonLinear/SIGNUM.sci
++++ b/modules/scicos_blocks/macros/NonLinear/SIGNUM.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/NonLinear/SINBLK_f.sci b/modules/scicos_blocks/macros/NonLinear/SINBLK_f.sci
+index 8218444..3a845e8 100644
+--- a/modules/scicos_blocks/macros/NonLinear/SINBLK_f.sci
++++ b/modules/scicos_blocks/macros/NonLinear/SINBLK_f.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/NonLinear/TANBLK_f.sci b/modules/scicos_blocks/macros/NonLinear/TANBLK_f.sci
+index d64a2e0..df14c3e 100644
+--- a/modules/scicos_blocks/macros/NonLinear/TANBLK_f.sci
++++ b/modules/scicos_blocks/macros/NonLinear/TANBLK_f.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/NonLinear/TrigFun.sci b/modules/scicos_blocks/macros/NonLinear/TrigFun.sci
+index be623fc..ac60ef4 100644
+--- a/modules/scicos_blocks/macros/NonLinear/TrigFun.sci
++++ b/modules/scicos_blocks/macros/NonLinear/TrigFun.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/NonLinear/buildmacros.sce b/modules/scicos_blocks/macros/NonLinear/buildmacros.sce
+index ed708e5..90e2511 100644
+--- a/modules/scicos_blocks/macros/NonLinear/buildmacros.sce
++++ b/modules/scicos_blocks/macros/NonLinear/buildmacros.sce
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/PDE/CFORTREDP.sci b/modules/scicos_blocks/macros/PDE/CFORTREDP.sci
+index 8d793b2..6b4235a 100644
+--- a/modules/scicos_blocks/macros/PDE/CFORTREDP.sci
++++ b/modules/scicos_blocks/macros/PDE/CFORTREDP.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/PDE/Disc2_5_FVM1d.sci b/modules/scicos_blocks/macros/PDE/Disc2_5_FVM1d.sci
+index 9fbc8be..f20e005 100644
+--- a/modules/scicos_blocks/macros/PDE/Disc2_5_FVM1d.sci
++++ b/modules/scicos_blocks/macros/PDE/Disc2_5_FVM1d.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/PDE/Disc_diff_oper2.sci b/modules/scicos_blocks/macros/PDE/Disc_diff_oper2.sci
+index 17c70d2..0e66168 100644
+--- a/modules/scicos_blocks/macros/PDE/Disc_diff_oper2.sci
++++ b/modules/scicos_blocks/macros/PDE/Disc_diff_oper2.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/PDE/Disc_diff_oper45.sci b/modules/scicos_blocks/macros/PDE/Disc_diff_oper45.sci
+index 46baaa3..3f409f4 100644
+--- a/modules/scicos_blocks/macros/PDE/Disc_diff_oper45.sci
++++ b/modules/scicos_blocks/macros/PDE/Disc_diff_oper45.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/PDE/IHM_EDP.sci b/modules/scicos_blocks/macros/PDE/IHM_EDP.sci
+index 99fc672..be1951d 100644
+--- a/modules/scicos_blocks/macros/PDE/IHM_EDP.sci
++++ b/modules/scicos_blocks/macros/PDE/IHM_EDP.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/PDE/PDE.sci b/modules/scicos_blocks/macros/PDE/PDE.sci
+index a8dfbb5..0d07d84 100644
+--- a/modules/scicos_blocks/macros/PDE/PDE.sci
++++ b/modules/scicos_blocks/macros/PDE/PDE.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/PDE/addf_mat.sci b/modules/scicos_blocks/macros/PDE/addf_mat.sci
+index 0b54146..7061010 100644
+--- a/modules/scicos_blocks/macros/PDE/addf_mat.sci
++++ b/modules/scicos_blocks/macros/PDE/addf_mat.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/PDE/addfv.sci b/modules/scicos_blocks/macros/PDE/addfv.sci
+index a9b2499..de929d2 100644
+--- a/modules/scicos_blocks/macros/PDE/addfv.sci
++++ b/modules/scicos_blocks/macros/PDE/addfv.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/PDE/arbre_decision.sci b/modules/scicos_blocks/macros/PDE/arbre_decision.sci
+index 16c4bb7..773a85a 100644
+--- a/modules/scicos_blocks/macros/PDE/arbre_decision.sci
++++ b/modules/scicos_blocks/macros/PDE/arbre_decision.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/PDE/assemb.sci b/modules/scicos_blocks/macros/PDE/assemb.sci
+index d09ab1e..ce5fc67 100644
+--- a/modules/scicos_blocks/macros/PDE/assemb.sci
++++ b/modules/scicos_blocks/macros/PDE/assemb.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/PDE/assemblage_FE1D.sci b/modules/scicos_blocks/macros/PDE/assemblage_FE1D.sci
+index 20dc68e..23eb10a 100644
+--- a/modules/scicos_blocks/macros/PDE/assemblage_FE1D.sci
++++ b/modules/scicos_blocks/macros/PDE/assemblage_FE1D.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/PDE/buildmacros.sce b/modules/scicos_blocks/macros/PDE/buildmacros.sce
+index dbce725..484d2b0 100644
+--- a/modules/scicos_blocks/macros/PDE/buildmacros.sce
++++ b/modules/scicos_blocks/macros/PDE/buildmacros.sce
+@@ -15,7 +15,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/PDE/cb_IHM_EDP.sci b/modules/scicos_blocks/macros/PDE/cb_IHM_EDP.sci
+index 23be58b..7b14084 100644
+--- a/modules/scicos_blocks/macros/PDE/cb_IHM_EDP.sci
++++ b/modules/scicos_blocks/macros/PDE/cb_IHM_EDP.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/PDE/cformatlinedp.sci b/modules/scicos_blocks/macros/PDE/cformatlinedp.sci
+index 15f7536..3f3c99a 100644
+--- a/modules/scicos_blocks/macros/PDE/cformatlinedp.sci
++++ b/modules/scicos_blocks/macros/PDE/cformatlinedp.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/PDE/code_generation.sci b/modules/scicos_blocks/macros/PDE/code_generation.sci
+index 0f1cccf..01eb88c 100644
+--- a/modules/scicos_blocks/macros/PDE/code_generation.sci
++++ b/modules/scicos_blocks/macros/PDE/code_generation.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/PDE/coef_FEM1d.sci b/modules/scicos_blocks/macros/PDE/coef_FEM1d.sci
+index 97d8831..f29612b 100644
+--- a/modules/scicos_blocks/macros/PDE/coef_FEM1d.sci
++++ b/modules/scicos_blocks/macros/PDE/coef_FEM1d.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/PDE/elemoper.sci b/modules/scicos_blocks/macros/PDE/elemoper.sci
+index 1f3a9e3..e86d8d0 100644
+--- a/modules/scicos_blocks/macros/PDE/elemoper.sci
++++ b/modules/scicos_blocks/macros/PDE/elemoper.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/PDE/eval_pts_EF.sci b/modules/scicos_blocks/macros/PDE/eval_pts_EF.sci
+index 6062858..abc0229 100644
+--- a/modules/scicos_blocks/macros/PDE/eval_pts_EF.sci
++++ b/modules/scicos_blocks/macros/PDE/eval_pts_EF.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/PDE/eval_pts_df.sci b/modules/scicos_blocks/macros/PDE/eval_pts_df.sci
+index 4b47aa5..c965624 100644
+--- a/modules/scicos_blocks/macros/PDE/eval_pts_df.sci
++++ b/modules/scicos_blocks/macros/PDE/eval_pts_df.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/PDE/eval_pts_vf.sci b/modules/scicos_blocks/macros/PDE/eval_pts_vf.sci
+index 984a724..eedf399 100644
+--- a/modules/scicos_blocks/macros/PDE/eval_pts_vf.sci
++++ b/modules/scicos_blocks/macros/PDE/eval_pts_vf.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/PDE/extraction_infos.sci b/modules/scicos_blocks/macros/PDE/extraction_infos.sci
+index d634914..2b11076 100644
+--- a/modules/scicos_blocks/macros/PDE/extraction_infos.sci
++++ b/modules/scicos_blocks/macros/PDE/extraction_infos.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/PDE/formkf.sci b/modules/scicos_blocks/macros/PDE/formkf.sci
+index 2d484be..cb59ec3 100644
+--- a/modules/scicos_blocks/macros/PDE/formkf.sci
++++ b/modules/scicos_blocks/macros/PDE/formkf.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/PDE/gen_code_FDM.sci b/modules/scicos_blocks/macros/PDE/gen_code_FDM.sci
+index 655cdf4..1572fc5 100644
+--- a/modules/scicos_blocks/macros/PDE/gen_code_FDM.sci
++++ b/modules/scicos_blocks/macros/PDE/gen_code_FDM.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/PDE/gen_code_FEM.sci b/modules/scicos_blocks/macros/PDE/gen_code_FEM.sci
+index a893b03..325fb2d 100644
+--- a/modules/scicos_blocks/macros/PDE/gen_code_FEM.sci
++++ b/modules/scicos_blocks/macros/PDE/gen_code_FEM.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/PDE/gen_code_FVM.sci b/modules/scicos_blocks/macros/PDE/gen_code_FVM.sci
+index b37b7e9..437145b 100644
+--- a/modules/scicos_blocks/macros/PDE/gen_code_FVM.sci
++++ b/modules/scicos_blocks/macros/PDE/gen_code_FVM.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/PDE/lecture_xml.sci b/modules/scicos_blocks/macros/PDE/lecture_xml.sci
+index 1b8b553..276af31 100644
+--- a/modules/scicos_blocks/macros/PDE/lecture_xml.sci
++++ b/modules/scicos_blocks/macros/PDE/lecture_xml.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/PDE/maillage_FE1D.sci b/modules/scicos_blocks/macros/PDE/maillage_FE1D.sci
+index 7edb434..c42863e 100644
+--- a/modules/scicos_blocks/macros/PDE/maillage_FE1D.sci
++++ b/modules/scicos_blocks/macros/PDE/maillage_FE1D.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/PDE/meth.xml b/modules/scicos_blocks/macros/PDE/meth.xml
+index b74397e..ce91887 100644
+--- a/modules/scicos_blocks/macros/PDE/meth.xml
++++ b/modules/scicos_blocks/macros/PDE/meth.xml
+@@ -16,7 +16,7 @@
+ 
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ 
+  See the file ../license.txt
+ -->
+diff --git a/modules/scicos_blocks/macros/PDE/msprintfv.sci b/modules/scicos_blocks/macros/PDE/msprintfv.sci
+index 3c97126..b0dc878 100644
+--- a/modules/scicos_blocks/macros/PDE/msprintfv.sci
++++ b/modules/scicos_blocks/macros/PDE/msprintfv.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/PDE/mulf3.sci b/modules/scicos_blocks/macros/PDE/mulf3.sci
+index 5bebe21..cef8612 100644
+--- a/modules/scicos_blocks/macros/PDE/mulf3.sci
++++ b/modules/scicos_blocks/macros/PDE/mulf3.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/PDE/mulf3v.sci b/modules/scicos_blocks/macros/PDE/mulf3v.sci
+index 5c71437..dc96f5f 100644
+--- a/modules/scicos_blocks/macros/PDE/mulf3v.sci
++++ b/modules/scicos_blocks/macros/PDE/mulf3v.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/PDE/mulf_string.sci b/modules/scicos_blocks/macros/PDE/mulf_string.sci
+index 1ccef4f..8cc098c 100644
+--- a/modules/scicos_blocks/macros/PDE/mulf_string.sci
++++ b/modules/scicos_blocks/macros/PDE/mulf_string.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/PDE/mulfstring.sci b/modules/scicos_blocks/macros/PDE/mulfstring.sci
+index 7a2dc9c..ffa63fb 100644
+--- a/modules/scicos_blocks/macros/PDE/mulfstring.sci
++++ b/modules/scicos_blocks/macros/PDE/mulfstring.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/PDE/mulfv.sci b/modules/scicos_blocks/macros/PDE/mulfv.sci
+index 6d9e220..f6a9edc 100644
+--- a/modules/scicos_blocks/macros/PDE/mulfv.sci
++++ b/modules/scicos_blocks/macros/PDE/mulfv.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/PDE/multMatVect.sci b/modules/scicos_blocks/macros/PDE/multMatVect.sci
+index 424310c..67c17a9 100644
+--- a/modules/scicos_blocks/macros/PDE/multMatVect.sci
++++ b/modules/scicos_blocks/macros/PDE/multMatVect.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/PDE/multVectStr.sci b/modules/scicos_blocks/macros/PDE/multVectStr.sci
+index 779ad28..20871bc 100644
+--- a/modules/scicos_blocks/macros/PDE/multVectStr.sci
++++ b/modules/scicos_blocks/macros/PDE/multVectStr.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/PDE/nombre_etats.sci b/modules/scicos_blocks/macros/PDE/nombre_etats.sci
+index e49194e..4610840 100644
+--- a/modules/scicos_blocks/macros/PDE/nombre_etats.sci
++++ b/modules/scicos_blocks/macros/PDE/nombre_etats.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/PDE/setint.sci b/modules/scicos_blocks/macros/PDE/setint.sci
+index 81714c1..0f1e7ee 100644
+--- a/modules/scicos_blocks/macros/PDE/setint.sci
++++ b/modules/scicos_blocks/macros/PDE/setint.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/PDE/setvalue_IHM-PDE.sci b/modules/scicos_blocks/macros/PDE/setvalue_IHM-PDE.sci
+index 06dcba4..cce0c88 100644
+--- a/modules/scicos_blocks/macros/PDE/setvalue_IHM-PDE.sci
++++ b/modules/scicos_blocks/macros/PDE/setvalue_IHM-PDE.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/PDE/setvalue_IHM_EDP.sci b/modules/scicos_blocks/macros/PDE/setvalue_IHM_EDP.sci
+index 46ea31a..817f8c8 100644
+--- a/modules/scicos_blocks/macros/PDE/setvalue_IHM_EDP.sci
++++ b/modules/scicos_blocks/macros/PDE/setvalue_IHM_EDP.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/PDE/shape.sci b/modules/scicos_blocks/macros/PDE/shape.sci
+index 8bcbecf..f4260da 100644
+--- a/modules/scicos_blocks/macros/PDE/shape.sci
++++ b/modules/scicos_blocks/macros/PDE/shape.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/PDE/subf_mat.sci b/modules/scicos_blocks/macros/PDE/subf_mat.sci
+index 89807ed..69b5435 100644
+--- a/modules/scicos_blocks/macros/PDE/subf_mat.sci
++++ b/modules/scicos_blocks/macros/PDE/subf_mat.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/PDE/subfv.sci b/modules/scicos_blocks/macros/PDE/subfv.sci
+index 834ba2c..519a0a5 100644
+--- a/modules/scicos_blocks/macros/PDE/subfv.sci
++++ b/modules/scicos_blocks/macros/PDE/subfv.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/PDE/translate.sci b/modules/scicos_blocks/macros/PDE/translate.sci
+index ca52024..09f433d 100644
+--- a/modules/scicos_blocks/macros/PDE/translate.sci
++++ b/modules/scicos_blocks/macros/PDE/translate.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/PDE/unimesh1D.sci b/modules/scicos_blocks/macros/PDE/unimesh1D.sci
+index 0c17bd2..ce82e8a 100644
+--- a/modules/scicos_blocks/macros/PDE/unimesh1D.sci
++++ b/modules/scicos_blocks/macros/PDE/unimesh1D.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Sinks/AFFICH_m.sci b/modules/scicos_blocks/macros/Sinks/AFFICH_m.sci
+index f1cb94d..f165355 100644
+--- a/modules/scicos_blocks/macros/Sinks/AFFICH_m.sci
++++ b/modules/scicos_blocks/macros/Sinks/AFFICH_m.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Sinks/CANIMXY.sci b/modules/scicos_blocks/macros/Sinks/CANIMXY.sci
+index 39b39be..385db8d 100644
+--- a/modules/scicos_blocks/macros/Sinks/CANIMXY.sci
++++ b/modules/scicos_blocks/macros/Sinks/CANIMXY.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Sinks/CANIMXY3D.sci b/modules/scicos_blocks/macros/Sinks/CANIMXY3D.sci
+index 5c56d50..a932a8d 100644
+--- a/modules/scicos_blocks/macros/Sinks/CANIMXY3D.sci
++++ b/modules/scicos_blocks/macros/Sinks/CANIMXY3D.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Sinks/CEVENTSCOPE.sci b/modules/scicos_blocks/macros/Sinks/CEVENTSCOPE.sci
+index 35031cd..e82a583 100644
+--- a/modules/scicos_blocks/macros/Sinks/CEVENTSCOPE.sci
++++ b/modules/scicos_blocks/macros/Sinks/CEVENTSCOPE.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Sinks/CFSCOPE.sci b/modules/scicos_blocks/macros/Sinks/CFSCOPE.sci
+index ac8fa4e..9abaef0 100644
+--- a/modules/scicos_blocks/macros/Sinks/CFSCOPE.sci
++++ b/modules/scicos_blocks/macros/Sinks/CFSCOPE.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Sinks/CLKOUTV_f.sci b/modules/scicos_blocks/macros/Sinks/CLKOUTV_f.sci
+index 59e2866..d28009d 100644
+--- a/modules/scicos_blocks/macros/Sinks/CLKOUTV_f.sci
++++ b/modules/scicos_blocks/macros/Sinks/CLKOUTV_f.sci
+@@ -15,7 +15,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Sinks/CLKOUT_f.sci b/modules/scicos_blocks/macros/Sinks/CLKOUT_f.sci
+index d821622..835c25b 100644
+--- a/modules/scicos_blocks/macros/Sinks/CLKOUT_f.sci
++++ b/modules/scicos_blocks/macros/Sinks/CLKOUT_f.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Sinks/CMAT3D.sci b/modules/scicos_blocks/macros/Sinks/CMAT3D.sci
+index f5965fd..41e9ed9 100644
+--- a/modules/scicos_blocks/macros/Sinks/CMAT3D.sci
++++ b/modules/scicos_blocks/macros/Sinks/CMAT3D.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Sinks/CMATVIEW.sci b/modules/scicos_blocks/macros/Sinks/CMATVIEW.sci
+index 0d3d61d..895ab51 100644
+--- a/modules/scicos_blocks/macros/Sinks/CMATVIEW.sci
++++ b/modules/scicos_blocks/macros/Sinks/CMATVIEW.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Sinks/CMSCOPE.sci b/modules/scicos_blocks/macros/Sinks/CMSCOPE.sci
+index 8768a07..6ca96ed 100644
+--- a/modules/scicos_blocks/macros/Sinks/CMSCOPE.sci
++++ b/modules/scicos_blocks/macros/Sinks/CMSCOPE.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Sinks/CSCOPE.sci b/modules/scicos_blocks/macros/Sinks/CSCOPE.sci
+index 2815b9a..74f8e54 100644
+--- a/modules/scicos_blocks/macros/Sinks/CSCOPE.sci
++++ b/modules/scicos_blocks/macros/Sinks/CSCOPE.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Sinks/CSCOPXY.sci b/modules/scicos_blocks/macros/Sinks/CSCOPXY.sci
+index 74e1108..52e29ba 100644
+--- a/modules/scicos_blocks/macros/Sinks/CSCOPXY.sci
++++ b/modules/scicos_blocks/macros/Sinks/CSCOPXY.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Sinks/CSCOPXY3D.sci b/modules/scicos_blocks/macros/Sinks/CSCOPXY3D.sci
+index b5be392..614bb47 100644
+--- a/modules/scicos_blocks/macros/Sinks/CSCOPXY3D.sci
++++ b/modules/scicos_blocks/macros/Sinks/CSCOPXY3D.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Sinks/OUTIMPL_f.sci b/modules/scicos_blocks/macros/Sinks/OUTIMPL_f.sci
+index 8f9c9e6..f9a71a3 100644
+--- a/modules/scicos_blocks/macros/Sinks/OUTIMPL_f.sci
++++ b/modules/scicos_blocks/macros/Sinks/OUTIMPL_f.sci
+@@ -15,7 +15,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Sinks/OUT_f.sci b/modules/scicos_blocks/macros/Sinks/OUT_f.sci
+index 2ffaf96..0a0924d 100644
+--- a/modules/scicos_blocks/macros/Sinks/OUT_f.sci
++++ b/modules/scicos_blocks/macros/Sinks/OUT_f.sci
+@@ -15,7 +15,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Sinks/TOWS_c.sci b/modules/scicos_blocks/macros/Sinks/TOWS_c.sci
+index 6ebb2fb..1bca350 100644
+--- a/modules/scicos_blocks/macros/Sinks/TOWS_c.sci
++++ b/modules/scicos_blocks/macros/Sinks/TOWS_c.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Sinks/TRASH_f.sci b/modules/scicos_blocks/macros/Sinks/TRASH_f.sci
+index eccbaee..0c2b6ee 100644
+--- a/modules/scicos_blocks/macros/Sinks/TRASH_f.sci
++++ b/modules/scicos_blocks/macros/Sinks/TRASH_f.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Sinks/WFILE_f.sci b/modules/scicos_blocks/macros/Sinks/WFILE_f.sci
+index 73a846f..c786d36 100644
+--- a/modules/scicos_blocks/macros/Sinks/WFILE_f.sci
++++ b/modules/scicos_blocks/macros/Sinks/WFILE_f.sci
+@@ -15,7 +15,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Sinks/WRITEAU_f.sci b/modules/scicos_blocks/macros/Sinks/WRITEAU_f.sci
+index ce37908..5b016d3 100644
+--- a/modules/scicos_blocks/macros/Sinks/WRITEAU_f.sci
++++ b/modules/scicos_blocks/macros/Sinks/WRITEAU_f.sci
+@@ -15,7 +15,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Sinks/WRITEC_f.sci b/modules/scicos_blocks/macros/Sinks/WRITEC_f.sci
+index 1bb6fca..2768da3 100644
+--- a/modules/scicos_blocks/macros/Sinks/WRITEC_f.sci
++++ b/modules/scicos_blocks/macros/Sinks/WRITEC_f.sci
+@@ -15,7 +15,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Sinks/buildmacros.sce b/modules/scicos_blocks/macros/Sinks/buildmacros.sce
+index b719780..801ddf3 100644
+--- a/modules/scicos_blocks/macros/Sinks/buildmacros.sce
++++ b/modules/scicos_blocks/macros/Sinks/buildmacros.sce
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Sources/CLKINV_f.sci b/modules/scicos_blocks/macros/Sources/CLKINV_f.sci
+index a4a3476..3d9b1af 100644
+--- a/modules/scicos_blocks/macros/Sources/CLKINV_f.sci
++++ b/modules/scicos_blocks/macros/Sources/CLKINV_f.sci
+@@ -15,7 +15,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Sources/CLKIN_f.sci b/modules/scicos_blocks/macros/Sources/CLKIN_f.sci
+index d3c9d2f..b933b4c 100644
+--- a/modules/scicos_blocks/macros/Sources/CLKIN_f.sci
++++ b/modules/scicos_blocks/macros/Sources/CLKIN_f.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Sources/CLOCK_c.sci b/modules/scicos_blocks/macros/Sources/CLOCK_c.sci
+index 7f5c3bf..42f4e69 100644
+--- a/modules/scicos_blocks/macros/Sources/CLOCK_c.sci
++++ b/modules/scicos_blocks/macros/Sources/CLOCK_c.sci
+@@ -15,7 +15,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Sources/CLOCK_f.sci b/modules/scicos_blocks/macros/Sources/CLOCK_f.sci
+index 296461d..33fa76e 100644
+--- a/modules/scicos_blocks/macros/Sources/CLOCK_f.sci
++++ b/modules/scicos_blocks/macros/Sources/CLOCK_f.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Sources/CONST.sci b/modules/scicos_blocks/macros/Sources/CONST.sci
+index 13153d7..408b758 100644
+--- a/modules/scicos_blocks/macros/Sources/CONST.sci
++++ b/modules/scicos_blocks/macros/Sources/CONST.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Sources/CONST_f.sci b/modules/scicos_blocks/macros/Sources/CONST_f.sci
+index f9f944c..2bf55e7 100644
+--- a/modules/scicos_blocks/macros/Sources/CONST_f.sci
++++ b/modules/scicos_blocks/macros/Sources/CONST_f.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Sources/CONST_m.sci b/modules/scicos_blocks/macros/Sources/CONST_m.sci
+index 4f2dfa0..6424906 100644
+--- a/modules/scicos_blocks/macros/Sources/CONST_m.sci
++++ b/modules/scicos_blocks/macros/Sources/CONST_m.sci
+@@ -15,7 +15,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Sources/CURVE_c.sci b/modules/scicos_blocks/macros/Sources/CURVE_c.sci
+index 705abef..1bbfbf9 100644
+--- a/modules/scicos_blocks/macros/Sources/CURVE_c.sci
++++ b/modules/scicos_blocks/macros/Sources/CURVE_c.sci
+@@ -16,7 +16,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Sources/CURV_f.sci b/modules/scicos_blocks/macros/Sources/CURV_f.sci
+index 27ae03a..10f0c97 100644
+--- a/modules/scicos_blocks/macros/Sources/CURV_f.sci
++++ b/modules/scicos_blocks/macros/Sources/CURV_f.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Sources/Counter.sci b/modules/scicos_blocks/macros/Sources/Counter.sci
+index e03c542..7889c34 100644
+--- a/modules/scicos_blocks/macros/Sources/Counter.sci
++++ b/modules/scicos_blocks/macros/Sources/Counter.sci
+@@ -15,7 +15,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Sources/FROMWSB.sci b/modules/scicos_blocks/macros/Sources/FROMWSB.sci
+index 807a398..5250585 100644
+--- a/modules/scicos_blocks/macros/Sources/FROMWSB.sci
++++ b/modules/scicos_blocks/macros/Sources/FROMWSB.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Sources/FROMWS_c.sci b/modules/scicos_blocks/macros/Sources/FROMWS_c.sci
+index 1df8852..e99c8e0 100644
+--- a/modules/scicos_blocks/macros/Sources/FROMWS_c.sci
++++ b/modules/scicos_blocks/macros/Sources/FROMWS_c.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Sources/GENSIN_f.sci b/modules/scicos_blocks/macros/Sources/GENSIN_f.sci
+index 373e4ab..666a158 100644
+--- a/modules/scicos_blocks/macros/Sources/GENSIN_f.sci
++++ b/modules/scicos_blocks/macros/Sources/GENSIN_f.sci
+@@ -15,7 +15,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Sources/GENSQR_f.sci b/modules/scicos_blocks/macros/Sources/GENSQR_f.sci
+index 9c502be..8a4d823 100644
+--- a/modules/scicos_blocks/macros/Sources/GENSQR_f.sci
++++ b/modules/scicos_blocks/macros/Sources/GENSQR_f.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Sources/GEN_SQR.sci b/modules/scicos_blocks/macros/Sources/GEN_SQR.sci
+index 631e649..47a7332 100644
+--- a/modules/scicos_blocks/macros/Sources/GEN_SQR.sci
++++ b/modules/scicos_blocks/macros/Sources/GEN_SQR.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Sources/Ground_g.sci b/modules/scicos_blocks/macros/Sources/Ground_g.sci
+index bc2f217..37ce87f 100644
+--- a/modules/scicos_blocks/macros/Sources/Ground_g.sci
++++ b/modules/scicos_blocks/macros/Sources/Ground_g.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Sources/INIMPL_f.sci b/modules/scicos_blocks/macros/Sources/INIMPL_f.sci
+index f215555..77b6db4 100644
+--- a/modules/scicos_blocks/macros/Sources/INIMPL_f.sci
++++ b/modules/scicos_blocks/macros/Sources/INIMPL_f.sci
+@@ -15,7 +15,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Sources/IN_f.sci b/modules/scicos_blocks/macros/Sources/IN_f.sci
+index 2a9a92d..8237005 100644
+--- a/modules/scicos_blocks/macros/Sources/IN_f.sci
++++ b/modules/scicos_blocks/macros/Sources/IN_f.sci
+@@ -15,7 +15,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Sources/Modulo_Count.sci b/modules/scicos_blocks/macros/Sources/Modulo_Count.sci
+index 3bcd699..44c19f5 100644
+--- a/modules/scicos_blocks/macros/Sources/Modulo_Count.sci
++++ b/modules/scicos_blocks/macros/Sources/Modulo_Count.sci
+@@ -15,7 +15,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Sources/PULSE_SC.sci b/modules/scicos_blocks/macros/Sources/PULSE_SC.sci
+index be644b2..654e2be 100644
+--- a/modules/scicos_blocks/macros/Sources/PULSE_SC.sci
++++ b/modules/scicos_blocks/macros/Sources/PULSE_SC.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Sources/RAMP.sci b/modules/scicos_blocks/macros/Sources/RAMP.sci
+index a2d8f3f..1b57aaa 100644
+--- a/modules/scicos_blocks/macros/Sources/RAMP.sci
++++ b/modules/scicos_blocks/macros/Sources/RAMP.sci
+@@ -15,7 +15,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Sources/RAND_f.sci b/modules/scicos_blocks/macros/Sources/RAND_f.sci
+index c9b4923..0b9a4b7 100644
+--- a/modules/scicos_blocks/macros/Sources/RAND_f.sci
++++ b/modules/scicos_blocks/macros/Sources/RAND_f.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Sources/RAND_m.sci b/modules/scicos_blocks/macros/Sources/RAND_m.sci
+index 34088d7..08b9289 100644
+--- a/modules/scicos_blocks/macros/Sources/RAND_m.sci
++++ b/modules/scicos_blocks/macros/Sources/RAND_m.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Sources/READAU_f.sci b/modules/scicos_blocks/macros/Sources/READAU_f.sci
+index 51024ec..768ee6a 100644
+--- a/modules/scicos_blocks/macros/Sources/READAU_f.sci
++++ b/modules/scicos_blocks/macros/Sources/READAU_f.sci
+@@ -15,7 +15,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Sources/READC_f.sci b/modules/scicos_blocks/macros/Sources/READC_f.sci
+index 3103ded..4f47961 100644
+--- a/modules/scicos_blocks/macros/Sources/READC_f.sci
++++ b/modules/scicos_blocks/macros/Sources/READC_f.sci
+@@ -15,7 +15,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Sources/RFILE_f.sci b/modules/scicos_blocks/macros/Sources/RFILE_f.sci
+index 302ec55..b9bfffa 100644
+--- a/modules/scicos_blocks/macros/Sources/RFILE_f.sci
++++ b/modules/scicos_blocks/macros/Sources/RFILE_f.sci
+@@ -15,7 +15,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Sources/SAWTOOTH_f.sci b/modules/scicos_blocks/macros/Sources/SAWTOOTH_f.sci
+index 0497865..af3950d 100644
+--- a/modules/scicos_blocks/macros/Sources/SAWTOOTH_f.sci
++++ b/modules/scicos_blocks/macros/Sources/SAWTOOTH_f.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Sources/STEP.sci b/modules/scicos_blocks/macros/Sources/STEP.sci
+index b98e40f..bb7d818 100644
+--- a/modules/scicos_blocks/macros/Sources/STEP.sci
++++ b/modules/scicos_blocks/macros/Sources/STEP.sci
+@@ -15,7 +15,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Sources/STEP_FUNCTION.sci b/modules/scicos_blocks/macros/Sources/STEP_FUNCTION.sci
+index 752e5aa..5fe3ae0 100644
+--- a/modules/scicos_blocks/macros/Sources/STEP_FUNCTION.sci
++++ b/modules/scicos_blocks/macros/Sources/STEP_FUNCTION.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Sources/SampleCLK.sci b/modules/scicos_blocks/macros/Sources/SampleCLK.sci
+index 9bbd423..f640649 100644
+--- a/modules/scicos_blocks/macros/Sources/SampleCLK.sci
++++ b/modules/scicos_blocks/macros/Sources/SampleCLK.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Sources/Sigbuilder.sci b/modules/scicos_blocks/macros/Sources/Sigbuilder.sci
+index 6b18b0e..655f70b 100644
+--- a/modules/scicos_blocks/macros/Sources/Sigbuilder.sci
++++ b/modules/scicos_blocks/macros/Sources/Sigbuilder.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Sources/TIME_f.sci b/modules/scicos_blocks/macros/Sources/TIME_f.sci
+index f6445c5..f090715 100644
+--- a/modules/scicos_blocks/macros/Sources/TIME_f.sci
++++ b/modules/scicos_blocks/macros/Sources/TIME_f.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Sources/TKSCALE.sci b/modules/scicos_blocks/macros/Sources/TKSCALE.sci
+index a1ced8f..0ff724c 100644
+--- a/modules/scicos_blocks/macros/Sources/TKSCALE.sci
++++ b/modules/scicos_blocks/macros/Sources/TKSCALE.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Sources/buildmacros.sce b/modules/scicos_blocks/macros/Sources/buildmacros.sce
+index 4978839..082d334 100644
+--- a/modules/scicos_blocks/macros/Sources/buildmacros.sce
++++ b/modules/scicos_blocks/macros/Sources/buildmacros.sce
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Sources/tkscaleblk.sci b/modules/scicos_blocks/macros/Sources/tkscaleblk.sci
+index 25eb70c..a24966e 100644
+--- a/modules/scicos_blocks/macros/Sources/tkscaleblk.sci
++++ b/modules/scicos_blocks/macros/Sources/tkscaleblk.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Threshold/GENERAL_f.sci b/modules/scicos_blocks/macros/Threshold/GENERAL_f.sci
+index a55d42b..0653a16 100644
+--- a/modules/scicos_blocks/macros/Threshold/GENERAL_f.sci
++++ b/modules/scicos_blocks/macros/Threshold/GENERAL_f.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Threshold/NEGTOPOS_f.sci b/modules/scicos_blocks/macros/Threshold/NEGTOPOS_f.sci
+index f8388c7..89582c6 100644
+--- a/modules/scicos_blocks/macros/Threshold/NEGTOPOS_f.sci
++++ b/modules/scicos_blocks/macros/Threshold/NEGTOPOS_f.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Threshold/POSTONEG_f.sci b/modules/scicos_blocks/macros/Threshold/POSTONEG_f.sci
+index 0e9b64e..3f53a44 100644
+--- a/modules/scicos_blocks/macros/Threshold/POSTONEG_f.sci
++++ b/modules/scicos_blocks/macros/Threshold/POSTONEG_f.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Threshold/ZCROSS_f.sci b/modules/scicos_blocks/macros/Threshold/ZCROSS_f.sci
+index 8dd3978..b2d6969 100644
+--- a/modules/scicos_blocks/macros/Threshold/ZCROSS_f.sci
++++ b/modules/scicos_blocks/macros/Threshold/ZCROSS_f.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/Threshold/buildmacros.sce b/modules/scicos_blocks/macros/Threshold/buildmacros.sce
+index 1f686e4..a1d95a5 100644
+--- a/modules/scicos_blocks/macros/Threshold/buildmacros.sce
++++ b/modules/scicos_blocks/macros/Threshold/buildmacros.sce
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/macros/buildmacros.sce b/modules/scicos_blocks/macros/buildmacros.sce
+index d4e6d1e..59cabec 100644
+--- a/modules/scicos_blocks/macros/buildmacros.sce
++++ b/modules/scicos_blocks/macros/buildmacros.sce
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/scicos_blocks/src/c/DllmainScicos_blocks.c b/modules/scicos_blocks/src/c/DllmainScicos_blocks.c
+index 0bc9235..7248239 100644
+--- a/modules/scicos_blocks/src/c/DllmainScicos_blocks.c
++++ b/modules/scicos_blocks/src/c/DllmainScicos_blocks.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/absblk.c b/modules/scicos_blocks/src/c/absblk.c
+index fe5b0f1..ae1047f 100644
+--- a/modules/scicos_blocks/src/c/absblk.c
++++ b/modules/scicos_blocks/src/c/absblk.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/absolute_value.c b/modules/scicos_blocks/src/c/absolute_value.c
+index ee5617a..686c02f 100644
+--- a/modules/scicos_blocks/src/c/absolute_value.c
++++ b/modules/scicos_blocks/src/c/absolute_value.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/acos_blk.c b/modules/scicos_blocks/src/c/acos_blk.c
+index b7a1a69..fb65908 100644
+--- a/modules/scicos_blocks/src/c/acos_blk.c
++++ b/modules/scicos_blocks/src/c/acos_blk.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/acosh_blk.c b/modules/scicos_blocks/src/c/acosh_blk.c
+index f15f3a2..9573622 100644
+--- a/modules/scicos_blocks/src/c/acosh_blk.c
++++ b/modules/scicos_blocks/src/c/acosh_blk.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/andlog.c b/modules/scicos_blocks/src/c/andlog.c
+index ae76ef2..3039c62 100644
+--- a/modules/scicos_blocks/src/c/andlog.c
++++ b/modules/scicos_blocks/src/c/andlog.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/asin_blk.c b/modules/scicos_blocks/src/c/asin_blk.c
+index a3275ad..4ed4481 100644
+--- a/modules/scicos_blocks/src/c/asin_blk.c
++++ b/modules/scicos_blocks/src/c/asin_blk.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/asinh_blk.c b/modules/scicos_blocks/src/c/asinh_blk.c
+index 6e51e5f..7f7a972 100644
+--- a/modules/scicos_blocks/src/c/asinh_blk.c
++++ b/modules/scicos_blocks/src/c/asinh_blk.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/assignment.c b/modules/scicos_blocks/src/c/assignment.c
+index 5805b2f..4a7efae 100644
+--- a/modules/scicos_blocks/src/c/assignment.c
++++ b/modules/scicos_blocks/src/c/assignment.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/atan_blk.c b/modules/scicos_blocks/src/c/atan_blk.c
+index e4c5cf6..29d2b34 100644
+--- a/modules/scicos_blocks/src/c/atan_blk.c
++++ b/modules/scicos_blocks/src/c/atan_blk.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/atanh_blk.c b/modules/scicos_blocks/src/c/atanh_blk.c
+index 96a733c..9d09c31 100644
+--- a/modules/scicos_blocks/src/c/atanh_blk.c
++++ b/modules/scicos_blocks/src/c/atanh_blk.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/automat.c b/modules/scicos_blocks/src/c/automat.c
+index 784d8e6..6d4406d 100644
+--- a/modules/scicos_blocks/src/c/automat.c
++++ b/modules/scicos_blocks/src/c/automat.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/backlash.c b/modules/scicos_blocks/src/c/backlash.c
+index 1730ed2..3362610 100644
+--- a/modules/scicos_blocks/src/c/backlash.c
++++ b/modules/scicos_blocks/src/c/backlash.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/bidon.c b/modules/scicos_blocks/src/c/bidon.c
+index 72210fa..d588cb2 100644
+--- a/modules/scicos_blocks/src/c/bidon.c
++++ b/modules/scicos_blocks/src/c/bidon.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/bit_clear_16.c b/modules/scicos_blocks/src/c/bit_clear_16.c
+index 7a9d130..e6c61fa 100644
+--- a/modules/scicos_blocks/src/c/bit_clear_16.c
++++ b/modules/scicos_blocks/src/c/bit_clear_16.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/bit_clear_32.c b/modules/scicos_blocks/src/c/bit_clear_32.c
+index 586d8a8..a4ea1c4 100644
+--- a/modules/scicos_blocks/src/c/bit_clear_32.c
++++ b/modules/scicos_blocks/src/c/bit_clear_32.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/bit_clear_8.c b/modules/scicos_blocks/src/c/bit_clear_8.c
+index 113f5f6..8364b48 100644
+--- a/modules/scicos_blocks/src/c/bit_clear_8.c
++++ b/modules/scicos_blocks/src/c/bit_clear_8.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/bit_set_16.c b/modules/scicos_blocks/src/c/bit_set_16.c
+index 3753878..2fb661d 100644
+--- a/modules/scicos_blocks/src/c/bit_set_16.c
++++ b/modules/scicos_blocks/src/c/bit_set_16.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/bit_set_32.c b/modules/scicos_blocks/src/c/bit_set_32.c
+index c2d1691..68a2ae5 100644
+--- a/modules/scicos_blocks/src/c/bit_set_32.c
++++ b/modules/scicos_blocks/src/c/bit_set_32.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/bit_set_8.c b/modules/scicos_blocks/src/c/bit_set_8.c
+index a1d69a1..a4d3ed8 100644
+--- a/modules/scicos_blocks/src/c/bit_set_8.c
++++ b/modules/scicos_blocks/src/c/bit_set_8.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/bounce_ball.c b/modules/scicos_blocks/src/c/bounce_ball.c
+index f5489c5..ac45cec 100644
+--- a/modules/scicos_blocks/src/c/bounce_ball.c
++++ b/modules/scicos_blocks/src/c/bounce_ball.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/bouncexy.c b/modules/scicos_blocks/src/c/bouncexy.c
+index d1986bf..e53b7c6 100644
+--- a/modules/scicos_blocks/src/c/bouncexy.c
++++ b/modules/scicos_blocks/src/c/bouncexy.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/canimxy.c b/modules/scicos_blocks/src/c/canimxy.c
+index 7407ffc..94666eb 100755
+--- a/modules/scicos_blocks/src/c/canimxy.c
++++ b/modules/scicos_blocks/src/c/canimxy.c
+@@ -14,7 +14,7 @@
+  *
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  *
+  * See the file ./license.txt
+  */
+diff --git a/modules/scicos_blocks/src/c/canimxy3d.c b/modules/scicos_blocks/src/c/canimxy3d.c
+index e11fac9..bdffc52 100644
+--- a/modules/scicos_blocks/src/c/canimxy3d.c
++++ b/modules/scicos_blocks/src/c/canimxy3d.c
+@@ -14,7 +14,7 @@
+  *
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  *
+  * See the file ./license.txt
+  */
+diff --git a/modules/scicos_blocks/src/c/cdummy.c b/modules/scicos_blocks/src/c/cdummy.c
+index 5d33620..879f0b7 100644
+--- a/modules/scicos_blocks/src/c/cdummy.c
++++ b/modules/scicos_blocks/src/c/cdummy.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/cevscpe.c b/modules/scicos_blocks/src/c/cevscpe.c
+index 899627d..9ef392c 100755
+--- a/modules/scicos_blocks/src/c/cevscpe.c
++++ b/modules/scicos_blocks/src/c/cevscpe.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/cfscope.c b/modules/scicos_blocks/src/c/cfscope.c
+index 2c71c54..5f3fb09 100755
+--- a/modules/scicos_blocks/src/c/cfscope.c
++++ b/modules/scicos_blocks/src/c/cfscope.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/cmat3d.c b/modules/scicos_blocks/src/c/cmat3d.c
+index b27e5e9..96e8f72 100644
+--- a/modules/scicos_blocks/src/c/cmat3d.c
++++ b/modules/scicos_blocks/src/c/cmat3d.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/cmatview.c b/modules/scicos_blocks/src/c/cmatview.c
+index 27e058f..946d8ac 100644
+--- a/modules/scicos_blocks/src/c/cmatview.c
++++ b/modules/scicos_blocks/src/c/cmatview.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/cmscope.c b/modules/scicos_blocks/src/c/cmscope.c
+index b8e7bba..f40919d 100644
+--- a/modules/scicos_blocks/src/c/cmscope.c
++++ b/modules/scicos_blocks/src/c/cmscope.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/constraint_c.c b/modules/scicos_blocks/src/c/constraint_c.c
+index 2412186..3e6110f 100644
+--- a/modules/scicos_blocks/src/c/constraint_c.c
++++ b/modules/scicos_blocks/src/c/constraint_c.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/convert.c b/modules/scicos_blocks/src/c/convert.c
+index fc6679d..6f94c19 100644
+--- a/modules/scicos_blocks/src/c/convert.c
++++ b/modules/scicos_blocks/src/c/convert.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/cos_blk.c b/modules/scicos_blocks/src/c/cos_blk.c
+index 134c5b6..b69d21f 100644
+--- a/modules/scicos_blocks/src/c/cos_blk.c
++++ b/modules/scicos_blocks/src/c/cos_blk.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/cosblk.c b/modules/scicos_blocks/src/c/cosblk.c
+index 68c15a0..6685577 100644
+--- a/modules/scicos_blocks/src/c/cosblk.c
++++ b/modules/scicos_blocks/src/c/cosblk.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/cosh_blk.c b/modules/scicos_blocks/src/c/cosh_blk.c
+index 3369347..091a5d3 100644
+--- a/modules/scicos_blocks/src/c/cosh_blk.c
++++ b/modules/scicos_blocks/src/c/cosh_blk.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/counter.c b/modules/scicos_blocks/src/c/counter.c
+index f3264f4..10b7540 100644
+--- a/modules/scicos_blocks/src/c/counter.c
++++ b/modules/scicos_blocks/src/c/counter.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/cscope.c b/modules/scicos_blocks/src/c/cscope.c
+index ad6f057..909e816 100644
+--- a/modules/scicos_blocks/src/c/cscope.c
++++ b/modules/scicos_blocks/src/c/cscope.c
+@@ -14,7 +14,7 @@
+  *
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  *
+  * See the file ./license.txt
+  */
+diff --git a/modules/scicos_blocks/src/c/cscopxy.c b/modules/scicos_blocks/src/c/cscopxy.c
+index ae3e326..6e4d0c2 100755
+--- a/modules/scicos_blocks/src/c/cscopxy.c
++++ b/modules/scicos_blocks/src/c/cscopxy.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/cscopxy3d.c b/modules/scicos_blocks/src/c/cscopxy3d.c
+index 2e92ada..effef5a 100755
+--- a/modules/scicos_blocks/src/c/cscopxy3d.c
++++ b/modules/scicos_blocks/src/c/cscopxy3d.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/csslti4.c b/modules/scicos_blocks/src/c/csslti4.c
+index 792134d..007034c 100644
+--- a/modules/scicos_blocks/src/c/csslti4.c
++++ b/modules/scicos_blocks/src/c/csslti4.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/cstblk4.c b/modules/scicos_blocks/src/c/cstblk4.c
+index 4c0e724..c276a58 100644
+--- a/modules/scicos_blocks/src/c/cstblk4.c
++++ b/modules/scicos_blocks/src/c/cstblk4.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/cstblk4_m.c b/modules/scicos_blocks/src/c/cstblk4_m.c
+index 6196b9f..63d6069 100644
+--- a/modules/scicos_blocks/src/c/cstblk4_m.c
++++ b/modules/scicos_blocks/src/c/cstblk4_m.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/cumsum_c.c b/modules/scicos_blocks/src/c/cumsum_c.c
+index f48ec1c..a8650ce 100644
+--- a/modules/scicos_blocks/src/c/cumsum_c.c
++++ b/modules/scicos_blocks/src/c/cumsum_c.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/cumsum_m.c b/modules/scicos_blocks/src/c/cumsum_m.c
+index 8b509e8..81afdfb 100644
+--- a/modules/scicos_blocks/src/c/cumsum_m.c
++++ b/modules/scicos_blocks/src/c/cumsum_m.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/cumsum_r.c b/modules/scicos_blocks/src/c/cumsum_r.c
+index 7ed0132..b0fe05d 100644
+--- a/modules/scicos_blocks/src/c/cumsum_r.c
++++ b/modules/scicos_blocks/src/c/cumsum_r.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/cumsumz_c.c b/modules/scicos_blocks/src/c/cumsumz_c.c
+index c2b65bd..2a6cbbf 100644
+--- a/modules/scicos_blocks/src/c/cumsumz_c.c
++++ b/modules/scicos_blocks/src/c/cumsumz_c.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/cumsumz_m.c b/modules/scicos_blocks/src/c/cumsumz_m.c
+index 3f85eb0..dc54df9 100644
+--- a/modules/scicos_blocks/src/c/cumsumz_m.c
++++ b/modules/scicos_blocks/src/c/cumsumz_m.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/cumsumz_r.c b/modules/scicos_blocks/src/c/cumsumz_r.c
+index 57050a7..2f0766b 100644
+--- a/modules/scicos_blocks/src/c/cumsumz_r.c
++++ b/modules/scicos_blocks/src/c/cumsumz_r.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/curve_c.c b/modules/scicos_blocks/src/c/curve_c.c
+index 941447f..0c7f870 100644
+--- a/modules/scicos_blocks/src/c/curve_c.c
++++ b/modules/scicos_blocks/src/c/curve_c.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/dband.c b/modules/scicos_blocks/src/c/dband.c
+index 64dc034..23df8eb 100644
+--- a/modules/scicos_blocks/src/c/dband.c
++++ b/modules/scicos_blocks/src/c/dband.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/deadband.c b/modules/scicos_blocks/src/c/deadband.c
+index 76237fc..1c43e39 100644
+--- a/modules/scicos_blocks/src/c/deadband.c
++++ b/modules/scicos_blocks/src/c/deadband.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/delay4.c b/modules/scicos_blocks/src/c/delay4.c
+index 5020e34..607e69c 100644
+--- a/modules/scicos_blocks/src/c/delay4.c
++++ b/modules/scicos_blocks/src/c/delay4.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/delay4_i16.c b/modules/scicos_blocks/src/c/delay4_i16.c
+index 285362a..a72e245 100644
+--- a/modules/scicos_blocks/src/c/delay4_i16.c
++++ b/modules/scicos_blocks/src/c/delay4_i16.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/delay4_i32.c b/modules/scicos_blocks/src/c/delay4_i32.c
+index a47de58..8cf4436 100644
+--- a/modules/scicos_blocks/src/c/delay4_i32.c
++++ b/modules/scicos_blocks/src/c/delay4_i32.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/delay4_i8.c b/modules/scicos_blocks/src/c/delay4_i8.c
+index 822f614..9141260 100644
+--- a/modules/scicos_blocks/src/c/delay4_i8.c
++++ b/modules/scicos_blocks/src/c/delay4_i8.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/delay4_ui16.c b/modules/scicos_blocks/src/c/delay4_ui16.c
+index f3b7a03..76396fd 100644
+--- a/modules/scicos_blocks/src/c/delay4_ui16.c
++++ b/modules/scicos_blocks/src/c/delay4_ui16.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/delay4_ui32.c b/modules/scicos_blocks/src/c/delay4_ui32.c
+index b8da5ed..1c6eb6e 100644
+--- a/modules/scicos_blocks/src/c/delay4_ui32.c
++++ b/modules/scicos_blocks/src/c/delay4_ui32.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/delay4_ui8.c b/modules/scicos_blocks/src/c/delay4_ui8.c
+index bf8c5bd..5eafbde 100644
+--- a/modules/scicos_blocks/src/c/delay4_ui8.c
++++ b/modules/scicos_blocks/src/c/delay4_ui8.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/deriv.c b/modules/scicos_blocks/src/c/deriv.c
+index 2b4c14f..6c2db2f 100644
+--- a/modules/scicos_blocks/src/c/deriv.c
++++ b/modules/scicos_blocks/src/c/deriv.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/diffblk_c.c b/modules/scicos_blocks/src/c/diffblk_c.c
+index dc580ce..03f4211 100644
+--- a/modules/scicos_blocks/src/c/diffblk_c.c
++++ b/modules/scicos_blocks/src/c/diffblk_c.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/dmmul.c b/modules/scicos_blocks/src/c/dmmul.c
+index 9b1d1e2..01be452 100644
+--- a/modules/scicos_blocks/src/c/dmmul.c
++++ b/modules/scicos_blocks/src/c/dmmul.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/dmmul1.c b/modules/scicos_blocks/src/c/dmmul1.c
+index e7ba816..b72a62f 100644
+--- a/modules/scicos_blocks/src/c/dmmul1.c
++++ b/modules/scicos_blocks/src/c/dmmul1.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/dollar4.c b/modules/scicos_blocks/src/c/dollar4.c
+index 071fdc4..4abca81 100644
+--- a/modules/scicos_blocks/src/c/dollar4.c
++++ b/modules/scicos_blocks/src/c/dollar4.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/dollar4_m.c b/modules/scicos_blocks/src/c/dollar4_m.c
+index d6a7cf2..55a7fc5 100644
+--- a/modules/scicos_blocks/src/c/dollar4_m.c
++++ b/modules/scicos_blocks/src/c/dollar4_m.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/dsslti4.c b/modules/scicos_blocks/src/c/dsslti4.c
+index ca96802..e0457ec 100644
+--- a/modules/scicos_blocks/src/c/dsslti4.c
++++ b/modules/scicos_blocks/src/c/dsslti4.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/edgetrig.c b/modules/scicos_blocks/src/c/edgetrig.c
+index 6548f74..5689eb6 100644
+--- a/modules/scicos_blocks/src/c/edgetrig.c
++++ b/modules/scicos_blocks/src/c/edgetrig.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/evaluate_expr.c b/modules/scicos_blocks/src/c/evaluate_expr.c
+index 8820e8c..a5e03a7 100644
+--- a/modules/scicos_blocks/src/c/evaluate_expr.c
++++ b/modules/scicos_blocks/src/c/evaluate_expr.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/evtdly4.c b/modules/scicos_blocks/src/c/evtdly4.c
+index 83c9eaf..6fafc4f 100644
+--- a/modules/scicos_blocks/src/c/evtdly4.c
++++ b/modules/scicos_blocks/src/c/evtdly4.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/evtvardly.c b/modules/scicos_blocks/src/c/evtvardly.c
+index 1462709..320cc13 100644
+--- a/modules/scicos_blocks/src/c/evtvardly.c
++++ b/modules/scicos_blocks/src/c/evtvardly.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/expblk_m.c b/modules/scicos_blocks/src/c/expblk_m.c
+index 0b25acf..75f4f90 100644
+--- a/modules/scicos_blocks/src/c/expblk_m.c
++++ b/modules/scicos_blocks/src/c/expblk_m.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/extdiag.c b/modules/scicos_blocks/src/c/extdiag.c
+index b0971bf..c354424 100644
+--- a/modules/scicos_blocks/src/c/extdiag.c
++++ b/modules/scicos_blocks/src/c/extdiag.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/extdiagz.c b/modules/scicos_blocks/src/c/extdiagz.c
+index 928fade..19908e6 100644
+--- a/modules/scicos_blocks/src/c/extdiagz.c
++++ b/modules/scicos_blocks/src/c/extdiagz.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/extract.c b/modules/scicos_blocks/src/c/extract.c
+index 83a3e37..837b5c8 100644
+--- a/modules/scicos_blocks/src/c/extract.c
++++ b/modules/scicos_blocks/src/c/extract.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/extract_bit_16_LH.c b/modules/scicos_blocks/src/c/extract_bit_16_LH.c
+index 89cf6df..930928e 100644
+--- a/modules/scicos_blocks/src/c/extract_bit_16_LH.c
++++ b/modules/scicos_blocks/src/c/extract_bit_16_LH.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/extract_bit_16_LSB.c b/modules/scicos_blocks/src/c/extract_bit_16_LSB.c
+index 25746c5..f7c88a6 100644
+--- a/modules/scicos_blocks/src/c/extract_bit_16_LSB.c
++++ b/modules/scicos_blocks/src/c/extract_bit_16_LSB.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/extract_bit_16_MSB0.c b/modules/scicos_blocks/src/c/extract_bit_16_MSB0.c
+index 607d4f0..8d9cd73 100644
+--- a/modules/scicos_blocks/src/c/extract_bit_16_MSB0.c
++++ b/modules/scicos_blocks/src/c/extract_bit_16_MSB0.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/extract_bit_16_MSB1.c b/modules/scicos_blocks/src/c/extract_bit_16_MSB1.c
+index 2c1c283..4b122c8 100644
+--- a/modules/scicos_blocks/src/c/extract_bit_16_MSB1.c
++++ b/modules/scicos_blocks/src/c/extract_bit_16_MSB1.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/extract_bit_16_RB0.c b/modules/scicos_blocks/src/c/extract_bit_16_RB0.c
+index 3dc825f..066da3d 100644
+--- a/modules/scicos_blocks/src/c/extract_bit_16_RB0.c
++++ b/modules/scicos_blocks/src/c/extract_bit_16_RB0.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/extract_bit_16_RB1.c b/modules/scicos_blocks/src/c/extract_bit_16_RB1.c
+index c812ef6..652e9bb 100644
+--- a/modules/scicos_blocks/src/c/extract_bit_16_RB1.c
++++ b/modules/scicos_blocks/src/c/extract_bit_16_RB1.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/extract_bit_16_UH0.c b/modules/scicos_blocks/src/c/extract_bit_16_UH0.c
+index 210f7f0..324d912 100644
+--- a/modules/scicos_blocks/src/c/extract_bit_16_UH0.c
++++ b/modules/scicos_blocks/src/c/extract_bit_16_UH0.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/extract_bit_16_UH1.c b/modules/scicos_blocks/src/c/extract_bit_16_UH1.c
+index 44d6c2c..9c608fd 100644
+--- a/modules/scicos_blocks/src/c/extract_bit_16_UH1.c
++++ b/modules/scicos_blocks/src/c/extract_bit_16_UH1.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/extract_bit_32_LH.c b/modules/scicos_blocks/src/c/extract_bit_32_LH.c
+index d0ff334..f2a2e9f 100644
+--- a/modules/scicos_blocks/src/c/extract_bit_32_LH.c
++++ b/modules/scicos_blocks/src/c/extract_bit_32_LH.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/extract_bit_32_LSB.c b/modules/scicos_blocks/src/c/extract_bit_32_LSB.c
+index 84f497f..292cac8 100644
+--- a/modules/scicos_blocks/src/c/extract_bit_32_LSB.c
++++ b/modules/scicos_blocks/src/c/extract_bit_32_LSB.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/extract_bit_32_MSB0.c b/modules/scicos_blocks/src/c/extract_bit_32_MSB0.c
+index b0b0152..15a0441 100644
+--- a/modules/scicos_blocks/src/c/extract_bit_32_MSB0.c
++++ b/modules/scicos_blocks/src/c/extract_bit_32_MSB0.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/extract_bit_32_MSB1.c b/modules/scicos_blocks/src/c/extract_bit_32_MSB1.c
+index ba92942..4a976fd 100644
+--- a/modules/scicos_blocks/src/c/extract_bit_32_MSB1.c
++++ b/modules/scicos_blocks/src/c/extract_bit_32_MSB1.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/extract_bit_32_RB0.c b/modules/scicos_blocks/src/c/extract_bit_32_RB0.c
+index 2ede5f0..b45f10f 100644
+--- a/modules/scicos_blocks/src/c/extract_bit_32_RB0.c
++++ b/modules/scicos_blocks/src/c/extract_bit_32_RB0.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/extract_bit_32_RB1.c b/modules/scicos_blocks/src/c/extract_bit_32_RB1.c
+index 2896254..6d5c813 100644
+--- a/modules/scicos_blocks/src/c/extract_bit_32_RB1.c
++++ b/modules/scicos_blocks/src/c/extract_bit_32_RB1.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/extract_bit_32_UH0.c b/modules/scicos_blocks/src/c/extract_bit_32_UH0.c
+index 969939e..60589ce 100644
+--- a/modules/scicos_blocks/src/c/extract_bit_32_UH0.c
++++ b/modules/scicos_blocks/src/c/extract_bit_32_UH0.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/extract_bit_32_UH1.c b/modules/scicos_blocks/src/c/extract_bit_32_UH1.c
+index 454204d..61a594b 100644
+--- a/modules/scicos_blocks/src/c/extract_bit_32_UH1.c
++++ b/modules/scicos_blocks/src/c/extract_bit_32_UH1.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/extract_bit_8_LH.c b/modules/scicos_blocks/src/c/extract_bit_8_LH.c
+index 1e650bc..5d403d8 100644
+--- a/modules/scicos_blocks/src/c/extract_bit_8_LH.c
++++ b/modules/scicos_blocks/src/c/extract_bit_8_LH.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/extract_bit_8_LSB.c b/modules/scicos_blocks/src/c/extract_bit_8_LSB.c
+index 19a980a..3a90125 100644
+--- a/modules/scicos_blocks/src/c/extract_bit_8_LSB.c
++++ b/modules/scicos_blocks/src/c/extract_bit_8_LSB.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/extract_bit_8_MSB0.c b/modules/scicos_blocks/src/c/extract_bit_8_MSB0.c
+index 7a876f7..3487db1 100644
+--- a/modules/scicos_blocks/src/c/extract_bit_8_MSB0.c
++++ b/modules/scicos_blocks/src/c/extract_bit_8_MSB0.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/extract_bit_8_MSB1.c b/modules/scicos_blocks/src/c/extract_bit_8_MSB1.c
+index ca76a2b..54e2e98 100644
+--- a/modules/scicos_blocks/src/c/extract_bit_8_MSB1.c
++++ b/modules/scicos_blocks/src/c/extract_bit_8_MSB1.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/extract_bit_8_RB0.c b/modules/scicos_blocks/src/c/extract_bit_8_RB0.c
+index d0735e8..bbb3d3f 100644
+--- a/modules/scicos_blocks/src/c/extract_bit_8_RB0.c
++++ b/modules/scicos_blocks/src/c/extract_bit_8_RB0.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/extract_bit_8_RB1.c b/modules/scicos_blocks/src/c/extract_bit_8_RB1.c
+index ed27ee7..f1b258a 100644
+--- a/modules/scicos_blocks/src/c/extract_bit_8_RB1.c
++++ b/modules/scicos_blocks/src/c/extract_bit_8_RB1.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/extract_bit_8_UH0.c b/modules/scicos_blocks/src/c/extract_bit_8_UH0.c
+index 882ba4c..18699b3 100644
+--- a/modules/scicos_blocks/src/c/extract_bit_8_UH0.c
++++ b/modules/scicos_blocks/src/c/extract_bit_8_UH0.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/extract_bit_8_UH1.c b/modules/scicos_blocks/src/c/extract_bit_8_UH1.c
+index 4f8dcc4..e6b7835 100644
+--- a/modules/scicos_blocks/src/c/extract_bit_8_UH1.c
++++ b/modules/scicos_blocks/src/c/extract_bit_8_UH1.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/extract_bit_u16_MSB1.c b/modules/scicos_blocks/src/c/extract_bit_u16_MSB1.c
+index 2a20332..7db38c4 100644
+--- a/modules/scicos_blocks/src/c/extract_bit_u16_MSB1.c
++++ b/modules/scicos_blocks/src/c/extract_bit_u16_MSB1.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/extract_bit_u16_RB1.c b/modules/scicos_blocks/src/c/extract_bit_u16_RB1.c
+index 92cbed4..a7a83a6 100644
+--- a/modules/scicos_blocks/src/c/extract_bit_u16_RB1.c
++++ b/modules/scicos_blocks/src/c/extract_bit_u16_RB1.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/extract_bit_u16_UH1.c b/modules/scicos_blocks/src/c/extract_bit_u16_UH1.c
+index 8fae04a..c7ad5f0 100644
+--- a/modules/scicos_blocks/src/c/extract_bit_u16_UH1.c
++++ b/modules/scicos_blocks/src/c/extract_bit_u16_UH1.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/extract_bit_u32_MSB1.c b/modules/scicos_blocks/src/c/extract_bit_u32_MSB1.c
+index 41bb610..6097c6d 100644
+--- a/modules/scicos_blocks/src/c/extract_bit_u32_MSB1.c
++++ b/modules/scicos_blocks/src/c/extract_bit_u32_MSB1.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/extract_bit_u32_RB1.c b/modules/scicos_blocks/src/c/extract_bit_u32_RB1.c
+index 985e088..24404cd 100644
+--- a/modules/scicos_blocks/src/c/extract_bit_u32_RB1.c
++++ b/modules/scicos_blocks/src/c/extract_bit_u32_RB1.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/extract_bit_u32_UH1.c b/modules/scicos_blocks/src/c/extract_bit_u32_UH1.c
+index 8fae137..0c91ac6 100644
+--- a/modules/scicos_blocks/src/c/extract_bit_u32_UH1.c
++++ b/modules/scicos_blocks/src/c/extract_bit_u32_UH1.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/extract_bit_u8_MSB1.c b/modules/scicos_blocks/src/c/extract_bit_u8_MSB1.c
+index 26e6203..6b61566 100644
+--- a/modules/scicos_blocks/src/c/extract_bit_u8_MSB1.c
++++ b/modules/scicos_blocks/src/c/extract_bit_u8_MSB1.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/extract_bit_u8_RB1.c b/modules/scicos_blocks/src/c/extract_bit_u8_RB1.c
+index acda352..fc59392 100644
+--- a/modules/scicos_blocks/src/c/extract_bit_u8_RB1.c
++++ b/modules/scicos_blocks/src/c/extract_bit_u8_RB1.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/extract_bit_u8_UH1.c b/modules/scicos_blocks/src/c/extract_bit_u8_UH1.c
+index e43253d..4abb588 100644
+--- a/modules/scicos_blocks/src/c/extract_bit_u8_UH1.c
++++ b/modules/scicos_blocks/src/c/extract_bit_u8_UH1.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/extractor.c b/modules/scicos_blocks/src/c/extractor.c
+index 1fe2cb4..76faf01 100644
+--- a/modules/scicos_blocks/src/c/extractor.c
++++ b/modules/scicos_blocks/src/c/extractor.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/extractz.c b/modules/scicos_blocks/src/c/extractz.c
+index 5fce2ec..623a63d 100644
+--- a/modules/scicos_blocks/src/c/extractz.c
++++ b/modules/scicos_blocks/src/c/extractz.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/exttril.c b/modules/scicos_blocks/src/c/exttril.c
+index bef3f7a..29e93ba 100644
+--- a/modules/scicos_blocks/src/c/exttril.c
++++ b/modules/scicos_blocks/src/c/exttril.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/exttrilz.c b/modules/scicos_blocks/src/c/exttrilz.c
+index e5118a9..71f4361 100644
+--- a/modules/scicos_blocks/src/c/exttrilz.c
++++ b/modules/scicos_blocks/src/c/exttrilz.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/exttriu.c b/modules/scicos_blocks/src/c/exttriu.c
+index a03cc72..815ae31 100644
+--- a/modules/scicos_blocks/src/c/exttriu.c
++++ b/modules/scicos_blocks/src/c/exttriu.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/exttriuz.c b/modules/scicos_blocks/src/c/exttriuz.c
+index d8138f4..747fc6d 100644
+--- a/modules/scicos_blocks/src/c/exttriuz.c
++++ b/modules/scicos_blocks/src/c/exttriuz.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/foriterator.c b/modules/scicos_blocks/src/c/foriterator.c
+index 129710b..ebfe214 100644
+--- a/modules/scicos_blocks/src/c/foriterator.c
++++ b/modules/scicos_blocks/src/c/foriterator.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/fromws_c.c b/modules/scicos_blocks/src/c/fromws_c.c
+index 02a17e4..7d1e6d7 100644
+--- a/modules/scicos_blocks/src/c/fromws_c.c
++++ b/modules/scicos_blocks/src/c/fromws_c.c
+@@ -14,7 +14,7 @@
+    *
+    * You should have received a copy of the GNU General Public License
+    * along with this program; if not, write to the Free Software
+-   * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+    *
+    * See the file ./license.txt
+    */
+diff --git a/modules/scicos_blocks/src/c/gain.c b/modules/scicos_blocks/src/c/gain.c
+index 9d01921..d7d2a05 100644
+--- a/modules/scicos_blocks/src/c/gain.c
++++ b/modules/scicos_blocks/src/c/gain.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/gainblk.c b/modules/scicos_blocks/src/c/gainblk.c
+index d414fa0..644e666 100644
+--- a/modules/scicos_blocks/src/c/gainblk.c
++++ b/modules/scicos_blocks/src/c/gainblk.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/gainblk_i16e.c b/modules/scicos_blocks/src/c/gainblk_i16e.c
+index 61e6b49..8f222da 100644
+--- a/modules/scicos_blocks/src/c/gainblk_i16e.c
++++ b/modules/scicos_blocks/src/c/gainblk_i16e.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/gainblk_i16n.c b/modules/scicos_blocks/src/c/gainblk_i16n.c
+index 46ad1bb..007c7e8 100644
+--- a/modules/scicos_blocks/src/c/gainblk_i16n.c
++++ b/modules/scicos_blocks/src/c/gainblk_i16n.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/gainblk_i16s.c b/modules/scicos_blocks/src/c/gainblk_i16s.c
+index 00ce91f..3e131a3 100644
+--- a/modules/scicos_blocks/src/c/gainblk_i16s.c
++++ b/modules/scicos_blocks/src/c/gainblk_i16s.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/gainblk_i32e.c b/modules/scicos_blocks/src/c/gainblk_i32e.c
+index c6478f7..c724e58 100644
+--- a/modules/scicos_blocks/src/c/gainblk_i32e.c
++++ b/modules/scicos_blocks/src/c/gainblk_i32e.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/gainblk_i32n.c b/modules/scicos_blocks/src/c/gainblk_i32n.c
+index 34d8f21..2e6ab1a 100644
+--- a/modules/scicos_blocks/src/c/gainblk_i32n.c
++++ b/modules/scicos_blocks/src/c/gainblk_i32n.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/gainblk_i32s.c b/modules/scicos_blocks/src/c/gainblk_i32s.c
+index 0061edc..f6609b0 100644
+--- a/modules/scicos_blocks/src/c/gainblk_i32s.c
++++ b/modules/scicos_blocks/src/c/gainblk_i32s.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/gainblk_i8e.c b/modules/scicos_blocks/src/c/gainblk_i8e.c
+index fc21f05..87bc5d2 100644
+--- a/modules/scicos_blocks/src/c/gainblk_i8e.c
++++ b/modules/scicos_blocks/src/c/gainblk_i8e.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/gainblk_i8n.c b/modules/scicos_blocks/src/c/gainblk_i8n.c
+index 52c4604..c83168f 100644
+--- a/modules/scicos_blocks/src/c/gainblk_i8n.c
++++ b/modules/scicos_blocks/src/c/gainblk_i8n.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/gainblk_i8s.c b/modules/scicos_blocks/src/c/gainblk_i8s.c
+index 88523c4..fa60394 100644
+--- a/modules/scicos_blocks/src/c/gainblk_i8s.c
++++ b/modules/scicos_blocks/src/c/gainblk_i8s.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/gainblk_ui16e.c b/modules/scicos_blocks/src/c/gainblk_ui16e.c
+index 0e0996f..beaf180 100644
+--- a/modules/scicos_blocks/src/c/gainblk_ui16e.c
++++ b/modules/scicos_blocks/src/c/gainblk_ui16e.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/gainblk_ui16n.c b/modules/scicos_blocks/src/c/gainblk_ui16n.c
+index 1026851..11c9dd1 100644
+--- a/modules/scicos_blocks/src/c/gainblk_ui16n.c
++++ b/modules/scicos_blocks/src/c/gainblk_ui16n.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/gainblk_ui16s.c b/modules/scicos_blocks/src/c/gainblk_ui16s.c
+index 585d83d..1919976 100644
+--- a/modules/scicos_blocks/src/c/gainblk_ui16s.c
++++ b/modules/scicos_blocks/src/c/gainblk_ui16s.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/gainblk_ui32e.c b/modules/scicos_blocks/src/c/gainblk_ui32e.c
+index 905427d..72bbf10 100644
+--- a/modules/scicos_blocks/src/c/gainblk_ui32e.c
++++ b/modules/scicos_blocks/src/c/gainblk_ui32e.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/gainblk_ui32n.c b/modules/scicos_blocks/src/c/gainblk_ui32n.c
+index 85d66e5..1a79983 100644
+--- a/modules/scicos_blocks/src/c/gainblk_ui32n.c
++++ b/modules/scicos_blocks/src/c/gainblk_ui32n.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/gainblk_ui32s.c b/modules/scicos_blocks/src/c/gainblk_ui32s.c
+index df296d1..995a2c6 100644
+--- a/modules/scicos_blocks/src/c/gainblk_ui32s.c
++++ b/modules/scicos_blocks/src/c/gainblk_ui32s.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/gainblk_ui8e.c b/modules/scicos_blocks/src/c/gainblk_ui8e.c
+index 85989fb..412325d 100644
+--- a/modules/scicos_blocks/src/c/gainblk_ui8e.c
++++ b/modules/scicos_blocks/src/c/gainblk_ui8e.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/gainblk_ui8n.c b/modules/scicos_blocks/src/c/gainblk_ui8n.c
+index 8fd53d7..fcd1651 100644
+--- a/modules/scicos_blocks/src/c/gainblk_ui8n.c
++++ b/modules/scicos_blocks/src/c/gainblk_ui8n.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/gainblk_ui8s.c b/modules/scicos_blocks/src/c/gainblk_ui8s.c
+index 3ff1046..f477e9f 100644
+--- a/modules/scicos_blocks/src/c/gainblk_ui8s.c
++++ b/modules/scicos_blocks/src/c/gainblk_ui8s.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/hystheresis.c b/modules/scicos_blocks/src/c/hystheresis.c
+index 96c1677..3f08f75 100644
+--- a/modules/scicos_blocks/src/c/hystheresis.c
++++ b/modules/scicos_blocks/src/c/hystheresis.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/integral_func.c b/modules/scicos_blocks/src/c/integral_func.c
+index a9b5483..c323bcc 100644
+--- a/modules/scicos_blocks/src/c/integral_func.c
++++ b/modules/scicos_blocks/src/c/integral_func.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/integralz_func.c b/modules/scicos_blocks/src/c/integralz_func.c
+index a243108..41dc810 100644
+--- a/modules/scicos_blocks/src/c/integralz_func.c
++++ b/modules/scicos_blocks/src/c/integralz_func.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/invblk4.c b/modules/scicos_blocks/src/c/invblk4.c
+index b568b60..3fbe61e 100644
+--- a/modules/scicos_blocks/src/c/invblk4.c
++++ b/modules/scicos_blocks/src/c/invblk4.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/logic.c b/modules/scicos_blocks/src/c/logic.c
+index d2b6274..e81debd 100644
+--- a/modules/scicos_blocks/src/c/logic.c
++++ b/modules/scicos_blocks/src/c/logic.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/logicalop.c b/modules/scicos_blocks/src/c/logicalop.c
+index fb3cc1a..76e69c4 100644
+--- a/modules/scicos_blocks/src/c/logicalop.c
++++ b/modules/scicos_blocks/src/c/logicalop.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/logicalop_i16.c b/modules/scicos_blocks/src/c/logicalop_i16.c
+index a289eba..dc4ac5d 100644
+--- a/modules/scicos_blocks/src/c/logicalop_i16.c
++++ b/modules/scicos_blocks/src/c/logicalop_i16.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/logicalop_i32.c b/modules/scicos_blocks/src/c/logicalop_i32.c
+index 92a6474..a3e2667 100644
+--- a/modules/scicos_blocks/src/c/logicalop_i32.c
++++ b/modules/scicos_blocks/src/c/logicalop_i32.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/logicalop_i8.c b/modules/scicos_blocks/src/c/logicalop_i8.c
+index 35bb118..ff9e93f 100644
+--- a/modules/scicos_blocks/src/c/logicalop_i8.c
++++ b/modules/scicos_blocks/src/c/logicalop_i8.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/logicalop_m.c b/modules/scicos_blocks/src/c/logicalop_m.c
+index 147a3f2..fcc3418 100644
+--- a/modules/scicos_blocks/src/c/logicalop_m.c
++++ b/modules/scicos_blocks/src/c/logicalop_m.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/logicalop_ui16.c b/modules/scicos_blocks/src/c/logicalop_ui16.c
+index 4d5e283..a8cebd8 100644
+--- a/modules/scicos_blocks/src/c/logicalop_ui16.c
++++ b/modules/scicos_blocks/src/c/logicalop_ui16.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/logicalop_ui32.c b/modules/scicos_blocks/src/c/logicalop_ui32.c
+index a4595fd..b05e802 100644
+--- a/modules/scicos_blocks/src/c/logicalop_ui32.c
++++ b/modules/scicos_blocks/src/c/logicalop_ui32.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/logicalop_ui8.c b/modules/scicos_blocks/src/c/logicalop_ui8.c
+index 3c6c611..05f1cd5 100644
+--- a/modules/scicos_blocks/src/c/logicalop_ui8.c
++++ b/modules/scicos_blocks/src/c/logicalop_ui8.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/lookup2d.c b/modules/scicos_blocks/src/c/lookup2d.c
+index 69f4817..b7063a2 100644
+--- a/modules/scicos_blocks/src/c/lookup2d.c
++++ b/modules/scicos_blocks/src/c/lookup2d.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/lookup_c.c b/modules/scicos_blocks/src/c/lookup_c.c
+index fd6272b..4603335 100644
+--- a/modules/scicos_blocks/src/c/lookup_c.c
++++ b/modules/scicos_blocks/src/c/lookup_c.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/m_frequ.c b/modules/scicos_blocks/src/c/m_frequ.c
+index 993ea82..77a1ce6 100644
+--- a/modules/scicos_blocks/src/c/m_frequ.c
++++ b/modules/scicos_blocks/src/c/m_frequ.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/mat_bksl.c b/modules/scicos_blocks/src/c/mat_bksl.c
+index dce9f41..4b91020 100644
+--- a/modules/scicos_blocks/src/c/mat_bksl.c
++++ b/modules/scicos_blocks/src/c/mat_bksl.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/mat_cath.c b/modules/scicos_blocks/src/c/mat_cath.c
+index 9c48258..7cc2cc8 100644
+--- a/modules/scicos_blocks/src/c/mat_cath.c
++++ b/modules/scicos_blocks/src/c/mat_cath.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/mat_catv.c b/modules/scicos_blocks/src/c/mat_catv.c
+index 470d301..b10bb63 100644
+--- a/modules/scicos_blocks/src/c/mat_catv.c
++++ b/modules/scicos_blocks/src/c/mat_catv.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/mat_det.c b/modules/scicos_blocks/src/c/mat_det.c
+index 004d50b..8bab189 100644
+--- a/modules/scicos_blocks/src/c/mat_det.c
++++ b/modules/scicos_blocks/src/c/mat_det.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/mat_diag.c b/modules/scicos_blocks/src/c/mat_diag.c
+index a201dc2..aea446d 100644
+--- a/modules/scicos_blocks/src/c/mat_diag.c
++++ b/modules/scicos_blocks/src/c/mat_diag.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/mat_div.c b/modules/scicos_blocks/src/c/mat_div.c
+index db5e6a9..adb4e3d 100644
+--- a/modules/scicos_blocks/src/c/mat_div.c
++++ b/modules/scicos_blocks/src/c/mat_div.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/mat_expm.c b/modules/scicos_blocks/src/c/mat_expm.c
+index ab637c2..04fbe15 100644
+--- a/modules/scicos_blocks/src/c/mat_expm.c
++++ b/modules/scicos_blocks/src/c/mat_expm.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/mat_inv.c b/modules/scicos_blocks/src/c/mat_inv.c
+index 6b77b59..ab00283 100644
+--- a/modules/scicos_blocks/src/c/mat_inv.c
++++ b/modules/scicos_blocks/src/c/mat_inv.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/mat_lu.c b/modules/scicos_blocks/src/c/mat_lu.c
+index 306fa70..9f31de4 100644
+--- a/modules/scicos_blocks/src/c/mat_lu.c
++++ b/modules/scicos_blocks/src/c/mat_lu.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/mat_pinv.c b/modules/scicos_blocks/src/c/mat_pinv.c
+index 7bfafbd..c41f7ed 100755
+--- a/modules/scicos_blocks/src/c/mat_pinv.c
++++ b/modules/scicos_blocks/src/c/mat_pinv.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/mat_reshape.c b/modules/scicos_blocks/src/c/mat_reshape.c
+index d201d9a..282eb90 100644
+--- a/modules/scicos_blocks/src/c/mat_reshape.c
++++ b/modules/scicos_blocks/src/c/mat_reshape.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/mat_sing.c b/modules/scicos_blocks/src/c/mat_sing.c
+index 8d7a9c1..78435ad 100644
+--- a/modules/scicos_blocks/src/c/mat_sing.c
++++ b/modules/scicos_blocks/src/c/mat_sing.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/mat_sqrt.c b/modules/scicos_blocks/src/c/mat_sqrt.c
+index c4d3d5a..51ed526 100644
+--- a/modules/scicos_blocks/src/c/mat_sqrt.c
++++ b/modules/scicos_blocks/src/c/mat_sqrt.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/mat_sum.c b/modules/scicos_blocks/src/c/mat_sum.c
+index 14960b6..e7eb98d 100644
+--- a/modules/scicos_blocks/src/c/mat_sum.c
++++ b/modules/scicos_blocks/src/c/mat_sum.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/mat_sumc.c b/modules/scicos_blocks/src/c/mat_sumc.c
+index ae88a05..3bec351 100644
+--- a/modules/scicos_blocks/src/c/mat_sumc.c
++++ b/modules/scicos_blocks/src/c/mat_sumc.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/mat_suml.c b/modules/scicos_blocks/src/c/mat_suml.c
+index 83f6723..4e81d1a 100644
+--- a/modules/scicos_blocks/src/c/mat_suml.c
++++ b/modules/scicos_blocks/src/c/mat_suml.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/mat_svd.c b/modules/scicos_blocks/src/c/mat_svd.c
+index 65a854e..6811f3b 100644
+--- a/modules/scicos_blocks/src/c/mat_svd.c
++++ b/modules/scicos_blocks/src/c/mat_svd.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/mat_vps.c b/modules/scicos_blocks/src/c/mat_vps.c
+index 55b1f1a..0ab00c0 100644
+--- a/modules/scicos_blocks/src/c/mat_vps.c
++++ b/modules/scicos_blocks/src/c/mat_vps.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/mat_vpv.c b/modules/scicos_blocks/src/c/mat_vpv.c
+index 2bd5037..d60d86b 100644
+--- a/modules/scicos_blocks/src/c/mat_vpv.c
++++ b/modules/scicos_blocks/src/c/mat_vpv.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/matbyscal.c b/modules/scicos_blocks/src/c/matbyscal.c
+index 2873b7c..89217b3 100644
+--- a/modules/scicos_blocks/src/c/matbyscal.c
++++ b/modules/scicos_blocks/src/c/matbyscal.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/matbyscal_e.c b/modules/scicos_blocks/src/c/matbyscal_e.c
+index 8ca4aba..4156445 100644
+--- a/modules/scicos_blocks/src/c/matbyscal_e.c
++++ b/modules/scicos_blocks/src/c/matbyscal_e.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/matbyscal_s.c b/modules/scicos_blocks/src/c/matbyscal_s.c
+index 58f6e50..b5c86cc 100644
+--- a/modules/scicos_blocks/src/c/matbyscal_s.c
++++ b/modules/scicos_blocks/src/c/matbyscal_s.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/mathermit_m.c b/modules/scicos_blocks/src/c/mathermit_m.c
+index 387040f..e9ec4fd 100644
+--- a/modules/scicos_blocks/src/c/mathermit_m.c
++++ b/modules/scicos_blocks/src/c/mathermit_m.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/matmul2_e.c b/modules/scicos_blocks/src/c/matmul2_e.c
+index 2eb4b44..b188b4f 100644
+--- a/modules/scicos_blocks/src/c/matmul2_e.c
++++ b/modules/scicos_blocks/src/c/matmul2_e.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/matmul2_m.c b/modules/scicos_blocks/src/c/matmul2_m.c
+index dac4de8..63c7be0 100644
+--- a/modules/scicos_blocks/src/c/matmul2_m.c
++++ b/modules/scicos_blocks/src/c/matmul2_m.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/matmul2_s.c b/modules/scicos_blocks/src/c/matmul2_s.c
+index 2439046..b51ece1 100644
+--- a/modules/scicos_blocks/src/c/matmul2_s.c
++++ b/modules/scicos_blocks/src/c/matmul2_s.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/matmul_i16e.c b/modules/scicos_blocks/src/c/matmul_i16e.c
+index 266ffb1..ec62763 100644
+--- a/modules/scicos_blocks/src/c/matmul_i16e.c
++++ b/modules/scicos_blocks/src/c/matmul_i16e.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/matmul_i16n.c b/modules/scicos_blocks/src/c/matmul_i16n.c
+index 9d5fe47..75ab163 100644
+--- a/modules/scicos_blocks/src/c/matmul_i16n.c
++++ b/modules/scicos_blocks/src/c/matmul_i16n.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/matmul_i16s.c b/modules/scicos_blocks/src/c/matmul_i16s.c
+index 6e6c3e5..0d67f73 100644
+--- a/modules/scicos_blocks/src/c/matmul_i16s.c
++++ b/modules/scicos_blocks/src/c/matmul_i16s.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/matmul_i32e.c b/modules/scicos_blocks/src/c/matmul_i32e.c
+index e498098..12450bc 100644
+--- a/modules/scicos_blocks/src/c/matmul_i32e.c
++++ b/modules/scicos_blocks/src/c/matmul_i32e.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/matmul_i32n.c b/modules/scicos_blocks/src/c/matmul_i32n.c
+index 5aa9797..0019c2a 100644
+--- a/modules/scicos_blocks/src/c/matmul_i32n.c
++++ b/modules/scicos_blocks/src/c/matmul_i32n.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/matmul_i32s.c b/modules/scicos_blocks/src/c/matmul_i32s.c
+index 1ad0e62..8a7e7cc 100644
+--- a/modules/scicos_blocks/src/c/matmul_i32s.c
++++ b/modules/scicos_blocks/src/c/matmul_i32s.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/matmul_i8e.c b/modules/scicos_blocks/src/c/matmul_i8e.c
+index 54fa0a2..14ebd9c 100644
+--- a/modules/scicos_blocks/src/c/matmul_i8e.c
++++ b/modules/scicos_blocks/src/c/matmul_i8e.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/matmul_i8n.c b/modules/scicos_blocks/src/c/matmul_i8n.c
+index 9966ee5..336bc64 100644
+--- a/modules/scicos_blocks/src/c/matmul_i8n.c
++++ b/modules/scicos_blocks/src/c/matmul_i8n.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/matmul_i8s.c b/modules/scicos_blocks/src/c/matmul_i8s.c
+index 3a4b57f..5d47189 100644
+--- a/modules/scicos_blocks/src/c/matmul_i8s.c
++++ b/modules/scicos_blocks/src/c/matmul_i8s.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/matmul_m.c b/modules/scicos_blocks/src/c/matmul_m.c
+index c283281..579a6f0 100644
+--- a/modules/scicos_blocks/src/c/matmul_m.c
++++ b/modules/scicos_blocks/src/c/matmul_m.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/matmul_ui16e.c b/modules/scicos_blocks/src/c/matmul_ui16e.c
+index e709585..c048c46 100644
+--- a/modules/scicos_blocks/src/c/matmul_ui16e.c
++++ b/modules/scicos_blocks/src/c/matmul_ui16e.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/matmul_ui16n.c b/modules/scicos_blocks/src/c/matmul_ui16n.c
+index 25f3e8a..17b7b8c 100644
+--- a/modules/scicos_blocks/src/c/matmul_ui16n.c
++++ b/modules/scicos_blocks/src/c/matmul_ui16n.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/matmul_ui16s.c b/modules/scicos_blocks/src/c/matmul_ui16s.c
+index cc36ed3..9296088 100644
+--- a/modules/scicos_blocks/src/c/matmul_ui16s.c
++++ b/modules/scicos_blocks/src/c/matmul_ui16s.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/matmul_ui32e.c b/modules/scicos_blocks/src/c/matmul_ui32e.c
+index 86234cb..791726c 100644
+--- a/modules/scicos_blocks/src/c/matmul_ui32e.c
++++ b/modules/scicos_blocks/src/c/matmul_ui32e.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/matmul_ui32n.c b/modules/scicos_blocks/src/c/matmul_ui32n.c
+index a2aff71..b6c9df2 100644
+--- a/modules/scicos_blocks/src/c/matmul_ui32n.c
++++ b/modules/scicos_blocks/src/c/matmul_ui32n.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/matmul_ui32s.c b/modules/scicos_blocks/src/c/matmul_ui32s.c
+index a111204..3d68cd6 100644
+--- a/modules/scicos_blocks/src/c/matmul_ui32s.c
++++ b/modules/scicos_blocks/src/c/matmul_ui32s.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/matmul_ui8e.c b/modules/scicos_blocks/src/c/matmul_ui8e.c
+index 50bca99..ee6463c 100644
+--- a/modules/scicos_blocks/src/c/matmul_ui8e.c
++++ b/modules/scicos_blocks/src/c/matmul_ui8e.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/matmul_ui8n.c b/modules/scicos_blocks/src/c/matmul_ui8n.c
+index b71f672..1170b35 100644
+--- a/modules/scicos_blocks/src/c/matmul_ui8n.c
++++ b/modules/scicos_blocks/src/c/matmul_ui8n.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/matmul_ui8s.c b/modules/scicos_blocks/src/c/matmul_ui8s.c
+index 2a4c6cc..1f70ee7 100644
+--- a/modules/scicos_blocks/src/c/matmul_ui8s.c
++++ b/modules/scicos_blocks/src/c/matmul_ui8s.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/mattran_m.c b/modules/scicos_blocks/src/c/mattran_m.c
+index e9302cc..c2d0360 100644
+--- a/modules/scicos_blocks/src/c/mattran_m.c
++++ b/modules/scicos_blocks/src/c/mattran_m.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/matz_abs.c b/modules/scicos_blocks/src/c/matz_abs.c
+index 6e847cb..bbbcd82 100644
+--- a/modules/scicos_blocks/src/c/matz_abs.c
++++ b/modules/scicos_blocks/src/c/matz_abs.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/matz_absc.c b/modules/scicos_blocks/src/c/matz_absc.c
+index 13ea204..d0f7d93 100644
+--- a/modules/scicos_blocks/src/c/matz_absc.c
++++ b/modules/scicos_blocks/src/c/matz_absc.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/matz_bksl.c b/modules/scicos_blocks/src/c/matz_bksl.c
+index 35f9bcb..8b1e742 100644
+--- a/modules/scicos_blocks/src/c/matz_bksl.c
++++ b/modules/scicos_blocks/src/c/matz_bksl.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/matz_cath.c b/modules/scicos_blocks/src/c/matz_cath.c
+index 5b0ee01..bc0b33c 100644
+--- a/modules/scicos_blocks/src/c/matz_cath.c
++++ b/modules/scicos_blocks/src/c/matz_cath.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/matz_cath.h b/modules/scicos_blocks/src/c/matz_cath.h
+index 8a67173..53bbcb0 100644
+--- a/modules/scicos_blocks/src/c/matz_cath.h
++++ b/modules/scicos_blocks/src/c/matz_cath.h
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/matz_catv.c b/modules/scicos_blocks/src/c/matz_catv.c
+index ffde3f1..b1eb652 100644
+--- a/modules/scicos_blocks/src/c/matz_catv.c
++++ b/modules/scicos_blocks/src/c/matz_catv.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/matz_conj.c b/modules/scicos_blocks/src/c/matz_conj.c
+index 796852b..70872e0 100644
+--- a/modules/scicos_blocks/src/c/matz_conj.c
++++ b/modules/scicos_blocks/src/c/matz_conj.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/matz_det.c b/modules/scicos_blocks/src/c/matz_det.c
+index 26e1bdc..1aa1d10 100644
+--- a/modules/scicos_blocks/src/c/matz_det.c
++++ b/modules/scicos_blocks/src/c/matz_det.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/matz_diag.c b/modules/scicos_blocks/src/c/matz_diag.c
+index db0743e..97939c6 100644
+--- a/modules/scicos_blocks/src/c/matz_diag.c
++++ b/modules/scicos_blocks/src/c/matz_diag.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/matz_div.c b/modules/scicos_blocks/src/c/matz_div.c
+index 59be832..886f2da 100644
+--- a/modules/scicos_blocks/src/c/matz_div.c
++++ b/modules/scicos_blocks/src/c/matz_div.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/matz_expm.c b/modules/scicos_blocks/src/c/matz_expm.c
+index af3ca78..62a2ba8 100644
+--- a/modules/scicos_blocks/src/c/matz_expm.c
++++ b/modules/scicos_blocks/src/c/matz_expm.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/matz_inv.c b/modules/scicos_blocks/src/c/matz_inv.c
+index da7af1f..5f8cdfe 100644
+--- a/modules/scicos_blocks/src/c/matz_inv.c
++++ b/modules/scicos_blocks/src/c/matz_inv.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/matz_lu.c b/modules/scicos_blocks/src/c/matz_lu.c
+index de86c66..9d205e2 100644
+--- a/modules/scicos_blocks/src/c/matz_lu.c
++++ b/modules/scicos_blocks/src/c/matz_lu.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/matz_pinv.c b/modules/scicos_blocks/src/c/matz_pinv.c
+index 8c564ba..3c9c711 100644
+--- a/modules/scicos_blocks/src/c/matz_pinv.c
++++ b/modules/scicos_blocks/src/c/matz_pinv.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/matz_reim.c b/modules/scicos_blocks/src/c/matz_reim.c
+index bb55250..74e2155 100644
+--- a/modules/scicos_blocks/src/c/matz_reim.c
++++ b/modules/scicos_blocks/src/c/matz_reim.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/matz_reimc.c b/modules/scicos_blocks/src/c/matz_reimc.c
+index b5720da..085b9b0 100644
+--- a/modules/scicos_blocks/src/c/matz_reimc.c
++++ b/modules/scicos_blocks/src/c/matz_reimc.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/matz_reshape.c b/modules/scicos_blocks/src/c/matz_reshape.c
+index 4eb9fff..7b90092 100644
+--- a/modules/scicos_blocks/src/c/matz_reshape.c
++++ b/modules/scicos_blocks/src/c/matz_reshape.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/matz_sing.c b/modules/scicos_blocks/src/c/matz_sing.c
+index 8b377a3..9a668ea 100644
+--- a/modules/scicos_blocks/src/c/matz_sing.c
++++ b/modules/scicos_blocks/src/c/matz_sing.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/matz_sqrt.c b/modules/scicos_blocks/src/c/matz_sqrt.c
+index 1de4749..98b2b33 100644
+--- a/modules/scicos_blocks/src/c/matz_sqrt.c
++++ b/modules/scicos_blocks/src/c/matz_sqrt.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/matz_sum.c b/modules/scicos_blocks/src/c/matz_sum.c
+index 02f8dbb..40b5731 100644
+--- a/modules/scicos_blocks/src/c/matz_sum.c
++++ b/modules/scicos_blocks/src/c/matz_sum.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/matz_sumc.c b/modules/scicos_blocks/src/c/matz_sumc.c
+index ce9a4be..78b6bac 100644
+--- a/modules/scicos_blocks/src/c/matz_sumc.c
++++ b/modules/scicos_blocks/src/c/matz_sumc.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/matz_suml.c b/modules/scicos_blocks/src/c/matz_suml.c
+index 98f2741..adc9e84 100644
+--- a/modules/scicos_blocks/src/c/matz_suml.c
++++ b/modules/scicos_blocks/src/c/matz_suml.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/matz_svd.c b/modules/scicos_blocks/src/c/matz_svd.c
+index 1ef488a..c645d7c 100644
+--- a/modules/scicos_blocks/src/c/matz_svd.c
++++ b/modules/scicos_blocks/src/c/matz_svd.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/matz_vps.c b/modules/scicos_blocks/src/c/matz_vps.c
+index 9354337..ffbfd89 100644
+--- a/modules/scicos_blocks/src/c/matz_vps.c
++++ b/modules/scicos_blocks/src/c/matz_vps.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/matz_vpv.c b/modules/scicos_blocks/src/c/matz_vpv.c
+index c37becf..56534e5 100644
+--- a/modules/scicos_blocks/src/c/matz_vpv.c
++++ b/modules/scicos_blocks/src/c/matz_vpv.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/matzmul2_m.c b/modules/scicos_blocks/src/c/matzmul2_m.c
+index 9cf2c36..6a58a49 100644
+--- a/modules/scicos_blocks/src/c/matzmul2_m.c
++++ b/modules/scicos_blocks/src/c/matzmul2_m.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/matzmul_m.c b/modules/scicos_blocks/src/c/matzmul_m.c
+index d9eaa1e..b1502ad 100644
+--- a/modules/scicos_blocks/src/c/matzmul_m.c
++++ b/modules/scicos_blocks/src/c/matzmul_m.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/matztran_m.c b/modules/scicos_blocks/src/c/matztran_m.c
+index cbcdcab..775ecf1 100644
+--- a/modules/scicos_blocks/src/c/matztran_m.c
++++ b/modules/scicos_blocks/src/c/matztran_m.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/minmax.c b/modules/scicos_blocks/src/c/minmax.c
+index 8912152..1c69667 100644
+--- a/modules/scicos_blocks/src/c/minmax.c
++++ b/modules/scicos_blocks/src/c/minmax.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/modulo_count.c b/modules/scicos_blocks/src/c/modulo_count.c
+index 946fe35..1aa5131 100644
+--- a/modules/scicos_blocks/src/c/modulo_count.c
++++ b/modules/scicos_blocks/src/c/modulo_count.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/mswitch.c b/modules/scicos_blocks/src/c/mswitch.c
+index 694f4b5..17e6832 100644
+--- a/modules/scicos_blocks/src/c/mswitch.c
++++ b/modules/scicos_blocks/src/c/mswitch.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/multiplex.c b/modules/scicos_blocks/src/c/multiplex.c
+index caee752..524e72b 100644
+--- a/modules/scicos_blocks/src/c/multiplex.c
++++ b/modules/scicos_blocks/src/c/multiplex.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/plusblk.c b/modules/scicos_blocks/src/c/plusblk.c
+index 88f34ab..c04fcbd 100644
+--- a/modules/scicos_blocks/src/c/plusblk.c
++++ b/modules/scicos_blocks/src/c/plusblk.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/prod.c b/modules/scicos_blocks/src/c/prod.c
+index dc2e36a..c042062 100644
+--- a/modules/scicos_blocks/src/c/prod.c
++++ b/modules/scicos_blocks/src/c/prod.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/product.c b/modules/scicos_blocks/src/c/product.c
+index ffcbd92..9ba2d4e 100644
+--- a/modules/scicos_blocks/src/c/product.c
++++ b/modules/scicos_blocks/src/c/product.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/ramp.c b/modules/scicos_blocks/src/c/ramp.c
+index 39ba62b..48f317f 100644
+--- a/modules/scicos_blocks/src/c/ramp.c
++++ b/modules/scicos_blocks/src/c/ramp.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/ratelimiter.c b/modules/scicos_blocks/src/c/ratelimiter.c
+index 7292e07..4883482 100644
+--- a/modules/scicos_blocks/src/c/ratelimiter.c
++++ b/modules/scicos_blocks/src/c/ratelimiter.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/readau.c b/modules/scicos_blocks/src/c/readau.c
+index 4a31d93..1eeb498 100644
+--- a/modules/scicos_blocks/src/c/readau.c
++++ b/modules/scicos_blocks/src/c/readau.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/readc.c b/modules/scicos_blocks/src/c/readc.c
+index 72b600c..65225fa 100644
+--- a/modules/scicos_blocks/src/c/readc.c
++++ b/modules/scicos_blocks/src/c/readc.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/relational_op.c b/modules/scicos_blocks/src/c/relational_op.c
+index 8ad36ac..30e2bfb 100644
+--- a/modules/scicos_blocks/src/c/relational_op.c
++++ b/modules/scicos_blocks/src/c/relational_op.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/relational_op_i16.c b/modules/scicos_blocks/src/c/relational_op_i16.c
+index 94d3886..2363d64 100644
+--- a/modules/scicos_blocks/src/c/relational_op_i16.c
++++ b/modules/scicos_blocks/src/c/relational_op_i16.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/relational_op_i32.c b/modules/scicos_blocks/src/c/relational_op_i32.c
+index 89550d8..5ad8e5a 100644
+--- a/modules/scicos_blocks/src/c/relational_op_i32.c
++++ b/modules/scicos_blocks/src/c/relational_op_i32.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/relational_op_i8.c b/modules/scicos_blocks/src/c/relational_op_i8.c
+index 5aa2338..581d395 100644
+--- a/modules/scicos_blocks/src/c/relational_op_i8.c
++++ b/modules/scicos_blocks/src/c/relational_op_i8.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/relational_op_ui16.c b/modules/scicos_blocks/src/c/relational_op_ui16.c
+index 8dad05a..f90e4ff 100644
+--- a/modules/scicos_blocks/src/c/relational_op_ui16.c
++++ b/modules/scicos_blocks/src/c/relational_op_ui16.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/relational_op_ui32.c b/modules/scicos_blocks/src/c/relational_op_ui32.c
+index 5206412..0e5bcd3 100644
+--- a/modules/scicos_blocks/src/c/relational_op_ui32.c
++++ b/modules/scicos_blocks/src/c/relational_op_ui32.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/relational_op_ui8.c b/modules/scicos_blocks/src/c/relational_op_ui8.c
+index 6883cc7..5676672 100644
+--- a/modules/scicos_blocks/src/c/relational_op_ui8.c
++++ b/modules/scicos_blocks/src/c/relational_op_ui8.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/relationalop.c b/modules/scicos_blocks/src/c/relationalop.c
+index 2ec08c1..9653496 100644
+--- a/modules/scicos_blocks/src/c/relationalop.c
++++ b/modules/scicos_blocks/src/c/relationalop.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/relay.c b/modules/scicos_blocks/src/c/relay.c
+index de13c7c..11a62fb 100644
+--- a/modules/scicos_blocks/src/c/relay.c
++++ b/modules/scicos_blocks/src/c/relay.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/ricc_m.c b/modules/scicos_blocks/src/c/ricc_m.c
+index faac924..33d37cf 100644
+--- a/modules/scicos_blocks/src/c/ricc_m.c
++++ b/modules/scicos_blocks/src/c/ricc_m.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/rndblk_m.c b/modules/scicos_blocks/src/c/rndblk_m.c
+index e757efa..bb8e46e 100644
+--- a/modules/scicos_blocks/src/c/rndblk_m.c
++++ b/modules/scicos_blocks/src/c/rndblk_m.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/rndblkz_m.c b/modules/scicos_blocks/src/c/rndblkz_m.c
+index 03ba925..4ddae0a 100644
+--- a/modules/scicos_blocks/src/c/rndblkz_m.c
++++ b/modules/scicos_blocks/src/c/rndblkz_m.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/root_coef.c b/modules/scicos_blocks/src/c/root_coef.c
+index 5304af9..ecec9b6 100644
+--- a/modules/scicos_blocks/src/c/root_coef.c
++++ b/modules/scicos_blocks/src/c/root_coef.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/rootz_coef.c b/modules/scicos_blocks/src/c/rootz_coef.c
+index e45b029..384bdb7 100644
+--- a/modules/scicos_blocks/src/c/rootz_coef.c
++++ b/modules/scicos_blocks/src/c/rootz_coef.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/samphold4.c b/modules/scicos_blocks/src/c/samphold4.c
+index 388fde5..ea58303 100644
+--- a/modules/scicos_blocks/src/c/samphold4.c
++++ b/modules/scicos_blocks/src/c/samphold4.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/samphold4_m.c b/modules/scicos_blocks/src/c/samphold4_m.c
+index e9f19d4..66af32f 100644
+--- a/modules/scicos_blocks/src/c/samphold4_m.c
++++ b/modules/scicos_blocks/src/c/samphold4_m.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/satur.c b/modules/scicos_blocks/src/c/satur.c
+index 6b7d317..383ee64 100644
+--- a/modules/scicos_blocks/src/c/satur.c
++++ b/modules/scicos_blocks/src/c/satur.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/scalar2vector.c b/modules/scicos_blocks/src/c/scalar2vector.c
+index f70fb89..f258d43 100644
+--- a/modules/scicos_blocks/src/c/scalar2vector.c
++++ b/modules/scicos_blocks/src/c/scalar2vector.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/scicos_evalhermite.c b/modules/scicos_blocks/src/c/scicos_evalhermite.c
+index 5bc3972..e8b10fe 100644
+--- a/modules/scicos_blocks/src/c/scicos_evalhermite.c
++++ b/modules/scicos_blocks/src/c/scicos_evalhermite.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/scicos_evalhermite.h b/modules/scicos_blocks/src/c/scicos_evalhermite.h
+index 4517410..e37ca4e 100644
+--- a/modules/scicos_blocks/src/c/scicos_evalhermite.h
++++ b/modules/scicos_blocks/src/c/scicos_evalhermite.h
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/scicos_indexfinder.c b/modules/scicos_blocks/src/c/scicos_indexfinder.c
+index 67e3df6..812544e 100644
+--- a/modules/scicos_blocks/src/c/scicos_indexfinder.c
++++ b/modules/scicos_blocks/src/c/scicos_indexfinder.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/scicos_indexfinder.h b/modules/scicos_blocks/src/c/scicos_indexfinder.h
+index eeb9c61..f1fb202 100644
+--- a/modules/scicos_blocks/src/c/scicos_indexfinder.h
++++ b/modules/scicos_blocks/src/c/scicos_indexfinder.h
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/scicosexit.c b/modules/scicos_blocks/src/c/scicosexit.c
+index 7e295b8..037f5b4 100644
+--- a/modules/scicos_blocks/src/c/scicosexit.c
++++ b/modules/scicos_blocks/src/c/scicosexit.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/scoGetProperty.c b/modules/scicos_blocks/src/c/scoGetProperty.c
+index 1c5e264..eb3f4d0 100755
+--- a/modules/scicos_blocks/src/c/scoGetProperty.c
++++ b/modules/scicos_blocks/src/c/scoGetProperty.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/scoMemoryScope.c b/modules/scicos_blocks/src/c/scoMemoryScope.c
+index d520816..070b721 100644
+--- a/modules/scicos_blocks/src/c/scoMemoryScope.c
++++ b/modules/scicos_blocks/src/c/scoMemoryScope.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/scoMisc.c b/modules/scicos_blocks/src/c/scoMisc.c
+index f940178..3824bc0 100755
+--- a/modules/scicos_blocks/src/c/scoMisc.c
++++ b/modules/scicos_blocks/src/c/scoMisc.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/scoSetProperty.c b/modules/scicos_blocks/src/c/scoSetProperty.c
+index e4758cf..59b9b21 100755
+--- a/modules/scicos_blocks/src/c/scoSetProperty.c
++++ b/modules/scicos_blocks/src/c/scoSetProperty.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/scoWindowScope.c b/modules/scicos_blocks/src/c/scoWindowScope.c
+index d540bc1..68c1261 100644
+--- a/modules/scicos_blocks/src/c/scoWindowScope.c
++++ b/modules/scicos_blocks/src/c/scoWindowScope.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/selector.c b/modules/scicos_blocks/src/c/selector.c
+index 4d142cf..5533c7e 100644
+--- a/modules/scicos_blocks/src/c/selector.c
++++ b/modules/scicos_blocks/src/c/selector.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/selector_m.c b/modules/scicos_blocks/src/c/selector_m.c
+index e4561da..cc7960a 100644
+--- a/modules/scicos_blocks/src/c/selector_m.c
++++ b/modules/scicos_blocks/src/c/selector_m.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/shift_16_LA.c b/modules/scicos_blocks/src/c/shift_16_LA.c
+index dab4403..3a33b2b 100644
+--- a/modules/scicos_blocks/src/c/shift_16_LA.c
++++ b/modules/scicos_blocks/src/c/shift_16_LA.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/shift_16_LC.c b/modules/scicos_blocks/src/c/shift_16_LC.c
+index 83bd1e3..4a30aa5 100644
+--- a/modules/scicos_blocks/src/c/shift_16_LC.c
++++ b/modules/scicos_blocks/src/c/shift_16_LC.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/shift_16_RA.c b/modules/scicos_blocks/src/c/shift_16_RA.c
+index f817449..2e2b105 100644
+--- a/modules/scicos_blocks/src/c/shift_16_RA.c
++++ b/modules/scicos_blocks/src/c/shift_16_RA.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/shift_16_RC.c b/modules/scicos_blocks/src/c/shift_16_RC.c
+index 832bfce..fda3852 100644
+--- a/modules/scicos_blocks/src/c/shift_16_RC.c
++++ b/modules/scicos_blocks/src/c/shift_16_RC.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/shift_32_LA.c b/modules/scicos_blocks/src/c/shift_32_LA.c
+index 2144589..5eb0d9b 100644
+--- a/modules/scicos_blocks/src/c/shift_32_LA.c
++++ b/modules/scicos_blocks/src/c/shift_32_LA.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/shift_32_LC.c b/modules/scicos_blocks/src/c/shift_32_LC.c
+index c6b5cbc..a8952f4 100644
+--- a/modules/scicos_blocks/src/c/shift_32_LC.c
++++ b/modules/scicos_blocks/src/c/shift_32_LC.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/shift_32_RA.c b/modules/scicos_blocks/src/c/shift_32_RA.c
+index 3cc45e4..305e080 100644
+--- a/modules/scicos_blocks/src/c/shift_32_RA.c
++++ b/modules/scicos_blocks/src/c/shift_32_RA.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/shift_32_RC.c b/modules/scicos_blocks/src/c/shift_32_RC.c
+index 7a30448..d2c934a 100644
+--- a/modules/scicos_blocks/src/c/shift_32_RC.c
++++ b/modules/scicos_blocks/src/c/shift_32_RC.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/shift_8_LA.c b/modules/scicos_blocks/src/c/shift_8_LA.c
+index 8b8f479..6b9361c 100644
+--- a/modules/scicos_blocks/src/c/shift_8_LA.c
++++ b/modules/scicos_blocks/src/c/shift_8_LA.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/shift_8_LC.c b/modules/scicos_blocks/src/c/shift_8_LC.c
+index b5a8f5f..875ab0c 100644
+--- a/modules/scicos_blocks/src/c/shift_8_LC.c
++++ b/modules/scicos_blocks/src/c/shift_8_LC.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/shift_8_RA.c b/modules/scicos_blocks/src/c/shift_8_RA.c
+index 9956479..4f3e437 100644
+--- a/modules/scicos_blocks/src/c/shift_8_RA.c
++++ b/modules/scicos_blocks/src/c/shift_8_RA.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/shift_8_RC.c b/modules/scicos_blocks/src/c/shift_8_RC.c
+index bcc51d4..712a8fa 100644
+--- a/modules/scicos_blocks/src/c/shift_8_RC.c
++++ b/modules/scicos_blocks/src/c/shift_8_RC.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/shift_u16_RA.c b/modules/scicos_blocks/src/c/shift_u16_RA.c
+index d8eafcb..34aee3a 100644
+--- a/modules/scicos_blocks/src/c/shift_u16_RA.c
++++ b/modules/scicos_blocks/src/c/shift_u16_RA.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/shift_u32_RA.c b/modules/scicos_blocks/src/c/shift_u32_RA.c
+index 490c28d..38a43ec 100644
+--- a/modules/scicos_blocks/src/c/shift_u32_RA.c
++++ b/modules/scicos_blocks/src/c/shift_u32_RA.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/shift_u8_RA.c b/modules/scicos_blocks/src/c/shift_u8_RA.c
+index a5569cf..21df761 100644
+--- a/modules/scicos_blocks/src/c/shift_u8_RA.c
++++ b/modules/scicos_blocks/src/c/shift_u8_RA.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/signum.c b/modules/scicos_blocks/src/c/signum.c
+index 43b8614..15a68eb 100644
+--- a/modules/scicos_blocks/src/c/signum.c
++++ b/modules/scicos_blocks/src/c/signum.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/sin_blk.c b/modules/scicos_blocks/src/c/sin_blk.c
+index 9a63e4d..c500f6a 100644
+--- a/modules/scicos_blocks/src/c/sin_blk.c
++++ b/modules/scicos_blocks/src/c/sin_blk.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/sinh_blk.c b/modules/scicos_blocks/src/c/sinh_blk.c
+index 86226ca..52780d4 100644
+--- a/modules/scicos_blocks/src/c/sinh_blk.c
++++ b/modules/scicos_blocks/src/c/sinh_blk.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/step_func.c b/modules/scicos_blocks/src/c/step_func.c
+index d90efc4..1db94b7 100644
+--- a/modules/scicos_blocks/src/c/step_func.c
++++ b/modules/scicos_blocks/src/c/step_func.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/submat.c b/modules/scicos_blocks/src/c/submat.c
+index bba295b..5e7b718 100644
+--- a/modules/scicos_blocks/src/c/submat.c
++++ b/modules/scicos_blocks/src/c/submat.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/submatz.c b/modules/scicos_blocks/src/c/submatz.c
+index c48102a..79991a0 100644
+--- a/modules/scicos_blocks/src/c/submatz.c
++++ b/modules/scicos_blocks/src/c/submatz.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/sum.c b/modules/scicos_blocks/src/c/sum.c
+index c196c4e..2da073b 100644
+--- a/modules/scicos_blocks/src/c/sum.c
++++ b/modules/scicos_blocks/src/c/sum.c
+@@ -15,7 +15,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/summation.c b/modules/scicos_blocks/src/c/summation.c
+index dad3ddf..07bba3f 100644
+--- a/modules/scicos_blocks/src/c/summation.c
++++ b/modules/scicos_blocks/src/c/summation.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/summation_i16e.c b/modules/scicos_blocks/src/c/summation_i16e.c
+index 5c78a81..a185718 100644
+--- a/modules/scicos_blocks/src/c/summation_i16e.c
++++ b/modules/scicos_blocks/src/c/summation_i16e.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/summation_i16n.c b/modules/scicos_blocks/src/c/summation_i16n.c
+index 357073d..a060648 100644
+--- a/modules/scicos_blocks/src/c/summation_i16n.c
++++ b/modules/scicos_blocks/src/c/summation_i16n.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/summation_i16s.c b/modules/scicos_blocks/src/c/summation_i16s.c
+index dc73624..8802311 100644
+--- a/modules/scicos_blocks/src/c/summation_i16s.c
++++ b/modules/scicos_blocks/src/c/summation_i16s.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/summation_i32e.c b/modules/scicos_blocks/src/c/summation_i32e.c
+index 306abe8..8e3ea72 100644
+--- a/modules/scicos_blocks/src/c/summation_i32e.c
++++ b/modules/scicos_blocks/src/c/summation_i32e.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/summation_i32n.c b/modules/scicos_blocks/src/c/summation_i32n.c
+index b192083..998e6a0 100644
+--- a/modules/scicos_blocks/src/c/summation_i32n.c
++++ b/modules/scicos_blocks/src/c/summation_i32n.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/summation_i32s.c b/modules/scicos_blocks/src/c/summation_i32s.c
+index 2b29f87..d505b66 100644
+--- a/modules/scicos_blocks/src/c/summation_i32s.c
++++ b/modules/scicos_blocks/src/c/summation_i32s.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/summation_i8e.c b/modules/scicos_blocks/src/c/summation_i8e.c
+index 4d24f88..d7975fd 100644
+--- a/modules/scicos_blocks/src/c/summation_i8e.c
++++ b/modules/scicos_blocks/src/c/summation_i8e.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/summation_i8n.c b/modules/scicos_blocks/src/c/summation_i8n.c
+index f9ef047..7c4d313 100644
+--- a/modules/scicos_blocks/src/c/summation_i8n.c
++++ b/modules/scicos_blocks/src/c/summation_i8n.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/summation_i8s.c b/modules/scicos_blocks/src/c/summation_i8s.c
+index 9b6af96..86b2c0d 100644
+--- a/modules/scicos_blocks/src/c/summation_i8s.c
++++ b/modules/scicos_blocks/src/c/summation_i8s.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/summation_ui16e.c b/modules/scicos_blocks/src/c/summation_ui16e.c
+index a9beebf..c7972bd 100644
+--- a/modules/scicos_blocks/src/c/summation_ui16e.c
++++ b/modules/scicos_blocks/src/c/summation_ui16e.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/summation_ui16n.c b/modules/scicos_blocks/src/c/summation_ui16n.c
+index 9818d7e..c768629 100644
+--- a/modules/scicos_blocks/src/c/summation_ui16n.c
++++ b/modules/scicos_blocks/src/c/summation_ui16n.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/summation_ui16s.c b/modules/scicos_blocks/src/c/summation_ui16s.c
+index 36857a2..4ca83dc 100644
+--- a/modules/scicos_blocks/src/c/summation_ui16s.c
++++ b/modules/scicos_blocks/src/c/summation_ui16s.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/summation_ui32e.c b/modules/scicos_blocks/src/c/summation_ui32e.c
+index c7af103..8fab434 100644
+--- a/modules/scicos_blocks/src/c/summation_ui32e.c
++++ b/modules/scicos_blocks/src/c/summation_ui32e.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/summation_ui32n.c b/modules/scicos_blocks/src/c/summation_ui32n.c
+index fedd76a..d529d5b 100644
+--- a/modules/scicos_blocks/src/c/summation_ui32n.c
++++ b/modules/scicos_blocks/src/c/summation_ui32n.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/summation_ui32s.c b/modules/scicos_blocks/src/c/summation_ui32s.c
+index 7a355ac..e6329e5 100644
+--- a/modules/scicos_blocks/src/c/summation_ui32s.c
++++ b/modules/scicos_blocks/src/c/summation_ui32s.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/summation_ui8e.c b/modules/scicos_blocks/src/c/summation_ui8e.c
+index 1a4727b..480108a 100644
+--- a/modules/scicos_blocks/src/c/summation_ui8e.c
++++ b/modules/scicos_blocks/src/c/summation_ui8e.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/summation_ui8n.c b/modules/scicos_blocks/src/c/summation_ui8n.c
+index c855878..bdb203d 100644
+--- a/modules/scicos_blocks/src/c/summation_ui8n.c
++++ b/modules/scicos_blocks/src/c/summation_ui8n.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/summation_ui8s.c b/modules/scicos_blocks/src/c/summation_ui8s.c
+index b3b8eaa..8f001cb 100644
+--- a/modules/scicos_blocks/src/c/summation_ui8s.c
++++ b/modules/scicos_blocks/src/c/summation_ui8s.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/summation_z.c b/modules/scicos_blocks/src/c/summation_z.c
+index e5eb0e1..b4d4b61 100644
+--- a/modules/scicos_blocks/src/c/summation_z.c
++++ b/modules/scicos_blocks/src/c/summation_z.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/switch2.c b/modules/scicos_blocks/src/c/switch2.c
+index befdc30..e8a1f02 100644
+--- a/modules/scicos_blocks/src/c/switch2.c
++++ b/modules/scicos_blocks/src/c/switch2.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/switch2_m.c b/modules/scicos_blocks/src/c/switch2_m.c
+index 68c2fbc..7ea0e24 100644
+--- a/modules/scicos_blocks/src/c/switch2_m.c
++++ b/modules/scicos_blocks/src/c/switch2_m.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/switchn.c b/modules/scicos_blocks/src/c/switchn.c
+index 9861c1d..b53cf72 100644
+--- a/modules/scicos_blocks/src/c/switchn.c
++++ b/modules/scicos_blocks/src/c/switchn.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/tablex2d_c.c b/modules/scicos_blocks/src/c/tablex2d_c.c
+index f34f662..3cfc299 100644
+--- a/modules/scicos_blocks/src/c/tablex2d_c.c
++++ b/modules/scicos_blocks/src/c/tablex2d_c.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/tan_blk.c b/modules/scicos_blocks/src/c/tan_blk.c
+index a2c13f1..003add1 100644
+--- a/modules/scicos_blocks/src/c/tan_blk.c
++++ b/modules/scicos_blocks/src/c/tan_blk.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/tanh_blk.c b/modules/scicos_blocks/src/c/tanh_blk.c
+index 32fe462..f0c879e 100644
+--- a/modules/scicos_blocks/src/c/tanh_blk.c
++++ b/modules/scicos_blocks/src/c/tanh_blk.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/tcslti4.c b/modules/scicos_blocks/src/c/tcslti4.c
+index c9b6639..3315f30 100644
+--- a/modules/scicos_blocks/src/c/tcslti4.c
++++ b/modules/scicos_blocks/src/c/tcslti4.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/tcsltj4.c b/modules/scicos_blocks/src/c/tcsltj4.c
+index f40433c..dcbf253 100644
+--- a/modules/scicos_blocks/src/c/tcsltj4.c
++++ b/modules/scicos_blocks/src/c/tcsltj4.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/time_delay.c b/modules/scicos_blocks/src/c/time_delay.c
+index 7d635cb..20a8ac3 100644
+--- a/modules/scicos_blocks/src/c/time_delay.c
++++ b/modules/scicos_blocks/src/c/time_delay.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/tows_c.c b/modules/scicos_blocks/src/c/tows_c.c
+index f1271e0..7d8dc99 100644
+--- a/modules/scicos_blocks/src/c/tows_c.c
++++ b/modules/scicos_blocks/src/c/tows_c.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/variable_delay.c b/modules/scicos_blocks/src/c/variable_delay.c
+index 2f9d044..0747b62 100644
+--- a/modules/scicos_blocks/src/c/variable_delay.c
++++ b/modules/scicos_blocks/src/c/variable_delay.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/whileiterator.c b/modules/scicos_blocks/src/c/whileiterator.c
+index e68e7ea..ce534a9 100644
+--- a/modules/scicos_blocks/src/c/whileiterator.c
++++ b/modules/scicos_blocks/src/c/whileiterator.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/writeau.c b/modules/scicos_blocks/src/c/writeau.c
+index 66cf069..fa3d800 100644
+--- a/modules/scicos_blocks/src/c/writeau.c
++++ b/modules/scicos_blocks/src/c/writeau.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/writec.c b/modules/scicos_blocks/src/c/writec.c
+index 97cc03a..83c32b9 100644
+--- a/modules/scicos_blocks/src/c/writec.c
++++ b/modules/scicos_blocks/src/c/writec.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/c/zcross2.c b/modules/scicos_blocks/src/c/zcross2.c
+index bf790db..6986d88 100644
+--- a/modules/scicos_blocks/src/c/zcross2.c
++++ b/modules/scicos_blocks/src/c/zcross2.c
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * See the file ./license.txt
+ */
+diff --git a/modules/scicos_blocks/src/fortran/csslti.f b/modules/scicos_blocks/src/fortran/csslti.f
+index a55731d..9afe3eb 100644
+--- a/modules/scicos_blocks/src/fortran/csslti.f
++++ b/modules/scicos_blocks/src/fortran/csslti.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c     
+ c     You should have received a copy of the GNU General Public License
+ c     along with this program; if not, write to the Free Software
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ c     
+ c     See the file ./license.txt
+ c     
+diff --git a/modules/scicos_blocks/src/fortran/cstblk.f b/modules/scicos_blocks/src/fortran/cstblk.f
+index f60ce1a..80d9654 100644
+--- a/modules/scicos_blocks/src/fortran/cstblk.f
++++ b/modules/scicos_blocks/src/fortran/cstblk.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c     
+ c     You should have received a copy of the GNU General Public License
+ c     along with this program; if not, write to the Free Software
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ c     
+ c     See the file ./license.txt
+ c     
+diff --git a/modules/scicos_blocks/src/fortran/delay.f b/modules/scicos_blocks/src/fortran/delay.f
+index 9dc359e..ec80d80 100644
+--- a/modules/scicos_blocks/src/fortran/delay.f
++++ b/modules/scicos_blocks/src/fortran/delay.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c     
+ c     You should have received a copy of the GNU General Public License
+ c     along with this program; if not, write to the Free Software
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ c     
+ c     See the file ./license.txt
+ c     
+diff --git a/modules/scicos_blocks/src/fortran/delayv.f b/modules/scicos_blocks/src/fortran/delayv.f
+index bb2220e..6928a72 100644
+--- a/modules/scicos_blocks/src/fortran/delayv.f
++++ b/modules/scicos_blocks/src/fortran/delayv.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c     
+ c     You should have received a copy of the GNU General Public License
+ c     along with this program; if not, write to the Free Software
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ c     
+ c     See the file ./license.txt
+ c     
+diff --git a/modules/scicos_blocks/src/fortran/demux.f b/modules/scicos_blocks/src/fortran/demux.f
+index 048f8e6..744521f 100644
+--- a/modules/scicos_blocks/src/fortran/demux.f
++++ b/modules/scicos_blocks/src/fortran/demux.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c     
+ c     You should have received a copy of the GNU General Public License
+ c     along with this program; if not, write to the Free Software
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ c     
+ c     See the file ./license.txt
+ c     
+diff --git a/modules/scicos_blocks/src/fortran/diffblk.f b/modules/scicos_blocks/src/fortran/diffblk.f
+index e0b5bf2..c6dae5e 100644
+--- a/modules/scicos_blocks/src/fortran/diffblk.f
++++ b/modules/scicos_blocks/src/fortran/diffblk.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c     
+ c     You should have received a copy of the GNU General Public License
+ c     along with this program; if not, write to the Free Software
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ c     
+ c     See the file ./license.txt
+ c     
+diff --git a/modules/scicos_blocks/src/fortran/dlradp.f b/modules/scicos_blocks/src/fortran/dlradp.f
+index 4b41f2f..08692b1 100644
+--- a/modules/scicos_blocks/src/fortran/dlradp.f
++++ b/modules/scicos_blocks/src/fortran/dlradp.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c     
+ c     You should have received a copy of the GNU General Public License
+ c     along with this program; if not, write to the Free Software
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ c     
+ c     See the file ./license.txt
+ c     
+diff --git a/modules/scicos_blocks/src/fortran/dollar.f b/modules/scicos_blocks/src/fortran/dollar.f
+index 47a04ad..8cce9c0 100644
+--- a/modules/scicos_blocks/src/fortran/dollar.f
++++ b/modules/scicos_blocks/src/fortran/dollar.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c     
+ c     You should have received a copy of the GNU General Public License
+ c     along with this program; if not, write to the Free Software
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ c     
+ c     See the file ./license.txt
+ c     
+diff --git a/modules/scicos_blocks/src/fortran/dsslti.f b/modules/scicos_blocks/src/fortran/dsslti.f
+index 155f75a..d4371ab 100644
+--- a/modules/scicos_blocks/src/fortran/dsslti.f
++++ b/modules/scicos_blocks/src/fortran/dsslti.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c     
+ c     You should have received a copy of the GNU General Public License
+ c     along with this program; if not, write to the Free Software
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ c     
+ c     See the file ./license.txt
+ c     
+diff --git a/modules/scicos_blocks/src/fortran/eselect.f b/modules/scicos_blocks/src/fortran/eselect.f
+index a5b0937..5889b8e 100644
+--- a/modules/scicos_blocks/src/fortran/eselect.f
++++ b/modules/scicos_blocks/src/fortran/eselect.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c     
+ c     You should have received a copy of the GNU General Public License
+ c     along with this program; if not, write to the Free Software
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ c     
+ c     See the file ./license.txt
+ c     
+diff --git a/modules/scicos_blocks/src/fortran/evtdly.f b/modules/scicos_blocks/src/fortran/evtdly.f
+index 89415e0..fec62fd 100644
+--- a/modules/scicos_blocks/src/fortran/evtdly.f
++++ b/modules/scicos_blocks/src/fortran/evtdly.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c     
+ c     You should have received a copy of the GNU General Public License
+ c     along with this program; if not, write to the Free Software
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ c     
+ c     See the file ./license.txt
+ c     
+diff --git a/modules/scicos_blocks/src/fortran/expblk.f b/modules/scicos_blocks/src/fortran/expblk.f
+index 0d9fcb6..87af222 100644
+--- a/modules/scicos_blocks/src/fortran/expblk.f
++++ b/modules/scicos_blocks/src/fortran/expblk.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c     
+ c     You should have received a copy of the GNU General Public License
+ c     along with this program; if not, write to the Free Software
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ c     
+ c     See the file ./license.txt
+ c     
+diff --git a/modules/scicos_blocks/src/fortran/forblk.f b/modules/scicos_blocks/src/fortran/forblk.f
+index 49b23d9..6d2eaf4 100644
+--- a/modules/scicos_blocks/src/fortran/forblk.f
++++ b/modules/scicos_blocks/src/fortran/forblk.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c     
+ c     You should have received a copy of the GNU General Public License
+ c     along with this program; if not, write to the Free Software
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ c     
+ c     See the file ./license.txt
+ c     
+diff --git a/modules/scicos_blocks/src/fortran/fsv.f b/modules/scicos_blocks/src/fortran/fsv.f
+index 518524f..2abc0cd 100644
+--- a/modules/scicos_blocks/src/fortran/fsv.f
++++ b/modules/scicos_blocks/src/fortran/fsv.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c     
+ c     You should have received a copy of the GNU General Public License
+ c     along with this program; if not, write to the Free Software
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ c     
+ c     See the file ./license.txt
+ c     
+diff --git a/modules/scicos_blocks/src/fortran/gensin.f b/modules/scicos_blocks/src/fortran/gensin.f
+index 68db5ec..de28dc7 100644
+--- a/modules/scicos_blocks/src/fortran/gensin.f
++++ b/modules/scicos_blocks/src/fortran/gensin.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c     
+ c     You should have received a copy of the GNU General Public License
+ c     along with this program; if not, write to the Free Software
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ c     
+ c     See the file ./license.txt
+ c     
+diff --git a/modules/scicos_blocks/src/fortran/gensqr.f b/modules/scicos_blocks/src/fortran/gensqr.f
+index ca9fc0c..e199724 100644
+--- a/modules/scicos_blocks/src/fortran/gensqr.f
++++ b/modules/scicos_blocks/src/fortran/gensqr.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c     
+ c     You should have received a copy of the GNU General Public License
+ c     along with this program; if not, write to the Free Software
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ c     
+ c     See the file ./license.txt
+ c     
+diff --git a/modules/scicos_blocks/src/fortran/hltblk.f b/modules/scicos_blocks/src/fortran/hltblk.f
+index faeb58a..2be2651 100644
+--- a/modules/scicos_blocks/src/fortran/hltblk.f
++++ b/modules/scicos_blocks/src/fortran/hltblk.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c     
+ c     You should have received a copy of the GNU General Public License
+ c     along with this program; if not, write to the Free Software
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ c     
+ c     See the file ./license.txt
+ c     
+diff --git a/modules/scicos_blocks/src/fortran/ifthel.f b/modules/scicos_blocks/src/fortran/ifthel.f
+index b5b27e6..29acfaf 100644
+--- a/modules/scicos_blocks/src/fortran/ifthel.f
++++ b/modules/scicos_blocks/src/fortran/ifthel.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c     
+ c     You should have received a copy of the GNU General Public License
+ c     along with this program; if not, write to the Free Software
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ c     
+ c     See the file ./license.txt
+ c     
+diff --git a/modules/scicos_blocks/src/fortran/integr.f b/modules/scicos_blocks/src/fortran/integr.f
+index 40f759d..699b1bf 100644
+--- a/modules/scicos_blocks/src/fortran/integr.f
++++ b/modules/scicos_blocks/src/fortran/integr.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c     
+ c     You should have received a copy of the GNU General Public License
+ c     along with this program; if not, write to the Free Software
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ c     
+ c     See the file ./license.txt
+ c     
+diff --git a/modules/scicos_blocks/src/fortran/intplt.f b/modules/scicos_blocks/src/fortran/intplt.f
+index eb0acf7..c8b17af 100644
+--- a/modules/scicos_blocks/src/fortran/intplt.f
++++ b/modules/scicos_blocks/src/fortran/intplt.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c     
+ c     You should have received a copy of the GNU General Public License
+ c     along with this program; if not, write to the Free Software
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ c     
+ c     See the file ./license.txt
+ c     
+diff --git a/modules/scicos_blocks/src/fortran/intpol.f b/modules/scicos_blocks/src/fortran/intpol.f
+index 6c50c92..002b79e 100644
+--- a/modules/scicos_blocks/src/fortran/intpol.f
++++ b/modules/scicos_blocks/src/fortran/intpol.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c     
+ c     You should have received a copy of the GNU General Public License
+ c     along with this program; if not, write to the Free Software
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ c     
+ c     See the file ./license.txt
+ c     
+diff --git a/modules/scicos_blocks/src/fortran/intrp2.f b/modules/scicos_blocks/src/fortran/intrp2.f
+index 9e0e0c2..4b23558 100644
+--- a/modules/scicos_blocks/src/fortran/intrp2.f
++++ b/modules/scicos_blocks/src/fortran/intrp2.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c     
+ c     You should have received a copy of the GNU General Public License
+ c     along with this program; if not, write to the Free Software
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ c     
+ c     See the file ./license.txt
+ c     
+diff --git a/modules/scicos_blocks/src/fortran/intrpl.f b/modules/scicos_blocks/src/fortran/intrpl.f
+index 1804856..3091364 100644
+--- a/modules/scicos_blocks/src/fortran/intrpl.f
++++ b/modules/scicos_blocks/src/fortran/intrpl.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c     
+ c     You should have received a copy of the GNU General Public License
+ c     along with this program; if not, write to the Free Software
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ c     
+ c     See the file ./license.txt
+ c     
+diff --git a/modules/scicos_blocks/src/fortran/invblk.f b/modules/scicos_blocks/src/fortran/invblk.f
+index 638ad62..0adb5c8 100644
+--- a/modules/scicos_blocks/src/fortran/invblk.f
++++ b/modules/scicos_blocks/src/fortran/invblk.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c     
+ c     You should have received a copy of the GNU General Public License
+ c     along with this program; if not, write to the Free Software
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ c     
+ c     See the file ./license.txt
+ c     
+diff --git a/modules/scicos_blocks/src/fortran/iocopy.f b/modules/scicos_blocks/src/fortran/iocopy.f
+index ad30d06..d340309 100644
+--- a/modules/scicos_blocks/src/fortran/iocopy.f
++++ b/modules/scicos_blocks/src/fortran/iocopy.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c     
+ c     You should have received a copy of the GNU General Public License
+ c     along with this program; if not, write to the Free Software
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ c     
+ c     See the file ./license.txt
+ c     
+diff --git a/modules/scicos_blocks/src/fortran/logblk.f b/modules/scicos_blocks/src/fortran/logblk.f
+index 95b3674..0948bd3 100644
+--- a/modules/scicos_blocks/src/fortran/logblk.f
++++ b/modules/scicos_blocks/src/fortran/logblk.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c     
+ c     You should have received a copy of the GNU General Public License
+ c     along with this program; if not, write to the Free Software
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ c     
+ c     See the file ./license.txt
+ c     
+diff --git a/modules/scicos_blocks/src/fortran/lookup.f b/modules/scicos_blocks/src/fortran/lookup.f
+index c55e7c0..dc8b90f 100644
+--- a/modules/scicos_blocks/src/fortran/lookup.f
++++ b/modules/scicos_blocks/src/fortran/lookup.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c     
+ c     You should have received a copy of the GNU General Public License
+ c     along with this program; if not, write to the Free Software
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ c     
+ c     See the file ./license.txt
+ c     
+diff --git a/modules/scicos_blocks/src/fortran/lsplit.f b/modules/scicos_blocks/src/fortran/lsplit.f
+index 029a37e..2d3156c 100644
+--- a/modules/scicos_blocks/src/fortran/lsplit.f
++++ b/modules/scicos_blocks/src/fortran/lsplit.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c     
+ c     You should have received a copy of the GNU General Public License
+ c     along with this program; if not, write to the Free Software
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ c     
+ c     See the file ./license.txt
+ c     
+diff --git a/modules/scicos_blocks/src/fortran/lusat.f b/modules/scicos_blocks/src/fortran/lusat.f
+index 85d1bb9..5a1e2f8 100644
+--- a/modules/scicos_blocks/src/fortran/lusat.f
++++ b/modules/scicos_blocks/src/fortran/lusat.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c     
+ c     You should have received a copy of the GNU General Public License
+ c     along with this program; if not, write to the Free Software
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ c     
+ c     See the file ./license.txt
+ c     
+diff --git a/modules/scicos_blocks/src/fortran/maxblk.f b/modules/scicos_blocks/src/fortran/maxblk.f
+index c255f74..42ebf85 100644
+--- a/modules/scicos_blocks/src/fortran/maxblk.f
++++ b/modules/scicos_blocks/src/fortran/maxblk.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c     
+ c     You should have received a copy of the GNU General Public License
+ c     along with this program; if not, write to the Free Software
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ c     
+ c     See the file ./license.txt
+ c     
+diff --git a/modules/scicos_blocks/src/fortran/memo.f b/modules/scicos_blocks/src/fortran/memo.f
+index 366f09b..24d765a 100644
+--- a/modules/scicos_blocks/src/fortran/memo.f
++++ b/modules/scicos_blocks/src/fortran/memo.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c     
+ c     You should have received a copy of the GNU General Public License
+ c     along with this program; if not, write to the Free Software
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ c     
+ c     See the file ./license.txt
+ c     
+diff --git a/modules/scicos_blocks/src/fortran/mfclck.f b/modules/scicos_blocks/src/fortran/mfclck.f
+index 9556c4f..c1b8262 100644
+--- a/modules/scicos_blocks/src/fortran/mfclck.f
++++ b/modules/scicos_blocks/src/fortran/mfclck.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c     
+ c     You should have received a copy of the GNU General Public License
+ c     along with this program; if not, write to the Free Software
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ c     
+ c     See the file ./license.txt
+ c     
+diff --git a/modules/scicos_blocks/src/fortran/minblk.f b/modules/scicos_blocks/src/fortran/minblk.f
+index 6675c64..c5870fd 100644
+--- a/modules/scicos_blocks/src/fortran/minblk.f
++++ b/modules/scicos_blocks/src/fortran/minblk.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c     
+ c     You should have received a copy of the GNU General Public License
+ c     along with this program; if not, write to the Free Software
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ c     
+ c     See the file ./license.txt
+ c     
+diff --git a/modules/scicos_blocks/src/fortran/mux.f b/modules/scicos_blocks/src/fortran/mux.f
+index e5910cc..d05581b 100644
+--- a/modules/scicos_blocks/src/fortran/mux.f
++++ b/modules/scicos_blocks/src/fortran/mux.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c     
+ c     You should have received a copy of the GNU General Public License
+ c     along with this program; if not, write to the Free Software
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ c     
+ c     See the file ./license.txt
+ c     
+diff --git a/modules/scicos_blocks/src/fortran/pload.f b/modules/scicos_blocks/src/fortran/pload.f
+index bbc7c74..ffc915d 100644
+--- a/modules/scicos_blocks/src/fortran/pload.f
++++ b/modules/scicos_blocks/src/fortran/pload.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c     
+ c     You should have received a copy of the GNU General Public License
+ c     along with this program; if not, write to the Free Software
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ c     
+ c     See the file ./license.txt
+ c     
+diff --git a/modules/scicos_blocks/src/fortran/powblk.f b/modules/scicos_blocks/src/fortran/powblk.f
+index baa9dc4..de320a6 100644
+--- a/modules/scicos_blocks/src/fortran/powblk.f
++++ b/modules/scicos_blocks/src/fortran/powblk.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c     
+ c     You should have received a copy of the GNU General Public License
+ c     along with this program; if not, write to the Free Software
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ c     
+ c     See the file ./license.txt
+ c     
+diff --git a/modules/scicos_blocks/src/fortran/qzcel.f b/modules/scicos_blocks/src/fortran/qzcel.f
+index 0581560..886775e 100644
+--- a/modules/scicos_blocks/src/fortran/qzcel.f
++++ b/modules/scicos_blocks/src/fortran/qzcel.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c     
+ c     You should have received a copy of the GNU General Public License
+ c     along with this program; if not, write to the Free Software
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ c     
+ c     See the file ./license.txt
+ c     
+diff --git a/modules/scicos_blocks/src/fortran/qzflr.f b/modules/scicos_blocks/src/fortran/qzflr.f
+index d812152..5bd993d 100644
+--- a/modules/scicos_blocks/src/fortran/qzflr.f
++++ b/modules/scicos_blocks/src/fortran/qzflr.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c     
+ c     You should have received a copy of the GNU General Public License
+ c     along with this program; if not, write to the Free Software
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ c     
+ c     See the file ./license.txt
+ c     
+diff --git a/modules/scicos_blocks/src/fortran/qzrnd.f b/modules/scicos_blocks/src/fortran/qzrnd.f
+index 254da95..56d4d6a 100644
+--- a/modules/scicos_blocks/src/fortran/qzrnd.f
++++ b/modules/scicos_blocks/src/fortran/qzrnd.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c     
+ c     You should have received a copy of the GNU General Public License
+ c     along with this program; if not, write to the Free Software
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ c     
+ c     See the file ./license.txt
+ c     
+diff --git a/modules/scicos_blocks/src/fortran/qztrn.f b/modules/scicos_blocks/src/fortran/qztrn.f
+index 617a5b5..0c08676 100644
+--- a/modules/scicos_blocks/src/fortran/qztrn.f
++++ b/modules/scicos_blocks/src/fortran/qztrn.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c     
+ c     You should have received a copy of the GNU General Public License
+ c     along with this program; if not, write to the Free Software
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ c     
+ c     See the file ./license.txt
+ c     
+diff --git a/modules/scicos_blocks/src/fortran/readf.f b/modules/scicos_blocks/src/fortran/readf.f
+index ef033fb..c3f0829 100644
+--- a/modules/scicos_blocks/src/fortran/readf.f
++++ b/modules/scicos_blocks/src/fortran/readf.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c     
+ c     You should have received a copy of the GNU General Public License
+ c     along with this program; if not, write to the Free Software
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ c     
+ c     See the file ./license.txt
+ c     
+diff --git a/modules/scicos_blocks/src/fortran/rndblk.f b/modules/scicos_blocks/src/fortran/rndblk.f
+index b836a3a..220bf8b 100644
+--- a/modules/scicos_blocks/src/fortran/rndblk.f
++++ b/modules/scicos_blocks/src/fortran/rndblk.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c     
+ c     You should have received a copy of the GNU General Public License
+ c     along with this program; if not, write to the Free Software
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ c     
+ c     See the file ./license.txt
+ c     
+diff --git a/modules/scicos_blocks/src/fortran/samphold.f b/modules/scicos_blocks/src/fortran/samphold.f
+index cbe7522..ca9d670 100644
+--- a/modules/scicos_blocks/src/fortran/samphold.f
++++ b/modules/scicos_blocks/src/fortran/samphold.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c     
+ c     You should have received a copy of the GNU General Public License
+ c     along with this program; if not, write to the Free Software
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ c     
+ c     See the file ./license.txt
+ c     
+diff --git a/modules/scicos_blocks/src/fortran/sawtth.f b/modules/scicos_blocks/src/fortran/sawtth.f
+index 77292c0..f8979ba 100644
+--- a/modules/scicos_blocks/src/fortran/sawtth.f
++++ b/modules/scicos_blocks/src/fortran/sawtth.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c     
+ c     You should have received a copy of the GNU General Public License
+ c     along with this program; if not, write to the Free Software
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ c     
+ c     See the file ./license.txt
+ c     
+diff --git a/modules/scicos_blocks/src/fortran/sciblk.f b/modules/scicos_blocks/src/fortran/sciblk.f
+index 6290dad..ef9a6fb 100644
+--- a/modules/scicos_blocks/src/fortran/sciblk.f
++++ b/modules/scicos_blocks/src/fortran/sciblk.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c     
+ c     You should have received a copy of the GNU General Public License
+ c     along with this program; if not, write to the Free Software
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ c     
+ c     See the file ./license.txt
+ c     
+diff --git a/modules/scicos_blocks/src/fortran/selblk.f b/modules/scicos_blocks/src/fortran/selblk.f
+index 79b3985..cd95659 100644
+--- a/modules/scicos_blocks/src/fortran/selblk.f
++++ b/modules/scicos_blocks/src/fortran/selblk.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c 
+ c     You should have received a copy of the GNU General Public License 
+ c     along with this program; if not, write to the Free Software 
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 
+ c 
+ c     See the file ./license.txt 
+ c 
+diff --git a/modules/scicos_blocks/src/fortran/sinblk.f b/modules/scicos_blocks/src/fortran/sinblk.f
+index 1a0d9e8..54632e3 100644
+--- a/modules/scicos_blocks/src/fortran/sinblk.f
++++ b/modules/scicos_blocks/src/fortran/sinblk.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c 
+ c     You should have received a copy of the GNU General Public License 
+ c     along with this program; if not, write to the Free Software 
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 
+ c 
+ c     See the file ./license.txt 
+ c 
+diff --git a/modules/scicos_blocks/src/fortran/sqrblk.f b/modules/scicos_blocks/src/fortran/sqrblk.f
+index 29d53e3..b8d53ad 100644
+--- a/modules/scicos_blocks/src/fortran/sqrblk.f
++++ b/modules/scicos_blocks/src/fortran/sqrblk.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c 
+ c     You should have received a copy of the GNU General Public License 
+ c     along with this program; if not, write to the Free Software 
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 
+ c 
+ c     See the file ./license.txt 
+ c 
+diff --git a/modules/scicos_blocks/src/fortran/sum2.f b/modules/scicos_blocks/src/fortran/sum2.f
+index f22a7a9..6a4f1b8 100644
+--- a/modules/scicos_blocks/src/fortran/sum2.f
++++ b/modules/scicos_blocks/src/fortran/sum2.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c 
+ c     You should have received a copy of the GNU General Public License 
+ c     along with this program; if not, write to the Free Software 
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 
+ c 
+ c     See the file ./license.txt 
+ c 
+diff --git a/modules/scicos_blocks/src/fortran/sum3.f b/modules/scicos_blocks/src/fortran/sum3.f
+index 6656f6f..a7bb705 100644
+--- a/modules/scicos_blocks/src/fortran/sum3.f
++++ b/modules/scicos_blocks/src/fortran/sum3.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c 
+ c     You should have received a copy of the GNU General Public License 
+ c     along with this program; if not, write to the Free Software 
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 
+ c 
+ c     See the file ./license.txt 
+ c 
+diff --git a/modules/scicos_blocks/src/fortran/tanblk.f b/modules/scicos_blocks/src/fortran/tanblk.f
+index 550ceb8..c0d2bcb 100644
+--- a/modules/scicos_blocks/src/fortran/tanblk.f
++++ b/modules/scicos_blocks/src/fortran/tanblk.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c     
+ c     You should have received a copy of the GNU General Public License
+ c     along with this program; if not, write to the Free Software
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ c     
+ c     See the file ./license.txt
+ c     
+diff --git a/modules/scicos_blocks/src/fortran/tcslti.f b/modules/scicos_blocks/src/fortran/tcslti.f
+index 72035f2..e063bae 100644
+--- a/modules/scicos_blocks/src/fortran/tcslti.f
++++ b/modules/scicos_blocks/src/fortran/tcslti.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c     
+ c     You should have received a copy of the GNU General Public License
+ c     along with this program; if not, write to the Free Software
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ c     
+ c     See the file ./license.txt
+ c     
+diff --git a/modules/scicos_blocks/src/fortran/tcsltj.f b/modules/scicos_blocks/src/fortran/tcsltj.f
+index 1100f3a..d4a0fd1 100644
+--- a/modules/scicos_blocks/src/fortran/tcsltj.f
++++ b/modules/scicos_blocks/src/fortran/tcsltj.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c 
+ c     You should have received a copy of the GNU General Public License 
+ c     along with this program; if not, write to the Free Software 
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 
+ c 
+ c     See the file ./license.txt 
+ c 
+diff --git a/modules/scicos_blocks/src/fortran/timblk.f b/modules/scicos_blocks/src/fortran/timblk.f
+index 289de0b..596b550 100644
+--- a/modules/scicos_blocks/src/fortran/timblk.f
++++ b/modules/scicos_blocks/src/fortran/timblk.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c 
+ c     You should have received a copy of the GNU General Public License 
+ c     along with this program; if not, write to the Free Software 
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 
+ c 
+ c     See the file ./license.txt 
+ c 
+diff --git a/modules/scicos_blocks/src/fortran/trash.f b/modules/scicos_blocks/src/fortran/trash.f
+index 20c5dd2..4e17083 100644
+--- a/modules/scicos_blocks/src/fortran/trash.f
++++ b/modules/scicos_blocks/src/fortran/trash.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c 
+ c     You should have received a copy of the GNU General Public License 
+ c     along with this program; if not, write to the Free Software 
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 
+ c 
+ c     See the file ./license.txt 
+ c 
+diff --git a/modules/scicos_blocks/src/fortran/writef.f b/modules/scicos_blocks/src/fortran/writef.f
+index 26feb71..0fe6e39 100644
+--- a/modules/scicos_blocks/src/fortran/writef.f
++++ b/modules/scicos_blocks/src/fortran/writef.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c 
+ c     You should have received a copy of the GNU General Public License 
+ c     along with this program; if not, write to the Free Software 
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 
+ c 
+ c     See the file ./license.txt 
+ c 
+diff --git a/modules/scicos_blocks/src/fortran/zcross.f b/modules/scicos_blocks/src/fortran/zcross.f
+index 8af4074..28c6cfa 100644
+--- a/modules/scicos_blocks/src/fortran/zcross.f
++++ b/modules/scicos_blocks/src/fortran/zcross.f
+@@ -14,7 +14,7 @@ c     GNU General Public License for more details.
+ c 
+ c     You should have received a copy of the GNU General Public License 
+ c     along with this program; if not, write to the Free Software 
+-c     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 
++c     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 
+ c 
+ c     See the file ./license.txt 
+ c 
+diff --git a/modules/scicos_blocks/src/scripts/GenBlocks.sh b/modules/scicos_blocks/src/scripts/GenBlocks.sh
+index 6a99551..aa8ab70 100755
+--- a/modules/scicos_blocks/src/scripts/GenBlocks.sh
++++ b/modules/scicos_blocks/src/scripts/GenBlocks.sh
+@@ -15,7 +15,7 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ #
+ # See the file ./license.txt
+ #
+diff --git a/modules/scicos_blocks/src/scripts/generateblocksheader.sce b/modules/scicos_blocks/src/scripts/generateblocksheader.sce
+index 6f19f7e..cf179db 100644
+--- a/modules/scicos_blocks/src/scripts/generateblocksheader.sce
++++ b/modules/scicos_blocks/src/scripts/generateblocksheader.sce
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ./license.txt
+ //
+@@ -64,7 +64,7 @@ BLOCKS_H = [
+ "*";
+ "* You should have received a copy of the GNU General Public License";
+ "* along with this program; if not, write to the Free Software";
+-"* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.";
++"* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.";
+ "*";
+ "* See the file ./license.txt";
+ "*/";
+diff --git a/modules/scicos_blocks/src/scripts/genmoc.sce b/modules/scicos_blocks/src/scripts/genmoc.sce
+index 44a88cd..f9333da 100644
+--- a/modules/scicos_blocks/src/scripts/genmoc.sce
++++ b/modules/scicos_blocks/src/scripts/genmoc.sce
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ./license.txt
+ //
+diff --git a/modules/tclsci/tcl/sciGUI/license.txt b/modules/tclsci/tcl/sciGUI/license.txt
+index c96ea8b..9f50329 100644
+--- a/modules/tclsci/tcl/sciGUI/license.txt
++++ b/modules/tclsci/tcl/sciGUI/license.txt
+@@ -13,4 +13,4 @@ GNU General Public License for more details.
+ 
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+diff --git a/modules/tclsci/tcl/utils/Balloon.tcl b/modules/tclsci/tcl/utils/Balloon.tcl
+index c941f18..c2c9a03 100644
+--- a/modules/tclsci/tcl/utils/Balloon.tcl
++++ b/modules/tclsci/tcl/utils/Balloon.tcl
+@@ -20,7 +20,7 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ 
+ ##############################################################################
+ #
+diff --git a/modules/xcos/help/en_US/batch_functions/lincos.xml b/modules/xcos/help/en_US/batch_functions/lincos.xml
+index 5ca1372..2f306ea 100644
+--- a/modules/xcos/help/en_US/batch_functions/lincos.xml
++++ b/modules/xcos/help/en_US/batch_functions/lincos.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/batch_functions/scicos.xml b/modules/xcos/help/en_US/batch_functions/scicos.xml
+index a398706..6749ccc 100644
+--- a/modules/xcos/help/en_US/batch_functions/scicos.xml
++++ b/modules/xcos/help/en_US/batch_functions/scicos.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/batch_functions/scicos_simulate.xml b/modules/xcos/help/en_US/batch_functions/scicos_simulate.xml
+index 9fb960e..e043605 100644
+--- a/modules/xcos/help/en_US/batch_functions/scicos_simulate.xml
++++ b/modules/xcos/help/en_US/batch_functions/scicos_simulate.xml
+@@ -18,7 +18,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/batch_functions/scicosim.xml b/modules/xcos/help/en_US/batch_functions/scicosim.xml
+index 8e40280..3d1b495 100644
+--- a/modules/xcos/help/en_US/batch_functions/scicosim.xml
++++ b/modules/xcos/help/en_US/batch_functions/scicosim.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/batch_functions/steadycos.xml b/modules/xcos/help/en_US/batch_functions/steadycos.xml
+index 3636fc4..d251cdc 100644
+--- a/modules/xcos/help/en_US/batch_functions/steadycos.xml
++++ b/modules/xcos/help/en_US/batch_functions/steadycos.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Annotations_pal/AA_Annotations_pal.xml b/modules/xcos/help/en_US/palettes/Annotations_pal/AA_Annotations_pal.xml
+index 3d5508f..655a8ea 100644
+--- a/modules/xcos/help/en_US/palettes/Annotations_pal/AA_Annotations_pal.xml
++++ b/modules/xcos/help/en_US/palettes/Annotations_pal/AA_Annotations_pal.xml
+@@ -18,7 +18,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Annotations_pal/TEXT_f.xml b/modules/xcos/help/en_US/palettes/Annotations_pal/TEXT_f.xml
+index df765f3..6eca78e 100644
+--- a/modules/xcos/help/en_US/palettes/Annotations_pal/TEXT_f.xml
++++ b/modules/xcos/help/en_US/palettes/Annotations_pal/TEXT_f.xml
+@@ -18,7 +18,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Commonlyusedblocks_pal/AA_Commonlyusedblocks_pal.xml b/modules/xcos/help/en_US/palettes/Commonlyusedblocks_pal/AA_Commonlyusedblocks_pal.xml
+index 4404fb9..e0b2d5e 100644
+--- a/modules/xcos/help/en_US/palettes/Commonlyusedblocks_pal/AA_Commonlyusedblocks_pal.xml
++++ b/modules/xcos/help/en_US/palettes/Commonlyusedblocks_pal/AA_Commonlyusedblocks_pal.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Commonlyusedblocks_pal/LOGICAL_OP.xml b/modules/xcos/help/en_US/palettes/Commonlyusedblocks_pal/LOGICAL_OP.xml
+index ddf7f81..7339d10 100644
+--- a/modules/xcos/help/en_US/palettes/Commonlyusedblocks_pal/LOGICAL_OP.xml
++++ b/modules/xcos/help/en_US/palettes/Commonlyusedblocks_pal/LOGICAL_OP.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Commonlyusedblocks_pal/RELATIONALOP.xml b/modules/xcos/help/en_US/palettes/Commonlyusedblocks_pal/RELATIONALOP.xml
+index 02c8733..ec4c455 100644
+--- a/modules/xcos/help/en_US/palettes/Commonlyusedblocks_pal/RELATIONALOP.xml
++++ b/modules/xcos/help/en_US/palettes/Commonlyusedblocks_pal/RELATIONALOP.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Continuous_pal/AA_Continuous_pal.xml b/modules/xcos/help/en_US/palettes/Continuous_pal/AA_Continuous_pal.xml
+index 1069c64..c9f4aad 100644
+--- a/modules/xcos/help/en_US/palettes/Continuous_pal/AA_Continuous_pal.xml
++++ b/modules/xcos/help/en_US/palettes/Continuous_pal/AA_Continuous_pal.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Continuous_pal/CLINDUMMY_f.xml b/modules/xcos/help/en_US/palettes/Continuous_pal/CLINDUMMY_f.xml
+index f53165b..7389114 100644
+--- a/modules/xcos/help/en_US/palettes/Continuous_pal/CLINDUMMY_f.xml
++++ b/modules/xcos/help/en_US/palettes/Continuous_pal/CLINDUMMY_f.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Continuous_pal/CLR.xml b/modules/xcos/help/en_US/palettes/Continuous_pal/CLR.xml
+index 5ce486a..4c047b0 100644
+--- a/modules/xcos/help/en_US/palettes/Continuous_pal/CLR.xml
++++ b/modules/xcos/help/en_US/palettes/Continuous_pal/CLR.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Continuous_pal/CLSS.xml b/modules/xcos/help/en_US/palettes/Continuous_pal/CLSS.xml
+index e0033f5..cf4c914 100644
+--- a/modules/xcos/help/en_US/palettes/Continuous_pal/CLSS.xml
++++ b/modules/xcos/help/en_US/palettes/Continuous_pal/CLSS.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Continuous_pal/DERIV.xml b/modules/xcos/help/en_US/palettes/Continuous_pal/DERIV.xml
+index 6010960..9daf03b 100644
+--- a/modules/xcos/help/en_US/palettes/Continuous_pal/DERIV.xml
++++ b/modules/xcos/help/en_US/palettes/Continuous_pal/DERIV.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Continuous_pal/INTEGRAL_f.xml b/modules/xcos/help/en_US/palettes/Continuous_pal/INTEGRAL_f.xml
+index d4f22f2..829e5a8 100644
+--- a/modules/xcos/help/en_US/palettes/Continuous_pal/INTEGRAL_f.xml
++++ b/modules/xcos/help/en_US/palettes/Continuous_pal/INTEGRAL_f.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Continuous_pal/INTEGRAL_m.xml b/modules/xcos/help/en_US/palettes/Continuous_pal/INTEGRAL_m.xml
+index daf1911..f4f1b56 100644
+--- a/modules/xcos/help/en_US/palettes/Continuous_pal/INTEGRAL_m.xml
++++ b/modules/xcos/help/en_US/palettes/Continuous_pal/INTEGRAL_m.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Continuous_pal/PID.xml b/modules/xcos/help/en_US/palettes/Continuous_pal/PID.xml
+index 7428789..550b64a 100644
+--- a/modules/xcos/help/en_US/palettes/Continuous_pal/PID.xml
++++ b/modules/xcos/help/en_US/palettes/Continuous_pal/PID.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Continuous_pal/TCLSS.xml b/modules/xcos/help/en_US/palettes/Continuous_pal/TCLSS.xml
+index a14406b..26bb30f 100644
+--- a/modules/xcos/help/en_US/palettes/Continuous_pal/TCLSS.xml
++++ b/modules/xcos/help/en_US/palettes/Continuous_pal/TCLSS.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Continuous_pal/TIME_DELAY.xml b/modules/xcos/help/en_US/palettes/Continuous_pal/TIME_DELAY.xml
+index 1085326..666e699 100644
+--- a/modules/xcos/help/en_US/palettes/Continuous_pal/TIME_DELAY.xml
++++ b/modules/xcos/help/en_US/palettes/Continuous_pal/TIME_DELAY.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Continuous_pal/VARIABLE_DELAY.xml b/modules/xcos/help/en_US/palettes/Continuous_pal/VARIABLE_DELAY.xml
+index 93adb44..df03cd3 100644
+--- a/modules/xcos/help/en_US/palettes/Continuous_pal/VARIABLE_DELAY.xml
++++ b/modules/xcos/help/en_US/palettes/Continuous_pal/VARIABLE_DELAY.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Demonstrationsblocks_pal/AA_Demonstrationsblocks_pal.xml b/modules/xcos/help/en_US/palettes/Demonstrationsblocks_pal/AA_Demonstrationsblocks_pal.xml
+index f17c8a5..c8498af 100644
+--- a/modules/xcos/help/en_US/palettes/Demonstrationsblocks_pal/AA_Demonstrationsblocks_pal.xml
++++ b/modules/xcos/help/en_US/palettes/Demonstrationsblocks_pal/AA_Demonstrationsblocks_pal.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Demonstrationsblocks_pal/AUTOMAT.xml b/modules/xcos/help/en_US/palettes/Demonstrationsblocks_pal/AUTOMAT.xml
+index 3ee22bc..0926bae 100644
+--- a/modules/xcos/help/en_US/palettes/Demonstrationsblocks_pal/AUTOMAT.xml
++++ b/modules/xcos/help/en_US/palettes/Demonstrationsblocks_pal/AUTOMAT.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Demonstrationsblocks_pal/BOUNCE.xml b/modules/xcos/help/en_US/palettes/Demonstrationsblocks_pal/BOUNCE.xml
+index a8077f8..b2e4729 100644
+--- a/modules/xcos/help/en_US/palettes/Demonstrationsblocks_pal/BOUNCE.xml
++++ b/modules/xcos/help/en_US/palettes/Demonstrationsblocks_pal/BOUNCE.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Demonstrationsblocks_pal/BOUNCEXY.xml b/modules/xcos/help/en_US/palettes/Demonstrationsblocks_pal/BOUNCEXY.xml
+index 08ce51e..763ea88 100644
+--- a/modules/xcos/help/en_US/palettes/Demonstrationsblocks_pal/BOUNCEXY.xml
++++ b/modules/xcos/help/en_US/palettes/Demonstrationsblocks_pal/BOUNCEXY.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Demonstrationsblocks_pal/BPLATFORM.xml b/modules/xcos/help/en_US/palettes/Demonstrationsblocks_pal/BPLATFORM.xml
+index 142d6e1..667b13b 100644
+--- a/modules/xcos/help/en_US/palettes/Demonstrationsblocks_pal/BPLATFORM.xml
++++ b/modules/xcos/help/en_US/palettes/Demonstrationsblocks_pal/BPLATFORM.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Demonstrationsblocks_pal/PDE.xml b/modules/xcos/help/en_US/palettes/Demonstrationsblocks_pal/PDE.xml
+index f9b284b..3679b01 100644
+--- a/modules/xcos/help/en_US/palettes/Demonstrationsblocks_pal/PDE.xml
++++ b/modules/xcos/help/en_US/palettes/Demonstrationsblocks_pal/PDE.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Discontinuities_pal/AA_Discontinuous_pal.xml b/modules/xcos/help/en_US/palettes/Discontinuities_pal/AA_Discontinuous_pal.xml
+index 5e0a259..71610ab 100644
+--- a/modules/xcos/help/en_US/palettes/Discontinuities_pal/AA_Discontinuous_pal.xml
++++ b/modules/xcos/help/en_US/palettes/Discontinuities_pal/AA_Discontinuous_pal.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Discontinuities_pal/BACKLASH.xml b/modules/xcos/help/en_US/palettes/Discontinuities_pal/BACKLASH.xml
+index b93095e..b4979a5 100644
+--- a/modules/xcos/help/en_US/palettes/Discontinuities_pal/BACKLASH.xml
++++ b/modules/xcos/help/en_US/palettes/Discontinuities_pal/BACKLASH.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Discontinuities_pal/DEADBAND.xml b/modules/xcos/help/en_US/palettes/Discontinuities_pal/DEADBAND.xml
+index 5f9c5ce..549eb0b 100644
+--- a/modules/xcos/help/en_US/palettes/Discontinuities_pal/DEADBAND.xml
++++ b/modules/xcos/help/en_US/palettes/Discontinuities_pal/DEADBAND.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Discontinuities_pal/HYSTHERESIS.xml b/modules/xcos/help/en_US/palettes/Discontinuities_pal/HYSTHERESIS.xml
+index 3b7ecb0..65068db 100644
+--- a/modules/xcos/help/en_US/palettes/Discontinuities_pal/HYSTHERESIS.xml
++++ b/modules/xcos/help/en_US/palettes/Discontinuities_pal/HYSTHERESIS.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Discontinuities_pal/RATELIMITER.xml b/modules/xcos/help/en_US/palettes/Discontinuities_pal/RATELIMITER.xml
+index 03b73d7..11f4c68 100644
+--- a/modules/xcos/help/en_US/palettes/Discontinuities_pal/RATELIMITER.xml
++++ b/modules/xcos/help/en_US/palettes/Discontinuities_pal/RATELIMITER.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Discontinuities_pal/SATURATION.xml b/modules/xcos/help/en_US/palettes/Discontinuities_pal/SATURATION.xml
+index fdc1f7d..08d00ea 100644
+--- a/modules/xcos/help/en_US/palettes/Discontinuities_pal/SATURATION.xml
++++ b/modules/xcos/help/en_US/palettes/Discontinuities_pal/SATURATION.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Discrete_pal/AA_Discrete_pal.xml b/modules/xcos/help/en_US/palettes/Discrete_pal/AA_Discrete_pal.xml
+index 8a80c21..b3ed622 100644
+--- a/modules/xcos/help/en_US/palettes/Discrete_pal/AA_Discrete_pal.xml
++++ b/modules/xcos/help/en_US/palettes/Discrete_pal/AA_Discrete_pal.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Discrete_pal/DELAYV_f.xml b/modules/xcos/help/en_US/palettes/Discrete_pal/DELAYV_f.xml
+index bc5e21d..98ab8c7 100644
+--- a/modules/xcos/help/en_US/palettes/Discrete_pal/DELAYV_f.xml
++++ b/modules/xcos/help/en_US/palettes/Discrete_pal/DELAYV_f.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Discrete_pal/DELAY_f.xml b/modules/xcos/help/en_US/palettes/Discrete_pal/DELAY_f.xml
+index 462fe13..46bee97 100644
+--- a/modules/xcos/help/en_US/palettes/Discrete_pal/DELAY_f.xml
++++ b/modules/xcos/help/en_US/palettes/Discrete_pal/DELAY_f.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Discrete_pal/DLR.xml b/modules/xcos/help/en_US/palettes/Discrete_pal/DLR.xml
+index 39d3ba1..7fd90d2 100644
+--- a/modules/xcos/help/en_US/palettes/Discrete_pal/DLR.xml
++++ b/modules/xcos/help/en_US/palettes/Discrete_pal/DLR.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Discrete_pal/DLRADAPT_f.xml b/modules/xcos/help/en_US/palettes/Discrete_pal/DLRADAPT_f.xml
+index 5cfd696..8113f1c 100644
+--- a/modules/xcos/help/en_US/palettes/Discrete_pal/DLRADAPT_f.xml
++++ b/modules/xcos/help/en_US/palettes/Discrete_pal/DLRADAPT_f.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Discrete_pal/DLSS.xml b/modules/xcos/help/en_US/palettes/Discrete_pal/DLSS.xml
+index b58a4b7..8b1a6cc 100644
+--- a/modules/xcos/help/en_US/palettes/Discrete_pal/DLSS.xml
++++ b/modules/xcos/help/en_US/palettes/Discrete_pal/DLSS.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Discrete_pal/DOLLAR_f.xml b/modules/xcos/help/en_US/palettes/Discrete_pal/DOLLAR_f.xml
+index 9600622..c06c304 100644
+--- a/modules/xcos/help/en_US/palettes/Discrete_pal/DOLLAR_f.xml
++++ b/modules/xcos/help/en_US/palettes/Discrete_pal/DOLLAR_f.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Discrete_pal/REGISTER.xml b/modules/xcos/help/en_US/palettes/Discrete_pal/REGISTER.xml
+index 8dd4b50..85b10d1 100644
+--- a/modules/xcos/help/en_US/palettes/Discrete_pal/REGISTER.xml
++++ b/modules/xcos/help/en_US/palettes/Discrete_pal/REGISTER.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Electrical_pal/AA_Electrical_pal.xml b/modules/xcos/help/en_US/palettes/Electrical_pal/AA_Electrical_pal.xml
+index 2784f11..d8fa75e 100644
+--- a/modules/xcos/help/en_US/palettes/Electrical_pal/AA_Electrical_pal.xml
++++ b/modules/xcos/help/en_US/palettes/Electrical_pal/AA_Electrical_pal.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Electrical_pal/CCS.xml b/modules/xcos/help/en_US/palettes/Electrical_pal/CCS.xml
+index 4b8678f..89f64d9 100644
+--- a/modules/xcos/help/en_US/palettes/Electrical_pal/CCS.xml
++++ b/modules/xcos/help/en_US/palettes/Electrical_pal/CCS.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Electrical_pal/CVS.xml b/modules/xcos/help/en_US/palettes/Electrical_pal/CVS.xml
+index 57bedf1..5a20b17 100644
+--- a/modules/xcos/help/en_US/palettes/Electrical_pal/CVS.xml
++++ b/modules/xcos/help/en_US/palettes/Electrical_pal/CVS.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Electrical_pal/Capacitor.xml b/modules/xcos/help/en_US/palettes/Electrical_pal/Capacitor.xml
+index faefae9..6287b84 100644
+--- a/modules/xcos/help/en_US/palettes/Electrical_pal/Capacitor.xml
++++ b/modules/xcos/help/en_US/palettes/Electrical_pal/Capacitor.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Electrical_pal/ConstantVoltage.xml b/modules/xcos/help/en_US/palettes/Electrical_pal/ConstantVoltage.xml
+index 10b71e5..ae455de 100644
+--- a/modules/xcos/help/en_US/palettes/Electrical_pal/ConstantVoltage.xml
++++ b/modules/xcos/help/en_US/palettes/Electrical_pal/ConstantVoltage.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Electrical_pal/CurrentSensor.xml b/modules/xcos/help/en_US/palettes/Electrical_pal/CurrentSensor.xml
+index 29a8ed5..7c2e302 100644
+--- a/modules/xcos/help/en_US/palettes/Electrical_pal/CurrentSensor.xml
++++ b/modules/xcos/help/en_US/palettes/Electrical_pal/CurrentSensor.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Electrical_pal/Diode.xml b/modules/xcos/help/en_US/palettes/Electrical_pal/Diode.xml
+index 6fc1623..fb38d2c 100644
+--- a/modules/xcos/help/en_US/palettes/Electrical_pal/Diode.xml
++++ b/modules/xcos/help/en_US/palettes/Electrical_pal/Diode.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Electrical_pal/Ground.xml b/modules/xcos/help/en_US/palettes/Electrical_pal/Ground.xml
+index fda085c..b052384 100644
+--- a/modules/xcos/help/en_US/palettes/Electrical_pal/Ground.xml
++++ b/modules/xcos/help/en_US/palettes/Electrical_pal/Ground.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Electrical_pal/Gyrator.xml b/modules/xcos/help/en_US/palettes/Electrical_pal/Gyrator.xml
+index c88237d..e1998c7 100644
+--- a/modules/xcos/help/en_US/palettes/Electrical_pal/Gyrator.xml
++++ b/modules/xcos/help/en_US/palettes/Electrical_pal/Gyrator.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Electrical_pal/IdealTransformer.xml b/modules/xcos/help/en_US/palettes/Electrical_pal/IdealTransformer.xml
+index be26267..5b205a2 100644
+--- a/modules/xcos/help/en_US/palettes/Electrical_pal/IdealTransformer.xml
++++ b/modules/xcos/help/en_US/palettes/Electrical_pal/IdealTransformer.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Electrical_pal/Inductor.xml b/modules/xcos/help/en_US/palettes/Electrical_pal/Inductor.xml
+index f5b3106..36b7258 100644
+--- a/modules/xcos/help/en_US/palettes/Electrical_pal/Inductor.xml
++++ b/modules/xcos/help/en_US/palettes/Electrical_pal/Inductor.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Electrical_pal/NMOS.xml b/modules/xcos/help/en_US/palettes/Electrical_pal/NMOS.xml
+index 8153c72..c2dcad5 100644
+--- a/modules/xcos/help/en_US/palettes/Electrical_pal/NMOS.xml
++++ b/modules/xcos/help/en_US/palettes/Electrical_pal/NMOS.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Electrical_pal/NPN.xml b/modules/xcos/help/en_US/palettes/Electrical_pal/NPN.xml
+index 8b5ed94..825d9ea 100644
+--- a/modules/xcos/help/en_US/palettes/Electrical_pal/NPN.xml
++++ b/modules/xcos/help/en_US/palettes/Electrical_pal/NPN.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Electrical_pal/OpAmp.xml b/modules/xcos/help/en_US/palettes/Electrical_pal/OpAmp.xml
+index 4d27718..b6de99d 100644
+--- a/modules/xcos/help/en_US/palettes/Electrical_pal/OpAmp.xml
++++ b/modules/xcos/help/en_US/palettes/Electrical_pal/OpAmp.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Electrical_pal/PMOS.xml b/modules/xcos/help/en_US/palettes/Electrical_pal/PMOS.xml
+index de8bd82..f5ba335 100644
+--- a/modules/xcos/help/en_US/palettes/Electrical_pal/PMOS.xml
++++ b/modules/xcos/help/en_US/palettes/Electrical_pal/PMOS.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Electrical_pal/PNP.xml b/modules/xcos/help/en_US/palettes/Electrical_pal/PNP.xml
+index b2637dd..fe06c7b 100644
+--- a/modules/xcos/help/en_US/palettes/Electrical_pal/PNP.xml
++++ b/modules/xcos/help/en_US/palettes/Electrical_pal/PNP.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Electrical_pal/PotentialSensor.xml b/modules/xcos/help/en_US/palettes/Electrical_pal/PotentialSensor.xml
+index cfc5344..8019db9 100644
+--- a/modules/xcos/help/en_US/palettes/Electrical_pal/PotentialSensor.xml
++++ b/modules/xcos/help/en_US/palettes/Electrical_pal/PotentialSensor.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Electrical_pal/Resistor.xml b/modules/xcos/help/en_US/palettes/Electrical_pal/Resistor.xml
+index bdd177b..4452c37 100644
+--- a/modules/xcos/help/en_US/palettes/Electrical_pal/Resistor.xml
++++ b/modules/xcos/help/en_US/palettes/Electrical_pal/Resistor.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Electrical_pal/SineVoltage.xml b/modules/xcos/help/en_US/palettes/Electrical_pal/SineVoltage.xml
+index e5a325b..fb3d655 100644
+--- a/modules/xcos/help/en_US/palettes/Electrical_pal/SineVoltage.xml
++++ b/modules/xcos/help/en_US/palettes/Electrical_pal/SineVoltage.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Electrical_pal/Switch.xml b/modules/xcos/help/en_US/palettes/Electrical_pal/Switch.xml
+index 27ee082..6b9c67e 100644
+--- a/modules/xcos/help/en_US/palettes/Electrical_pal/Switch.xml
++++ b/modules/xcos/help/en_US/palettes/Electrical_pal/Switch.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Electrical_pal/VVsourceAC.xml b/modules/xcos/help/en_US/palettes/Electrical_pal/VVsourceAC.xml
+index 1543200..05b333d 100644
+--- a/modules/xcos/help/en_US/palettes/Electrical_pal/VVsourceAC.xml
++++ b/modules/xcos/help/en_US/palettes/Electrical_pal/VVsourceAC.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Electrical_pal/VariableResistor.xml b/modules/xcos/help/en_US/palettes/Electrical_pal/VariableResistor.xml
+index 9c562ca..348c0fe 100644
+--- a/modules/xcos/help/en_US/palettes/Electrical_pal/VariableResistor.xml
++++ b/modules/xcos/help/en_US/palettes/Electrical_pal/VariableResistor.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Electrical_pal/VoltageSensor.xml b/modules/xcos/help/en_US/palettes/Electrical_pal/VoltageSensor.xml
+index 04ec068..813fc61 100644
+--- a/modules/xcos/help/en_US/palettes/Electrical_pal/VoltageSensor.xml
++++ b/modules/xcos/help/en_US/palettes/Electrical_pal/VoltageSensor.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Electrical_pal/VsourceAC.xml b/modules/xcos/help/en_US/palettes/Electrical_pal/VsourceAC.xml
+index 23d161d..483503a 100644
+--- a/modules/xcos/help/en_US/palettes/Electrical_pal/VsourceAC.xml
++++ b/modules/xcos/help/en_US/palettes/Electrical_pal/VsourceAC.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Events_pal/AA_Events_pal.xml b/modules/xcos/help/en_US/palettes/Events_pal/AA_Events_pal.xml
+index f091d39..2f99be9 100644
+--- a/modules/xcos/help/en_US/palettes/Events_pal/AA_Events_pal.xml
++++ b/modules/xcos/help/en_US/palettes/Events_pal/AA_Events_pal.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Events_pal/ANDBLK.xml b/modules/xcos/help/en_US/palettes/Events_pal/ANDBLK.xml
+index 7c64d81..658d423 100644
+--- a/modules/xcos/help/en_US/palettes/Events_pal/ANDBLK.xml
++++ b/modules/xcos/help/en_US/palettes/Events_pal/ANDBLK.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Events_pal/ANDLOG_f.xml b/modules/xcos/help/en_US/palettes/Events_pal/ANDLOG_f.xml
+index fb6c99a..5052f06 100644
+--- a/modules/xcos/help/en_US/palettes/Events_pal/ANDLOG_f.xml
++++ b/modules/xcos/help/en_US/palettes/Events_pal/ANDLOG_f.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Events_pal/CEVENTSCOPE.xml b/modules/xcos/help/en_US/palettes/Events_pal/CEVENTSCOPE.xml
+index df225ca..10def8c 100644
+--- a/modules/xcos/help/en_US/palettes/Events_pal/CEVENTSCOPE.xml
++++ b/modules/xcos/help/en_US/palettes/Events_pal/CEVENTSCOPE.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Events_pal/CLKFROM.xml b/modules/xcos/help/en_US/palettes/Events_pal/CLKFROM.xml
+index 4f0c6b5..a226fdc 100644
+--- a/modules/xcos/help/en_US/palettes/Events_pal/CLKFROM.xml
++++ b/modules/xcos/help/en_US/palettes/Events_pal/CLKFROM.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Events_pal/CLKGOTO.xml b/modules/xcos/help/en_US/palettes/Events_pal/CLKGOTO.xml
+index 135c724..b225b07 100644
+--- a/modules/xcos/help/en_US/palettes/Events_pal/CLKGOTO.xml
++++ b/modules/xcos/help/en_US/palettes/Events_pal/CLKGOTO.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Events_pal/CLKGotoTagVisibility.xml b/modules/xcos/help/en_US/palettes/Events_pal/CLKGotoTagVisibility.xml
+index 62e364f..d6f49be 100644
+--- a/modules/xcos/help/en_US/palettes/Events_pal/CLKGotoTagVisibility.xml
++++ b/modules/xcos/help/en_US/palettes/Events_pal/CLKGotoTagVisibility.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Events_pal/CLKSOMV_f.xml b/modules/xcos/help/en_US/palettes/Events_pal/CLKSOMV_f.xml
+index bf46d9e..16ce7ae 100644
+--- a/modules/xcos/help/en_US/palettes/Events_pal/CLKSOMV_f.xml
++++ b/modules/xcos/help/en_US/palettes/Events_pal/CLKSOMV_f.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Events_pal/EDGE_TRIGGER.xml b/modules/xcos/help/en_US/palettes/Events_pal/EDGE_TRIGGER.xml
+index fae470e..faecca7 100644
+--- a/modules/xcos/help/en_US/palettes/Events_pal/EDGE_TRIGGER.xml
++++ b/modules/xcos/help/en_US/palettes/Events_pal/EDGE_TRIGGER.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Events_pal/ESELECT_f.xml b/modules/xcos/help/en_US/palettes/Events_pal/ESELECT_f.xml
+index f74768c..31faeb0 100644
+--- a/modules/xcos/help/en_US/palettes/Events_pal/ESELECT_f.xml
++++ b/modules/xcos/help/en_US/palettes/Events_pal/ESELECT_f.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Events_pal/EVTDLY_c.xml b/modules/xcos/help/en_US/palettes/Events_pal/EVTDLY_c.xml
+index 222f133..b1ea8d8 100644
+--- a/modules/xcos/help/en_US/palettes/Events_pal/EVTDLY_c.xml
++++ b/modules/xcos/help/en_US/palettes/Events_pal/EVTDLY_c.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Events_pal/EVTGEN_f.xml b/modules/xcos/help/en_US/palettes/Events_pal/EVTGEN_f.xml
+index d635c16..921234c 100644
+--- a/modules/xcos/help/en_US/palettes/Events_pal/EVTGEN_f.xml
++++ b/modules/xcos/help/en_US/palettes/Events_pal/EVTGEN_f.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Events_pal/EVTVARDLY.xml b/modules/xcos/help/en_US/palettes/Events_pal/EVTVARDLY.xml
+index 22642df..e1a029f 100644
+--- a/modules/xcos/help/en_US/palettes/Events_pal/EVTVARDLY.xml
++++ b/modules/xcos/help/en_US/palettes/Events_pal/EVTVARDLY.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Events_pal/Extract_Activation.xml b/modules/xcos/help/en_US/palettes/Events_pal/Extract_Activation.xml
+index 944870c..a95c172 100644
+--- a/modules/xcos/help/en_US/palettes/Events_pal/Extract_Activation.xml
++++ b/modules/xcos/help/en_US/palettes/Events_pal/Extract_Activation.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Events_pal/HALT_f.xml b/modules/xcos/help/en_US/palettes/Events_pal/HALT_f.xml
+index 5c0b074..44977f7 100644
+--- a/modules/xcos/help/en_US/palettes/Events_pal/HALT_f.xml
++++ b/modules/xcos/help/en_US/palettes/Events_pal/HALT_f.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Events_pal/IFTHEL_f.xml b/modules/xcos/help/en_US/palettes/Events_pal/IFTHEL_f.xml
+index a807667..e21862a 100644
+--- a/modules/xcos/help/en_US/palettes/Events_pal/IFTHEL_f.xml
++++ b/modules/xcos/help/en_US/palettes/Events_pal/IFTHEL_f.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Events_pal/MCLOCK_f.xml b/modules/xcos/help/en_US/palettes/Events_pal/MCLOCK_f.xml
+index 9753ca9..61eb6a1 100644
+--- a/modules/xcos/help/en_US/palettes/Events_pal/MCLOCK_f.xml
++++ b/modules/xcos/help/en_US/palettes/Events_pal/MCLOCK_f.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Events_pal/MFCLCK_f.xml b/modules/xcos/help/en_US/palettes/Events_pal/MFCLCK_f.xml
+index 1ac98cb..755a173 100644
+--- a/modules/xcos/help/en_US/palettes/Events_pal/MFCLCK_f.xml
++++ b/modules/xcos/help/en_US/palettes/Events_pal/MFCLCK_f.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Events_pal/M_freq.xml b/modules/xcos/help/en_US/palettes/Events_pal/M_freq.xml
+index aaf187f..e8a674d 100644
+--- a/modules/xcos/help/en_US/palettes/Events_pal/M_freq.xml
++++ b/modules/xcos/help/en_US/palettes/Events_pal/M_freq.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Events_pal/freq_div.xml b/modules/xcos/help/en_US/palettes/Events_pal/freq_div.xml
+index 60cd56c..de9710b 100644
+--- a/modules/xcos/help/en_US/palettes/Events_pal/freq_div.xml
++++ b/modules/xcos/help/en_US/palettes/Events_pal/freq_div.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Implicit_pal/AA_Implicit_pal.xml b/modules/xcos/help/en_US/palettes/Implicit_pal/AA_Implicit_pal.xml
+index 6d428b2..2a56ea0 100644
+--- a/modules/xcos/help/en_US/palettes/Implicit_pal/AA_Implicit_pal.xml
++++ b/modules/xcos/help/en_US/palettes/Implicit_pal/AA_Implicit_pal.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Implicit_pal/CONSTRAINT_c.xml b/modules/xcos/help/en_US/palettes/Implicit_pal/CONSTRAINT_c.xml
+index ca34bc5..697f130 100644
+--- a/modules/xcos/help/en_US/palettes/Implicit_pal/CONSTRAINT_c.xml
++++ b/modules/xcos/help/en_US/palettes/Implicit_pal/CONSTRAINT_c.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Implicit_pal/DIFF_f.xml b/modules/xcos/help/en_US/palettes/Implicit_pal/DIFF_f.xml
+index 6354a87..920cc5f 100644
+--- a/modules/xcos/help/en_US/palettes/Implicit_pal/DIFF_f.xml
++++ b/modules/xcos/help/en_US/palettes/Implicit_pal/DIFF_f.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Integer_pal/AA_Integer_pal.xml b/modules/xcos/help/en_US/palettes/Integer_pal/AA_Integer_pal.xml
+index 45c22ea..51e4830 100644
+--- a/modules/xcos/help/en_US/palettes/Integer_pal/AA_Integer_pal.xml
++++ b/modules/xcos/help/en_US/palettes/Integer_pal/AA_Integer_pal.xml
+@@ -18,7 +18,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Integer_pal/BITCLEAR.xml b/modules/xcos/help/en_US/palettes/Integer_pal/BITCLEAR.xml
+index 1562502..87e62f4 100644
+--- a/modules/xcos/help/en_US/palettes/Integer_pal/BITCLEAR.xml
++++ b/modules/xcos/help/en_US/palettes/Integer_pal/BITCLEAR.xml
+@@ -18,7 +18,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Integer_pal/BITSET.xml b/modules/xcos/help/en_US/palettes/Integer_pal/BITSET.xml
+index 44f80d6..1af309d 100644
+--- a/modules/xcos/help/en_US/palettes/Integer_pal/BITSET.xml
++++ b/modules/xcos/help/en_US/palettes/Integer_pal/BITSET.xml
+@@ -18,7 +18,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Integer_pal/CONVERT.xml b/modules/xcos/help/en_US/palettes/Integer_pal/CONVERT.xml
+index 2129349..a5f6dde 100644
+--- a/modules/xcos/help/en_US/palettes/Integer_pal/CONVERT.xml
++++ b/modules/xcos/help/en_US/palettes/Integer_pal/CONVERT.xml
+@@ -18,7 +18,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Integer_pal/DFLIPFLOP.xml b/modules/xcos/help/en_US/palettes/Integer_pal/DFLIPFLOP.xml
+index 8ae85ad..dc4a545 100644
+--- a/modules/xcos/help/en_US/palettes/Integer_pal/DFLIPFLOP.xml
++++ b/modules/xcos/help/en_US/palettes/Integer_pal/DFLIPFLOP.xml
+@@ -18,7 +18,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Integer_pal/DLATCH.xml b/modules/xcos/help/en_US/palettes/Integer_pal/DLATCH.xml
+index 3640921..fb168f9 100644
+--- a/modules/xcos/help/en_US/palettes/Integer_pal/DLATCH.xml
++++ b/modules/xcos/help/en_US/palettes/Integer_pal/DLATCH.xml
+@@ -18,7 +18,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Integer_pal/EXTRACTBITS.xml b/modules/xcos/help/en_US/palettes/Integer_pal/EXTRACTBITS.xml
+index 80743e7..7a01b65 100644
+--- a/modules/xcos/help/en_US/palettes/Integer_pal/EXTRACTBITS.xml
++++ b/modules/xcos/help/en_US/palettes/Integer_pal/EXTRACTBITS.xml
+@@ -18,7 +18,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  *
+diff --git a/modules/xcos/help/en_US/palettes/Integer_pal/INTMUL.xml b/modules/xcos/help/en_US/palettes/Integer_pal/INTMUL.xml
+index 9001e4d..b3ed8fa 100644
+--- a/modules/xcos/help/en_US/palettes/Integer_pal/INTMUL.xml
++++ b/modules/xcos/help/en_US/palettes/Integer_pal/INTMUL.xml
+@@ -18,7 +18,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  *
+diff --git a/modules/xcos/help/en_US/palettes/Integer_pal/JKFLIPFLOP.xml b/modules/xcos/help/en_US/palettes/Integer_pal/JKFLIPFLOP.xml
+index a98e5c4..ccf6feb 100644
+--- a/modules/xcos/help/en_US/palettes/Integer_pal/JKFLIPFLOP.xml
++++ b/modules/xcos/help/en_US/palettes/Integer_pal/JKFLIPFLOP.xml
+@@ -18,7 +18,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Integer_pal/LOGIC.xml b/modules/xcos/help/en_US/palettes/Integer_pal/LOGIC.xml
+index caee344..e0dab4a 100644
+--- a/modules/xcos/help/en_US/palettes/Integer_pal/LOGIC.xml
++++ b/modules/xcos/help/en_US/palettes/Integer_pal/LOGIC.xml
+@@ -18,7 +18,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  *
+diff --git a/modules/xcos/help/en_US/palettes/Integer_pal/SHIFT.xml b/modules/xcos/help/en_US/palettes/Integer_pal/SHIFT.xml
+index beba3eb..834e527 100644
+--- a/modules/xcos/help/en_US/palettes/Integer_pal/SHIFT.xml
++++ b/modules/xcos/help/en_US/palettes/Integer_pal/SHIFT.xml
+@@ -18,7 +18,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Integer_pal/SRFLIPFLOP.xml b/modules/xcos/help/en_US/palettes/Integer_pal/SRFLIPFLOP.xml
+index a169060..aa5644d 100644
+--- a/modules/xcos/help/en_US/palettes/Integer_pal/SRFLIPFLOP.xml
++++ b/modules/xcos/help/en_US/palettes/Integer_pal/SRFLIPFLOP.xml
+@@ -18,7 +18,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  *
+diff --git a/modules/xcos/help/en_US/palettes/Lookuptables_pal/AA_Lookuptables_pal.xml b/modules/xcos/help/en_US/palettes/Lookuptables_pal/AA_Lookuptables_pal.xml
+index 4108f27..55f55a0 100644
+--- a/modules/xcos/help/en_US/palettes/Lookuptables_pal/AA_Lookuptables_pal.xml
++++ b/modules/xcos/help/en_US/palettes/Lookuptables_pal/AA_Lookuptables_pal.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Lookuptables_pal/INTRP2BLK_f.xml b/modules/xcos/help/en_US/palettes/Lookuptables_pal/INTRP2BLK_f.xml
+index 63d8c7b..253c6fc 100644
+--- a/modules/xcos/help/en_US/palettes/Lookuptables_pal/INTRP2BLK_f.xml
++++ b/modules/xcos/help/en_US/palettes/Lookuptables_pal/INTRP2BLK_f.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Lookuptables_pal/INTRPLBLK_f.xml b/modules/xcos/help/en_US/palettes/Lookuptables_pal/INTRPLBLK_f.xml
+index 520e0b8..5248454 100644
+--- a/modules/xcos/help/en_US/palettes/Lookuptables_pal/INTRPLBLK_f.xml
++++ b/modules/xcos/help/en_US/palettes/Lookuptables_pal/INTRPLBLK_f.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Lookuptables_pal/LOOKUP_f.xml b/modules/xcos/help/en_US/palettes/Lookuptables_pal/LOOKUP_f.xml
+index d451a7a..5771464 100644
+--- a/modules/xcos/help/en_US/palettes/Lookuptables_pal/LOOKUP_f.xml
++++ b/modules/xcos/help/en_US/palettes/Lookuptables_pal/LOOKUP_f.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Mathoperations_pal/AA_Mathoperations_pal.xml b/modules/xcos/help/en_US/palettes/Mathoperations_pal/AA_Mathoperations_pal.xml
+index d911f9b..33ce7b0 100644
+--- a/modules/xcos/help/en_US/palettes/Mathoperations_pal/AA_Mathoperations_pal.xml
++++ b/modules/xcos/help/en_US/palettes/Mathoperations_pal/AA_Mathoperations_pal.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Mathoperations_pal/ABS_VALUE.xml b/modules/xcos/help/en_US/palettes/Mathoperations_pal/ABS_VALUE.xml
+index 9bd5bc7..4ff2ac4 100644
+--- a/modules/xcos/help/en_US/palettes/Mathoperations_pal/ABS_VALUE.xml
++++ b/modules/xcos/help/en_US/palettes/Mathoperations_pal/ABS_VALUE.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Mathoperations_pal/BIGSOM_f.xml b/modules/xcos/help/en_US/palettes/Mathoperations_pal/BIGSOM_f.xml
+index dc8415c..37d95f2 100644
+--- a/modules/xcos/help/en_US/palettes/Mathoperations_pal/BIGSOM_f.xml
++++ b/modules/xcos/help/en_US/palettes/Mathoperations_pal/BIGSOM_f.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Mathoperations_pal/COSBLK_f.xml b/modules/xcos/help/en_US/palettes/Mathoperations_pal/COSBLK_f.xml
+index d57bbb1..835c039 100644
+--- a/modules/xcos/help/en_US/palettes/Mathoperations_pal/COSBLK_f.xml
++++ b/modules/xcos/help/en_US/palettes/Mathoperations_pal/COSBLK_f.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Mathoperations_pal/EXPBLK_m.xml b/modules/xcos/help/en_US/palettes/Mathoperations_pal/EXPBLK_m.xml
+index fc36e67..2be49e5 100644
+--- a/modules/xcos/help/en_US/palettes/Mathoperations_pal/EXPBLK_m.xml
++++ b/modules/xcos/help/en_US/palettes/Mathoperations_pal/EXPBLK_m.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Mathoperations_pal/GAINBLK_f.xml b/modules/xcos/help/en_US/palettes/Mathoperations_pal/GAINBLK_f.xml
+index e480922..d8372ad 100644
+--- a/modules/xcos/help/en_US/palettes/Mathoperations_pal/GAINBLK_f.xml
++++ b/modules/xcos/help/en_US/palettes/Mathoperations_pal/GAINBLK_f.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Mathoperations_pal/INVBLK.xml b/modules/xcos/help/en_US/palettes/Mathoperations_pal/INVBLK.xml
+index bdffcd5..32d4d9f 100644
+--- a/modules/xcos/help/en_US/palettes/Mathoperations_pal/INVBLK.xml
++++ b/modules/xcos/help/en_US/palettes/Mathoperations_pal/INVBLK.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Mathoperations_pal/LOGBLK_f.xml b/modules/xcos/help/en_US/palettes/Mathoperations_pal/LOGBLK_f.xml
+index 2815363..602ad50 100644
+--- a/modules/xcos/help/en_US/palettes/Mathoperations_pal/LOGBLK_f.xml
++++ b/modules/xcos/help/en_US/palettes/Mathoperations_pal/LOGBLK_f.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Mathoperations_pal/MATMAGPHI.xml b/modules/xcos/help/en_US/palettes/Mathoperations_pal/MATMAGPHI.xml
+index cb8ac76..9b8d403 100644
+--- a/modules/xcos/help/en_US/palettes/Mathoperations_pal/MATMAGPHI.xml
++++ b/modules/xcos/help/en_US/palettes/Mathoperations_pal/MATMAGPHI.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Mathoperations_pal/MATZREIM.xml b/modules/xcos/help/en_US/palettes/Mathoperations_pal/MATZREIM.xml
+index 34cb8cc..6a7caad 100644
+--- a/modules/xcos/help/en_US/palettes/Mathoperations_pal/MATZREIM.xml
++++ b/modules/xcos/help/en_US/palettes/Mathoperations_pal/MATZREIM.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Mathoperations_pal/MAXMIN.xml b/modules/xcos/help/en_US/palettes/Mathoperations_pal/MAXMIN.xml
+index 6df7db7..f2ddbbe 100644
+--- a/modules/xcos/help/en_US/palettes/Mathoperations_pal/MAXMIN.xml
++++ b/modules/xcos/help/en_US/palettes/Mathoperations_pal/MAXMIN.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Mathoperations_pal/MAX_f.xml b/modules/xcos/help/en_US/palettes/Mathoperations_pal/MAX_f.xml
+index b0d72d0..2b594fb 100644
+--- a/modules/xcos/help/en_US/palettes/Mathoperations_pal/MAX_f.xml
++++ b/modules/xcos/help/en_US/palettes/Mathoperations_pal/MAX_f.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Mathoperations_pal/MIN_f.xml b/modules/xcos/help/en_US/palettes/Mathoperations_pal/MIN_f.xml
+index 00761ec..eafbf90 100644
+--- a/modules/xcos/help/en_US/palettes/Mathoperations_pal/MIN_f.xml
++++ b/modules/xcos/help/en_US/palettes/Mathoperations_pal/MIN_f.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Mathoperations_pal/POWBLK_f.xml b/modules/xcos/help/en_US/palettes/Mathoperations_pal/POWBLK_f.xml
+index a5ea0f3..9b451c9 100644
+--- a/modules/xcos/help/en_US/palettes/Mathoperations_pal/POWBLK_f.xml
++++ b/modules/xcos/help/en_US/palettes/Mathoperations_pal/POWBLK_f.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Mathoperations_pal/PRODUCT.xml b/modules/xcos/help/en_US/palettes/Mathoperations_pal/PRODUCT.xml
+index a424aa5..13e3751 100644
+--- a/modules/xcos/help/en_US/palettes/Mathoperations_pal/PRODUCT.xml
++++ b/modules/xcos/help/en_US/palettes/Mathoperations_pal/PRODUCT.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Mathoperations_pal/PROD_f.xml b/modules/xcos/help/en_US/palettes/Mathoperations_pal/PROD_f.xml
+index a0a51cd..b1dcc32 100644
+--- a/modules/xcos/help/en_US/palettes/Mathoperations_pal/PROD_f.xml
++++ b/modules/xcos/help/en_US/palettes/Mathoperations_pal/PROD_f.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Mathoperations_pal/SIGNUM.xml b/modules/xcos/help/en_US/palettes/Mathoperations_pal/SIGNUM.xml
+index 83ab032..2b3001a 100644
+--- a/modules/xcos/help/en_US/palettes/Mathoperations_pal/SIGNUM.xml
++++ b/modules/xcos/help/en_US/palettes/Mathoperations_pal/SIGNUM.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Mathoperations_pal/SINBLK_f.xml b/modules/xcos/help/en_US/palettes/Mathoperations_pal/SINBLK_f.xml
+index c8e2a2b..e8112d5 100644
+--- a/modules/xcos/help/en_US/palettes/Mathoperations_pal/SINBLK_f.xml
++++ b/modules/xcos/help/en_US/palettes/Mathoperations_pal/SINBLK_f.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Mathoperations_pal/SQRT.xml b/modules/xcos/help/en_US/palettes/Mathoperations_pal/SQRT.xml
+index 9c51ce0..078817d 100644
+--- a/modules/xcos/help/en_US/palettes/Mathoperations_pal/SQRT.xml
++++ b/modules/xcos/help/en_US/palettes/Mathoperations_pal/SQRT.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Mathoperations_pal/SUMMATION.xml b/modules/xcos/help/en_US/palettes/Mathoperations_pal/SUMMATION.xml
+index de5e84e..bdf7a0f 100644
+--- a/modules/xcos/help/en_US/palettes/Mathoperations_pal/SUMMATION.xml
++++ b/modules/xcos/help/en_US/palettes/Mathoperations_pal/SUMMATION.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Mathoperations_pal/SUM_f.xml b/modules/xcos/help/en_US/palettes/Mathoperations_pal/SUM_f.xml
+index 3d1b56a..31ddcde 100644
+--- a/modules/xcos/help/en_US/palettes/Mathoperations_pal/SUM_f.xml
++++ b/modules/xcos/help/en_US/palettes/Mathoperations_pal/SUM_f.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Mathoperations_pal/TANBLK_f.xml b/modules/xcos/help/en_US/palettes/Mathoperations_pal/TANBLK_f.xml
+index cd24e52..8de1313 100644
+--- a/modules/xcos/help/en_US/palettes/Mathoperations_pal/TANBLK_f.xml
++++ b/modules/xcos/help/en_US/palettes/Mathoperations_pal/TANBLK_f.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Mathoperations_pal/TrigFun.xml b/modules/xcos/help/en_US/palettes/Mathoperations_pal/TrigFun.xml
+index d33eb90..e93b3b9 100644
+--- a/modules/xcos/help/en_US/palettes/Mathoperations_pal/TrigFun.xml
++++ b/modules/xcos/help/en_US/palettes/Mathoperations_pal/TrigFun.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Matrix_pal/AA_Matrix_pal.xml b/modules/xcos/help/en_US/palettes/Matrix_pal/AA_Matrix_pal.xml
+index 0b4b5f0..c306066 100644
+--- a/modules/xcos/help/en_US/palettes/Matrix_pal/AA_Matrix_pal.xml
++++ b/modules/xcos/help/en_US/palettes/Matrix_pal/AA_Matrix_pal.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Matrix_pal/CUMSUM.xml b/modules/xcos/help/en_US/palettes/Matrix_pal/CUMSUM.xml
+index 22568bf..563fc34 100644
+--- a/modules/xcos/help/en_US/palettes/Matrix_pal/CUMSUM.xml
++++ b/modules/xcos/help/en_US/palettes/Matrix_pal/CUMSUM.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Matrix_pal/EXTRACT.xml b/modules/xcos/help/en_US/palettes/Matrix_pal/EXTRACT.xml
+index 68e387b..1e835f3 100644
+--- a/modules/xcos/help/en_US/palettes/Matrix_pal/EXTRACT.xml
++++ b/modules/xcos/help/en_US/palettes/Matrix_pal/EXTRACT.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Matrix_pal/EXTTRI.xml b/modules/xcos/help/en_US/palettes/Matrix_pal/EXTTRI.xml
+index 4758564..4ae762d 100644
+--- a/modules/xcos/help/en_US/palettes/Matrix_pal/EXTTRI.xml
++++ b/modules/xcos/help/en_US/palettes/Matrix_pal/EXTTRI.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Matrix_pal/MATBKSL.xml b/modules/xcos/help/en_US/palettes/Matrix_pal/MATBKSL.xml
+index d36ed7c..8fe5a83 100644
+--- a/modules/xcos/help/en_US/palettes/Matrix_pal/MATBKSL.xml
++++ b/modules/xcos/help/en_US/palettes/Matrix_pal/MATBKSL.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Matrix_pal/MATCATH.xml b/modules/xcos/help/en_US/palettes/Matrix_pal/MATCATH.xml
+index ebd2777..a4a9a85 100644
+--- a/modules/xcos/help/en_US/palettes/Matrix_pal/MATCATH.xml
++++ b/modules/xcos/help/en_US/palettes/Matrix_pal/MATCATH.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Matrix_pal/MATCATV.xml b/modules/xcos/help/en_US/palettes/Matrix_pal/MATCATV.xml
+index 4308da0..bbe5f21 100644
+--- a/modules/xcos/help/en_US/palettes/Matrix_pal/MATCATV.xml
++++ b/modules/xcos/help/en_US/palettes/Matrix_pal/MATCATV.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Matrix_pal/MATDET.xml b/modules/xcos/help/en_US/palettes/Matrix_pal/MATDET.xml
+index c05cc86..e900e62 100644
+--- a/modules/xcos/help/en_US/palettes/Matrix_pal/MATDET.xml
++++ b/modules/xcos/help/en_US/palettes/Matrix_pal/MATDET.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Matrix_pal/MATDIAG.xml b/modules/xcos/help/en_US/palettes/Matrix_pal/MATDIAG.xml
+index 230744c..a8e9e78 100644
+--- a/modules/xcos/help/en_US/palettes/Matrix_pal/MATDIAG.xml
++++ b/modules/xcos/help/en_US/palettes/Matrix_pal/MATDIAG.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Matrix_pal/MATDIV.xml b/modules/xcos/help/en_US/palettes/Matrix_pal/MATDIV.xml
+index 3ca1bfd..3713f99 100644
+--- a/modules/xcos/help/en_US/palettes/Matrix_pal/MATDIV.xml
++++ b/modules/xcos/help/en_US/palettes/Matrix_pal/MATDIV.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Matrix_pal/MATEIG.xml b/modules/xcos/help/en_US/palettes/Matrix_pal/MATEIG.xml
+index 9d37a52..ab843d7 100644
+--- a/modules/xcos/help/en_US/palettes/Matrix_pal/MATEIG.xml
++++ b/modules/xcos/help/en_US/palettes/Matrix_pal/MATEIG.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Matrix_pal/MATEXPM.xml b/modules/xcos/help/en_US/palettes/Matrix_pal/MATEXPM.xml
+index 611d861..b0f1b2d 100644
+--- a/modules/xcos/help/en_US/palettes/Matrix_pal/MATEXPM.xml
++++ b/modules/xcos/help/en_US/palettes/Matrix_pal/MATEXPM.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Matrix_pal/MATINV.xml b/modules/xcos/help/en_US/palettes/Matrix_pal/MATINV.xml
+index 0043373..fa5105a 100644
+--- a/modules/xcos/help/en_US/palettes/Matrix_pal/MATINV.xml
++++ b/modules/xcos/help/en_US/palettes/Matrix_pal/MATINV.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Matrix_pal/MATLU.xml b/modules/xcos/help/en_US/palettes/Matrix_pal/MATLU.xml
+index ee291e6..85e9654 100644
+--- a/modules/xcos/help/en_US/palettes/Matrix_pal/MATLU.xml
++++ b/modules/xcos/help/en_US/palettes/Matrix_pal/MATLU.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Matrix_pal/MATMUL.xml b/modules/xcos/help/en_US/palettes/Matrix_pal/MATMUL.xml
+index 809c946..95b29ac 100644
+--- a/modules/xcos/help/en_US/palettes/Matrix_pal/MATMUL.xml
++++ b/modules/xcos/help/en_US/palettes/Matrix_pal/MATMUL.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Matrix_pal/MATPINV.xml b/modules/xcos/help/en_US/palettes/Matrix_pal/MATPINV.xml
+index bd54a4e..168ca3c 100644
+--- a/modules/xcos/help/en_US/palettes/Matrix_pal/MATPINV.xml
++++ b/modules/xcos/help/en_US/palettes/Matrix_pal/MATPINV.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Matrix_pal/MATRESH.xml b/modules/xcos/help/en_US/palettes/Matrix_pal/MATRESH.xml
+index fb4bcb5..76cf599 100644
+--- a/modules/xcos/help/en_US/palettes/Matrix_pal/MATRESH.xml
++++ b/modules/xcos/help/en_US/palettes/Matrix_pal/MATRESH.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Matrix_pal/MATSING.xml b/modules/xcos/help/en_US/palettes/Matrix_pal/MATSING.xml
+index 224e2e5..2fa8e02 100644
+--- a/modules/xcos/help/en_US/palettes/Matrix_pal/MATSING.xml
++++ b/modules/xcos/help/en_US/palettes/Matrix_pal/MATSING.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Matrix_pal/MATSUM.xml b/modules/xcos/help/en_US/palettes/Matrix_pal/MATSUM.xml
+index 53e11b2..62247ce 100644
+--- a/modules/xcos/help/en_US/palettes/Matrix_pal/MATSUM.xml
++++ b/modules/xcos/help/en_US/palettes/Matrix_pal/MATSUM.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Matrix_pal/MATTRAN.xml b/modules/xcos/help/en_US/palettes/Matrix_pal/MATTRAN.xml
+index 0fd232f..64e64a9 100644
+--- a/modules/xcos/help/en_US/palettes/Matrix_pal/MATTRAN.xml
++++ b/modules/xcos/help/en_US/palettes/Matrix_pal/MATTRAN.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Matrix_pal/MATZCONJ.xml b/modules/xcos/help/en_US/palettes/Matrix_pal/MATZCONJ.xml
+index a8ca2d3..3b12fc4 100644
+--- a/modules/xcos/help/en_US/palettes/Matrix_pal/MATZCONJ.xml
++++ b/modules/xcos/help/en_US/palettes/Matrix_pal/MATZCONJ.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Matrix_pal/RICC.xml b/modules/xcos/help/en_US/palettes/Matrix_pal/RICC.xml
+index 0a82236..e0452b4 100644
+--- a/modules/xcos/help/en_US/palettes/Matrix_pal/RICC.xml
++++ b/modules/xcos/help/en_US/palettes/Matrix_pal/RICC.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Matrix_pal/ROOTCOEF.xml b/modules/xcos/help/en_US/palettes/Matrix_pal/ROOTCOEF.xml
+index a535ac3..3d1ef8f 100644
+--- a/modules/xcos/help/en_US/palettes/Matrix_pal/ROOTCOEF.xml
++++ b/modules/xcos/help/en_US/palettes/Matrix_pal/ROOTCOEF.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Matrix_pal/SUBMAT.xml b/modules/xcos/help/en_US/palettes/Matrix_pal/SUBMAT.xml
+index 8233e85..058b846 100644
+--- a/modules/xcos/help/en_US/palettes/Matrix_pal/SUBMAT.xml
++++ b/modules/xcos/help/en_US/palettes/Matrix_pal/SUBMAT.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Portaction_pal/AA_Portaction_pal.xml b/modules/xcos/help/en_US/palettes/Portaction_pal/AA_Portaction_pal.xml
+index 1b78d78..1de5ba4 100644
+--- a/modules/xcos/help/en_US/palettes/Portaction_pal/AA_Portaction_pal.xml
++++ b/modules/xcos/help/en_US/palettes/Portaction_pal/AA_Portaction_pal.xml
+@@ -18,7 +18,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Portaction_pal/CLKINV_f.xml b/modules/xcos/help/en_US/palettes/Portaction_pal/CLKINV_f.xml
+index 48051c8..61ad1eb 100644
+--- a/modules/xcos/help/en_US/palettes/Portaction_pal/CLKINV_f.xml
++++ b/modules/xcos/help/en_US/palettes/Portaction_pal/CLKINV_f.xml
+@@ -18,7 +18,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Portaction_pal/CLKOUTV_f.xml b/modules/xcos/help/en_US/palettes/Portaction_pal/CLKOUTV_f.xml
+index ddac018..d8dce29 100644
+--- a/modules/xcos/help/en_US/palettes/Portaction_pal/CLKOUTV_f.xml
++++ b/modules/xcos/help/en_US/palettes/Portaction_pal/CLKOUTV_f.xml
+@@ -18,7 +18,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Portaction_pal/INIMPL_f.xml b/modules/xcos/help/en_US/palettes/Portaction_pal/INIMPL_f.xml
+index 0b17b10..c9edb34 100644
+--- a/modules/xcos/help/en_US/palettes/Portaction_pal/INIMPL_f.xml
++++ b/modules/xcos/help/en_US/palettes/Portaction_pal/INIMPL_f.xml
+@@ -18,7 +18,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Portaction_pal/IN_f.xml b/modules/xcos/help/en_US/palettes/Portaction_pal/IN_f.xml
+index f3c63a6..68cec00 100644
+--- a/modules/xcos/help/en_US/palettes/Portaction_pal/IN_f.xml
++++ b/modules/xcos/help/en_US/palettes/Portaction_pal/IN_f.xml
+@@ -18,7 +18,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Portaction_pal/OUTIMPL_f.xml b/modules/xcos/help/en_US/palettes/Portaction_pal/OUTIMPL_f.xml
+index 3bf29b5..870ec4d 100644
+--- a/modules/xcos/help/en_US/palettes/Portaction_pal/OUTIMPL_f.xml
++++ b/modules/xcos/help/en_US/palettes/Portaction_pal/OUTIMPL_f.xml
+@@ -18,7 +18,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Portaction_pal/OUT_f.xml b/modules/xcos/help/en_US/palettes/Portaction_pal/OUT_f.xml
+index 629d580..d975ba3 100644
+--- a/modules/xcos/help/en_US/palettes/Portaction_pal/OUT_f.xml
++++ b/modules/xcos/help/en_US/palettes/Portaction_pal/OUT_f.xml
+@@ -18,7 +18,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Signalprocessing_pal/AA_Signalprocessing_pal.xml b/modules/xcos/help/en_US/palettes/Signalprocessing_pal/AA_Signalprocessing_pal.xml
+index 7498431..ab3ff98 100644
+--- a/modules/xcos/help/en_US/palettes/Signalprocessing_pal/AA_Signalprocessing_pal.xml
++++ b/modules/xcos/help/en_US/palettes/Signalprocessing_pal/AA_Signalprocessing_pal.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Signalprocessing_pal/QUANT_f.xml b/modules/xcos/help/en_US/palettes/Signalprocessing_pal/QUANT_f.xml
+index d6ef0f9..9347d64 100644
+--- a/modules/xcos/help/en_US/palettes/Signalprocessing_pal/QUANT_f.xml
++++ b/modules/xcos/help/en_US/palettes/Signalprocessing_pal/QUANT_f.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Signalprocessing_pal/SAMPHOLD_m.xml b/modules/xcos/help/en_US/palettes/Signalprocessing_pal/SAMPHOLD_m.xml
+index 94e8f90..2be4c66 100644
+--- a/modules/xcos/help/en_US/palettes/Signalprocessing_pal/SAMPHOLD_m.xml
++++ b/modules/xcos/help/en_US/palettes/Signalprocessing_pal/SAMPHOLD_m.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Signalrouting_pal/AA_Signalrouting_pal.xml b/modules/xcos/help/en_US/palettes/Signalrouting_pal/AA_Signalrouting_pal.xml
+index 650eebe..3ceb63d 100644
+--- a/modules/xcos/help/en_US/palettes/Signalrouting_pal/AA_Signalrouting_pal.xml
++++ b/modules/xcos/help/en_US/palettes/Signalrouting_pal/AA_Signalrouting_pal.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Signalrouting_pal/DEMUX.xml b/modules/xcos/help/en_US/palettes/Signalrouting_pal/DEMUX.xml
+index 1f15fc4..19fba4c 100644
+--- a/modules/xcos/help/en_US/palettes/Signalrouting_pal/DEMUX.xml
++++ b/modules/xcos/help/en_US/palettes/Signalrouting_pal/DEMUX.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Signalrouting_pal/EXTRACTOR.xml b/modules/xcos/help/en_US/palettes/Signalrouting_pal/EXTRACTOR.xml
+index bc380d6..9997e72 100644
+--- a/modules/xcos/help/en_US/palettes/Signalrouting_pal/EXTRACTOR.xml
++++ b/modules/xcos/help/en_US/palettes/Signalrouting_pal/EXTRACTOR.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Signalrouting_pal/FROM.xml b/modules/xcos/help/en_US/palettes/Signalrouting_pal/FROM.xml
+index 68c9d28..4eb912b 100644
+--- a/modules/xcos/help/en_US/palettes/Signalrouting_pal/FROM.xml
++++ b/modules/xcos/help/en_US/palettes/Signalrouting_pal/FROM.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Signalrouting_pal/FROMMO.xml b/modules/xcos/help/en_US/palettes/Signalrouting_pal/FROMMO.xml
+index fd85693..ec0b02f 100644
+--- a/modules/xcos/help/en_US/palettes/Signalrouting_pal/FROMMO.xml
++++ b/modules/xcos/help/en_US/palettes/Signalrouting_pal/FROMMO.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Signalrouting_pal/GOTO.xml b/modules/xcos/help/en_US/palettes/Signalrouting_pal/GOTO.xml
+index b520221..f8ec079 100644
+--- a/modules/xcos/help/en_US/palettes/Signalrouting_pal/GOTO.xml
++++ b/modules/xcos/help/en_US/palettes/Signalrouting_pal/GOTO.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Signalrouting_pal/GOTOMO.xml b/modules/xcos/help/en_US/palettes/Signalrouting_pal/GOTOMO.xml
+index f8d5326..02a6498 100644
+--- a/modules/xcos/help/en_US/palettes/Signalrouting_pal/GOTOMO.xml
++++ b/modules/xcos/help/en_US/palettes/Signalrouting_pal/GOTOMO.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Signalrouting_pal/GotoTagVisibility.xml b/modules/xcos/help/en_US/palettes/Signalrouting_pal/GotoTagVisibility.xml
+index 5ef7880..38c56da 100644
+--- a/modules/xcos/help/en_US/palettes/Signalrouting_pal/GotoTagVisibility.xml
++++ b/modules/xcos/help/en_US/palettes/Signalrouting_pal/GotoTagVisibility.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Signalrouting_pal/GotoTagVisibilityMO.xml b/modules/xcos/help/en_US/palettes/Signalrouting_pal/GotoTagVisibilityMO.xml
+index 904824c..8b5d078 100644
+--- a/modules/xcos/help/en_US/palettes/Signalrouting_pal/GotoTagVisibilityMO.xml
++++ b/modules/xcos/help/en_US/palettes/Signalrouting_pal/GotoTagVisibilityMO.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Signalrouting_pal/ISELECT_m.xml b/modules/xcos/help/en_US/palettes/Signalrouting_pal/ISELECT_m.xml
+index 928a59c..c7805cb 100644
+--- a/modules/xcos/help/en_US/palettes/Signalrouting_pal/ISELECT_m.xml
++++ b/modules/xcos/help/en_US/palettes/Signalrouting_pal/ISELECT_m.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Signalrouting_pal/MUX.xml b/modules/xcos/help/en_US/palettes/Signalrouting_pal/MUX.xml
+index ffedd48..73212c9 100644
+--- a/modules/xcos/help/en_US/palettes/Signalrouting_pal/MUX.xml
++++ b/modules/xcos/help/en_US/palettes/Signalrouting_pal/MUX.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Signalrouting_pal/M_SWITCH.xml b/modules/xcos/help/en_US/palettes/Signalrouting_pal/M_SWITCH.xml
+index c56516c..f71fb70 100644
+--- a/modules/xcos/help/en_US/palettes/Signalrouting_pal/M_SWITCH.xml
++++ b/modules/xcos/help/en_US/palettes/Signalrouting_pal/M_SWITCH.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Signalrouting_pal/NRMSOM_f.xml b/modules/xcos/help/en_US/palettes/Signalrouting_pal/NRMSOM_f.xml
+index 9cb86da..a28cf83 100644
+--- a/modules/xcos/help/en_US/palettes/Signalrouting_pal/NRMSOM_f.xml
++++ b/modules/xcos/help/en_US/palettes/Signalrouting_pal/NRMSOM_f.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Signalrouting_pal/RELAY_f.xml b/modules/xcos/help/en_US/palettes/Signalrouting_pal/RELAY_f.xml
+index 3472201..0b81b07 100644
+--- a/modules/xcos/help/en_US/palettes/Signalrouting_pal/RELAY_f.xml
++++ b/modules/xcos/help/en_US/palettes/Signalrouting_pal/RELAY_f.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Signalrouting_pal/SELECT_m.xml b/modules/xcos/help/en_US/palettes/Signalrouting_pal/SELECT_m.xml
+index 7cf1510..bd12624 100644
+--- a/modules/xcos/help/en_US/palettes/Signalrouting_pal/SELECT_m.xml
++++ b/modules/xcos/help/en_US/palettes/Signalrouting_pal/SELECT_m.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Signalrouting_pal/SWITCH2_m.xml b/modules/xcos/help/en_US/palettes/Signalrouting_pal/SWITCH2_m.xml
+index 07967d4..0135d3f 100644
+--- a/modules/xcos/help/en_US/palettes/Signalrouting_pal/SWITCH2_m.xml
++++ b/modules/xcos/help/en_US/palettes/Signalrouting_pal/SWITCH2_m.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Signalrouting_pal/SWITCH_f.xml b/modules/xcos/help/en_US/palettes/Signalrouting_pal/SWITCH_f.xml
+index 99241f1..e0d0c54 100644
+--- a/modules/xcos/help/en_US/palettes/Signalrouting_pal/SWITCH_f.xml
++++ b/modules/xcos/help/en_US/palettes/Signalrouting_pal/SWITCH_f.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Sinks_pal/AA_Sinks_pal.xml b/modules/xcos/help/en_US/palettes/Sinks_pal/AA_Sinks_pal.xml
+index 538255c..d158e0c 100644
+--- a/modules/xcos/help/en_US/palettes/Sinks_pal/AA_Sinks_pal.xml
++++ b/modules/xcos/help/en_US/palettes/Sinks_pal/AA_Sinks_pal.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Sinks_pal/AFFICH_m.xml b/modules/xcos/help/en_US/palettes/Sinks_pal/AFFICH_m.xml
+index 9c159a9..ae10696 100644
+--- a/modules/xcos/help/en_US/palettes/Sinks_pal/AFFICH_m.xml
++++ b/modules/xcos/help/en_US/palettes/Sinks_pal/AFFICH_m.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Sinks_pal/CANIMXY.xml b/modules/xcos/help/en_US/palettes/Sinks_pal/CANIMXY.xml
+index 8897db0..80e3071 100644
+--- a/modules/xcos/help/en_US/palettes/Sinks_pal/CANIMXY.xml
++++ b/modules/xcos/help/en_US/palettes/Sinks_pal/CANIMXY.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Sinks_pal/CANIMXY3D.xml b/modules/xcos/help/en_US/palettes/Sinks_pal/CANIMXY3D.xml
+index 6864215..a5cd076 100644
+--- a/modules/xcos/help/en_US/palettes/Sinks_pal/CANIMXY3D.xml
++++ b/modules/xcos/help/en_US/palettes/Sinks_pal/CANIMXY3D.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Sinks_pal/CFSCOPE.xml b/modules/xcos/help/en_US/palettes/Sinks_pal/CFSCOPE.xml
+index d669bc8..58fba8f 100644
+--- a/modules/xcos/help/en_US/palettes/Sinks_pal/CFSCOPE.xml
++++ b/modules/xcos/help/en_US/palettes/Sinks_pal/CFSCOPE.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Sinks_pal/CMAT3D.xml b/modules/xcos/help/en_US/palettes/Sinks_pal/CMAT3D.xml
+index 3032193..68d85a7 100644
+--- a/modules/xcos/help/en_US/palettes/Sinks_pal/CMAT3D.xml
++++ b/modules/xcos/help/en_US/palettes/Sinks_pal/CMAT3D.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Sinks_pal/CMATVIEW.xml b/modules/xcos/help/en_US/palettes/Sinks_pal/CMATVIEW.xml
+index 7d5b155..24cc4dd 100644
+--- a/modules/xcos/help/en_US/palettes/Sinks_pal/CMATVIEW.xml
++++ b/modules/xcos/help/en_US/palettes/Sinks_pal/CMATVIEW.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Sinks_pal/CMSCOPE.xml b/modules/xcos/help/en_US/palettes/Sinks_pal/CMSCOPE.xml
+index c38ac2c..1110499 100644
+--- a/modules/xcos/help/en_US/palettes/Sinks_pal/CMSCOPE.xml
++++ b/modules/xcos/help/en_US/palettes/Sinks_pal/CMSCOPE.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Sinks_pal/CSCOPE.xml b/modules/xcos/help/en_US/palettes/Sinks_pal/CSCOPE.xml
+index c874aa4..13f69f8 100644
+--- a/modules/xcos/help/en_US/palettes/Sinks_pal/CSCOPE.xml
++++ b/modules/xcos/help/en_US/palettes/Sinks_pal/CSCOPE.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Sinks_pal/CSCOPXY.xml b/modules/xcos/help/en_US/palettes/Sinks_pal/CSCOPXY.xml
+index 9141a6d..c393791 100644
+--- a/modules/xcos/help/en_US/palettes/Sinks_pal/CSCOPXY.xml
++++ b/modules/xcos/help/en_US/palettes/Sinks_pal/CSCOPXY.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Sinks_pal/CSCOPXY3D.xml b/modules/xcos/help/en_US/palettes/Sinks_pal/CSCOPXY3D.xml
+index fbeb4bc..32f516c 100644
+--- a/modules/xcos/help/en_US/palettes/Sinks_pal/CSCOPXY3D.xml
++++ b/modules/xcos/help/en_US/palettes/Sinks_pal/CSCOPXY3D.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Sinks_pal/ENDBLK.xml b/modules/xcos/help/en_US/palettes/Sinks_pal/ENDBLK.xml
+index 776d642..6976d59 100644
+--- a/modules/xcos/help/en_US/palettes/Sinks_pal/ENDBLK.xml
++++ b/modules/xcos/help/en_US/palettes/Sinks_pal/ENDBLK.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Sinks_pal/END_c.xml b/modules/xcos/help/en_US/palettes/Sinks_pal/END_c.xml
+index dac9f9b..910e96d 100644
+--- a/modules/xcos/help/en_US/palettes/Sinks_pal/END_c.xml
++++ b/modules/xcos/help/en_US/palettes/Sinks_pal/END_c.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Sinks_pal/TOWS_c.xml b/modules/xcos/help/en_US/palettes/Sinks_pal/TOWS_c.xml
+index 59a7134..b13158f 100644
+--- a/modules/xcos/help/en_US/palettes/Sinks_pal/TOWS_c.xml
++++ b/modules/xcos/help/en_US/palettes/Sinks_pal/TOWS_c.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Sinks_pal/TRASH_f.xml b/modules/xcos/help/en_US/palettes/Sinks_pal/TRASH_f.xml
+index 8c5114d..3db98ec 100644
+--- a/modules/xcos/help/en_US/palettes/Sinks_pal/TRASH_f.xml
++++ b/modules/xcos/help/en_US/palettes/Sinks_pal/TRASH_f.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Sinks_pal/WFILE_f.xml b/modules/xcos/help/en_US/palettes/Sinks_pal/WFILE_f.xml
+index 5e4998f..2070ff7 100644
+--- a/modules/xcos/help/en_US/palettes/Sinks_pal/WFILE_f.xml
++++ b/modules/xcos/help/en_US/palettes/Sinks_pal/WFILE_f.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Sinks_pal/WRITEAU_f.xml b/modules/xcos/help/en_US/palettes/Sinks_pal/WRITEAU_f.xml
+index cf5e335..620a841 100644
+--- a/modules/xcos/help/en_US/palettes/Sinks_pal/WRITEAU_f.xml
++++ b/modules/xcos/help/en_US/palettes/Sinks_pal/WRITEAU_f.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Sinks_pal/WRITEC_f.xml b/modules/xcos/help/en_US/palettes/Sinks_pal/WRITEC_f.xml
+index 2a5f6c7..a433105 100644
+--- a/modules/xcos/help/en_US/palettes/Sinks_pal/WRITEC_f.xml
++++ b/modules/xcos/help/en_US/palettes/Sinks_pal/WRITEC_f.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Sources_pal/AA_Sources_pal.xml b/modules/xcos/help/en_US/palettes/Sources_pal/AA_Sources_pal.xml
+index 37b8b2b..17ad5a8 100644
+--- a/modules/xcos/help/en_US/palettes/Sources_pal/AA_Sources_pal.xml
++++ b/modules/xcos/help/en_US/palettes/Sources_pal/AA_Sources_pal.xml
+@@ -18,7 +18,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Sources_pal/CLOCK_c.xml b/modules/xcos/help/en_US/palettes/Sources_pal/CLOCK_c.xml
+index dabb685..cd19777 100644
+--- a/modules/xcos/help/en_US/palettes/Sources_pal/CLOCK_c.xml
++++ b/modules/xcos/help/en_US/palettes/Sources_pal/CLOCK_c.xml
+@@ -19,7 +19,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Sources_pal/CONST_m.xml b/modules/xcos/help/en_US/palettes/Sources_pal/CONST_m.xml
+index e987940..1aadc75 100644
+--- a/modules/xcos/help/en_US/palettes/Sources_pal/CONST_m.xml
++++ b/modules/xcos/help/en_US/palettes/Sources_pal/CONST_m.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Sources_pal/CURV_f.xml b/modules/xcos/help/en_US/palettes/Sources_pal/CURV_f.xml
+index a329eed..a16b269 100644
+--- a/modules/xcos/help/en_US/palettes/Sources_pal/CURV_f.xml
++++ b/modules/xcos/help/en_US/palettes/Sources_pal/CURV_f.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Sources_pal/Counter.xml b/modules/xcos/help/en_US/palettes/Sources_pal/Counter.xml
+index df06edd..6312084 100644
+--- a/modules/xcos/help/en_US/palettes/Sources_pal/Counter.xml
++++ b/modules/xcos/help/en_US/palettes/Sources_pal/Counter.xml
+@@ -18,7 +18,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Sources_pal/FROMWSB.xml b/modules/xcos/help/en_US/palettes/Sources_pal/FROMWSB.xml
+index f52e3f4..4bee84a 100644
+--- a/modules/xcos/help/en_US/palettes/Sources_pal/FROMWSB.xml
++++ b/modules/xcos/help/en_US/palettes/Sources_pal/FROMWSB.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Sources_pal/GENSIN_f.xml b/modules/xcos/help/en_US/palettes/Sources_pal/GENSIN_f.xml
+index 3fc79a7..c227973 100644
+--- a/modules/xcos/help/en_US/palettes/Sources_pal/GENSIN_f.xml
++++ b/modules/xcos/help/en_US/palettes/Sources_pal/GENSIN_f.xml
+@@ -18,7 +18,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Sources_pal/GENSQR_f.xml b/modules/xcos/help/en_US/palettes/Sources_pal/GENSQR_f.xml
+index e8325d7..3c17cc7 100644
+--- a/modules/xcos/help/en_US/palettes/Sources_pal/GENSQR_f.xml
++++ b/modules/xcos/help/en_US/palettes/Sources_pal/GENSQR_f.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Sources_pal/Modulo_Count.xml b/modules/xcos/help/en_US/palettes/Sources_pal/Modulo_Count.xml
+index 4137543..b157cc6 100644
+--- a/modules/xcos/help/en_US/palettes/Sources_pal/Modulo_Count.xml
++++ b/modules/xcos/help/en_US/palettes/Sources_pal/Modulo_Count.xml
+@@ -18,7 +18,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Sources_pal/RAMP.xml b/modules/xcos/help/en_US/palettes/Sources_pal/RAMP.xml
+index 968e730..dacb2ef 100644
+--- a/modules/xcos/help/en_US/palettes/Sources_pal/RAMP.xml
++++ b/modules/xcos/help/en_US/palettes/Sources_pal/RAMP.xml
+@@ -18,7 +18,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Sources_pal/RAND_m.xml b/modules/xcos/help/en_US/palettes/Sources_pal/RAND_m.xml
+index 8e48ca9..03a2a05 100644
+--- a/modules/xcos/help/en_US/palettes/Sources_pal/RAND_m.xml
++++ b/modules/xcos/help/en_US/palettes/Sources_pal/RAND_m.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Sources_pal/READAU_f.xml b/modules/xcos/help/en_US/palettes/Sources_pal/READAU_f.xml
+index cbaea50..35e90c4 100644
+--- a/modules/xcos/help/en_US/palettes/Sources_pal/READAU_f.xml
++++ b/modules/xcos/help/en_US/palettes/Sources_pal/READAU_f.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Sources_pal/READC_f.xml b/modules/xcos/help/en_US/palettes/Sources_pal/READC_f.xml
+index 0ccae98..7cf4be3 100644
+--- a/modules/xcos/help/en_US/palettes/Sources_pal/READC_f.xml
++++ b/modules/xcos/help/en_US/palettes/Sources_pal/READC_f.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Sources_pal/RFILE_f.xml b/modules/xcos/help/en_US/palettes/Sources_pal/RFILE_f.xml
+index 6933b20..3b912e7 100644
+--- a/modules/xcos/help/en_US/palettes/Sources_pal/RFILE_f.xml
++++ b/modules/xcos/help/en_US/palettes/Sources_pal/RFILE_f.xml
+@@ -18,7 +18,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Sources_pal/SAWTOOTH_f.xml b/modules/xcos/help/en_US/palettes/Sources_pal/SAWTOOTH_f.xml
+index c2edc12..32625fd 100644
+--- a/modules/xcos/help/en_US/palettes/Sources_pal/SAWTOOTH_f.xml
++++ b/modules/xcos/help/en_US/palettes/Sources_pal/SAWTOOTH_f.xml
+@@ -18,7 +18,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Sources_pal/STEP_FUNCTION.xml b/modules/xcos/help/en_US/palettes/Sources_pal/STEP_FUNCTION.xml
+index f0e6fa2..db12c85 100644
+--- a/modules/xcos/help/en_US/palettes/Sources_pal/STEP_FUNCTION.xml
++++ b/modules/xcos/help/en_US/palettes/Sources_pal/STEP_FUNCTION.xml
+@@ -18,7 +18,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Sources_pal/SampleCLK.xml b/modules/xcos/help/en_US/palettes/Sources_pal/SampleCLK.xml
+index edc0645..8448e03 100644
+--- a/modules/xcos/help/en_US/palettes/Sources_pal/SampleCLK.xml
++++ b/modules/xcos/help/en_US/palettes/Sources_pal/SampleCLK.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Sources_pal/Sigbuilder.xml b/modules/xcos/help/en_US/palettes/Sources_pal/Sigbuilder.xml
+index 93cbcd7..9e1f8dd 100644
+--- a/modules/xcos/help/en_US/palettes/Sources_pal/Sigbuilder.xml
++++ b/modules/xcos/help/en_US/palettes/Sources_pal/Sigbuilder.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Sources_pal/TIME_f.xml b/modules/xcos/help/en_US/palettes/Sources_pal/TIME_f.xml
+index cf2308a..4927eee 100644
+--- a/modules/xcos/help/en_US/palettes/Sources_pal/TIME_f.xml
++++ b/modules/xcos/help/en_US/palettes/Sources_pal/TIME_f.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Sources_pal/TKSCALE.xml b/modules/xcos/help/en_US/palettes/Sources_pal/TKSCALE.xml
+index f172d19..75a594a 100644
+--- a/modules/xcos/help/en_US/palettes/Sources_pal/TKSCALE.xml
++++ b/modules/xcos/help/en_US/palettes/Sources_pal/TKSCALE.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Thermohydraulics_pal/AA_ThermoHydraulics_pal.xml b/modules/xcos/help/en_US/palettes/Thermohydraulics_pal/AA_ThermoHydraulics_pal.xml
+index 2591d90..c8fbfc8 100644
+--- a/modules/xcos/help/en_US/palettes/Thermohydraulics_pal/AA_ThermoHydraulics_pal.xml
++++ b/modules/xcos/help/en_US/palettes/Thermohydraulics_pal/AA_ThermoHydraulics_pal.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Thermohydraulics_pal/Bache.xml b/modules/xcos/help/en_US/palettes/Thermohydraulics_pal/Bache.xml
+index bcdd793..14e21ff 100644
+--- a/modules/xcos/help/en_US/palettes/Thermohydraulics_pal/Bache.xml
++++ b/modules/xcos/help/en_US/palettes/Thermohydraulics_pal/Bache.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Thermohydraulics_pal/PerteDP.xml b/modules/xcos/help/en_US/palettes/Thermohydraulics_pal/PerteDP.xml
+index 0e491e3..e0630bb 100644
+--- a/modules/xcos/help/en_US/palettes/Thermohydraulics_pal/PerteDP.xml
++++ b/modules/xcos/help/en_US/palettes/Thermohydraulics_pal/PerteDP.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Thermohydraulics_pal/PuitsP.xml b/modules/xcos/help/en_US/palettes/Thermohydraulics_pal/PuitsP.xml
+index 94b5ad8..24bfacc 100644
+--- a/modules/xcos/help/en_US/palettes/Thermohydraulics_pal/PuitsP.xml
++++ b/modules/xcos/help/en_US/palettes/Thermohydraulics_pal/PuitsP.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Thermohydraulics_pal/SourceP.xml b/modules/xcos/help/en_US/palettes/Thermohydraulics_pal/SourceP.xml
+index 760e42f..78dd912 100644
+--- a/modules/xcos/help/en_US/palettes/Thermohydraulics_pal/SourceP.xml
++++ b/modules/xcos/help/en_US/palettes/Thermohydraulics_pal/SourceP.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Thermohydraulics_pal/VanneReglante.xml b/modules/xcos/help/en_US/palettes/Thermohydraulics_pal/VanneReglante.xml
+index 86705ec..3c63a85 100644
+--- a/modules/xcos/help/en_US/palettes/Thermohydraulics_pal/VanneReglante.xml
++++ b/modules/xcos/help/en_US/palettes/Thermohydraulics_pal/VanneReglante.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Userdefinedfunctions_pal/AA_Userdefinedfunctions_pal.xml b/modules/xcos/help/en_US/palettes/Userdefinedfunctions_pal/AA_Userdefinedfunctions_pal.xml
+index 8d8aef3..a84251c 100644
+--- a/modules/xcos/help/en_US/palettes/Userdefinedfunctions_pal/AA_Userdefinedfunctions_pal.xml
++++ b/modules/xcos/help/en_US/palettes/Userdefinedfunctions_pal/AA_Userdefinedfunctions_pal.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Userdefinedfunctions_pal/CBLOCK.xml b/modules/xcos/help/en_US/palettes/Userdefinedfunctions_pal/CBLOCK.xml
+index cf56578..b38962c 100644
+--- a/modules/xcos/help/en_US/palettes/Userdefinedfunctions_pal/CBLOCK.xml
++++ b/modules/xcos/help/en_US/palettes/Userdefinedfunctions_pal/CBLOCK.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Userdefinedfunctions_pal/EXPRESSION.xml b/modules/xcos/help/en_US/palettes/Userdefinedfunctions_pal/EXPRESSION.xml
+index f503d97..bf3956a 100644
+--- a/modules/xcos/help/en_US/palettes/Userdefinedfunctions_pal/EXPRESSION.xml
++++ b/modules/xcos/help/en_US/palettes/Userdefinedfunctions_pal/EXPRESSION.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Userdefinedfunctions_pal/MBLOCK.xml b/modules/xcos/help/en_US/palettes/Userdefinedfunctions_pal/MBLOCK.xml
+index f8871b9..3d2db8b 100644
+--- a/modules/xcos/help/en_US/palettes/Userdefinedfunctions_pal/MBLOCK.xml
++++ b/modules/xcos/help/en_US/palettes/Userdefinedfunctions_pal/MBLOCK.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Userdefinedfunctions_pal/SUPER_f.xml b/modules/xcos/help/en_US/palettes/Userdefinedfunctions_pal/SUPER_f.xml
+index bc7b1ca..b6f1c60 100644
+--- a/modules/xcos/help/en_US/palettes/Userdefinedfunctions_pal/SUPER_f.xml
++++ b/modules/xcos/help/en_US/palettes/Userdefinedfunctions_pal/SUPER_f.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Userdefinedfunctions_pal/c_block.xml b/modules/xcos/help/en_US/palettes/Userdefinedfunctions_pal/c_block.xml
+index 2934838..8901d51 100644
+--- a/modules/xcos/help/en_US/palettes/Userdefinedfunctions_pal/c_block.xml
++++ b/modules/xcos/help/en_US/palettes/Userdefinedfunctions_pal/c_block.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Userdefinedfunctions_pal/fortran_block.xml b/modules/xcos/help/en_US/palettes/Userdefinedfunctions_pal/fortran_block.xml
+index 69df08c..19fdf55 100644
+--- a/modules/xcos/help/en_US/palettes/Userdefinedfunctions_pal/fortran_block.xml
++++ b/modules/xcos/help/en_US/palettes/Userdefinedfunctions_pal/fortran_block.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Userdefinedfunctions_pal/generic_block3.xml b/modules/xcos/help/en_US/palettes/Userdefinedfunctions_pal/generic_block3.xml
+index a906d46..57c2f97 100644
+--- a/modules/xcos/help/en_US/palettes/Userdefinedfunctions_pal/generic_block3.xml
++++ b/modules/xcos/help/en_US/palettes/Userdefinedfunctions_pal/generic_block3.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Userdefinedfunctions_pal/scifunc_block_m.xml b/modules/xcos/help/en_US/palettes/Userdefinedfunctions_pal/scifunc_block_m.xml
+index f0efe56..04406aa 100644
+--- a/modules/xcos/help/en_US/palettes/Userdefinedfunctions_pal/scifunc_block_m.xml
++++ b/modules/xcos/help/en_US/palettes/Userdefinedfunctions_pal/scifunc_block_m.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Zerocrossingdetection_pal/AA_Zerocrossingdetection_pal.xml b/modules/xcos/help/en_US/palettes/Zerocrossingdetection_pal/AA_Zerocrossingdetection_pal.xml
+index 1364839..d4a089f 100644
+--- a/modules/xcos/help/en_US/palettes/Zerocrossingdetection_pal/AA_Zerocrossingdetection_pal.xml
++++ b/modules/xcos/help/en_US/palettes/Zerocrossingdetection_pal/AA_Zerocrossingdetection_pal.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Zerocrossingdetection_pal/GENERAL_f.xml b/modules/xcos/help/en_US/palettes/Zerocrossingdetection_pal/GENERAL_f.xml
+index 3068899..78f8d3f 100644
+--- a/modules/xcos/help/en_US/palettes/Zerocrossingdetection_pal/GENERAL_f.xml
++++ b/modules/xcos/help/en_US/palettes/Zerocrossingdetection_pal/GENERAL_f.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Zerocrossingdetection_pal/NEGTOPOS_f.xml b/modules/xcos/help/en_US/palettes/Zerocrossingdetection_pal/NEGTOPOS_f.xml
+index 76a15f2..9644333 100644
+--- a/modules/xcos/help/en_US/palettes/Zerocrossingdetection_pal/NEGTOPOS_f.xml
++++ b/modules/xcos/help/en_US/palettes/Zerocrossingdetection_pal/NEGTOPOS_f.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Zerocrossingdetection_pal/POSTONEG_f.xml b/modules/xcos/help/en_US/palettes/Zerocrossingdetection_pal/POSTONEG_f.xml
+index e8be6b7..09d849b 100644
+--- a/modules/xcos/help/en_US/palettes/Zerocrossingdetection_pal/POSTONEG_f.xml
++++ b/modules/xcos/help/en_US/palettes/Zerocrossingdetection_pal/POSTONEG_f.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/palettes/Zerocrossingdetection_pal/ZCROSS_f.xml b/modules/xcos/help/en_US/palettes/Zerocrossingdetection_pal/ZCROSS_f.xml
+index 0bb9805..36ce1eb 100644
+--- a/modules/xcos/help/en_US/palettes/Zerocrossingdetection_pal/ZCROSS_f.xml
++++ b/modules/xcos/help/en_US/palettes/Zerocrossingdetection_pal/ZCROSS_f.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/programming_scicos_blocks/c_computational_functions/C_macros.xml b/modules/xcos/help/en_US/programming_scicos_blocks/c_computational_functions/C_macros.xml
+index 1ff56e1..3a07cc0 100644
+--- a/modules/xcos/help/en_US/programming_scicos_blocks/c_computational_functions/C_macros.xml
++++ b/modules/xcos/help/en_US/programming_scicos_blocks/c_computational_functions/C_macros.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/programming_scicos_blocks/c_computational_functions/C_struct.xml b/modules/xcos/help/en_US/programming_scicos_blocks/c_computational_functions/C_struct.xml
+index 90bcfd4..7ab3f3d 100644
+--- a/modules/xcos/help/en_US/programming_scicos_blocks/c_computational_functions/C_struct.xml
++++ b/modules/xcos/help/en_US/programming_scicos_blocks/c_computational_functions/C_struct.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/programming_scicos_blocks/c_computational_functions/C_utils.xml b/modules/xcos/help/en_US/programming_scicos_blocks/c_computational_functions/C_utils.xml
+index c997be6..5ab2e89 100644
+--- a/modules/xcos/help/en_US/programming_scicos_blocks/c_computational_functions/C_utils.xml
++++ b/modules/xcos/help/en_US/programming_scicos_blocks/c_computational_functions/C_utils.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/programming_scicos_blocks/scilab_computational_functions/sci_struct.xml b/modules/xcos/help/en_US/programming_scicos_blocks/scilab_computational_functions/sci_struct.xml
+index 0c1d925..fad0d62 100644
+--- a/modules/xcos/help/en_US/programming_scicos_blocks/scilab_computational_functions/sci_struct.xml
++++ b/modules/xcos/help/en_US/programming_scicos_blocks/scilab_computational_functions/sci_struct.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/programming_scicos_blocks/utilities_functions/curblock.xml b/modules/xcos/help/en_US/programming_scicos_blocks/utilities_functions/curblock.xml
+index f4520dd..a80b98e 100644
+--- a/modules/xcos/help/en_US/programming_scicos_blocks/utilities_functions/curblock.xml
++++ b/modules/xcos/help/en_US/programming_scicos_blocks/utilities_functions/curblock.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/programming_scicos_blocks/utilities_functions/getblocklabel.xml b/modules/xcos/help/en_US/programming_scicos_blocks/utilities_functions/getblocklabel.xml
+index 50fa280..1a55e30 100644
+--- a/modules/xcos/help/en_US/programming_scicos_blocks/utilities_functions/getblocklabel.xml
++++ b/modules/xcos/help/en_US/programming_scicos_blocks/utilities_functions/getblocklabel.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/programming_scicos_blocks/utilities_functions/getscicosvars.xml b/modules/xcos/help/en_US/programming_scicos_blocks/utilities_functions/getscicosvars.xml
+index 3ed8c81..63de90e 100644
+--- a/modules/xcos/help/en_US/programming_scicos_blocks/utilities_functions/getscicosvars.xml
++++ b/modules/xcos/help/en_US/programming_scicos_blocks/utilities_functions/getscicosvars.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/programming_scicos_blocks/utilities_functions/phase_simulation.xml b/modules/xcos/help/en_US/programming_scicos_blocks/utilities_functions/phase_simulation.xml
+index 5b9dd84..82db4a1 100644
+--- a/modules/xcos/help/en_US/programming_scicos_blocks/utilities_functions/phase_simulation.xml
++++ b/modules/xcos/help/en_US/programming_scicos_blocks/utilities_functions/phase_simulation.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/programming_scicos_blocks/utilities_functions/pointer_xproperty.xml b/modules/xcos/help/en_US/programming_scicos_blocks/utilities_functions/pointer_xproperty.xml
+index 04b97f5..ad1632b 100644
+--- a/modules/xcos/help/en_US/programming_scicos_blocks/utilities_functions/pointer_xproperty.xml
++++ b/modules/xcos/help/en_US/programming_scicos_blocks/utilities_functions/pointer_xproperty.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/programming_scicos_blocks/utilities_functions/scicos_time.xml b/modules/xcos/help/en_US/programming_scicos_blocks/utilities_functions/scicos_time.xml
+index 9104813..e15403a 100644
+--- a/modules/xcos/help/en_US/programming_scicos_blocks/utilities_functions/scicos_time.xml
++++ b/modules/xcos/help/en_US/programming_scicos_blocks/utilities_functions/scicos_time.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/programming_scicos_blocks/utilities_functions/set_blockerror.xml b/modules/xcos/help/en_US/programming_scicos_blocks/utilities_functions/set_blockerror.xml
+index 4a876c9..cfae88f 100644
+--- a/modules/xcos/help/en_US/programming_scicos_blocks/utilities_functions/set_blockerror.xml
++++ b/modules/xcos/help/en_US/programming_scicos_blocks/utilities_functions/set_blockerror.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/programming_scicos_blocks/utilities_functions/set_xproperty.xml b/modules/xcos/help/en_US/programming_scicos_blocks/utilities_functions/set_xproperty.xml
+index 88f9f25..0308276 100644
+--- a/modules/xcos/help/en_US/programming_scicos_blocks/utilities_functions/set_xproperty.xml
++++ b/modules/xcos/help/en_US/programming_scicos_blocks/utilities_functions/set_xproperty.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/scilab_data_structures/blocks/scicos_block.xml b/modules/xcos/help/en_US/scilab_data_structures/blocks/scicos_block.xml
+index f83967a..89defe9 100644
+--- a/modules/xcos/help/en_US/scilab_data_structures/blocks/scicos_block.xml
++++ b/modules/xcos/help/en_US/scilab_data_structures/blocks/scicos_block.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/scilab_data_structures/blocks/scicos_graphics.xml b/modules/xcos/help/en_US/scilab_data_structures/blocks/scicos_graphics.xml
+index 83e81c2..c339c7a 100644
+--- a/modules/xcos/help/en_US/scilab_data_structures/blocks/scicos_graphics.xml
++++ b/modules/xcos/help/en_US/scilab_data_structures/blocks/scicos_graphics.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/scilab_data_structures/blocks/scicos_model.xml b/modules/xcos/help/en_US/scilab_data_structures/blocks/scicos_model.xml
+index a4d60d5..5d1eb7e 100644
+--- a/modules/xcos/help/en_US/scilab_data_structures/blocks/scicos_model.xml
++++ b/modules/xcos/help/en_US/scilab_data_structures/blocks/scicos_model.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/scilab_data_structures/compilation_simulation/scicos_cpr.xml b/modules/xcos/help/en_US/scilab_data_structures/compilation_simulation/scicos_cpr.xml
+index bb7bc3c..de43e5f 100644
+--- a/modules/xcos/help/en_US/scilab_data_structures/compilation_simulation/scicos_cpr.xml
++++ b/modules/xcos/help/en_US/scilab_data_structures/compilation_simulation/scicos_cpr.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/scilab_data_structures/compilation_simulation/scicos_sim.xml b/modules/xcos/help/en_US/scilab_data_structures/compilation_simulation/scicos_sim.xml
+index 0ea456f..8927e25 100644
+--- a/modules/xcos/help/en_US/scilab_data_structures/compilation_simulation/scicos_sim.xml
++++ b/modules/xcos/help/en_US/scilab_data_structures/compilation_simulation/scicos_sim.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/scilab_data_structures/compilation_simulation/scicos_state.xml b/modules/xcos/help/en_US/scilab_data_structures/compilation_simulation/scicos_state.xml
+index e2dd2b1..0e19ae8 100644
+--- a/modules/xcos/help/en_US/scilab_data_structures/compilation_simulation/scicos_state.xml
++++ b/modules/xcos/help/en_US/scilab_data_structures/compilation_simulation/scicos_state.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/scilab_data_structures/diagram/scicos_diagram.xml b/modules/xcos/help/en_US/scilab_data_structures/diagram/scicos_diagram.xml
+index a580e12..48dea25 100644
+--- a/modules/xcos/help/en_US/scilab_data_structures/diagram/scicos_diagram.xml
++++ b/modules/xcos/help/en_US/scilab_data_structures/diagram/scicos_diagram.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/scilab_data_structures/diagram/scicos_params.xml b/modules/xcos/help/en_US/scilab_data_structures/diagram/scicos_params.xml
+index 6e887a2..771d975 100644
+--- a/modules/xcos/help/en_US/scilab_data_structures/diagram/scicos_params.xml
++++ b/modules/xcos/help/en_US/scilab_data_structures/diagram/scicos_params.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/scilab_data_structures/links/scicos_link.xml b/modules/xcos/help/en_US/scilab_data_structures/links/scicos_link.xml
+index b445255..bdebdb1 100644
+--- a/modules/xcos/help/en_US/scilab_data_structures/links/scicos_link.xml
++++ b/modules/xcos/help/en_US/scilab_data_structures/links/scicos_link.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/scilab_utilities_functions/buildouttb.xml b/modules/xcos/help/en_US/scilab_utilities_functions/buildouttb.xml
+index 5f8af23..a773910 100644
+--- a/modules/xcos/help/en_US/scilab_utilities_functions/buildouttb.xml
++++ b/modules/xcos/help/en_US/scilab_utilities_functions/buildouttb.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/scilab_utilities_functions/create_palette.xml b/modules/xcos/help/en_US/scilab_utilities_functions/create_palette.xml
+index cf11a3e..d903229 100644
+--- a/modules/xcos/help/en_US/scilab_utilities_functions/create_palette.xml
++++ b/modules/xcos/help/en_US/scilab_utilities_functions/create_palette.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/scilab_utilities_functions/get_scicos_version.xml b/modules/xcos/help/en_US/scilab_utilities_functions/get_scicos_version.xml
+index 141f525..6c0b154 100644
+--- a/modules/xcos/help/en_US/scilab_utilities_functions/get_scicos_version.xml
++++ b/modules/xcos/help/en_US/scilab_utilities_functions/get_scicos_version.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/scilab_utilities_functions/loadScicos.xml b/modules/xcos/help/en_US/scilab_utilities_functions/loadScicos.xml
+index 1ede36c..79fe96a 100644
+--- a/modules/xcos/help/en_US/scilab_utilities_functions/loadScicos.xml
++++ b/modules/xcos/help/en_US/scilab_utilities_functions/loadScicos.xml
+@@ -14,7 +14,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/scilab_utilities_functions/scicos_debug.xml b/modules/xcos/help/en_US/scilab_utilities_functions/scicos_debug.xml
+index 565a034..fbea32c 100644
+--- a/modules/xcos/help/en_US/scilab_utilities_functions/scicos_debug.xml
++++ b/modules/xcos/help/en_US/scilab_utilities_functions/scicos_debug.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/scilab_utilities_functions/var2vec.xml b/modules/xcos/help/en_US/scilab_utilities_functions/var2vec.xml
+index 4e3f0fc..196f225 100644
+--- a/modules/xcos/help/en_US/scilab_utilities_functions/var2vec.xml
++++ b/modules/xcos/help/en_US/scilab_utilities_functions/var2vec.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/scilab_utilities_functions/vec2var.xml b/modules/xcos/help/en_US/scilab_utilities_functions/vec2var.xml
+index a683f72..e201ce8 100644
+--- a/modules/xcos/help/en_US/scilab_utilities_functions/vec2var.xml
++++ b/modules/xcos/help/en_US/scilab_utilities_functions/vec2var.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/en_US/xcos.xml b/modules/xcos/help/en_US/xcos.xml
+index 2bb69f4..0154c74 100644
+--- a/modules/xcos/help/en_US/xcos.xml
++++ b/modules/xcos/help/en_US/xcos.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  *
+diff --git a/modules/xcos/help/en_US/xcos_menu_entries.xml b/modules/xcos/help/en_US/xcos_menu_entries.xml
+index 46f7dea..1e77fb1 100644
+--- a/modules/xcos/help/en_US/xcos_menu_entries.xml
++++ b/modules/xcos/help/en_US/xcos_menu_entries.xml
+@@ -17,7 +17,7 @@
+  *
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  *
+  * See the file ./license.txt
+  *
+diff --git a/modules/xcos/help/fr_FR/palettes/Discrete_pal/DELAY_f.xml b/modules/xcos/help/fr_FR/palettes/Discrete_pal/DELAY_f.xml
+index 136b7eb..1d70359 100644
+--- a/modules/xcos/help/fr_FR/palettes/Discrete_pal/DELAY_f.xml
++++ b/modules/xcos/help/fr_FR/palettes/Discrete_pal/DELAY_f.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/ja_JP/batch_functions/lincos.xml b/modules/xcos/help/ja_JP/batch_functions/lincos.xml
+index c462feb..cd9c2cb 100644
+--- a/modules/xcos/help/ja_JP/batch_functions/lincos.xml
++++ b/modules/xcos/help/ja_JP/batch_functions/lincos.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/ja_JP/batch_functions/scicos.xml b/modules/xcos/help/ja_JP/batch_functions/scicos.xml
+index b7e4a38..67bd592 100644
+--- a/modules/xcos/help/ja_JP/batch_functions/scicos.xml
++++ b/modules/xcos/help/ja_JP/batch_functions/scicos.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/ja_JP/batch_functions/scicos_simulate.xml b/modules/xcos/help/ja_JP/batch_functions/scicos_simulate.xml
+index be058d3..03fe922 100644
+--- a/modules/xcos/help/ja_JP/batch_functions/scicos_simulate.xml
++++ b/modules/xcos/help/ja_JP/batch_functions/scicos_simulate.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/ja_JP/batch_functions/scicosim.xml b/modules/xcos/help/ja_JP/batch_functions/scicosim.xml
+index 725236b..318a632 100644
+--- a/modules/xcos/help/ja_JP/batch_functions/scicosim.xml
++++ b/modules/xcos/help/ja_JP/batch_functions/scicosim.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/ja_JP/batch_functions/steadycos.xml b/modules/xcos/help/ja_JP/batch_functions/steadycos.xml
+index 531065d..c28fd31 100644
+--- a/modules/xcos/help/ja_JP/batch_functions/steadycos.xml
++++ b/modules/xcos/help/ja_JP/batch_functions/steadycos.xml
+@@ -17,7 +17,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/ja_JP/xcos.xml b/modules/xcos/help/ja_JP/xcos.xml
+index cf8cb74..5eb796f 100644
+--- a/modules/xcos/help/ja_JP/xcos.xml
++++ b/modules/xcos/help/ja_JP/xcos.xml
+@@ -14,7 +14,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/help/ja_JP/xcos_menu_entries.xml b/modules/xcos/help/ja_JP/xcos_menu_entries.xml
+index 2abd13c..021224c 100644
+--- a/modules/xcos/help/ja_JP/xcos_menu_entries.xml
++++ b/modules/xcos/help/ja_JP/xcos_menu_entries.xml
+@@ -14,7 +14,7 @@
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  * 
+  * See the file ./license.txt
+  -->
+diff --git a/modules/xcos/macros/xcos_compile.sci b/modules/xcos/macros/xcos_compile.sci
+index bf39388..4611223 100644
+--- a/modules/xcos/macros/xcos_compile.sci
++++ b/modules/xcos/macros/xcos_compile.sci
+@@ -14,7 +14,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ../license.txt
+ //
+diff --git a/modules/xcos/macros/xcos_workspace_init.sci b/modules/xcos/macros/xcos_workspace_init.sci
+index dbc8731..3a9774b 100644
+--- a/modules/xcos/macros/xcos_workspace_init.sci
++++ b/modules/xcos/macros/xcos_workspace_init.sci
+@@ -12,7 +12,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ //
+ // See the file ./license.txt
+ //
+-- 
+1.7.7
+
diff --git a/0007-fix-zero-length.patch b/0007-fix-zero-length.patch
new file mode 100644
index 0000000..d997b5a
--- /dev/null
+++ b/0007-fix-zero-length.patch
@@ -0,0 +1,606 @@
+From 45fe61f62916f464c3e58444f939bcaf320d01a7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Cl=C3=A9ment=20DAVID?= <clement.david at scilab-enterprises.com>
+Date: Tue, 1 Nov 2011 14:42:11 +0100
+Subject: [PATCH 7/8] fix zero length
+
+---
+ modules/action_binding/help/en_US/addchapter.sce   |    1 +
+ modules/action_binding/help/fr_FR/addchapter.sce   |    1 +
+ modules/action_binding/help/ja_JP/addchapter.sce   |    1 +
+ modules/action_binding/help/pt_BR/addchapter.sce   |    1 +
+ modules/atoms/license.txt                          |    1 +
+ modules/commons/etc/commons.quit                   |    1 +
+ modules/commons/etc/commons.start                  |    1 +
+ .../tests/nonreg_tests/bug_649.mat                 |    1 +
+ modules/double/help/en_US/addchapter.sce           |    1 +
+ modules/double/help/fr_FR/addchapter.sce           |    1 +
+ modules/double/help/ja_JP/addchapter.sce           |    1 +
+ modules/double/help/pt_BR/addchapter.sce           |    1 +
+ modules/graph/etc/graph.quit                       |    1 +
+ modules/graph/etc/graph.start                      |    1 +
+ modules/history_browser/etc/history_browser.quit   |    1 +
+ modules/history_browser/etc/history_browser.start  |    1 +
+ modules/mexlib/help/en_US/addchapter.sce           |    1 +
+ modules/mexlib/help/fr_FR/addchapter.sce           |    1 +
+ modules/mexlib/help/pt_BR/addchapter.sce           |    1 +
+ modules/renderer/help/en_US/addchapter.sce         |    1 +
+ modules/renderer/help/fr_FR/addchapter.sce         |    1 +
+ modules/renderer/help/pt_BR/addchapter.sce         |    1 +
+ modules/types/etc/types.quit                       |    1 +
+ modules/types/etc/types.start                      |    1 +
+ modules/ui_data/etc/ui_data.quit                   |    1 +
+ modules/ui_data/etc/ui_data.start                  |    1 +
+ modules/ui_data/src/jni/ui_data.i                  |    1 +
+ .../xcos/tests/nonreg_tests/constant.unix.err.ref  |    1 +
+ .../xcos/tests/nonreg_tests/constant.win.err.ref   |    1 +
+ .../tests/nonreg_tests/delay_anal.unix.err.ref     |    1 +
+ .../xcos/tests/nonreg_tests/delay_anal.win.err.ref |    1 +
+ .../xcos/tests/nonreg_tests/disease.unix.err.ref   |    1 +
+ .../xcos/tests/nonreg_tests/disease.win.err.ref    |    1 +
+ modules/xcos/tests/nonreg_tests/gain.unix.err.ref  |    1 +
+ modules/xcos/tests/nonreg_tests/gain.win.err.ref   |    1 +
+ .../xcos/tests/nonreg_tests/gensin.unix.err.ref    |    1 +
+ modules/xcos/tests/nonreg_tests/gensin.win.err.ref |    1 +
+ .../xcos/tests/nonreg_tests/gensin_2.unix.err.ref  |    1 +
+ .../xcos/tests/nonreg_tests/gensin_2.win.err.ref   |    1 +
+ .../xcos/tests/nonreg_tests/gensin_3.unix.err.ref  |    1 +
+ .../xcos/tests/nonreg_tests/gensin_3.win.err.ref   |    1 +
+ .../xcos/tests/nonreg_tests/gensin_4.unix.err.ref  |    1 +
+ .../xcos/tests/nonreg_tests/gensin_4.win.err.ref   |    1 +
+ .../xcos/tests/nonreg_tests/inputfile.unix.err.ref |    1 +
+ .../xcos/tests/nonreg_tests/inputfile.win.err.ref  |    1 +
+ .../xcos/tests/nonreg_tests/integral.unix.err.ref  |    1 +
+ .../xcos/tests/nonreg_tests/integral.win.err.ref   |    1 +
+ .../tests/nonreg_tests/integral_2.unix.err.ref     |    1 +
+ .../xcos/tests/nonreg_tests/integral_2.win.err.ref |    1 +
+ .../tests/nonreg_tests/integral_multi.unix.err.ref |    1 +
+ .../tests/nonreg_tests/integral_multi.win.err.ref  |    1 +
+ .../nonreg_tests/integral_multi_2.unix.err.ref     |    1 +
+ .../nonreg_tests/integral_multi_2.win.err.ref      |    1 +
+ .../nonreg_tests/integral_multi_3.unix.err.ref     |    1 +
+ .../nonreg_tests/integral_multi_3.win.err.ref      |    1 +
+ .../nonreg_tests/integral_sawtooth.unix.err.ref    |    1 +
+ .../nonreg_tests/integral_sawtooth.win.err.ref     |    1 +
+ .../integral_sawtooth_sin.unix.err.ref             |    1 +
+ .../nonreg_tests/integral_sawtooth_sin.win.err.ref |    1 +
+ .../xcos/tests/nonreg_tests/intro_qq.unix.err.ref  |    1 +
+ .../xcos/tests/nonreg_tests/intro_qq.win.err.ref   |    1 +
+ modules/xcos/tests/nonreg_tests/lut.unix.err.ref   |    1 +
+ modules/xcos/tests/nonreg_tests/lut.win.err.ref    |    1 +
+ .../tests/nonreg_tests/modelica_RLC.unix.err.ref   |    1 +
+ .../tests/nonreg_tests/modelica_RLC.win.err.ref    |    1 +
+ .../xcos/tests/nonreg_tests/nonlinear.unix.err.ref |    1 +
+ .../xcos/tests/nonreg_tests/nonlinear.win.err.ref  |    1 +
+ .../tests/nonreg_tests/outputfile.unix.err.ref     |    1 +
+ .../xcos/tests/nonreg_tests/outputfile.win.err.ref |    1 +
+ .../xcos/tests/nonreg_tests/predator.unix.err.ref  |    1 +
+ .../xcos/tests/nonreg_tests/predator.win.err.ref   |    1 +
+ .../tests/nonreg_tests/ramp_sawtooth.unix.err.ref  |    1 +
+ .../tests/nonreg_tests/ramp_sawtooth.win.err.ref   |    1 +
+ .../xcos/tests/nonreg_tests/rossler.unix.err.ref   |    1 +
+ .../xcos/tests/nonreg_tests/rossler.win.err.ref    |    1 +
+ .../xcos/tests/nonreg_tests/sardines.unix.err.ref  |    1 +
+ .../xcos/tests/nonreg_tests/sardines.win.err.ref   |    1 +
+ .../xcos/tests/nonreg_tests/sigbuild.unix.err.ref  |    1 +
+ .../xcos/tests/nonreg_tests/sigbuild.win.err.ref   |    1 +
+ modules/xcos/tests/nonreg_tests/state.unix.err.ref |    1 +
+ modules/xcos/tests/nonreg_tests/state.win.err.ref  |    1 +
+ .../xcos/tests/nonreg_tests/threshold.unix.err.ref |    1 +
+ .../xcos/tests/nonreg_tests/threshold.win.err.ref  |    1 +
+ .../tests/nonreg_tests/transferfcn.unix.err.ref    |    1 +
+ .../tests/nonreg_tests/transferfcn.win.err.ref     |    1 +
+ 85 files changed, 85 insertions(+), 0 deletions(-)
+
+diff --git a/modules/action_binding/help/en_US/addchapter.sce b/modules/action_binding/help/en_US/addchapter.sce
+index e69de29..8b13789 100644
+--- a/modules/action_binding/help/en_US/addchapter.sce
++++ b/modules/action_binding/help/en_US/addchapter.sce
+@@ -0,0 +1 @@
++
+diff --git a/modules/action_binding/help/fr_FR/addchapter.sce b/modules/action_binding/help/fr_FR/addchapter.sce
+index e69de29..8b13789 100644
+--- a/modules/action_binding/help/fr_FR/addchapter.sce
++++ b/modules/action_binding/help/fr_FR/addchapter.sce
+@@ -0,0 +1 @@
++
+diff --git a/modules/action_binding/help/ja_JP/addchapter.sce b/modules/action_binding/help/ja_JP/addchapter.sce
+index e69de29..8b13789 100755
+--- a/modules/action_binding/help/ja_JP/addchapter.sce
++++ b/modules/action_binding/help/ja_JP/addchapter.sce
+@@ -0,0 +1 @@
++
+diff --git a/modules/action_binding/help/pt_BR/addchapter.sce b/modules/action_binding/help/pt_BR/addchapter.sce
+index e69de29..8b13789 100644
+--- a/modules/action_binding/help/pt_BR/addchapter.sce
++++ b/modules/action_binding/help/pt_BR/addchapter.sce
+@@ -0,0 +1 @@
++
+diff --git a/modules/atoms/license.txt b/modules/atoms/license.txt
+index e69de29..8b13789 100644
+--- a/modules/atoms/license.txt
++++ b/modules/atoms/license.txt
+@@ -0,0 +1 @@
++
+diff --git a/modules/commons/etc/commons.quit b/modules/commons/etc/commons.quit
+index e69de29..8b13789 100644
+--- a/modules/commons/etc/commons.quit
++++ b/modules/commons/etc/commons.quit
+@@ -0,0 +1 @@
++
+diff --git a/modules/commons/etc/commons.start b/modules/commons/etc/commons.start
+index e69de29..8b13789 100644
+--- a/modules/commons/etc/commons.start
++++ b/modules/commons/etc/commons.start
+@@ -0,0 +1 @@
++
+diff --git a/modules/compatibility_functions/tests/nonreg_tests/bug_649.mat b/modules/compatibility_functions/tests/nonreg_tests/bug_649.mat
+index e69de29..8b13789 100755
+--- a/modules/compatibility_functions/tests/nonreg_tests/bug_649.mat
++++ b/modules/compatibility_functions/tests/nonreg_tests/bug_649.mat
+@@ -0,0 +1 @@
++
+diff --git a/modules/double/help/en_US/addchapter.sce b/modules/double/help/en_US/addchapter.sce
+index e69de29..8b13789 100644
+--- a/modules/double/help/en_US/addchapter.sce
++++ b/modules/double/help/en_US/addchapter.sce
+@@ -0,0 +1 @@
++
+diff --git a/modules/double/help/fr_FR/addchapter.sce b/modules/double/help/fr_FR/addchapter.sce
+index e69de29..8b13789 100644
+--- a/modules/double/help/fr_FR/addchapter.sce
++++ b/modules/double/help/fr_FR/addchapter.sce
+@@ -0,0 +1 @@
++
+diff --git a/modules/double/help/ja_JP/addchapter.sce b/modules/double/help/ja_JP/addchapter.sce
+index e69de29..8b13789 100755
+--- a/modules/double/help/ja_JP/addchapter.sce
++++ b/modules/double/help/ja_JP/addchapter.sce
+@@ -0,0 +1 @@
++
+diff --git a/modules/double/help/pt_BR/addchapter.sce b/modules/double/help/pt_BR/addchapter.sce
+index e69de29..8b13789 100644
+--- a/modules/double/help/pt_BR/addchapter.sce
++++ b/modules/double/help/pt_BR/addchapter.sce
+@@ -0,0 +1 @@
++
+diff --git a/modules/graph/etc/graph.quit b/modules/graph/etc/graph.quit
+index e69de29..8b13789 100644
+--- a/modules/graph/etc/graph.quit
++++ b/modules/graph/etc/graph.quit
+@@ -0,0 +1 @@
++
+diff --git a/modules/graph/etc/graph.start b/modules/graph/etc/graph.start
+index e69de29..8b13789 100644
+--- a/modules/graph/etc/graph.start
++++ b/modules/graph/etc/graph.start
+@@ -0,0 +1 @@
++
+diff --git a/modules/history_browser/etc/history_browser.quit b/modules/history_browser/etc/history_browser.quit
+index e69de29..8b13789 100644
+--- a/modules/history_browser/etc/history_browser.quit
++++ b/modules/history_browser/etc/history_browser.quit
+@@ -0,0 +1 @@
++
+diff --git a/modules/history_browser/etc/history_browser.start b/modules/history_browser/etc/history_browser.start
+index e69de29..8b13789 100644
+--- a/modules/history_browser/etc/history_browser.start
++++ b/modules/history_browser/etc/history_browser.start
+@@ -0,0 +1 @@
++
+diff --git a/modules/mexlib/help/en_US/addchapter.sce b/modules/mexlib/help/en_US/addchapter.sce
+index e69de29..8b13789 100644
+--- a/modules/mexlib/help/en_US/addchapter.sce
++++ b/modules/mexlib/help/en_US/addchapter.sce
+@@ -0,0 +1 @@
++
+diff --git a/modules/mexlib/help/fr_FR/addchapter.sce b/modules/mexlib/help/fr_FR/addchapter.sce
+index e69de29..8b13789 100644
+--- a/modules/mexlib/help/fr_FR/addchapter.sce
++++ b/modules/mexlib/help/fr_FR/addchapter.sce
+@@ -0,0 +1 @@
++
+diff --git a/modules/mexlib/help/pt_BR/addchapter.sce b/modules/mexlib/help/pt_BR/addchapter.sce
+index e69de29..8b13789 100644
+--- a/modules/mexlib/help/pt_BR/addchapter.sce
++++ b/modules/mexlib/help/pt_BR/addchapter.sce
+@@ -0,0 +1 @@
++
+diff --git a/modules/renderer/help/en_US/addchapter.sce b/modules/renderer/help/en_US/addchapter.sce
+index e69de29..8b13789 100644
+--- a/modules/renderer/help/en_US/addchapter.sce
++++ b/modules/renderer/help/en_US/addchapter.sce
+@@ -0,0 +1 @@
++
+diff --git a/modules/renderer/help/fr_FR/addchapter.sce b/modules/renderer/help/fr_FR/addchapter.sce
+index e69de29..8b13789 100644
+--- a/modules/renderer/help/fr_FR/addchapter.sce
++++ b/modules/renderer/help/fr_FR/addchapter.sce
+@@ -0,0 +1 @@
++
+diff --git a/modules/renderer/help/pt_BR/addchapter.sce b/modules/renderer/help/pt_BR/addchapter.sce
+index e69de29..8b13789 100644
+--- a/modules/renderer/help/pt_BR/addchapter.sce
++++ b/modules/renderer/help/pt_BR/addchapter.sce
+@@ -0,0 +1 @@
++
+diff --git a/modules/types/etc/types.quit b/modules/types/etc/types.quit
+index e69de29..8b13789 100644
+--- a/modules/types/etc/types.quit
++++ b/modules/types/etc/types.quit
+@@ -0,0 +1 @@
++
+diff --git a/modules/types/etc/types.start b/modules/types/etc/types.start
+index e69de29..8b13789 100644
+--- a/modules/types/etc/types.start
++++ b/modules/types/etc/types.start
+@@ -0,0 +1 @@
++
+diff --git a/modules/ui_data/etc/ui_data.quit b/modules/ui_data/etc/ui_data.quit
+index e69de29..8b13789 100644
+--- a/modules/ui_data/etc/ui_data.quit
++++ b/modules/ui_data/etc/ui_data.quit
+@@ -0,0 +1 @@
++
+diff --git a/modules/ui_data/etc/ui_data.start b/modules/ui_data/etc/ui_data.start
+index e69de29..8b13789 100644
+--- a/modules/ui_data/etc/ui_data.start
++++ b/modules/ui_data/etc/ui_data.start
+@@ -0,0 +1 @@
++
+diff --git a/modules/ui_data/src/jni/ui_data.i b/modules/ui_data/src/jni/ui_data.i
+index e69de29..8b13789 100644
+--- a/modules/ui_data/src/jni/ui_data.i
++++ b/modules/ui_data/src/jni/ui_data.i
+@@ -0,0 +1 @@
++
+diff --git a/modules/xcos/tests/nonreg_tests/constant.unix.err.ref b/modules/xcos/tests/nonreg_tests/constant.unix.err.ref
+index e69de29..8b13789 100644
+--- a/modules/xcos/tests/nonreg_tests/constant.unix.err.ref
++++ b/modules/xcos/tests/nonreg_tests/constant.unix.err.ref
+@@ -0,0 +1 @@
++
+diff --git a/modules/xcos/tests/nonreg_tests/constant.win.err.ref b/modules/xcos/tests/nonreg_tests/constant.win.err.ref
+index e69de29..8b13789 100644
+--- a/modules/xcos/tests/nonreg_tests/constant.win.err.ref
++++ b/modules/xcos/tests/nonreg_tests/constant.win.err.ref
+@@ -0,0 +1 @@
++
+diff --git a/modules/xcos/tests/nonreg_tests/delay_anal.unix.err.ref b/modules/xcos/tests/nonreg_tests/delay_anal.unix.err.ref
+index e69de29..8b13789 100644
+--- a/modules/xcos/tests/nonreg_tests/delay_anal.unix.err.ref
++++ b/modules/xcos/tests/nonreg_tests/delay_anal.unix.err.ref
+@@ -0,0 +1 @@
++
+diff --git a/modules/xcos/tests/nonreg_tests/delay_anal.win.err.ref b/modules/xcos/tests/nonreg_tests/delay_anal.win.err.ref
+index e69de29..8b13789 100644
+--- a/modules/xcos/tests/nonreg_tests/delay_anal.win.err.ref
++++ b/modules/xcos/tests/nonreg_tests/delay_anal.win.err.ref
+@@ -0,0 +1 @@
++
+diff --git a/modules/xcos/tests/nonreg_tests/disease.unix.err.ref b/modules/xcos/tests/nonreg_tests/disease.unix.err.ref
+index e69de29..8b13789 100644
+--- a/modules/xcos/tests/nonreg_tests/disease.unix.err.ref
++++ b/modules/xcos/tests/nonreg_tests/disease.unix.err.ref
+@@ -0,0 +1 @@
++
+diff --git a/modules/xcos/tests/nonreg_tests/disease.win.err.ref b/modules/xcos/tests/nonreg_tests/disease.win.err.ref
+index e69de29..8b13789 100644
+--- a/modules/xcos/tests/nonreg_tests/disease.win.err.ref
++++ b/modules/xcos/tests/nonreg_tests/disease.win.err.ref
+@@ -0,0 +1 @@
++
+diff --git a/modules/xcos/tests/nonreg_tests/gain.unix.err.ref b/modules/xcos/tests/nonreg_tests/gain.unix.err.ref
+index e69de29..8b13789 100644
+--- a/modules/xcos/tests/nonreg_tests/gain.unix.err.ref
++++ b/modules/xcos/tests/nonreg_tests/gain.unix.err.ref
+@@ -0,0 +1 @@
++
+diff --git a/modules/xcos/tests/nonreg_tests/gain.win.err.ref b/modules/xcos/tests/nonreg_tests/gain.win.err.ref
+index e69de29..8b13789 100644
+--- a/modules/xcos/tests/nonreg_tests/gain.win.err.ref
++++ b/modules/xcos/tests/nonreg_tests/gain.win.err.ref
+@@ -0,0 +1 @@
++
+diff --git a/modules/xcos/tests/nonreg_tests/gensin.unix.err.ref b/modules/xcos/tests/nonreg_tests/gensin.unix.err.ref
+index e69de29..8b13789 100644
+--- a/modules/xcos/tests/nonreg_tests/gensin.unix.err.ref
++++ b/modules/xcos/tests/nonreg_tests/gensin.unix.err.ref
+@@ -0,0 +1 @@
++
+diff --git a/modules/xcos/tests/nonreg_tests/gensin.win.err.ref b/modules/xcos/tests/nonreg_tests/gensin.win.err.ref
+index e69de29..8b13789 100644
+--- a/modules/xcos/tests/nonreg_tests/gensin.win.err.ref
++++ b/modules/xcos/tests/nonreg_tests/gensin.win.err.ref
+@@ -0,0 +1 @@
++
+diff --git a/modules/xcos/tests/nonreg_tests/gensin_2.unix.err.ref b/modules/xcos/tests/nonreg_tests/gensin_2.unix.err.ref
+index e69de29..8b13789 100644
+--- a/modules/xcos/tests/nonreg_tests/gensin_2.unix.err.ref
++++ b/modules/xcos/tests/nonreg_tests/gensin_2.unix.err.ref
+@@ -0,0 +1 @@
++
+diff --git a/modules/xcos/tests/nonreg_tests/gensin_2.win.err.ref b/modules/xcos/tests/nonreg_tests/gensin_2.win.err.ref
+index e69de29..8b13789 100644
+--- a/modules/xcos/tests/nonreg_tests/gensin_2.win.err.ref
++++ b/modules/xcos/tests/nonreg_tests/gensin_2.win.err.ref
+@@ -0,0 +1 @@
++
+diff --git a/modules/xcos/tests/nonreg_tests/gensin_3.unix.err.ref b/modules/xcos/tests/nonreg_tests/gensin_3.unix.err.ref
+index e69de29..8b13789 100644
+--- a/modules/xcos/tests/nonreg_tests/gensin_3.unix.err.ref
++++ b/modules/xcos/tests/nonreg_tests/gensin_3.unix.err.ref
+@@ -0,0 +1 @@
++
+diff --git a/modules/xcos/tests/nonreg_tests/gensin_3.win.err.ref b/modules/xcos/tests/nonreg_tests/gensin_3.win.err.ref
+index e69de29..8b13789 100644
+--- a/modules/xcos/tests/nonreg_tests/gensin_3.win.err.ref
++++ b/modules/xcos/tests/nonreg_tests/gensin_3.win.err.ref
+@@ -0,0 +1 @@
++
+diff --git a/modules/xcos/tests/nonreg_tests/gensin_4.unix.err.ref b/modules/xcos/tests/nonreg_tests/gensin_4.unix.err.ref
+index e69de29..8b13789 100644
+--- a/modules/xcos/tests/nonreg_tests/gensin_4.unix.err.ref
++++ b/modules/xcos/tests/nonreg_tests/gensin_4.unix.err.ref
+@@ -0,0 +1 @@
++
+diff --git a/modules/xcos/tests/nonreg_tests/gensin_4.win.err.ref b/modules/xcos/tests/nonreg_tests/gensin_4.win.err.ref
+index e69de29..8b13789 100644
+--- a/modules/xcos/tests/nonreg_tests/gensin_4.win.err.ref
++++ b/modules/xcos/tests/nonreg_tests/gensin_4.win.err.ref
+@@ -0,0 +1 @@
++
+diff --git a/modules/xcos/tests/nonreg_tests/inputfile.unix.err.ref b/modules/xcos/tests/nonreg_tests/inputfile.unix.err.ref
+index e69de29..8b13789 100644
+--- a/modules/xcos/tests/nonreg_tests/inputfile.unix.err.ref
++++ b/modules/xcos/tests/nonreg_tests/inputfile.unix.err.ref
+@@ -0,0 +1 @@
++
+diff --git a/modules/xcos/tests/nonreg_tests/inputfile.win.err.ref b/modules/xcos/tests/nonreg_tests/inputfile.win.err.ref
+index e69de29..8b13789 100644
+--- a/modules/xcos/tests/nonreg_tests/inputfile.win.err.ref
++++ b/modules/xcos/tests/nonreg_tests/inputfile.win.err.ref
+@@ -0,0 +1 @@
++
+diff --git a/modules/xcos/tests/nonreg_tests/integral.unix.err.ref b/modules/xcos/tests/nonreg_tests/integral.unix.err.ref
+index e69de29..8b13789 100644
+--- a/modules/xcos/tests/nonreg_tests/integral.unix.err.ref
++++ b/modules/xcos/tests/nonreg_tests/integral.unix.err.ref
+@@ -0,0 +1 @@
++
+diff --git a/modules/xcos/tests/nonreg_tests/integral.win.err.ref b/modules/xcos/tests/nonreg_tests/integral.win.err.ref
+index e69de29..8b13789 100644
+--- a/modules/xcos/tests/nonreg_tests/integral.win.err.ref
++++ b/modules/xcos/tests/nonreg_tests/integral.win.err.ref
+@@ -0,0 +1 @@
++
+diff --git a/modules/xcos/tests/nonreg_tests/integral_2.unix.err.ref b/modules/xcos/tests/nonreg_tests/integral_2.unix.err.ref
+index e69de29..8b13789 100644
+--- a/modules/xcos/tests/nonreg_tests/integral_2.unix.err.ref
++++ b/modules/xcos/tests/nonreg_tests/integral_2.unix.err.ref
+@@ -0,0 +1 @@
++
+diff --git a/modules/xcos/tests/nonreg_tests/integral_2.win.err.ref b/modules/xcos/tests/nonreg_tests/integral_2.win.err.ref
+index e69de29..8b13789 100644
+--- a/modules/xcos/tests/nonreg_tests/integral_2.win.err.ref
++++ b/modules/xcos/tests/nonreg_tests/integral_2.win.err.ref
+@@ -0,0 +1 @@
++
+diff --git a/modules/xcos/tests/nonreg_tests/integral_multi.unix.err.ref b/modules/xcos/tests/nonreg_tests/integral_multi.unix.err.ref
+index e69de29..8b13789 100644
+--- a/modules/xcos/tests/nonreg_tests/integral_multi.unix.err.ref
++++ b/modules/xcos/tests/nonreg_tests/integral_multi.unix.err.ref
+@@ -0,0 +1 @@
++
+diff --git a/modules/xcos/tests/nonreg_tests/integral_multi.win.err.ref b/modules/xcos/tests/nonreg_tests/integral_multi.win.err.ref
+index e69de29..8b13789 100644
+--- a/modules/xcos/tests/nonreg_tests/integral_multi.win.err.ref
++++ b/modules/xcos/tests/nonreg_tests/integral_multi.win.err.ref
+@@ -0,0 +1 @@
++
+diff --git a/modules/xcos/tests/nonreg_tests/integral_multi_2.unix.err.ref b/modules/xcos/tests/nonreg_tests/integral_multi_2.unix.err.ref
+index e69de29..8b13789 100644
+--- a/modules/xcos/tests/nonreg_tests/integral_multi_2.unix.err.ref
++++ b/modules/xcos/tests/nonreg_tests/integral_multi_2.unix.err.ref
+@@ -0,0 +1 @@
++
+diff --git a/modules/xcos/tests/nonreg_tests/integral_multi_2.win.err.ref b/modules/xcos/tests/nonreg_tests/integral_multi_2.win.err.ref
+index e69de29..8b13789 100644
+--- a/modules/xcos/tests/nonreg_tests/integral_multi_2.win.err.ref
++++ b/modules/xcos/tests/nonreg_tests/integral_multi_2.win.err.ref
+@@ -0,0 +1 @@
++
+diff --git a/modules/xcos/tests/nonreg_tests/integral_multi_3.unix.err.ref b/modules/xcos/tests/nonreg_tests/integral_multi_3.unix.err.ref
+index e69de29..8b13789 100644
+--- a/modules/xcos/tests/nonreg_tests/integral_multi_3.unix.err.ref
++++ b/modules/xcos/tests/nonreg_tests/integral_multi_3.unix.err.ref
+@@ -0,0 +1 @@
++
+diff --git a/modules/xcos/tests/nonreg_tests/integral_multi_3.win.err.ref b/modules/xcos/tests/nonreg_tests/integral_multi_3.win.err.ref
+index e69de29..8b13789 100644
+--- a/modules/xcos/tests/nonreg_tests/integral_multi_3.win.err.ref
++++ b/modules/xcos/tests/nonreg_tests/integral_multi_3.win.err.ref
+@@ -0,0 +1 @@
++
+diff --git a/modules/xcos/tests/nonreg_tests/integral_sawtooth.unix.err.ref b/modules/xcos/tests/nonreg_tests/integral_sawtooth.unix.err.ref
+index e69de29..8b13789 100644
+--- a/modules/xcos/tests/nonreg_tests/integral_sawtooth.unix.err.ref
++++ b/modules/xcos/tests/nonreg_tests/integral_sawtooth.unix.err.ref
+@@ -0,0 +1 @@
++
+diff --git a/modules/xcos/tests/nonreg_tests/integral_sawtooth.win.err.ref b/modules/xcos/tests/nonreg_tests/integral_sawtooth.win.err.ref
+index e69de29..8b13789 100644
+--- a/modules/xcos/tests/nonreg_tests/integral_sawtooth.win.err.ref
++++ b/modules/xcos/tests/nonreg_tests/integral_sawtooth.win.err.ref
+@@ -0,0 +1 @@
++
+diff --git a/modules/xcos/tests/nonreg_tests/integral_sawtooth_sin.unix.err.ref b/modules/xcos/tests/nonreg_tests/integral_sawtooth_sin.unix.err.ref
+index e69de29..8b13789 100644
+--- a/modules/xcos/tests/nonreg_tests/integral_sawtooth_sin.unix.err.ref
++++ b/modules/xcos/tests/nonreg_tests/integral_sawtooth_sin.unix.err.ref
+@@ -0,0 +1 @@
++
+diff --git a/modules/xcos/tests/nonreg_tests/integral_sawtooth_sin.win.err.ref b/modules/xcos/tests/nonreg_tests/integral_sawtooth_sin.win.err.ref
+index e69de29..8b13789 100644
+--- a/modules/xcos/tests/nonreg_tests/integral_sawtooth_sin.win.err.ref
++++ b/modules/xcos/tests/nonreg_tests/integral_sawtooth_sin.win.err.ref
+@@ -0,0 +1 @@
++
+diff --git a/modules/xcos/tests/nonreg_tests/intro_qq.unix.err.ref b/modules/xcos/tests/nonreg_tests/intro_qq.unix.err.ref
+index e69de29..8b13789 100644
+--- a/modules/xcos/tests/nonreg_tests/intro_qq.unix.err.ref
++++ b/modules/xcos/tests/nonreg_tests/intro_qq.unix.err.ref
+@@ -0,0 +1 @@
++
+diff --git a/modules/xcos/tests/nonreg_tests/intro_qq.win.err.ref b/modules/xcos/tests/nonreg_tests/intro_qq.win.err.ref
+index e69de29..8b13789 100644
+--- a/modules/xcos/tests/nonreg_tests/intro_qq.win.err.ref
++++ b/modules/xcos/tests/nonreg_tests/intro_qq.win.err.ref
+@@ -0,0 +1 @@
++
+diff --git a/modules/xcos/tests/nonreg_tests/lut.unix.err.ref b/modules/xcos/tests/nonreg_tests/lut.unix.err.ref
+index e69de29..8b13789 100644
+--- a/modules/xcos/tests/nonreg_tests/lut.unix.err.ref
++++ b/modules/xcos/tests/nonreg_tests/lut.unix.err.ref
+@@ -0,0 +1 @@
++
+diff --git a/modules/xcos/tests/nonreg_tests/lut.win.err.ref b/modules/xcos/tests/nonreg_tests/lut.win.err.ref
+index e69de29..8b13789 100644
+--- a/modules/xcos/tests/nonreg_tests/lut.win.err.ref
++++ b/modules/xcos/tests/nonreg_tests/lut.win.err.ref
+@@ -0,0 +1 @@
++
+diff --git a/modules/xcos/tests/nonreg_tests/modelica_RLC.unix.err.ref b/modules/xcos/tests/nonreg_tests/modelica_RLC.unix.err.ref
+index e69de29..8b13789 100644
+--- a/modules/xcos/tests/nonreg_tests/modelica_RLC.unix.err.ref
++++ b/modules/xcos/tests/nonreg_tests/modelica_RLC.unix.err.ref
+@@ -0,0 +1 @@
++
+diff --git a/modules/xcos/tests/nonreg_tests/modelica_RLC.win.err.ref b/modules/xcos/tests/nonreg_tests/modelica_RLC.win.err.ref
+index e69de29..8b13789 100644
+--- a/modules/xcos/tests/nonreg_tests/modelica_RLC.win.err.ref
++++ b/modules/xcos/tests/nonreg_tests/modelica_RLC.win.err.ref
+@@ -0,0 +1 @@
++
+diff --git a/modules/xcos/tests/nonreg_tests/nonlinear.unix.err.ref b/modules/xcos/tests/nonreg_tests/nonlinear.unix.err.ref
+index e69de29..8b13789 100644
+--- a/modules/xcos/tests/nonreg_tests/nonlinear.unix.err.ref
++++ b/modules/xcos/tests/nonreg_tests/nonlinear.unix.err.ref
+@@ -0,0 +1 @@
++
+diff --git a/modules/xcos/tests/nonreg_tests/nonlinear.win.err.ref b/modules/xcos/tests/nonreg_tests/nonlinear.win.err.ref
+index e69de29..8b13789 100644
+--- a/modules/xcos/tests/nonreg_tests/nonlinear.win.err.ref
++++ b/modules/xcos/tests/nonreg_tests/nonlinear.win.err.ref
+@@ -0,0 +1 @@
++
+diff --git a/modules/xcos/tests/nonreg_tests/outputfile.unix.err.ref b/modules/xcos/tests/nonreg_tests/outputfile.unix.err.ref
+index e69de29..8b13789 100644
+--- a/modules/xcos/tests/nonreg_tests/outputfile.unix.err.ref
++++ b/modules/xcos/tests/nonreg_tests/outputfile.unix.err.ref
+@@ -0,0 +1 @@
++
+diff --git a/modules/xcos/tests/nonreg_tests/outputfile.win.err.ref b/modules/xcos/tests/nonreg_tests/outputfile.win.err.ref
+index e69de29..8b13789 100644
+--- a/modules/xcos/tests/nonreg_tests/outputfile.win.err.ref
++++ b/modules/xcos/tests/nonreg_tests/outputfile.win.err.ref
+@@ -0,0 +1 @@
++
+diff --git a/modules/xcos/tests/nonreg_tests/predator.unix.err.ref b/modules/xcos/tests/nonreg_tests/predator.unix.err.ref
+index e69de29..8b13789 100644
+--- a/modules/xcos/tests/nonreg_tests/predator.unix.err.ref
++++ b/modules/xcos/tests/nonreg_tests/predator.unix.err.ref
+@@ -0,0 +1 @@
++
+diff --git a/modules/xcos/tests/nonreg_tests/predator.win.err.ref b/modules/xcos/tests/nonreg_tests/predator.win.err.ref
+index e69de29..8b13789 100644
+--- a/modules/xcos/tests/nonreg_tests/predator.win.err.ref
++++ b/modules/xcos/tests/nonreg_tests/predator.win.err.ref
+@@ -0,0 +1 @@
++
+diff --git a/modules/xcos/tests/nonreg_tests/ramp_sawtooth.unix.err.ref b/modules/xcos/tests/nonreg_tests/ramp_sawtooth.unix.err.ref
+index e69de29..8b13789 100644
+--- a/modules/xcos/tests/nonreg_tests/ramp_sawtooth.unix.err.ref
++++ b/modules/xcos/tests/nonreg_tests/ramp_sawtooth.unix.err.ref
+@@ -0,0 +1 @@
++
+diff --git a/modules/xcos/tests/nonreg_tests/ramp_sawtooth.win.err.ref b/modules/xcos/tests/nonreg_tests/ramp_sawtooth.win.err.ref
+index e69de29..8b13789 100644
+--- a/modules/xcos/tests/nonreg_tests/ramp_sawtooth.win.err.ref
++++ b/modules/xcos/tests/nonreg_tests/ramp_sawtooth.win.err.ref
+@@ -0,0 +1 @@
++
+diff --git a/modules/xcos/tests/nonreg_tests/rossler.unix.err.ref b/modules/xcos/tests/nonreg_tests/rossler.unix.err.ref
+index e69de29..8b13789 100644
+--- a/modules/xcos/tests/nonreg_tests/rossler.unix.err.ref
++++ b/modules/xcos/tests/nonreg_tests/rossler.unix.err.ref
+@@ -0,0 +1 @@
++
+diff --git a/modules/xcos/tests/nonreg_tests/rossler.win.err.ref b/modules/xcos/tests/nonreg_tests/rossler.win.err.ref
+index e69de29..8b13789 100644
+--- a/modules/xcos/tests/nonreg_tests/rossler.win.err.ref
++++ b/modules/xcos/tests/nonreg_tests/rossler.win.err.ref
+@@ -0,0 +1 @@
++
+diff --git a/modules/xcos/tests/nonreg_tests/sardines.unix.err.ref b/modules/xcos/tests/nonreg_tests/sardines.unix.err.ref
+index e69de29..8b13789 100644
+--- a/modules/xcos/tests/nonreg_tests/sardines.unix.err.ref
++++ b/modules/xcos/tests/nonreg_tests/sardines.unix.err.ref
+@@ -0,0 +1 @@
++
+diff --git a/modules/xcos/tests/nonreg_tests/sardines.win.err.ref b/modules/xcos/tests/nonreg_tests/sardines.win.err.ref
+index e69de29..8b13789 100644
+--- a/modules/xcos/tests/nonreg_tests/sardines.win.err.ref
++++ b/modules/xcos/tests/nonreg_tests/sardines.win.err.ref
+@@ -0,0 +1 @@
++
+diff --git a/modules/xcos/tests/nonreg_tests/sigbuild.unix.err.ref b/modules/xcos/tests/nonreg_tests/sigbuild.unix.err.ref
+index e69de29..8b13789 100644
+--- a/modules/xcos/tests/nonreg_tests/sigbuild.unix.err.ref
++++ b/modules/xcos/tests/nonreg_tests/sigbuild.unix.err.ref
+@@ -0,0 +1 @@
++
+diff --git a/modules/xcos/tests/nonreg_tests/sigbuild.win.err.ref b/modules/xcos/tests/nonreg_tests/sigbuild.win.err.ref
+index e69de29..8b13789 100644
+--- a/modules/xcos/tests/nonreg_tests/sigbuild.win.err.ref
++++ b/modules/xcos/tests/nonreg_tests/sigbuild.win.err.ref
+@@ -0,0 +1 @@
++
+diff --git a/modules/xcos/tests/nonreg_tests/state.unix.err.ref b/modules/xcos/tests/nonreg_tests/state.unix.err.ref
+index e69de29..8b13789 100644
+--- a/modules/xcos/tests/nonreg_tests/state.unix.err.ref
++++ b/modules/xcos/tests/nonreg_tests/state.unix.err.ref
+@@ -0,0 +1 @@
++
+diff --git a/modules/xcos/tests/nonreg_tests/state.win.err.ref b/modules/xcos/tests/nonreg_tests/state.win.err.ref
+index e69de29..8b13789 100644
+--- a/modules/xcos/tests/nonreg_tests/state.win.err.ref
++++ b/modules/xcos/tests/nonreg_tests/state.win.err.ref
+@@ -0,0 +1 @@
++
+diff --git a/modules/xcos/tests/nonreg_tests/threshold.unix.err.ref b/modules/xcos/tests/nonreg_tests/threshold.unix.err.ref
+index e69de29..8b13789 100644
+--- a/modules/xcos/tests/nonreg_tests/threshold.unix.err.ref
++++ b/modules/xcos/tests/nonreg_tests/threshold.unix.err.ref
+@@ -0,0 +1 @@
++
+diff --git a/modules/xcos/tests/nonreg_tests/threshold.win.err.ref b/modules/xcos/tests/nonreg_tests/threshold.win.err.ref
+index e69de29..8b13789 100644
+--- a/modules/xcos/tests/nonreg_tests/threshold.win.err.ref
++++ b/modules/xcos/tests/nonreg_tests/threshold.win.err.ref
+@@ -0,0 +1 @@
++
+diff --git a/modules/xcos/tests/nonreg_tests/transferfcn.unix.err.ref b/modules/xcos/tests/nonreg_tests/transferfcn.unix.err.ref
+index e69de29..8b13789 100644
+--- a/modules/xcos/tests/nonreg_tests/transferfcn.unix.err.ref
++++ b/modules/xcos/tests/nonreg_tests/transferfcn.unix.err.ref
+@@ -0,0 +1 @@
++
+diff --git a/modules/xcos/tests/nonreg_tests/transferfcn.win.err.ref b/modules/xcos/tests/nonreg_tests/transferfcn.win.err.ref
+index e69de29..8b13789 100644
+--- a/modules/xcos/tests/nonreg_tests/transferfcn.win.err.ref
++++ b/modules/xcos/tests/nonreg_tests/transferfcn.win.err.ref
+@@ -0,0 +1 @@
++
+-- 
+1.7.7
+
diff --git a/0008-fix-class-path-in-manifest.patch b/0008-fix-class-path-in-manifest.patch
new file mode 100644
index 0000000..0276aec
--- /dev/null
+++ b/0008-fix-class-path-in-manifest.patch
@@ -0,0 +1,32 @@
+From 2411a7115f3f8b59a9dc504199886f0ac020f8f0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Cl=C3=A9ment=20DAVID?= <clement.david at scilab-enterprises.com>
+Date: Tue, 1 Nov 2011 15:41:53 +0100
+Subject: [PATCH 8/8] fix class-path in manifest
+
+---
+ modules/javasci/build.xml |    2 --
+ 1 files changed, 0 insertions(+), 2 deletions(-)
+
+diff --git a/modules/javasci/build.xml b/modules/javasci/build.xml
+index 287b575..4758abf 100644
+--- a/modules/javasci/build.xml
++++ b/modules/javasci/build.xml
+@@ -58,7 +58,6 @@
+         <attribute name="SciStringArray" value="javasci.SciStringArray"/>
+         <attribute name="ClassPath" value="javasci.ClassPath"/>
+         <attribute name="LibraryPath" value="javasci.LibraryPath"/>
+-        <attribute name="Class-Path" value="${manifest-v1.classpath}"/>
+       </manifest>
+     </jar>
+   </target>
+@@ -69,7 +68,6 @@
+     </manifestclasspath>
+     <jar destfile="${build.jar.dir}/${library.name}" basedir="${classes.dir}/v2/">
+       <manifest>
+-        <attribute name="Class-Path" value="${manifest.classpath}"/>
+       </manifest>
+     </jar>
+   </target>
+-- 
+1.7.7
+
diff --git a/scilab.spec b/scilab.spec
new file mode 100644
index 0000000..919234d
--- /dev/null
+++ b/scilab.spec
@@ -0,0 +1,282 @@
+Name:           scilab
+Version:        5.3.3
+Release:        3%{?dist}
+Summary:        Scientific software package for numerical computations
+
+Group:          Applications/Engineering
+License:        CeCILL
+URL:            http://www.scilab.org/
+Source0:        http://www.scilab.org/download/%{version}/scilab-%{version}-src.tar.gz
+
+Patch1:         0001-configure-upstream-patches.patch
+Patch2:         0002-Update-saxon-dependency-wrong-version.patch
+Patch3:         0003-Remove-Xcos-dependencies-check.patch
+Patch4:         0004-fix-javadoc-encoding.patch
+Patch5:         0005-autoreconf.patch
+# fix rpmlint errors
+Patch6:         0006-fix-incorrect-fsf-adress.patch
+Patch7:         0007-fix-zero-length.patch
+Patch8:         0008-fix-class-path-in-manifest.patch
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+# Dependencies are extracted from :
+# "http://wiki.scilab.org/Dependencies of Scilab 5.X"
+
+# Mandatory
+BuildRequires:  gcc-gfortran
+
+## for dynamic link features
+Requires:       gcc
+Requires:       gcc-c++
+Requires:       gcc-gfortran
+
+# Core
+BuildRequires:  libxml2-devel
+BuildRequires:  pcre-devel
+BuildRequires:  ncurses-devel
+
+# Numerical libraries
+# see "http://wiki.scilab.org/Linalg performances"
+BuildRequires:  lapack-devel
+
+# GUI/Console
+BuildRequires:  jpackage-utils
+BuildRequires:  java-devel
+BuildRequires:  ant
+
+BuildRequires:  flexdock >= 0.5.2
+BuildRequires:  jogl
+BuildRequires:  mesa-libGL-devel
+
+Requires:       flexdock >= 0.5.2
+Requires:       jogl
+
+BuildRequires:  jrosetta >= 1.0.4
+Requires:       jrosetta >= 1.0.4
+
+BuildRequires:  apache-commons-logging
+BuildRequires:  javahelp2
+BuildRequires:  jlatexmath
+BuildRequires:  jlatexmath-fop
+BuildRequires:  jgraphx
+BuildRequires:  fop
+BuildRequires:  jeuclid
+BuildRequires:  batik
+BuildRequires:  xmlgraphics-commons
+
+Requires:       apache-commons-logging
+Requires:       javahelp2
+Requires:       jlatexmath
+Requires:       jlatexmath-fop
+Requires:       jgraphx
+Requires:       fop
+Requires:       jeuclid
+Requires:       batik
+Requires:       xmlgraphics-commons
+
+# TCL/TK features
+BuildRequires:  tcl-devel
+BuildRequires:  tk-devel
+
+Requires:       tcl
+Requires:       tk
+
+# Modelica
+BuildRequires:  ocaml
+
+# Documentation
+BuildRequires:  saxon
+BuildRequires:  docbook-style-xsl
+BuildRequires:  liberation-sans-fonts
+
+# All optional dependencies are needed to provide a full-featured Scilab
+BuildRequires:  gettext-devel
+BuildRequires:  pvm
+BuildRequires:  fftw-devel
+BuildRequires:  matio-devel
+BuildRequires:  suitesparse-devel
+BuildRequires:  hdf5-devel
+BuildRequires:  jhdf5
+
+Requires:       pvm
+Requires:       jhdf5
+
+# Specific dependencies for packaging purpose
+BuildRequires:  desktop-file-utils
+
+%description
+Scilab is the free software for numerical computation providing a powerful
+computing environment for engineering and scientific applications. It
+includes hundreds of mathematical functions. It has a high level programming
+language allowing access to advanced data structures, 2-D and 3-D graphical
+functions.
+
+%package devel
+Group:          Applications/Engineering
+License:        CeCILL
+
+Summary:        Scientific software package for numerical computations (include files)
+
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+
+%description devel
+Scilab is the free software for numerical computation providing a powerful
+computing environment for engineering and scientific applications. It
+includes hundreds of mathematical functions. It has a high level programming
+language allowing access to advanced data structures, 2-D and 3-D graphical
+functions.
+
+This package provide include files for Scilab.
+
+%package doc
+Group:          Documentation
+License:        CeCILL
+
+Summary:        Scientific software package (documentation files)
+
+BuildArch:      noarch
+Requires:       %{name} = %{version}-%{release}
+
+%description doc
+Scilab is the free software for numerical computation providing a powerful
+computing environment for engineering and scientific applications. It
+includes hundreds of mathematical functions. It has a high level programming
+language allowing access to advanced data structures, 2-D and 3-D graphical
+functions.
+
+This package provide documentation files for Scilab.
+
+%package tests
+Group:          Applications/Engineering
+License:        CeCILL
+
+Summary:        Provides test files for Scilab
+
+BuildArch:      noarch
+Requires:       %{name} = %{version}-%{release}
+Requires:       testng
+
+%description tests
+Scilab is the free software for numerical computation providing a powerful
+computing environment for engineering and scientific applications. It
+includes hundreds of mathematical functions. It has a high level programming
+language allowing access to advanced data structures, 2-D and 3-D graphical
+functions.
+
+This package provide test files for Scilab.
+
+%prep
+%setup -q
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+
+# fix incorrect-fsf-adress
+%patch6 -p1
+# fix zero-length
+%patch7 -p1
+# fix class-path-in-manifest
+%patch8 -p1
+# fix spurious-executable-perm
+chmod -x modules/scicos_blocks/src/c/*.c modules/scicos_blocks/includes/*.h
+# fix file-not-utf8
+while read file
+do
+    iconv -f ISO-8859-1 -t UTF-8 -o $file.new $file && \
+    touch -r $file $file.new && \
+    mv $file.new $file
+done << EOF
+COPYING
+modules/scicos/macros/scicos_scicos/look_for_text.sci
+modules/scicos/macros/scicos_scicos/unhilite_modelica_block.sci
+EOF
+
+
+%build
+%configure PVM_ROOT=%{_datadir}/pvm3
+
+make %{?_smp_mflags}
+make %{?_smp_mflags} doc
+
+%install
+make %{?_smp_mflags} install DESTDIR=%{buildroot}
+desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
+%find_lang %{name}
+
+# Remove more advanced repl, user should use CLI options instead
+rm -fr %{buildroot}%{_datadir}/applications/%{name}-*.desktop
+# Remove la files
+rm -fr %{buildroot}%{_libdir}/%{name}/*.la
+
+# fix non-executable-script
+chmod +x %{buildroot}%{_datadir}/%{name}/modules/helptools/bin/*
+
+# Add localized help files to scilab-doc.lang
+# adapted from find-lang.sh
+# always provide the english help to handle missing localized help pages
+find %{buildroot}%{_datadir}/%{name}/modules/helptools/jar -type f -o -type l|sed '
+s:'"%{buildroot}"'::
+s:\(.*/'"%{name}"'_\)\([^\._]\+\)\(.*\.jar$\):%lang(\2) \1\2\3:
+s:^\([^%].*\)::
+s:%lang(en) ::
+s:%lang(C) ::
+/^$/d' >%{name}-doc.lang
+
+
+%files -f %{name}.lang
+%defattr(-,root,root,-)
+%doc README_Unix COPYING license.txt
+%{_bindir}/*
+%{_libdir}/%{name}
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/%{name}
+# part of scilab-devel
+%exclude %{_datadir}/%{name}/contrib
+%exclude %{_datadir}/%{name}/tools
+# part of scilab-doc
+%exclude %{_datadir}/%{name}/modules/helptools/jar/%{name}_*.jar
+%exclude %{_datadir}/%{name}/modules/*/examples
+%exclude %{_datadir}/%{name}/modules/*/help
+%exclude %{_datadir}/%{name}/modules/*/javadoc
+# part of scilab-tests
+%exclude %{_datadir}/%{name}/modules/*/tests
+
+%files devel
+%defattr(-,root,root,-)
+%doc README_Unix COPYING license.txt
+%{_includedir}/%{name}
+%{_libdir}/pkgconfig/%{name}.pc
+%{_datadir}/%{name}/contrib
+%{_datadir}/%{name}/tools
+
+%files doc -f %{name}-doc.lang
+%defattr(-,root,root,-)
+%doc README_Unix COPYING license.txt
+%{_datadir}/doc/%{name}-*
+%{_datadir}/%{name}/modules/*/examples
+%{_datadir}/%{name}/modules/*/help
+%{_datadir}/%{name}/modules/*/javadoc
+
+%files tests
+%defattr(-,root,root,-)
+%doc README_Unix COPYING license.txt
+%{_datadir}/%{name}/modules/*/tests
+
+%changelog
+* Wed Nov  9 2011 <c.david86 at gmail.com> 5.3.3-3
+- Remove dependency on atlas (need only lapack ABI)
+- Use noarch package on doc and tests
+- Remove ldconfig on post/postun
+- add a default font for doc generation
+- scilab does not depends on scilab-doc anymore
+
+* Sun Oct 30 2011 <c.david86 at gmail.com> 5.3.3-2
+- Use rpm auto dependency
+- add minimal versions for flexdock and jrosetta
+
+* Sun Oct 30 2011 <c.david86 at gmail.com> 5.3.3-1
+- First package
+
diff --git a/sources b/sources
index e69de29..9d7cd5f 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+0211096464d0bb2e097154d62ef827bd  scilab-5.3.3-src.tar.gz


More information about the scm-commits mailing list