[scilab] Update classpath.xml due to the jhdf5 move.

Clément David davidcl at fedoraproject.org
Mon Feb 13 06:38:16 UTC 2012


commit 30ab1accb03ebb5765255b7de6284ffa961d3025
Author: Clément DAVID <davidcl at fedoraproject.org>
Date:   Mon Feb 13 07:38:01 2012 +0100

    Update classpath.xml due to the jhdf5 move.

 0001-configure-upstream-patches.patch            |   26 +-
 0002-Update-saxon-dependency-wrong-version.patch |    6 +-
 0003-Remove-Xcos-dependencies-check.patch        |    4 +-
 0004-fix-javadoc-encoding.patch                  |    6 +-
 0005-autoreconf.patch                            |  780 +++++++++++-----------
 0006-fix-incorrect-fsf-adress.patch              |    6 +-
 0007-fix-zero-length.patch                       |    6 +-
 0008-fix-class-path-in-manifest.patch            |    6 +-
 scilab.spec                                      |    5 +-
 9 files changed, 428 insertions(+), 417 deletions(-)
---
diff --git a/0001-configure-upstream-patches.patch b/0001-configure-upstream-patches.patch
index 6addc5e..ae2fdb3 100644
--- a/0001-configure-upstream-patches.patch
+++ b/0001-configure-upstream-patches.patch
@@ -1,20 +1,20 @@
-From ab1fbc01bc782dcb46de2ee7eea1ed3775d9f46e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Cl=C3=A9ment=20DAVID?= <clement.david at scilab-enterprises.com>
+From 9e0624251ed34172dae47c5b1872659530dc170e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Cl=C3=A9ment=20DAVID?= <davidcl at fedoraproject.org>
 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 +++++++++
+ etc/librarypath.xml |   13 +++++++++++++
  m4/backtrace.m4     |   14 ++++++++------
  m4/compiler.m4      |   17 +++++++++++++++++
  m4/docbook.m4       |    2 +-
  m4/giws.m4          |   26 +++++++++++++++++++++++++-
- m4/hdf5.m4          |   12 ++++++++----
+ m4/hdf5.m4          |   14 ++++++++++----
  m4/java.m4          |   31 +++++++++++++++++++------------
  m4/libsmath.m4      |    8 ++++++++
- 10 files changed, 130 insertions(+), 30 deletions(-)
+ 10 files changed, 136 insertions(+), 30 deletions(-)
  create mode 100644 m4/compiler.m4
 
 diff --git a/build.incl.xml b/build.incl.xml
@@ -129,10 +129,10 @@ index 13cf07c..8423ccf 100644
  
                  # MathML rendering solution
 diff --git a/etc/librarypath.xml b/etc/librarypath.xml
-index 5b4be70..cdc53d3 100644
+index 5b4be70..06038bf 100644
 --- a/etc/librarypath.xml
 +++ b/etc/librarypath.xml
-@@ -28,11 +28,20 @@
+@@ -28,11 +28,24 @@
  <path value="$SCILAB/modules/graphic_export/.libs"/>
  <path value="$SCILAB/modules/scinotes/.libs"/>
  <path value="$SCILAB/modules/commons/.libs"/>
@@ -142,6 +142,10 @@ index 5b4be70..cdc53d3 100644
  <!-- Default path to the JNI classes under some Linux (JoGL under Debian for example) -->
  <path value="/usr/lib/jni/"/>
  
++<!-- Standard path for %{_jnidir} rpm macro (jpackage) -->
++<path value="/usr/lib/java/"/>
++<path value="/usr/lib64/java/"/>
++
 +<!-- RedHat put JNI on /usr/%{libdir}/%{name} instead of /usr/lib/jni -->
 +<path value="/usr/lib/jogl/"/>
 +<path value="/usr/lib64/jogl/"/>
@@ -268,10 +272,10 @@ index 0fc0d73..1b526f3 100644
  ])
 \ No newline at end of file
 diff --git a/m4/hdf5.m4 b/m4/hdf5.m4
-index b5b5ebd..9a2737d 100644
+index b5b5ebd..ff22751 100644
 --- a/m4/hdf5.m4
 +++ b/m4/hdf5.m4
-@@ -84,16 +84,20 @@ AC_DEFUN([AC_JAVA_HDF5], [
+@@ -84,16 +84,22 @@ AC_DEFUN([AC_JAVA_HDF5], [
  ])
  
  AC_DEFUN([AC_JNI_HDF5], [
@@ -281,6 +285,7 @@ index b5b5ebd..9a2737d 100644
 +      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/java -L/usr/lib64/java"                 # jpackage.org
 +      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
@@ -291,6 +296,7 @@ index b5b5ebd..9a2737d 100644
        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/java:/usr/lib64/java:"
 +      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
@@ -416,5 +422,5 @@ index 20676d6..dc911f4 100644
  
  # Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
 -- 
-1.7.7
+1.7.7.6
 
diff --git a/0002-Update-saxon-dependency-wrong-version.patch b/0002-Update-saxon-dependency-wrong-version.patch
index c49c1a1..6e8d447 100644
--- a/0002-Update-saxon-dependency-wrong-version.patch
+++ b/0002-Update-saxon-dependency-wrong-version.patch
@@ -1,5 +1,5 @@
-From b1b49af43df5c15a35bcca42f074793436eeaf1c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Cl=C3=A9ment=20DAVID?= <clement.david at scilab-enterprises.com>
+From 42c531d503dfcd91376e1d05511787db82005826 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Cl=C3=A9ment=20DAVID?= <davidcl at fedoraproject.org>
 Date: Mon, 31 Oct 2011 11:20:17 +0100
 Subject: [PATCH 2/8] Update saxon dependency (wrong version)
 
@@ -416,5 +416,5 @@ index 4f317fa..0000000
 -    }
 -}
 -- 
-1.7.7
+1.7.7.6
 
diff --git a/0003-Remove-Xcos-dependencies-check.patch b/0003-Remove-Xcos-dependencies-check.patch
index 143e77e..d4c3d0c 100644
--- a/0003-Remove-Xcos-dependencies-check.patch
+++ b/0003-Remove-Xcos-dependencies-check.patch
@@ -1,4 +1,4 @@
-From 86ea77b316580c685263e54cd6564e4b939daf72 Mon Sep 17 00:00:00 2001
+From ad5dd96e601fa4bac0ac71be9b291023750dcc28 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
@@ -86,5 +86,5 @@ index 2417b06..35ed224 100644
  	// CSON: MagicNumber
  	// CSON: IllegalCatch
 -- 
-1.7.7
+1.7.7.6
 
diff --git a/0004-fix-javadoc-encoding.patch b/0004-fix-javadoc-encoding.patch
index b4b2175..9f2e7e5 100644
--- a/0004-fix-javadoc-encoding.patch
+++ b/0004-fix-javadoc-encoding.patch
@@ -1,5 +1,5 @@
-From e42e4a78fa2e070bad79257f575d9a500547e809 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Cl=C3=A9ment=20DAVID?= <clement.david at scilab-enterprises.com>
+From 15a4e79cb2a6104920c9b055ac9acd5348dcdcdc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Cl=C3=A9ment=20DAVID?= <davidcl at fedoraproject.org>
 Date: Mon, 31 Oct 2011 14:31:27 +0100
 Subject: [PATCH 4/8] fix javadoc encoding
 
@@ -21,5 +21,5 @@ index 1e4d590..7b905ae 100644
  	-sourcepath $(top_srcdir)/modules/javasci/src/java:$(top_srcdir)/modules/types/src/java \
  	org.scilab.modules.javasci org.scilab.modules.types
 -- 
-1.7.7
+1.7.7.6
 
diff --git a/0005-autoreconf.patch b/0005-autoreconf.patch
index fb70218..5de2c56 100644
--- a/0005-autoreconf.patch
+++ b/0005-autoreconf.patch
@@ -1,12 +1,12 @@
-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
+From 7acd1f8faa26d0f2a7679325ca735137cff2171b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Cl=C3=A9ment=20DAVID?= <davidcl at fedoraproject.org>
+Date: Fri, 10 Feb 2012 17:21:40 +0100
 Subject: [PATCH 5/8] autoreconf
 
 ---
  Makefile.in                                    |    9 +-
  aclocal.m4                                     |    5 +-
- configure                                      | 1943 +++++++++++++++++-------
+ configure                                      | 1945 +++++++++++++++++-------
  contrib/Makefile.in                            |    7 +-
  libs/MALLOC/Makefile.in                        |    7 +-
  libs/Makefile.in                               |    7 +-
@@ -90,7 +90,7 @@ Subject: [PATCH 5/8] autoreconf
  modules/umfpack/Makefile.in                    |    7 +-
  modules/windows_tools/Makefile.in              |    7 +-
  modules/xcos/Makefile.in                       |    7 +-
- 86 files changed, 1724 insertions(+), 814 deletions(-)
+ 86 files changed, 1726 insertions(+), 814 deletions(-)
 
 diff --git a/Makefile.in b/Makefile.in
 index 4f7ceeb..e78d91e 100644
@@ -143,7 +143,7 @@ index fb246da..41d4466 100644
  m4_include([m4/fftw.m4])
  m4_include([m4/fortran.m4])
 diff --git a/configure b/configure
-index 9ddd7b1..386091c 100755
+index 9ddd7b1..ec38ef9 100755
 --- a/configure
 +++ b/configure
 @@ -1,7 +1,7 @@
@@ -2013,7 +2013,7 @@ index 9ddd7b1..386091c 100755
  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
+@@ -12162,13 +12447,16 @@ $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
  
@@ -2023,6 +2023,7 @@ index 9ddd7b1..386091c 100755
 +      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/java -L/usr/lib64/java"                 # jpackage.org
 +      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
@@ -2033,7 +2034,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -12202,7 +12489,7 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -12202,7 +12490,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; }
@@ -2042,36 +2043,37 @@ index 9ddd7b1..386091c 100755
    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
+@@ -12211,7 +12499,10 @@ 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/java:/usr/lib64/java:"
 +      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; }
+@@ -12221,7 +12512,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"
++// #line 12515 "configure"
  import ncsa.hdf.hdf5lib.H5;
  
  public class conftest {
-@@ -12276,7 +12565,7 @@ EOF
+@@ -12276,7 +12567,7 @@ EOF
     else
  
      cat << \EOF > conftest.java
 -// #line 12279 "configure"
-+// #line 12568 "configure"
++// #line 12570 "configure"
  import ncsa.hdf.hdf5lib.H5;
  
  public class conftest {
-@@ -12346,7 +12635,7 @@ $as_echo_n "checking flexdock... " >&6; }
+@@ -12346,7 +12637,7 @@ $as_echo_n "checking flexdock... " >&6; }
      PACKAGE_JAR_FILE=
      found_jar=no
      saved_ac_java_classpath=$ac_java_classpath
@@ -2080,34 +2082,34 @@ index 9ddd7b1..386091c 100755
      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; }
+@@ -12360,7 +12651,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"
++// #line 12654 "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; }
+@@ -12454,7 +12745,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"
++// #line 12748 "configure"
  import org.flexdock.util.Utilities;
  
  public class conftest {
-@@ -12505,7 +12794,7 @@ EOF
+@@ -12505,7 +12796,7 @@ EOF
     else
  
      cat << \EOF > conftest.java
 -// #line 12508 "configure"
-+// #line 12797 "configure"
++// #line 12799 "configure"
  import org.flexdock.util.Utilities;
  
  public class conftest {
-@@ -12564,7 +12853,7 @@ $as_echo_n "checking looks... " >&6; }
+@@ -12564,7 +12855,7 @@ $as_echo_n "checking looks... " >&6; }
      PACKAGE_JAR_FILE=
      found_jar=no
      saved_ac_java_classpath=$ac_java_classpath
@@ -2116,16 +2118,16 @@ index 9ddd7b1..386091c 100755
      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; }
+@@ -12578,7 +12869,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"
++// #line 12872 "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
+@@ -12663,7 +12954,7 @@ $as_echo "$as_me: WARNING: Could not find or use the Java package/jar looks used
  
                  LOOKS=$PACKAGE_JAR_FILE
  
@@ -2134,7 +2136,7 @@ index 9ddd7b1..386091c 100755
                  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; }
+@@ -12671,7 +12962,7 @@ $as_echo_n "checking jgoodies-looks... " >&6; }
      PACKAGE_JAR_FILE=
      found_jar=no
      saved_ac_java_classpath=$ac_java_classpath
@@ -2143,16 +2145,16 @@ index 9ddd7b1..386091c 100755
      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; }
+@@ -12685,7 +12976,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"
++// #line 12979 "configure"
  import com.jgoodies.looks.common.MenuItemRenderer;
  
  public class conftest {
-@@ -12779,7 +13068,7 @@ $as_echo_n "checking skinlf... " >&6; }
+@@ -12779,7 +13070,7 @@ $as_echo_n "checking skinlf... " >&6; }
      PACKAGE_JAR_FILE=
      found_jar=no
      saved_ac_java_classpath=$ac_java_classpath
@@ -2161,16 +2163,16 @@ index 9ddd7b1..386091c 100755
      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; }
+@@ -12793,7 +13084,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"
++// #line 13087 "configure"
  import com.l2fprod.util.AccessUtils;
  
  public class conftest {
-@@ -12886,7 +13175,7 @@ $as_echo_n "checking jogl... " >&6; }
+@@ -12886,7 +13177,7 @@ $as_echo_n "checking jogl... " >&6; }
      PACKAGE_JAR_FILE=
      found_jar=no
      saved_ac_java_classpath=$ac_java_classpath
@@ -2179,16 +2181,16 @@ index 9ddd7b1..386091c 100755
      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; }
+@@ -12900,7 +13191,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"
++// #line 13194 "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
+@@ -12991,10 +13282,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
@@ -2203,7 +2205,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -13028,7 +13319,7 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -13028,7 +13321,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; }
@@ -2212,7 +2214,7 @@ index 9ddd7b1..386091c 100755
    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
+@@ -13041,7 +13334,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; }
@@ -2221,7 +2223,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -13098,7 +13389,7 @@ $as_echo_n "checking gluegen-rt... " >&6; }
+@@ -13098,7 +13391,7 @@ $as_echo_n "checking gluegen-rt... " >&6; }
      PACKAGE_JAR_FILE=
      found_jar=no
      saved_ac_java_classpath=$ac_java_classpath
@@ -2230,16 +2232,16 @@ index 9ddd7b1..386091c 100755
      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; }
+@@ -13112,7 +13405,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"
++// #line 13408 "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
+@@ -13203,12 +13496,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
@@ -2256,7 +2258,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -13259,7 +13552,7 @@ $as_echo_n "checking jhall... " >&6; }
+@@ -13259,7 +13554,7 @@ $as_echo_n "checking jhall... " >&6; }
      PACKAGE_JAR_FILE=
      found_jar=no
      saved_ac_java_classpath=$ac_java_classpath
@@ -2265,16 +2267,16 @@ index 9ddd7b1..386091c 100755
      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; }
+@@ -13273,7 +13568,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"
++// #line 13571 "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
+@@ -13358,7 +13653,7 @@ $as_echo "$as_me: WARNING: Could not find or use the Java package/jar jhall used
  
                  JHALL=$PACKAGE_JAR_FILE
  
@@ -2283,7 +2285,7 @@ index 9ddd7b1..386091c 100755
                  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; }
+@@ -13366,7 +13661,7 @@ $as_echo_n "checking javahelp2... " >&6; }
      PACKAGE_JAR_FILE=
      found_jar=no
      saved_ac_java_classpath=$ac_java_classpath
@@ -2292,16 +2294,16 @@ index 9ddd7b1..386091c 100755
      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; }
+@@ -13380,7 +13675,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"
++// #line 13678 "configure"
  import javax.help.JHelp;
  
  public class conftest {
-@@ -13474,7 +13767,7 @@ $as_echo_n "checking jrosetta-API... " >&6; }
+@@ -13474,7 +13769,7 @@ $as_echo_n "checking jrosetta-API... " >&6; }
      PACKAGE_JAR_FILE=
      found_jar=no
      saved_ac_java_classpath=$ac_java_classpath
@@ -2310,16 +2312,16 @@ index 9ddd7b1..386091c 100755
      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; }
+@@ -13488,7 +13783,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"
++// #line 13786 "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
+@@ -13572,6 +13867,112 @@ $as_echo "$as_me: WARNING: Could not find or use the Java package/jar jrosetta-A
      fi
  
                  JROSETTA_API=$PACKAGE_JAR_FILE
@@ -2344,7 +2346,7 @@ index 9ddd7b1..386091c 100755
 +          export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 +
 +    cat << \EOF > conftest.java
-+// #line 13889 "configure"
++// #line 13891 "configure"
 +import com.artenum.rosetta.interfaces.core.ConsoleConfiguration;
 +
 +public class conftest {
@@ -2432,7 +2434,7 @@ index 9ddd7b1..386091c 100755
  
  
                  # Console Core
-@@ -13581,7 +13980,7 @@ $as_echo_n "checking jrosetta-engine... " >&6; }
+@@ -13581,7 +13982,7 @@ $as_echo_n "checking jrosetta-engine... " >&6; }
      PACKAGE_JAR_FILE=
      found_jar=no
      saved_ac_java_classpath=$ac_java_classpath
@@ -2441,16 +2443,16 @@ index 9ddd7b1..386091c 100755
      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; }
+@@ -13595,7 +13996,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"
++// #line 13999 "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
+@@ -13681,6 +14082,116 @@ $as_echo "$as_me: WARNING: Could not find or use the Java package/jar jrosetta-e
                  JROSETTA_ENGINE=$PACKAGE_JAR_FILE
  
  
@@ -2461,7 +2463,7 @@ index 9ddd7b1..386091c 100755
 +   if test "x" == "x"; then
 +
 +    cat << \EOF > conftest.java
-+// #line 14090 "configure"
++// #line 14092 "configure"
 +import com.artenum.rosetta.util.ConfigurationBuilder;
 +
 +public class conftest {
@@ -2512,7 +2514,7 @@ index 9ddd7b1..386091c 100755
 +   else
 +
 +    cat << \EOF > conftest.java
-+// #line 14141 "configure"
++// #line 14143 "configure"
 +import com.artenum.rosetta.util.ConfigurationBuilder;
 +
 +public class conftest {
@@ -2567,7 +2569,7 @@ index 9ddd7b1..386091c 100755
  
                  # MathML rendering solution
                  # Used in both graphic & help
-@@ -13690,7 +14199,7 @@ $as_echo_n "checking jeuclid-core... " >&6; }
+@@ -13690,7 +14201,7 @@ $as_echo_n "checking jeuclid-core... " >&6; }
      PACKAGE_JAR_FILE=
      found_jar=no
      saved_ac_java_classpath=$ac_java_classpath
@@ -2576,16 +2578,16 @@ index 9ddd7b1..386091c 100755
      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; }
+@@ -13704,7 +14215,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"
++// #line 14218 "configure"
  import net.sourceforge.jeuclid.LayoutContext;
  
  public class conftest {
-@@ -13799,7 +14308,7 @@ $as_echo_n "checking fop... " >&6; }
+@@ -13799,7 +14310,7 @@ $as_echo_n "checking fop... " >&6; }
      PACKAGE_JAR_FILE=
      found_jar=no
      saved_ac_java_classpath=$ac_java_classpath
@@ -2594,16 +2596,16 @@ index 9ddd7b1..386091c 100755
      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; }
+@@ -13813,7 +14324,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"
++// #line 14327 "configure"
  import org.apache.fop.pdf.PDFInfo;
  
  public class conftest {
-@@ -13906,7 +14415,7 @@ $as_echo_n "checking batik-all... " >&6; }
+@@ -13906,7 +14417,7 @@ $as_echo_n "checking batik-all... " >&6; }
      PACKAGE_JAR_FILE=
      found_jar=no
      saved_ac_java_classpath=$ac_java_classpath
@@ -2612,16 +2614,16 @@ index 9ddd7b1..386091c 100755
      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; }
+@@ -13920,7 +14431,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"
++// #line 14434 "configure"
  import org.apache.batik.parser.Parser;
  
  public class conftest {
-@@ -14013,7 +14522,7 @@ $as_echo_n "checking batik... " >&6; }
+@@ -14013,7 +14524,7 @@ $as_echo_n "checking batik... " >&6; }
      PACKAGE_JAR_FILE=
      found_jar=no
      saved_ac_java_classpath=$ac_java_classpath
@@ -2630,34 +2632,34 @@ index 9ddd7b1..386091c 100755
      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; }
+@@ -14027,7 +14538,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"
++// #line 14541 "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; }
+@@ -14121,7 +14632,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"
++// #line 14635 "configure"
  import org.apache.batik.Version;
  
  public class conftest {
-@@ -14172,7 +14681,7 @@ EOF
+@@ -14172,7 +14683,7 @@ EOF
     else
  
      cat << \EOF > conftest.java
 -// #line 14175 "configure"
-+// #line 14684 "configure"
++// #line 14686 "configure"
  import org.apache.batik.Version;
  
  public class conftest {
-@@ -14231,7 +14740,7 @@ $as_echo_n "checking commons-io... " >&6; }
+@@ -14231,7 +14742,7 @@ $as_echo_n "checking commons-io... " >&6; }
      PACKAGE_JAR_FILE=
      found_jar=no
      saved_ac_java_classpath=$ac_java_classpath
@@ -2666,16 +2668,16 @@ index 9ddd7b1..386091c 100755
      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; }
+@@ -14245,7 +14756,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"
++// #line 14759 "configure"
  import org.apache.commons.io.output.CountingOutputStream;
  
  public class conftest {
-@@ -14338,7 +14847,7 @@ $as_echo_n "checking xmlgraphics-commons... " >&6; }
+@@ -14338,7 +14849,7 @@ $as_echo_n "checking xmlgraphics-commons... " >&6; }
      PACKAGE_JAR_FILE=
      found_jar=no
      saved_ac_java_classpath=$ac_java_classpath
@@ -2684,16 +2686,16 @@ index 9ddd7b1..386091c 100755
      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; }
+@@ -14352,7 +14863,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"
++// #line 14866 "configure"
  import org.apache.xmlgraphics.util.Service;
  
  public class conftest {
-@@ -14445,7 +14954,7 @@ $as_echo_n "checking avalon-framework... " >&6; }
+@@ -14445,7 +14956,7 @@ $as_echo_n "checking avalon-framework... " >&6; }
      PACKAGE_JAR_FILE=
      found_jar=no
      saved_ac_java_classpath=$ac_java_classpath
@@ -2702,16 +2704,16 @@ index 9ddd7b1..386091c 100755
      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; }
+@@ -14459,7 +14970,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"
++// #line 14973 "configure"
  import org.apache.avalon.framework.configuration.ConfigurationException;
  
  public class conftest {
-@@ -14552,7 +15061,7 @@ $as_echo_n "checking xml-apis-ext... " >&6; }
+@@ -14552,7 +15063,7 @@ $as_echo_n "checking xml-apis-ext... " >&6; }
      PACKAGE_JAR_FILE=
      found_jar=no
      saved_ac_java_classpath=$ac_java_classpath
@@ -2720,16 +2722,16 @@ index 9ddd7b1..386091c 100755
      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; }
+@@ -14566,7 +15077,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"
++// #line 15080 "configure"
  import org.w3c.dom.svg.SVGDocument;
  
  public class conftest {
-@@ -14659,7 +15168,7 @@ $as_echo_n "checking xml-commons-apis-ext... " >&6; }
+@@ -14659,7 +15170,7 @@ $as_echo_n "checking xml-commons-apis-ext... " >&6; }
      PACKAGE_JAR_FILE=
      found_jar=no
      saved_ac_java_classpath=$ac_java_classpath
@@ -2738,16 +2740,16 @@ index 9ddd7b1..386091c 100755
      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; }
+@@ -14673,7 +15184,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"
++// #line 15187 "configure"
  import org.w3c.dom.svg.SVGDocument;
  
  public class conftest {
-@@ -14770,7 +15279,7 @@ $as_echo_n "checking commons-logging... " >&6; }
+@@ -14770,7 +15281,7 @@ $as_echo_n "checking commons-logging... " >&6; }
      PACKAGE_JAR_FILE=
      found_jar=no
      saved_ac_java_classpath=$ac_java_classpath
@@ -2756,16 +2758,16 @@ index 9ddd7b1..386091c 100755
      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; }
+@@ -14784,7 +15295,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"
++// #line 15298 "configure"
  import org.apache.commons.logging.LogFactory;
  
  public class conftest {
-@@ -14877,7 +15386,7 @@ $as_echo_n "checking jlatexmath... " >&6; }
+@@ -14877,7 +15388,7 @@ $as_echo_n "checking jlatexmath... " >&6; }
      PACKAGE_JAR_FILE=
      found_jar=no
      saved_ac_java_classpath=$ac_java_classpath
@@ -2774,34 +2776,34 @@ index 9ddd7b1..386091c 100755
      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; }
+@@ -14891,7 +15402,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"
++// #line 15405 "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; }
+@@ -14985,7 +15496,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"
++// #line 15499 "configure"
  import org.scilab.forge.jlatexmath.TeXFormula;
  
  public class conftest {
-@@ -15036,7 +15545,7 @@ EOF
+@@ -15036,7 +15547,7 @@ EOF
     else
  
      cat << \EOF > conftest.java
 -// #line 15039 "configure"
-+// #line 15548 "configure"
++// #line 15550 "configure"
  import org.scilab.forge.jlatexmath.TeXFormula;
  
  public class conftest {
-@@ -15101,7 +15610,7 @@ $as_echo_n "checking checkstyle... " >&6; }
+@@ -15101,7 +15612,7 @@ $as_echo_n "checking checkstyle... " >&6; }
      PACKAGE_JAR_FILE=
      found_jar=no
      saved_ac_java_classpath=$ac_java_classpath
@@ -2810,16 +2812,16 @@ index 9ddd7b1..386091c 100755
      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; }
+@@ -15115,7 +15626,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"
++// #line 15629 "configure"
  import com.puppycrawl.tools.checkstyle.CheckStyleTask;
  
  public class conftest {
-@@ -15208,7 +15717,7 @@ $as_echo_n "checking commons-beanutils... " >&6; }
+@@ -15208,7 +15719,7 @@ $as_echo_n "checking commons-beanutils... " >&6; }
      PACKAGE_JAR_FILE=
      found_jar=no
      saved_ac_java_classpath=$ac_java_classpath
@@ -2828,16 +2830,16 @@ index 9ddd7b1..386091c 100755
      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; }
+@@ -15222,7 +15733,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"
++// #line 15736 "configure"
  import org.apache.commons.beanutils.Converter;
  
  public class conftest {
-@@ -15315,7 +15824,7 @@ $as_echo_n "checking antlr... " >&6; }
+@@ -15315,7 +15826,7 @@ $as_echo_n "checking antlr... " >&6; }
      PACKAGE_JAR_FILE=
      found_jar=no
      saved_ac_java_classpath=$ac_java_classpath
@@ -2846,16 +2848,16 @@ index 9ddd7b1..386091c 100755
      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; }
+@@ -15329,7 +15840,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"
++// #line 15843 "configure"
  import antlr.TokenStreamException;
  
  public class conftest {
-@@ -15422,7 +15931,7 @@ $as_echo_n "checking testng... " >&6; }
+@@ -15422,7 +15933,7 @@ $as_echo_n "checking testng... " >&6; }
      PACKAGE_JAR_FILE=
      found_jar=no
      saved_ac_java_classpath=$ac_java_classpath
@@ -2864,16 +2866,16 @@ index 9ddd7b1..386091c 100755
      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; }
+@@ -15436,7 +15947,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"
++// #line 15950 "configure"
  import org.testng.TestNG;
  
  public class conftest {
-@@ -15529,7 +16038,7 @@ $as_echo_n "checking qdox... " >&6; }
+@@ -15529,7 +16040,7 @@ $as_echo_n "checking qdox... " >&6; }
      PACKAGE_JAR_FILE=
      found_jar=no
      saved_ac_java_classpath=$ac_java_classpath
@@ -2882,16 +2884,16 @@ index 9ddd7b1..386091c 100755
      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; }
+@@ -15543,7 +16054,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"
++// #line 16057 "configure"
  import com.thoughtworks.qdox.tools.QDoxTester;
  
  public class conftest {
-@@ -15636,7 +16145,7 @@ $as_echo_n "checking bsh... " >&6; }
+@@ -15636,7 +16147,7 @@ $as_echo_n "checking bsh... " >&6; }
      PACKAGE_JAR_FILE=
      found_jar=no
      saved_ac_java_classpath=$ac_java_classpath
@@ -2900,16 +2902,16 @@ index 9ddd7b1..386091c 100755
      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; }
+@@ -15650,7 +16161,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"
++// #line 16164 "configure"
  import bsh.Console;
  
  public class conftest {
-@@ -15743,7 +16252,7 @@ $as_echo_n "checking junit... " >&6; }
+@@ -15743,7 +16254,7 @@ $as_echo_n "checking junit... " >&6; }
      PACKAGE_JAR_FILE=
      found_jar=no
      saved_ac_java_classpath=$ac_java_classpath
@@ -2918,16 +2920,16 @@ index 9ddd7b1..386091c 100755
      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; }
+@@ -15757,7 +16268,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"
++// #line 16271 "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;}
+@@ -15870,7 +16381,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; }
@@ -2936,7 +2938,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    case $SWIG_BIN in
-@@ -15959,7 +16468,7 @@ do
+@@ -15959,7 +16470,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; }
@@ -2945,7 +2947,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    if test -n "$PYTHON"; then
-@@ -16020,7 +16529,7 @@ do
+@@ -16020,7 +16531,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; }
@@ -2954,7 +2956,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    if test -n "$GIWS_BIN"; then
-@@ -16061,7 +16570,32 @@ test -n "$GIWS_BIN" || GIWS_BIN="no"
+@@ -16061,7 +16572,32 @@ test -n "$GIWS_BIN" || GIWS_BIN="no"
  		as_fn_error $? "Could find giws in the PATH" "$LINENO" 5
     fi
  fi
@@ -2988,7 +2990,7 @@ index 9ddd7b1..386091c 100755
  
  
  
-@@ -16154,7 +16688,7 @@ done
+@@ -16154,7 +16690,7 @@ done
  for ac_func in rmdir
  do :
    ac_fn_c_check_func "$LINENO" "rmdir" "ac_cv_func_rmdir"
@@ -2997,7 +2999,7 @@ index 9ddd7b1..386091c 100755
    cat >>confdefs.h <<_ACEOF
  #define HAVE_RMDIR 1
  _ACEOF
-@@ -16164,7 +16698,7 @@ done
+@@ -16164,7 +16700,7 @@ done
  
  
  ac_fn_c_check_func "$LINENO" "getwd" "ac_cv_func_getwd"
@@ -3006,7 +3008,7 @@ index 9ddd7b1..386091c 100755
  
  $as_echo "#define HAVE_GETWD 1" >>confdefs.h
  
-@@ -16179,7 +16713,7 @@ fi
+@@ -16179,7 +16715,7 @@ fi
  for ac_func in regcomp
  do :
    ac_fn_c_check_func "$LINENO" "regcomp" "ac_cv_func_regcomp"
@@ -3015,7 +3017,7 @@ index 9ddd7b1..386091c 100755
    cat >>confdefs.h <<_ACEOF
  #define HAVE_REGCOMP 1
  _ACEOF
-@@ -16220,7 +16754,7 @@ done
+@@ -16220,7 +16756,7 @@ done
  for ac_func in select
  do :
    ac_fn_c_check_func "$LINENO" "select" "ac_cv_func_select"
@@ -3024,7 +3026,7 @@ index 9ddd7b1..386091c 100755
    cat >>confdefs.h <<_ACEOF
  #define HAVE_SELECT 1
  _ACEOF
-@@ -16233,7 +16767,7 @@ done
+@@ -16233,7 +16769,7 @@ done
  for ac_func in endpwent
  do :
    ac_fn_c_check_func "$LINENO" "endpwent" "ac_cv_func_endpwent"
@@ -3033,7 +3035,7 @@ index 9ddd7b1..386091c 100755
    cat >>confdefs.h <<_ACEOF
  #define HAVE_ENDPWENT 1
  _ACEOF
-@@ -16260,7 +16794,7 @@ done
+@@ -16260,7 +16796,7 @@ done
  for ac_func in gettimeofday
  do :
    ac_fn_c_check_func "$LINENO" "gettimeofday" "ac_cv_func_gettimeofday"
@@ -3042,7 +3044,7 @@ index 9ddd7b1..386091c 100755
    cat >>confdefs.h <<_ACEOF
  #define HAVE_GETTIMEOFDAY 1
  _ACEOF
-@@ -16273,7 +16807,7 @@ done
+@@ -16273,7 +16809,7 @@ done
  for ac_func in isascii
  do :
    ac_fn_c_check_func "$LINENO" "isascii" "ac_cv_func_isascii"
@@ -3051,7 +3053,7 @@ index 9ddd7b1..386091c 100755
    cat >>confdefs.h <<_ACEOF
  #define HAVE_ISASCII 1
  _ACEOF
-@@ -16286,7 +16820,7 @@ done
+@@ -16286,7 +16822,7 @@ done
  for ac_func in iswprint
  do :
    ac_fn_c_check_func "$LINENO" "iswprint" "ac_cv_func_iswprint"
@@ -3060,7 +3062,7 @@ index 9ddd7b1..386091c 100755
    cat >>confdefs.h <<_ACEOF
  #define HAVE_ISWPRINT 1
  _ACEOF
-@@ -16299,7 +16833,7 @@ done
+@@ -16299,7 +16835,7 @@ done
  for ac_func in mkdir
  do :
    ac_fn_c_check_func "$LINENO" "mkdir" "ac_cv_func_mkdir"
@@ -3069,7 +3071,7 @@ index 9ddd7b1..386091c 100755
    cat >>confdefs.h <<_ACEOF
  #define HAVE_MKDIR 1
  _ACEOF
-@@ -16312,7 +16846,7 @@ done
+@@ -16312,7 +16848,7 @@ done
  for ac_func in munmap
  do :
    ac_fn_c_check_func "$LINENO" "munmap" "ac_cv_func_munmap"
@@ -3078,7 +3080,7 @@ index 9ddd7b1..386091c 100755
    cat >>confdefs.h <<_ACEOF
  #define HAVE_MUNMAP 1
  _ACEOF
-@@ -16325,7 +16859,7 @@ done
+@@ -16325,7 +16861,7 @@ done
  for ac_func in strsignal
  do :
    ac_fn_c_check_func "$LINENO" "strsignal" "ac_cv_func_strsignal"
@@ -3087,7 +3089,7 @@ index 9ddd7b1..386091c 100755
    cat >>confdefs.h <<_ACEOF
  #define HAVE_STRSIGNAL 1
  _ACEOF
-@@ -16345,7 +16879,7 @@ case $host in
+@@ -16345,7 +16881,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; }
@@ -3096,7 +3098,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -16379,13 +16913,13 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -16379,13 +16915,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; }
@@ -3112,7 +3114,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -16419,7 +16953,7 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -16419,7 +16955,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; }
@@ -3121,7 +3123,7 @@ index 9ddd7b1..386091c 100755
    LIBM="$LIBM -lm"
  fi
  
-@@ -16427,7 +16961,7 @@ fi
+@@ -16427,7 +16963,7 @@ fi
  *)
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5
  $as_echo_n "checking for cos in -lm... " >&6; }
@@ -3130,7 +3132,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -16461,7 +16995,7 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -16461,7 +16997,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; }
@@ -3139,7 +3141,7 @@ index 9ddd7b1..386091c 100755
    LIBM="-lm"
  fi
  
-@@ -16489,7 +17023,7 @@ done
+@@ -16489,7 +17025,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"
@@ -3148,7 +3150,7 @@ index 9ddd7b1..386091c 100755
  
  else
  
-@@ -16506,7 +17040,7 @@ LDFLAGS="$save_LDFLAGS"
+@@ -16506,7 +17042,7 @@ LDFLAGS="$save_LDFLAGS"
  for ac_func in re_comp
  do :
    ac_fn_c_check_func "$LINENO" "re_comp" "ac_cv_func_re_comp"
@@ -3157,7 +3159,7 @@ index 9ddd7b1..386091c 100755
    cat >>confdefs.h <<_ACEOF
  #define HAVE_RE_COMP 1
  _ACEOF
-@@ -16519,7 +17053,7 @@ done
+@@ -16519,7 +17055,7 @@ done
  for ac_func in socket
  do :
    ac_fn_c_check_func "$LINENO" "socket" "ac_cv_func_socket"
@@ -3166,7 +3168,7 @@ index 9ddd7b1..386091c 100755
    cat >>confdefs.h <<_ACEOF
  #define HAVE_SOCKET 1
  _ACEOF
-@@ -16532,7 +17066,7 @@ done
+@@ -16532,7 +17068,7 @@ done
  for ac_func in uname
  do :
    ac_fn_c_check_func "$LINENO" "uname" "ac_cv_func_uname"
@@ -3175,7 +3177,7 @@ index 9ddd7b1..386091c 100755
    cat >>confdefs.h <<_ACEOF
  #define HAVE_UNAME 1
  _ACEOF
-@@ -16545,7 +17079,7 @@ done
+@@ -16545,7 +17081,7 @@ done
  for ac_func in setlocale
  do :
    ac_fn_c_check_func "$LINENO" "setlocale" "ac_cv_func_setlocale"
@@ -3184,7 +3186,7 @@ index 9ddd7b1..386091c 100755
    cat >>confdefs.h <<_ACEOF
  #define HAVE_SETLOCALE 1
  _ACEOF
-@@ -16557,7 +17091,7 @@ done
+@@ -16557,7 +17093,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; }
@@ -3193,7 +3195,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    if test "$cross_compiling" = yes; then :
-@@ -16621,7 +17155,7 @@ esac
+@@ -16621,7 +17157,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; }
@@ -3202,7 +3204,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    rm -f conftest.sym conftest.file
-@@ -16683,7 +17217,7 @@ fi
+@@ -16683,7 +17219,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; }
@@ -3211,7 +3213,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    if test "$cross_compiling" = yes; then :
-@@ -16731,7 +17265,7 @@ fi
+@@ -16731,7 +17267,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; }
@@ -3220,7 +3222,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    if test "$cross_compiling" = yes; then :
-@@ -16790,14 +17324,14 @@ if test $ac_cv_func_strtod = no; then
+@@ -16790,14 +17326,14 @@ if test $ac_cv_func_strtod = no; then
  esac
  
  ac_fn_c_check_func "$LINENO" "pow" "ac_cv_func_pow"
@@ -3237,7 +3239,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -16831,7 +17365,7 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -16831,7 +17367,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; }
@@ -3246,7 +3248,7 @@ index 9ddd7b1..386091c 100755
    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
+@@ -16881,7 +17417,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; }
@@ -3255,7 +3257,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -16921,7 +17455,7 @@ done
+@@ -16921,7 +17457,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; }
@@ -3264,7 +3266,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    ac_func_search_save_LIBS=$LIBS
-@@ -16955,11 +17489,11 @@ for ac_lib in '' dir; do
+@@ -16955,11 +17491,11 @@ for ac_lib in '' dir; do
  fi
  rm -f core conftest.err conftest.$ac_objext \
      conftest$ac_exeext
@@ -3278,7 +3280,7 @@ index 9ddd7b1..386091c 100755
  
  else
    ac_cv_search_opendir=no
-@@ -16978,7 +17512,7 @@ fi
+@@ -16978,7 +17514,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; }
@@ -3287,7 +3289,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    ac_func_search_save_LIBS=$LIBS
-@@ -17012,11 +17546,11 @@ for ac_lib in '' x; do
+@@ -17012,11 +17548,11 @@ for ac_lib in '' x; do
  fi
  rm -f core conftest.err conftest.$ac_objext \
      conftest$ac_exeext
@@ -3301,7 +3303,7 @@ index 9ddd7b1..386091c 100755
  
  else
    ac_cv_search_opendir=no
-@@ -17038,7 +17572,7 @@ fi
+@@ -17038,7 +17574,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; }
@@ -3310,7 +3312,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -17075,7 +17609,7 @@ fi
+@@ -17075,7 +17611,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; }
@@ -3319,7 +3321,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -17120,7 +17654,7 @@ fi
+@@ -17120,7 +17656,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"
@@ -3328,7 +3330,7 @@ index 9ddd7b1..386091c 100755
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-@@ -17130,7 +17664,7 @@ _ACEOF
+@@ -17130,7 +17666,7 @@ _ACEOF
  fi
  
  ac_fn_c_check_member "$LINENO" "struct stat" "st_rdev" "ac_cv_member_struct_stat_st_rdev" "$ac_includes_default"
@@ -3337,7 +3339,7 @@ index 9ddd7b1..386091c 100755
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_STRUCT_STAT_ST_RDEV 1
-@@ -17199,7 +17733,7 @@ rm -f conf$$.file
+@@ -17199,7 +17735,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; }
@@ -3346,7 +3348,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    case "$MSGFMT" in
-@@ -17240,7 +17774,7 @@ fi
+@@ -17240,7 +17776,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; }
@@ -3355,7 +3357,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    case $GMSGFMT in
-@@ -17322,7 +17856,7 @@ rm -f conf$$.file
+@@ -17322,7 +17858,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; }
@@ -3364,7 +3366,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    case "$XGETTEXT" in
-@@ -17400,7 +17934,7 @@ rm -f conf$$.file
+@@ -17400,7 +17936,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; }
@@ -3373,7 +3375,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    case "$MSGMERGE" in
-@@ -17470,7 +18004,7 @@ fi
+@@ -17470,7 +18006,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; }
@@ -3382,7 +3384,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -18017,7 +18551,7 @@ fi
+@@ -18017,7 +18553,7 @@ fi
  
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5
  $as_echo_n "checking for CFPreferencesCopyAppValue... " >&6; }
@@ -3391,7 +3393,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    gt_save_LIBS="$LIBS"
-@@ -18051,7 +18585,7 @@ $as_echo "#define HAVE_CFPREFERENCESCOPYAPPVALUE 1" >>confdefs.h
+@@ -18051,7 +18587,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; }
@@ -3400,7 +3402,7 @@ index 9ddd7b1..386091c 100755
    $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];
+@@ -18127,7 +18663,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; }
@@ -3409,7 +3411,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -18190,7 +18724,7 @@ $as_echo "$ac_res" >&6; }
+@@ -18190,7 +18726,7 @@ $as_echo "$ac_res" >&6; }
  
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
  $as_echo_n "checking for iconv... " >&6; }
@@ -3418,7 +3420,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
  
-@@ -18247,7 +18781,7 @@ $as_echo "$am_cv_func_iconv" >&6; }
+@@ -18247,7 +18783,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; }
@@ -3427,7 +3429,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
  
-@@ -18843,7 +19377,7 @@ fi
+@@ -18843,7 +19379,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; }
@@ -3436,7 +3438,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    gt_save_CPPFLAGS="$CPPFLAGS"
-@@ -19023,7 +19557,7 @@ $as_echo "#define HAVE_DCGETTEXT 1" >>confdefs.h
+@@ -19023,7 +19559,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; }
@@ -3445,7 +3447,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    if test "$cross_compiling" = yes; then :
-@@ -19067,7 +19601,7 @@ fi
+@@ -19067,7 +19603,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; }
@@ -3454,7 +3456,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -19102,7 +19636,7 @@ _ACEOF
+@@ -19102,7 +19638,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; }
@@ -3463,7 +3465,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -19138,7 +19672,7 @@ fi
+@@ -19138,7 +19674,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"
@@ -3472,7 +3474,7 @@ index 9ddd7b1..386091c 100755
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_STRUCT_STAT_ST_BLOCKS 1
-@@ -19187,7 +19721,7 @@ TERMCAP_LIB=no
+@@ -19187,7 +19723,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; }
@@ -3481,7 +3483,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -19215,7 +19749,7 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -19215,7 +19751,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; }
@@ -3490,7 +3492,7 @@ index 9ddd7b1..386091c 100755
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBCURSES 1
  _ACEOF
-@@ -19227,7 +19761,7 @@ fi
+@@ -19227,7 +19763,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; }
@@ -3499,7 +3501,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -19255,7 +19789,7 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -19255,7 +19791,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; }
@@ -3508,7 +3510,7 @@ index 9ddd7b1..386091c 100755
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBNCURSES 1
  _ACEOF
-@@ -19269,7 +19803,7 @@ fi
+@@ -19269,7 +19805,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; }
@@ -3517,7 +3519,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    ac_func_search_save_LIBS=$LIBS
-@@ -19303,11 +19837,11 @@ for ac_lib in '' termcap; do
+@@ -19303,11 +19839,11 @@ for ac_lib in '' termcap; do
  fi
  rm -f core conftest.err conftest.$ac_objext \
      conftest$ac_exeext
@@ -3531,7 +3533,7 @@ index 9ddd7b1..386091c 100755
  
  else
    ac_cv_search_tgetent=no
-@@ -19352,7 +19886,7 @@ fi
+@@ -19352,7 +19888,7 @@ fi
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
  $as_echo_n "checking for dlopen in -ldl... " >&6; }
@@ -3540,7 +3542,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -19386,7 +19920,7 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -19386,7 +19922,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; }
@@ -3549,7 +3551,7 @@ index 9ddd7b1..386091c 100755
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBDL 1
  _ACEOF
-@@ -19398,7 +19932,7 @@ fi
+@@ -19398,7 +19934,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; }
@@ -3558,7 +3560,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    ac_func_search_save_LIBS=$LIBS
-@@ -19432,11 +19966,11 @@ for ac_lib in '' pthread; do
+@@ -19432,11 +19968,11 @@ for ac_lib in '' pthread; do
  fi
  rm -f core conftest.err conftest.$ac_objext \
      conftest$ac_exeext
@@ -3572,7 +3574,7 @@ index 9ddd7b1..386091c 100755
  
  else
    ac_cv_search_pthread_join=no
-@@ -19492,7 +20026,7 @@ if test "x$with_fftw_include" != "xyes"; then
+@@ -19492,7 +20028,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"
@@ -3581,7 +3583,7 @@ index 9ddd7b1..386091c 100755
    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
+@@ -19503,7 +20039,7 @@ fi
  	CFLAGS="$save_CFLAGS"
  else
  	ac_fn_c_check_header_mongrel "$LINENO" "fftw3.h" "ac_cv_header_fftw3_h" "$ac_includes_default"
@@ -3590,7 +3592,7 @@ index 9ddd7b1..386091c 100755
    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
+@@ -19519,7 +20055,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; }
@@ -3599,7 +3601,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -19553,7 +20087,7 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -19553,7 +20089,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; }
@@ -3608,7 +3610,7 @@ index 9ddd7b1..386091c 100755
    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
+@@ -19565,7 +20101,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; }
@@ -3617,7 +3619,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -19599,7 +20133,7 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -19599,7 +20135,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; }
@@ -3626,7 +3628,7 @@ index 9ddd7b1..386091c 100755
    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
+@@ -19717,7 +20253,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; }
@@ -3635,7 +3637,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    case $PVMGETARCH in
-@@ -19765,7 +20299,7 @@ fi
+@@ -19765,7 +20301,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; }
@@ -3644,7 +3646,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    PVM_ARCH=`$PVMGETARCH`
-@@ -19854,7 +20388,7 @@ $as_echo "PVM header found in $PVM_INCLUDE_DIR" >&6; }
+@@ -19854,7 +20390,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"
@@ -3653,7 +3655,7 @@ index 9ddd7b1..386091c 100755
  
  else
    as_fn_error $? "check for PVM headers failed" "$LINENO" 5
-@@ -19959,7 +20493,7 @@ $as_echo "found $m in $PATH_LIB_PVM" >&6; }
+@@ -19959,7 +20495,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; }
@@ -3662,7 +3664,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    ac_func_search_save_LIBS=$LIBS
-@@ -19993,11 +20527,11 @@ for ac_lib in '' pvm3 pvm; do
+@@ -19993,11 +20529,11 @@ for ac_lib in '' pvm3 pvm; do
  fi
  rm -f core conftest.err conftest.$ac_objext \
      conftest$ac_exeext
@@ -3676,7 +3678,7 @@ index 9ddd7b1..386091c 100755
  
  else
    ac_cv_search_pvm_spawn=no
-@@ -20024,7 +20558,7 @@ fi
+@@ -20024,7 +20560,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; }
@@ -3685,7 +3687,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    ac_func_search_save_LIBS=$LIBS
-@@ -20058,11 +20592,11 @@ for ac_lib in '' pvm3 gpvm3; do
+@@ -20058,11 +20594,11 @@ for ac_lib in '' pvm3 gpvm3; do
  fi
  rm -f core conftest.err conftest.$ac_objext \
      conftest$ac_exeext
@@ -3699,7 +3701,7 @@ index 9ddd7b1..386091c 100755
  
  else
    ac_cv_search_pvm_barrier=no
-@@ -20176,7 +20710,7 @@ if test "$with_openmp" != no; then
+@@ -20176,7 +20712,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"
@@ -3708,7 +3710,7 @@ index 9ddd7b1..386091c 100755
    cat >>confdefs.h <<_ACEOF
  #define HAVE_OMP_H 1
  _ACEOF
-@@ -20239,7 +20773,7 @@ do
+@@ -20239,7 +20775,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; }
@@ -3717,7 +3719,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    if test -n "$XML_CONFIG"; then
-@@ -20292,7 +20826,7 @@ LIBS="$LIBS $XML_LIBS"
+@@ -20292,7 +20828,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; }
@@ -3726,7 +3728,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -20326,7 +20860,7 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -20326,7 +20862,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; }
@@ -3735,7 +3737,7 @@ index 9ddd7b1..386091c 100755
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBXML2 1
  _ACEOF
-@@ -20391,7 +20925,7 @@ if test "$enable_build_localization" != no; then
+@@ -20391,7 +20927,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"
@@ -3744,7 +3746,7 @@ index 9ddd7b1..386091c 100755
    cat >>confdefs.h <<_ACEOF
  #define HAVE_BIND_TEXTDOMAIN_CODESET 1
  _ACEOF
-@@ -20404,7 +20938,7 @@ done
+@@ -20404,7 +20940,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; }
@@ -3753,7 +3755,7 @@ index 9ddd7b1..386091c 100755
    $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'
+@@ -20473,7 +21009,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; }
@@ -3762,7 +3764,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    cat > conftest.$ac_ext <<_ACEOF
-@@ -20503,7 +21037,8 @@ $as_echo "$as_me:${as_lineno-$LINENO}: $*" >&5
+@@ -20503,7 +21039,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 |
@@ -3772,7 +3774,7 @@ index 9ddd7b1..386091c 100755
  $as_echo "$ac_f77_v_output" >&5
  FFLAGS=$ac_save_FFLAGS
  
-@@ -20568,7 +21103,7 @@ fi
+@@ -20568,7 +21105,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; }
@@ -3781,7 +3783,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    if test "x$FLIBS" != "x"; then
-@@ -20593,7 +21128,8 @@ $as_echo "$as_me:${as_lineno-$LINENO}: $*" >&5
+@@ -20593,7 +21130,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 |
@@ -3791,7 +3793,7 @@ index 9ddd7b1..386091c 100755
  $as_echo "$ac_f77_v_output" >&5
  FFLAGS=$ac_save_FFLAGS
  
-@@ -20781,7 +21317,7 @@ ac_compiler_gnu=$ac_cv_f77_compiler_gnu
+@@ -20781,7 +21319,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; }
@@ -3800,7 +3802,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    ac_f77_dm_save_LIBS=$LIBS
-@@ -20878,7 +21414,7 @@ else
+@@ -20878,7 +21416,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
@@ -3809,7 +3811,7 @@ index 9ddd7b1..386091c 100755
  fi
  
  ac_ext=c
-@@ -20893,7 +21429,7 @@ ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -20893,7 +21431,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; }
@@ -3818,7 +3820,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    cat > conftest.$ac_ext <<_ACEOF
-@@ -21040,7 +21576,7 @@ else
+@@ -21040,7 +21578,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
@@ -3827,7 +3829,7 @@ index 9ddd7b1..386091c 100755
  fi
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
-@@ -21178,7 +21714,7 @@ fi
+@@ -21178,7 +21716,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; }
@@ -3836,7 +3838,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -21220,11 +21756,11 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -21220,11 +21758,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; }
@@ -3850,7 +3852,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -21270,7 +21806,7 @@ $as_echo "$ac_res" >&6; }
+@@ -21270,7 +21808,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; }
@@ -3859,7 +3861,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -21312,7 +21848,7 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -21312,7 +21850,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; }
@@ -3868,7 +3870,7 @@ index 9ddd7b1..386091c 100755
    acx_blas_ok=yes; BLAS_TYPE="Atlas"
  			 BLAS_LIBS="-lcblas -lf77blas -latlas"
  fi
-@@ -21328,7 +21864,7 @@ if test $acx_blas_ok = no; then
+@@ -21328,7 +21866,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; }
@@ -3877,7 +3879,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -21382,7 +21918,7 @@ if test $acx_blas_ok = no; then
+@@ -21382,7 +21920,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; }
@@ -3886,7 +3888,7 @@ index 9ddd7b1..386091c 100755
    $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 :
+@@ -21429,7 +21967,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; }
@@ -3895,7 +3897,7 @@ index 9ddd7b1..386091c 100755
    $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 :
+@@ -21476,7 +22014,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; }
@@ -3904,7 +3906,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -21534,7 +22070,7 @@ if test $acx_blas_ok = no; then
+@@ -21534,7 +22072,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; }
@@ -3913,7 +3915,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -21588,7 +22124,7 @@ if test $acx_blas_ok = no; then
+@@ -21588,7 +22126,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; }
@@ -3922,7 +3924,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -21642,7 +22178,7 @@ if test $acx_blas_ok = no; then
+@@ -21642,7 +22180,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; }
@@ -3931,7 +3933,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -21684,11 +22220,11 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -21684,11 +22222,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; }
@@ -3945,7 +3947,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -21747,7 +22283,7 @@ if test $acx_blas_ok = no; then
+@@ -21747,7 +22285,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; }
@@ -3954,7 +3956,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -21801,7 +22337,7 @@ if test $acx_blas_ok = no; then
+@@ -21801,7 +22339,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; }
@@ -3963,7 +3965,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -21855,7 +22391,7 @@ if test $acx_blas_ok = no; then
+@@ -21855,7 +22393,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; }
@@ -3972,7 +3974,7 @@ index 9ddd7b1..386091c 100755
    $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 :
+@@ -21902,7 +22440,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; }
@@ -3981,7 +3983,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -21958,7 +22494,7 @@ if test $acx_blas_ok = no; then
+@@ -21958,7 +22496,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; }
@@ -3990,7 +3992,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -22007,6 +22543,10 @@ fi
+@@ -22007,6 +22545,10 @@ fi
  
  fi
  
@@ -4001,7 +4003,7 @@ index 9ddd7b1..386091c 100755
  
  
  LIBS="$acx_blas_save_LIBS"
-@@ -22136,7 +22676,7 @@ for lapack in lapack lapack_rs6k; do
+@@ -22136,7 +22678,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; }
@@ -4010,7 +4012,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -22189,6 +22729,10 @@ done
+@@ -22189,6 +22731,10 @@ done
  
  LDFLAGS="$saved_ldflags"
  
@@ -4021,7 +4023,7 @@ index 9ddd7b1..386091c 100755
  
  
  # Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
-@@ -22248,11 +22792,11 @@ if test "x$with_umfpack_include" != "xyes"; then
+@@ -22248,11 +22794,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"
@@ -4035,7 +4037,7 @@ index 9ddd7b1..386091c 100755
    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
+@@ -22270,11 +22816,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"
@@ -4049,7 +4051,7 @@ index 9ddd7b1..386091c 100755
    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; }
+@@ -22298,7 +22844,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; }
@@ -4058,7 +4060,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -22340,7 +22884,7 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -22340,7 +22886,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; }
@@ -4067,7 +4069,7 @@ index 9ddd7b1..386091c 100755
    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
+@@ -22349,7 +22895,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; }
@@ -4076,7 +4078,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -22391,7 +22935,7 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -22391,7 +22937,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; }
@@ -4085,7 +4087,7 @@ index 9ddd7b1..386091c 100755
    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
+@@ -22413,7 +22959,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; }
@@ -4094,7 +4096,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -22455,7 +22999,7 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -22455,7 +23001,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; }
@@ -4103,7 +4105,7 @@ index 9ddd7b1..386091c 100755
    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
+@@ -22465,7 +23011,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; }
@@ -4112,7 +4114,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -22507,7 +23051,7 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -22507,7 +23053,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; }
@@ -4121,7 +4123,7 @@ index 9ddd7b1..386091c 100755
    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
+@@ -22592,7 +23138,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; }
@@ -4130,7 +4132,7 @@ index 9ddd7b1..386091c 100755
    $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.
+@@ -22723,7 +23269,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/>.
@@ -4139,7 +4141,7 @@ index 9ddd7b1..386091c 100755
  else
  	PCRE_CFLAGS=$pkg_cv_PCRE_CFLAGS
  	PCRE_LIBS=$pkg_cv_PCRE_LIBS
-@@ -22737,7 +23281,7 @@ CFLAGS="$PCRE_CFLAGS $CFLAGS"
+@@ -22737,7 +23283,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; }
@@ -4148,7 +4150,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -22779,7 +23323,7 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -22779,7 +23325,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; }
@@ -4157,7 +4159,7 @@ index 9ddd7b1..386091c 100755
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBPCRE 1
  _ACEOF
-@@ -22794,7 +23338,7 @@ fi
+@@ -22794,7 +23340,7 @@ fi
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for regexec in -lpcreposix" >&5
  $as_echo_n "checking for regexec in -lpcreposix... " >&6; }
@@ -4166,7 +4168,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -22836,7 +23380,7 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -22836,7 +23382,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; }
@@ -4175,7 +4177,7 @@ index 9ddd7b1..386091c 100755
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBPCREPOSIX 1
  _ACEOF
-@@ -22851,7 +23395,7 @@ fi
+@@ -22851,7 +23397,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"
@@ -4184,7 +4186,7 @@ index 9ddd7b1..386091c 100755
    cat >>confdefs.h <<_ACEOF
  #define HAVE_PCRE_H 1
  _ACEOF
-@@ -22953,8 +23497,8 @@ if test "x$with_x" = xno; then
+@@ -22953,8 +23499,8 @@ if test "x$with_x" = xno; then
    have_x=disabled
  else
    case $x_includes,$x_libraries in #(
@@ -4195,7 +4197,7 @@ index 9ddd7b1..386091c 100755
    $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 :
+@@ -23263,7 +23809,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; }
@@ -4204,7 +4206,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -23305,14 +23849,14 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -23305,14 +23851,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; }
@@ -4221,7 +4223,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -23354,7 +23898,7 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -23354,7 +23900,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; }
@@ -4230,7 +4232,7 @@ index 9ddd7b1..386091c 100755
    X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
  fi
  
-@@ -23373,14 +23917,14 @@ rm -f core conftest.err conftest.$ac_objext \
+@@ -23373,14 +23919,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"
@@ -4247,7 +4249,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -23422,14 +23966,14 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -23422,14 +23968,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; }
@@ -4264,7 +4266,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -23471,7 +24015,7 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -23471,7 +24017,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; }
@@ -4273,7 +4275,7 @@ index 9ddd7b1..386091c 100755
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
  fi
  
-@@ -23486,14 +24030,14 @@ fi
+@@ -23486,14 +24032,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"
@@ -4290,7 +4292,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -23535,7 +24079,7 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -23535,7 +24081,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; }
@@ -4299,7 +4301,7 @@ index 9ddd7b1..386091c 100755
    X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
  fi
  
-@@ -23543,14 +24087,14 @@ fi
+@@ -23543,14 +24089,14 @@ fi
  
      # Guillermo Gomez says -lposix is necessary on A/UX.
      ac_fn_c_check_func "$LINENO" "remove" "ac_cv_func_remove"
@@ -4316,7 +4318,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -23592,7 +24136,7 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -23592,7 +24138,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; }
@@ -4325,7 +4327,7 @@ index 9ddd7b1..386091c 100755
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
  fi
  
-@@ -23600,14 +24144,14 @@ fi
+@@ -23600,14 +24146,14 @@ fi
  
      # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
      ac_fn_c_check_func "$LINENO" "shmat" "ac_cv_func_shmat"
@@ -4342,7 +4344,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -23649,7 +24193,7 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -23649,7 +24195,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; }
@@ -4351,7 +4353,7 @@ index 9ddd7b1..386091c 100755
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
  fi
  
-@@ -23667,7 +24211,7 @@ fi
+@@ -23667,7 +24213,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; }
@@ -4360,7 +4362,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -23709,7 +24253,7 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -23709,7 +24255,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; }
@@ -4369,7 +4371,7 @@ index 9ddd7b1..386091c 100755
    X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
  fi
  
-@@ -23725,7 +24269,7 @@ fi
+@@ -23725,7 +24271,7 @@ fi
  
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ldl" >&5
  $as_echo_n "checking for main in -ldl... " >&6; }
@@ -4378,7 +4380,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -23761,7 +24305,7 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -23761,7 +24307,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; }
@@ -4387,16 +4389,16 @@ index 9ddd7b1..386091c 100755
    TCLTK_LIBS=" -ldl"
  fi
  
-@@ -23792,7 +24336,7 @@ CPPFLAGS="$CPPFLAGS -I$CHK_TCL_INCLUDE_PATH"
+@@ -23792,7 +24338,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"
++#line 24341 "configure"
  #include "confdefs.h"
  
  #include "$CHK_TCL_INCLUDE_PATH/$CHK_TCL_INC_NAME"
-@@ -23822,7 +24366,7 @@ if test "$cross_compiling" = yes; then :
+@@ -23822,7 +24368,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
@@ -4405,7 +4407,7 @@ index 9ddd7b1..386091c 100755
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
-@@ -23856,7 +24400,7 @@ else
+@@ -23856,7 +24402,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)
@@ -4414,7 +4416,7 @@ index 9ddd7b1..386091c 100755
  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; }
+@@ -23925,7 +24471,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; }
@@ -4423,7 +4425,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -23979,7 +24523,7 @@ fi
+@@ -23979,7 +24525,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; }
@@ -4432,7 +4434,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -24064,7 +24608,7 @@ done
+@@ -24064,7 +24610,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"
@@ -4441,16 +4443,16 @@ index 9ddd7b1..386091c 100755
    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"
+@@ -24102,7 +24648,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"
++#line 24651 "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; }
+@@ -24237,7 +24783,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; }
@@ -4459,7 +4461,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -24292,7 +24836,7 @@ fi
+@@ -24292,7 +24838,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; }
@@ -4468,7 +4470,7 @@ index 9ddd7b1..386091c 100755
    $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.
+@@ -24517,7 +25063,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/>.
@@ -4477,7 +4479,7 @@ index 9ddd7b1..386091c 100755
  else
  	MATIO_CFLAGS=$pkg_cv_MATIO_CFLAGS
  	MATIO_LIBS=$pkg_cv_MATIO_LIBS
-@@ -24550,7 +25094,7 @@ done
+@@ -24550,7 +25096,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; }
@@ -4486,7 +4488,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -24592,7 +25136,7 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -24592,7 +25138,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; }
@@ -4495,7 +4497,7 @@ index 9ddd7b1..386091c 100755
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBMATIO 1
  _ACEOF
-@@ -24652,7 +25196,7 @@ else
+@@ -24652,7 +25198,7 @@ else
  fi
  
  
@@ -4504,7 +4506,7 @@ index 9ddd7b1..386091c 100755
  		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; }
+@@ -24669,7 +25215,7 @@ $as_echo_n "checking saxon... " >&6; }
      PACKAGE_JAR_FILE=
      found_jar=no
      saved_ac_java_classpath=$ac_java_classpath
@@ -4513,18 +4515,18 @@ index 9ddd7b1..386091c 100755
      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; }
+@@ -24683,8 +25229,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"
++// #line 25232 "configure"
 +import net.sf.saxon.Version;
  
  public class conftest {
      public static void main(String[] argv) {
-@@ -24759,10 +25303,10 @@ $as_echo "$jar_resolved" >&6; }
+@@ -24759,10 +25305,10 @@ $as_echo "$jar_resolved" >&6; }
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
        if test "" = "yes"; then
@@ -4538,7 +4540,7 @@ index 9ddd7b1..386091c 100755
        fi
      fi
  
-@@ -24776,7 +25320,7 @@ $as_echo_n "checking jlatexmath-fop... " >&6; }
+@@ -24776,7 +25322,7 @@ $as_echo_n "checking jlatexmath-fop... " >&6; }
      PACKAGE_JAR_FILE=
      found_jar=no
      saved_ac_java_classpath=$ac_java_classpath
@@ -4547,16 +4549,16 @@ index 9ddd7b1..386091c 100755
      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; }
+@@ -24790,7 +25336,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"
++// #line 25339 "configure"
  import org.scilab.forge.jlatexmath.fop.JLaTeXMathObj;
  
  public class conftest {
-@@ -25111,7 +25655,7 @@ esac
+@@ -25111,7 +25657,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; }
@@ -4565,7 +4567,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
              ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-@@ -25193,7 +25737,7 @@ Xsed="$SED -e 1s/^X//"
+@@ -25193,7 +25739,7 @@ Xsed="$SED -e 1s/^X//"
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
  $as_echo_n "checking for fgrep... " >&6; }
@@ -4574,7 +4576,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
-@@ -25324,7 +25868,7 @@ else
+@@ -25324,7 +25870,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
@@ -4583,7 +4585,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    if test -z "$LD"; then
-@@ -25364,7 +25908,7 @@ fi
+@@ -25364,7 +25910,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; }
@@ -4592,7 +4594,7 @@ index 9ddd7b1..386091c 100755
    $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
+@@ -25391,7 +25937,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; }
@@ -4601,7 +4603,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    if test -n "$NM"; then
-@@ -25454,7 +25998,7 @@ else
+@@ -25454,7 +26000,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; }
@@ -4610,7 +4612,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    if test -n "$DUMPBIN"; then
-@@ -25498,7 +26042,7 @@ do
+@@ -25498,7 +26044,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; }
@@ -4619,7 +4621,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_DUMPBIN"; then
-@@ -25570,7 +26114,7 @@ test -z "$NM" && NM=nm
+@@ -25570,7 +26116,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; }
@@ -4628,7 +4630,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    lt_cv_nm_interface="BSD nm"
-@@ -25594,7 +26138,7 @@ $as_echo "$lt_cv_nm_interface" >&6; }
+@@ -25594,7 +26140,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; }
@@ -4637,7 +4639,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
      i=0
-@@ -25791,7 +26335,7 @@ esac
+@@ -25791,7 +26337,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; }
@@ -4646,7 +4648,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    lt_cv_ld_reload_flag='-r'
-@@ -25827,7 +26371,7 @@ if test -n "$ac_tool_prefix"; then
+@@ -25827,7 +26373,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; }
@@ -4655,7 +4657,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    if test -n "$OBJDUMP"; then
-@@ -25867,7 +26411,7 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
+@@ -25867,7 +26413,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; }
@@ -4664,7 +4666,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_OBJDUMP"; then
-@@ -25926,7 +26470,7 @@ test -z "$OBJDUMP" && OBJDUMP=objdump
+@@ -25926,7 +26472,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; }
@@ -4673,7 +4675,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    lt_cv_file_magic_cmd='$MAGIC_CMD'
-@@ -26143,7 +26687,7 @@ if test -n "$ac_tool_prefix"; then
+@@ -26143,7 +26689,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; }
@@ -4682,7 +4684,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    if test -n "$AR"; then
-@@ -26183,7 +26727,7 @@ if test -z "$ac_cv_prog_AR"; then
+@@ -26183,7 +26729,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; }
@@ -4691,7 +4693,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_AR"; then
-@@ -26248,7 +26792,7 @@ if test -n "$ac_tool_prefix"; then
+@@ -26248,7 +26794,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; }
@@ -4700,7 +4702,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    if test -n "$STRIP"; then
-@@ -26288,7 +26832,7 @@ if test -z "$ac_cv_prog_STRIP"; then
+@@ -26288,7 +26834,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; }
@@ -4709,7 +4711,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_STRIP"; then
-@@ -26347,7 +26891,7 @@ if test -n "$ac_tool_prefix"; then
+@@ -26347,7 +26893,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; }
@@ -4718,7 +4720,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    if test -n "$RANLIB"; then
-@@ -26387,7 +26931,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
+@@ -26387,7 +26933,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; }
@@ -4727,7 +4729,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_RANLIB"; then
-@@ -26516,7 +27060,7 @@ compiler=$CC
+@@ -26516,7 +27062,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; }
@@ -4736,7 +4738,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
  
-@@ -26887,7 +27431,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+@@ -26887,7 +27433,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; }
@@ -4745,7 +4747,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    ac_ext=c
-@@ -26971,7 +27515,7 @@ need_locks="$enable_libtool_lock"
+@@ -26971,7 +27517,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; }
@@ -4754,7 +4756,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    if test -n "$DSYMUTIL"; then
-@@ -27011,7 +27555,7 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then
+@@ -27011,7 +27557,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; }
@@ -4763,7 +4765,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_DSYMUTIL"; then
-@@ -27063,7 +27607,7 @@ fi
+@@ -27063,7 +27609,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; }
@@ -4772,7 +4774,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    if test -n "$NMEDIT"; then
-@@ -27103,7 +27647,7 @@ if test -z "$ac_cv_prog_NMEDIT"; then
+@@ -27103,7 +27649,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; }
@@ -4781,7 +4783,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_NMEDIT"; then
-@@ -27155,7 +27699,7 @@ fi
+@@ -27155,7 +27701,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; }
@@ -4790,7 +4792,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    if test -n "$LIPO"; then
-@@ -27195,7 +27739,7 @@ if test -z "$ac_cv_prog_LIPO"; then
+@@ -27195,7 +27741,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; }
@@ -4799,7 +4801,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_LIPO"; then
-@@ -27247,7 +27791,7 @@ fi
+@@ -27247,7 +27793,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; }
@@ -4808,7 +4810,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    if test -n "$OTOOL"; then
-@@ -27287,7 +27831,7 @@ if test -z "$ac_cv_prog_OTOOL"; then
+@@ -27287,7 +27833,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; }
@@ -4817,7 +4819,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_OTOOL"; then
-@@ -27339,7 +27883,7 @@ fi
+@@ -27339,7 +27885,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; }
@@ -4826,7 +4828,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    if test -n "$OTOOL64"; then
-@@ -27379,7 +27923,7 @@ if test -z "$ac_cv_prog_OTOOL64"; then
+@@ -27379,7 +27925,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; }
@@ -4835,7 +4837,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_OTOOL64"; then
-@@ -27454,7 +27998,7 @@ fi
+@@ -27454,7 +28000,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; }
@@ -4844,7 +4846,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    lt_cv_apple_cc_single_mod=no
-@@ -27483,7 +28027,7 @@ fi
+@@ -27483,7 +28029,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; }
@@ -4853,7 +4855,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    lt_cv_ld_exported_symbols_list=no
-@@ -27523,7 +28067,7 @@ fi
+@@ -27523,7 +28069,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; }
@@ -4862,7 +4864,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    lt_cv_ld_force_load=no
-@@ -27590,7 +28134,7 @@ for ac_header in dlfcn.h
+@@ -27590,7 +28136,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
  "
@@ -4871,7 +4873,7 @@ index 9ddd7b1..386091c 100755
    cat >>confdefs.h <<_ACEOF
  #define HAVE_DLFCN_H 1
  _ACEOF
-@@ -27746,7 +28290,7 @@ fi
+@@ -27746,7 +28292,7 @@ fi
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
  $as_echo_n "checking for objdir... " >&6; }
@@ -4880,7 +4882,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    rm -f .libs 2>/dev/null
-@@ -27824,7 +28368,7 @@ file_magic*)
+@@ -27824,7 +28370,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; }
@@ -4889,7 +4891,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    case $MAGIC_CMD in
-@@ -27890,7 +28434,7 @@ if test -z "$lt_cv_path_MAGIC_CMD"; then
+@@ -27890,7 +28436,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; }
@@ -4898,7 +4900,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    case $MAGIC_CMD in
-@@ -28032,7 +28576,7 @@ if test "$GCC" = yes; then
+@@ -28032,7 +28578,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; }
@@ -4907,7 +4909,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    lt_cv_prog_compiler_rtti_exceptions=no
-@@ -28384,7 +28928,7 @@ $as_echo "$lt_prog_compiler_pic" >&6; }
+@@ -28384,7 +28930,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; }
@@ -4916,7 +4918,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    lt_cv_prog_compiler_pic_works=no
-@@ -28443,7 +28987,7 @@ fi
+@@ -28443,7 +28989,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; }
@@ -4925,7 +4927,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    lt_cv_prog_compiler_static_works=no
-@@ -28486,7 +29030,7 @@ fi
+@@ -28486,7 +29032,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; }
@@ -4934,7 +4936,7 @@ index 9ddd7b1..386091c 100755
    $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; }
+@@ -28541,7 +29087,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; }
@@ -4943,7 +4945,7 @@ index 9ddd7b1..386091c 100755
    $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
+@@ -29370,7 +29916,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; }
@@ -4952,7 +4954,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    lt_cv_prog_compiler__b=no
-@@ -29742,7 +30286,7 @@ x|xyes)
+@@ -29742,7 +30288,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; }
@@ -4961,7 +4963,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    $RM conftest*
-@@ -30371,7 +30915,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+@@ -30371,7 +30917,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
    shlibpath_overrides_runpath=no
  
    # Some binutils ld are patched to set DT_RUNPATH
@@ -4970,7 +4972,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    lt_cv_shlibpath_overrides_runpath=no
-@@ -30799,7 +31343,7 @@ else
+@@ -30799,7 +31345,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; }
@@ -4979,7 +4981,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -30841,7 +31385,7 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -30841,7 +31387,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; }
@@ -4988,7 +4990,7 @@ index 9ddd7b1..386091c 100755
    lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
  else
  
-@@ -30855,12 +31399,12 @@ fi
+@@ -30855,12 +31401,12 @@ fi
  
    *)
      ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
@@ -5003,7 +5005,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -30902,16 +31446,16 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -30902,16 +31448,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; }
@@ -5023,7 +5025,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -30953,12 +31497,12 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -30953,12 +31499,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; }
@@ -5038,7 +5040,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -31000,12 +31544,12 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -31000,12 +31546,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; }
@@ -5053,7 +5055,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -31047,7 +31591,7 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -31047,7 +31593,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; }
@@ -5062,7 +5064,7 @@ index 9ddd7b1..386091c 100755
    lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
  fi
  
-@@ -31088,7 +31632,7 @@ fi
+@@ -31088,7 +31634,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; }
@@ -5071,16 +5073,16 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    	  if test "$cross_compiling" = yes; then :
-@@ -31097,7 +31641,7 @@ else
+@@ -31097,7 +31643,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"
++#line 31646 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -31194,7 +31738,7 @@ $as_echo "$lt_cv_dlopen_self" >&6; }
+@@ -31194,7 +31740,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; }
@@ -5089,16 +5091,16 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    	  if test "$cross_compiling" = yes; then :
-@@ -31203,7 +31747,7 @@ else
+@@ -31203,7 +31749,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"
++#line 31752 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -31431,7 +31975,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+@@ -31431,7 +31977,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
@@ -5107,7 +5109,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
        # Double quotes because CXXCPP needs to be expanded
-@@ -31547,7 +32091,7 @@ else
+@@ -31547,7 +32093,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
@@ -5116,7 +5118,7 @@ index 9ddd7b1..386091c 100755
  fi
  
  ac_ext=c
-@@ -31732,7 +32276,7 @@ else
+@@ -31732,7 +32278,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
@@ -5125,7 +5127,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    if test -z "$LD"; then
-@@ -31772,7 +32316,7 @@ fi
+@@ -31772,7 +32318,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; }
@@ -5134,7 +5136,7 @@ index 9ddd7b1..386091c 100755
    $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; }
+@@ -33324,7 +33870,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; }
@@ -5143,7 +5145,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    lt_cv_prog_compiler_pic_works_CXX=no
-@@ -33380,7 +33924,7 @@ fi
+@@ -33380,7 +33926,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; }
@@ -5152,7 +5154,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    lt_cv_prog_compiler_static_works_CXX=no
-@@ -33420,7 +33964,7 @@ fi
+@@ -33420,7 +33966,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; }
@@ -5161,7 +5163,7 @@ index 9ddd7b1..386091c 100755
    $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; }
+@@ -33472,7 +34018,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; }
@@ -5170,7 +5172,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    lt_cv_prog_compiler_c_o_CXX=no
-@@ -33605,7 +34149,7 @@ x|xyes)
+@@ -33605,7 +34151,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; }
@@ -5179,7 +5181,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    $RM conftest*
-@@ -34075,7 +34619,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+@@ -34075,7 +34621,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
    shlibpath_overrides_runpath=no
  
    # Some binutils ld are patched to set DT_RUNPATH
@@ -5188,7 +5190,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    lt_cv_shlibpath_overrides_runpath=no
-@@ -34890,7 +35434,7 @@ $as_echo "$lt_prog_compiler_pic_F77" >&6; }
+@@ -34890,7 +35436,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; }
@@ -5197,7 +5199,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    lt_cv_prog_compiler_pic_works_F77=no
-@@ -34946,7 +35490,7 @@ fi
+@@ -34946,7 +35492,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; }
@@ -5206,7 +5208,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    lt_cv_prog_compiler_static_works_F77=no
-@@ -34986,7 +35530,7 @@ fi
+@@ -34986,7 +35532,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; }
@@ -5215,7 +5217,7 @@ index 9ddd7b1..386091c 100755
    $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; }
+@@ -35038,7 +35584,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; }
@@ -5224,7 +5226,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    lt_cv_prog_compiler_c_o_F77=no
-@@ -36159,7 +36703,7 @@ x|xyes)
+@@ -36159,7 +36705,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; }
@@ -5233,7 +5235,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    $RM conftest*
-@@ -36629,7 +37173,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+@@ -36629,7 +37175,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
    shlibpath_overrides_runpath=no
  
    # Some binutils ld are patched to set DT_RUNPATH
@@ -5242,7 +5244,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    lt_cv_shlibpath_overrides_runpath=no
-@@ -37022,7 +37566,7 @@ fi
+@@ -37022,7 +37568,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; }
@@ -5251,7 +5253,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -37110,7 +37654,7 @@ fi
+@@ -37110,7 +37656,7 @@ fi
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
  $as_echo_n "checking for inline... " >&6; }
@@ -5260,7 +5262,7 @@ index 9ddd7b1..386091c 100755
    $as_echo_n "(cached) " >&6
  else
    ac_cv_c_inline=no
-@@ -37197,9 +37741,142 @@ rm -f core conftest.err conftest.$ac_objext \
+@@ -37197,9 +37743,142 @@ rm -f core conftest.err conftest.$ac_objext \
  $as_echo "$have_glibc_backtrace" >&6; }
  
  if test "x$have_glibc_backtrace" = "xyes"; then
@@ -5406,7 +5408,7 @@ index 9ddd7b1..386091c 100755
  
  $as_echo "#define HAVE_GLIBC_BACKTRACE 1" >>confdefs.h
  
-@@ -37241,9 +37918,142 @@ rm -f core conftest.err conftest.$ac_objext \
+@@ -37241,9 +37920,142 @@ rm -f core conftest.err conftest.$ac_objext \
  $as_echo "$have_cplus_demangle" >&6; }
  
  if test "x$have_cplus_demangle" = "xyes"; then
@@ -5552,7 +5554,7 @@ index 9ddd7b1..386091c 100755
  
  
  $as_echo "#define HAVE_CPLUS_DEMANGLE 1" >>confdefs.h
-@@ -37258,7 +38068,7 @@ fi
+@@ -37258,7 +38070,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; }
@@ -5561,7 +5563,7 @@ index 9ddd7b1..386091c 100755
    $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;} ;;
+@@ -37430,10 +38242,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
@@ -5585,7 +5587,7 @@ index 9ddd7b1..386091c 100755
    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
+@@ -37601,7 +38424,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
  
@@ -5594,7 +5596,7 @@ index 9ddd7b1..386091c 100755
  ac_write_fail=0
  ac_clean_files_save=$ac_clean_files
  ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-@@ -37702,6 +38523,7 @@ fi
+@@ -37702,6 +38525,7 @@ fi
  IFS=" ""	$as_nl"
  
  # Find who we are.  Look in the path if we contain no directory separator.
@@ -5602,7 +5604,7 @@ index 9ddd7b1..386091c 100755
  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
+@@ -38009,7 +38833,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
@@ -5611,7 +5613,7 @@ index 9ddd7b1..386091c 100755
  
    CONFIG_FILES    = $CONFIG_FILES
    CONFIG_HEADERS  = $CONFIG_HEADERS
-@@ -38075,7 +38897,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+@@ -38075,7 +38899,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
@@ -5620,7 +5622,7 @@ index 9ddd7b1..386091c 100755
    with options \\"\$ac_cs_config\\"
  
  Copyright (C) 2010 Free Software Foundation, Inc.
-@@ -38762,7 +39584,7 @@ do
+@@ -38762,7 +39586,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" ;;
  
@@ -5629,7 +5631,7 @@ index 9ddd7b1..386091c 100755
    esac
  done
  
-@@ -38785,9 +39607,10 @@ fi
+@@ -38785,9 +39609,10 @@ fi
  # after its creation but before its name has been assigned to `$tmp'.
  $debug ||
  {
@@ -5642,7 +5644,7 @@ index 9ddd7b1..386091c 100755
  ' 0
    trap 'as_fn_exit 1' 1 2 13 15
  }
-@@ -38795,12 +39618,13 @@ $debug ||
+@@ -38795,12 +39620,13 @@ $debug ||
  
  {
    tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
@@ -5657,7 +5659,7 @@ index 9ddd7b1..386091c 100755
  
  # Set up the scripts for CONFIG_FILES section.
  # No need to generate them if there are no CONFIG_FILES.
-@@ -38822,7 +39646,7 @@ else
+@@ -38822,7 +39648,7 @@ else
    ac_cs_awk_cr=$ac_cr
  fi
  
@@ -5666,7 +5668,7 @@ index 9ddd7b1..386091c 100755
  _ACEOF
  
  
-@@ -38850,7 +39674,7 @@ done
+@@ -38850,7 +39676,7 @@ done
  rm -f conf$$subs.sh
  
  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
@@ -5675,7 +5677,7 @@ index 9ddd7b1..386091c 100755
  _ACEOF
  sed -n '
  h
-@@ -38898,7 +39722,7 @@ t delim
+@@ -38898,7 +39724,7 @@ t delim
  rm -f conf$$subs.awk
  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
  _ACAWK
@@ -5684,7 +5686,7 @@ index 9ddd7b1..386091c 100755
    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
+@@ -38930,7 +39756,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
@@ -5693,7 +5695,7 @@ index 9ddd7b1..386091c 100755
    || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
  _ACEOF
  
-@@ -38964,7 +39788,7 @@ fi # test -n "$CONFIG_FILES"
+@@ -38964,7 +39790,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
@@ -5702,7 +5704,7 @@ index 9ddd7b1..386091c 100755
  BEGIN {
  _ACEOF
  
-@@ -38976,8 +39800,8 @@ _ACEOF
+@@ -38976,8 +39802,8 @@ _ACEOF
  # handling of long lines.
  ac_delim='%!_!# '
  for ac_last_try in false false :; do
@@ -5713,7 +5715,7 @@ index 9ddd7b1..386091c 100755
      break
    elif $ac_last_try; then
      as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
-@@ -39078,7 +39902,7 @@ do
+@@ -39078,7 +39904,7 @@ do
    esac
    case $ac_mode$ac_tag in
    :[FHL]*:*);;
@@ -5722,7 +5724,7 @@ index 9ddd7b1..386091c 100755
    :[FH]-) ac_tag=-:-;;
    :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
    esac
-@@ -39097,7 +39921,7 @@ do
+@@ -39097,7 +39923,7 @@ do
      for ac_f
      do
        case $ac_f in
@@ -5731,7 +5733,7 @@ index 9ddd7b1..386091c 100755
        *) # 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
+@@ -39106,7 +39932,7 @@ do
  	   [\\/$]*) false;;
  	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
  	   esac ||
@@ -5740,7 +5742,7 @@ index 9ddd7b1..386091c 100755
        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;}
+@@ -39132,8 +39958,8 @@ $as_echo "$as_me: creating $ac_file" >&6;}
      esac
  
      case $ac_tag in
@@ -5751,7 +5753,7 @@ index 9ddd7b1..386091c 100755
      esac
      ;;
    esac
-@@ -39269,21 +40093,22 @@ s&@INSTALL@&$ac_INSTALL&;t t
+@@ -39269,21 +40095,22 @@ s&@INSTALL@&$ac_INSTALL&;t t
  s&@MKDIR_P@&$ac_MKDIR_P&;t t
  $ac_datarootdir_hack
  "
@@ -5781,7 +5783,7 @@ index 9ddd7b1..386091c 100755
    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;}
+@@ -39294,20 +40121,20 @@ which seems to be undefined.  Please make sure it is defined" >&2;}
    if test x"$ac_file" != x-; then
      {
        $as_echo "/* $configure_input  */" \
@@ -7302,5 +7304,5 @@ index fa505ac..91c1bb5 100644
  	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
  	$(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
 -- 
-1.7.7
+1.7.7.6
 
diff --git a/0006-fix-incorrect-fsf-adress.patch b/0006-fix-incorrect-fsf-adress.patch
index 7884e1b..b9cb52d 100644
--- a/0006-fix-incorrect-fsf-adress.patch
+++ b/0006-fix-incorrect-fsf-adress.patch
@@ -1,5 +1,5 @@
-From 3bedf7dc4f352ebf2880ecd7e32ea4acdb8f9024 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Cl=C3=A9ment=20DAVID?= <clement.david at scilab-enterprises.com>
+From 8cd703a9d2d77e15d5132bed88eb528dec5a264b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Cl=C3=A9ment=20DAVID?= <davidcl at fedoraproject.org>
 Date: Mon, 31 Oct 2011 16:58:11 +0100
 Subject: [PATCH 6/8] fix incorrect fsf adress
 
@@ -21349,5 +21349,5 @@ index dbc8731..3a9774b 100644
  // See the file ./license.txt
  //
 -- 
-1.7.7
+1.7.7.6
 
diff --git a/0007-fix-zero-length.patch b/0007-fix-zero-length.patch
index d997b5a..779d17f 100644
--- a/0007-fix-zero-length.patch
+++ b/0007-fix-zero-length.patch
@@ -1,5 +1,5 @@
-From 45fe61f62916f464c3e58444f939bcaf320d01a7 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Cl=C3=A9ment=20DAVID?= <clement.david at scilab-enterprises.com>
+From 27147e94fe3372b0feb843b6d32b899a8d450672 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Cl=C3=A9ment=20DAVID?= <davidcl at fedoraproject.org>
 Date: Tue, 1 Nov 2011 14:42:11 +0100
 Subject: [PATCH 7/8] fix zero length
 
@@ -602,5 +602,5 @@ index e69de29..8b13789 100644
 @@ -0,0 +1 @@
 +
 -- 
-1.7.7
+1.7.7.6
 
diff --git a/0008-fix-class-path-in-manifest.patch b/0008-fix-class-path-in-manifest.patch
index 0276aec..d06aae4 100644
--- a/0008-fix-class-path-in-manifest.patch
+++ b/0008-fix-class-path-in-manifest.patch
@@ -1,5 +1,5 @@
-From 2411a7115f3f8b59a9dc504199886f0ac020f8f0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Cl=C3=A9ment=20DAVID?= <clement.david at scilab-enterprises.com>
+From f445ffc4ca8c03deaf77aec88981fde994764710 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Cl=C3=A9ment=20DAVID?= <davidcl at fedoraproject.org>
 Date: Tue, 1 Nov 2011 15:41:53 +0100
 Subject: [PATCH 8/8] fix class-path in manifest
 
@@ -28,5 +28,5 @@ index 287b575..4758abf 100644
      </jar>
    </target>
 -- 
-1.7.7
+1.7.7.6
 
diff --git a/scilab.spec b/scilab.spec
index a800260..391a558 100644
--- a/scilab.spec
+++ b/scilab.spec
@@ -1,6 +1,6 @@
 Name:           scilab
 Version:        5.3.3
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Scientific software package for numerical computations
 
 Group:          Applications/Engineering
@@ -268,6 +268,9 @@ s:%lang(C) ::
 %{_datadir}/%{name}/modules/*/tests
 
 %changelog
+* Mon Feb 10 2012 Clément David <c.david86 at gmail.com> - 5.3.3-9
+- Update classpath.xml due to the jhdf5 move.
+
 * Fri Feb 10 2012 Petr Pisar <ppisar at redhat.com> - 5.3.3-8
 - Rebuild against PCRE 8.30
 


More information about the scm-commits mailing list