Merge remote-tracking branch 'origin/5.3' into MPI 87/5187/1
Sylvestre Ledru [Wed, 23 Mar 2011 19:23:45 +0000 (20:23 +0100)]
Conflicts:
scilab/Makefile.in
scilab/Version.incl
scilab/aclocal.m4
scilab/configure
scilab/configure.ac
scilab/contrib/Makefile.in
scilab/etc/modules.xml.in
scilab/libs/MALLOC/Makefile.in
scilab/libs/Makefile.in
scilab/libs/doublylinkedlist/Makefile.in
scilab/libs/dynamiclibrary/Makefile.in
scilab/libs/hashtable/Makefile.in
scilab/libs/libst/Makefile.in
scilab/modules/Makefile.in
scilab/modules/action_binding/Makefile.am
scilab/modules/action_binding/Makefile.in
scilab/modules/api_scilab/Makefile.in
scilab/modules/arnoldi/Makefile.in
scilab/modules/atoms/Makefile.in
scilab/modules/boolean/Makefile.in
scilab/modules/cacsd/Makefile.in
scilab/modules/call_scilab/Makefile.in
scilab/modules/commons/Makefile.in
scilab/modules/compatibility_functions/Makefile.in
scilab/modules/completion/Makefile.in
scilab/modules/console/Makefile.in
scilab/modules/core/Makefile.in
scilab/modules/core/includes/callinterf.h
scilab/modules/core/includes/version.h
scilab/modules/core/src/c/callinterf.c
scilab/modules/core/src/c/dynamic_gateways.c
scilab/modules/core/src/c/dynamic_gateways.h
scilab/modules/data_structures/Makefile.in
scilab/modules/demo_tools/Makefile.in
scilab/modules/development_tools/Makefile.in
scilab/modules/development_tools/macros/test_run.sci
scilab/modules/development_tools/src/fake/Makefile.in
scilab/modules/differential_equations/Makefile.in
scilab/modules/double/Makefile.in
scilab/modules/dynamic_link/Makefile.in
scilab/modules/elementary_functions/Makefile.in
scilab/modules/fftw/Makefile.in
scilab/modules/fileio/Makefile.in
scilab/modules/functions/Makefile.in
scilab/modules/genetic_algorithms/Makefile.in
scilab/modules/graph/Makefile.in
scilab/modules/graphic_export/Makefile.in
scilab/modules/graphics/Makefile.in
scilab/modules/gui/Makefile.in
scilab/modules/hdf5/Makefile.in
scilab/modules/helptools/Makefile.in
scilab/modules/history_browser/Makefile.in
scilab/modules/history_manager/Makefile.in
scilab/modules/integer/Makefile.in
scilab/modules/interpolation/Makefile.in
scilab/modules/intersci/Makefile.in
scilab/modules/io/Makefile.in
scilab/modules/javasci/Makefile.in
scilab/modules/jvm/Makefile.in
scilab/modules/linear_algebra/Makefile.in
scilab/modules/localization/Makefile.in
scilab/modules/m2sci/Makefile.in
scilab/modules/maple2scilab/Makefile.in
scilab/modules/matio/Makefile.in
scilab/modules/mexlib/Makefile.in
scilab/modules/modules_manager/Makefile.in
scilab/modules/optimization/Makefile.in
scilab/modules/output_stream/Makefile.in
scilab/modules/overloading/Makefile.in
scilab/modules/parallel/Makefile.in
scilab/modules/parameters/Makefile.in
scilab/modules/polynomials/Makefile.in
scilab/modules/pvm/Makefile.in
scilab/modules/randlib/Makefile.in
scilab/modules/renderer/Makefile.in
scilab/modules/scicos/Makefile.in
scilab/modules/scicos_blocks/Makefile.in
scilab/modules/scinotes/Makefile.in
scilab/modules/shell/Makefile.in
scilab/modules/signal_processing/Makefile.in
scilab/modules/simulated_annealing/Makefile.in
scilab/modules/sound/Makefile.in
scilab/modules/sparse/Makefile.in
scilab/modules/special_functions/Makefile.in
scilab/modules/spreadsheet/Makefile.in
scilab/modules/statistics/Makefile.in
scilab/modules/string/Makefile.in
scilab/modules/symbolic/Makefile.in
scilab/modules/tclsci/Makefile.in
scilab/modules/texmacs/Makefile.in
scilab/modules/time/Makefile.in
scilab/modules/types/Makefile.in
scilab/modules/ui_data/Makefile.in
scilab/modules/umfpack/Makefile.in
scilab/modules/windows_tools/Makefile.in
scilab/modules/xcos/Makefile.in
scilab/modules/xcos/sci_gateway/c/gw_xcos.c
scilab/modules/xpad/Makefile.am
scilab/modules/xpad/Makefile.in

Change-Id: I7646f6ae19de14ecc803d30c0ed456ffce774d30

99 files changed:
1  2 
scilab/Makefile.am
scilab/Makefile.in
scilab/Version.incl
scilab/aclocal.m4
scilab/configure
scilab/configure.ac
scilab/contrib/Makefile.in
scilab/etc/modules.xml.in
scilab/libs/MALLOC/Makefile.in
scilab/libs/Makefile.in
scilab/libs/doublylinkedlist/Makefile.in
scilab/libs/dynamiclibrary/Makefile.in
scilab/libs/hashtable/Makefile.in
scilab/libs/libst/Makefile.in
scilab/modules/Makefile.am
scilab/modules/Makefile.in
scilab/modules/action_binding/Makefile.in
scilab/modules/api_scilab/Makefile.in
scilab/modules/arnoldi/Makefile.in
scilab/modules/atoms/Makefile.in
scilab/modules/boolean/Makefile.in
scilab/modules/cacsd/Makefile.in
scilab/modules/call_scilab/Makefile.in
scilab/modules/commons/Makefile.in
scilab/modules/compatibility_functions/Makefile.in
scilab/modules/completion/Makefile.in
scilab/modules/console/Makefile.in
scilab/modules/core/Makefile.in
scilab/modules/core/includes/callinterf.h
scilab/modules/core/includes/version.h
scilab/modules/core/src/c/callinterf.c
scilab/modules/core/src/c/dynamic_gateways.c
scilab/modules/core/src/c/dynamic_gateways.h
scilab/modules/data_structures/Makefile.in
scilab/modules/demo_tools/Makefile.in
scilab/modules/development_tools/Makefile.in
scilab/modules/development_tools/macros/test_run.sci
scilab/modules/development_tools/src/fake/Makefile.in
scilab/modules/differential_equations/Makefile.in
scilab/modules/double/Makefile.in
scilab/modules/dynamic_link/Makefile.in
scilab/modules/elementary_functions/Makefile.in
scilab/modules/fftw/Makefile.in
scilab/modules/fileio/Makefile.in
scilab/modules/functions/Makefile.in
scilab/modules/genetic_algorithms/Makefile.in
scilab/modules/graph/Makefile.in
scilab/modules/graphic_export/Makefile.in
scilab/modules/graphics/Makefile.in
scilab/modules/gui/Makefile.in
scilab/modules/hdf5/Makefile.in
scilab/modules/helptools/Makefile.in
scilab/modules/history_browser/Makefile.in
scilab/modules/history_manager/Makefile.in
scilab/modules/integer/Makefile.in
scilab/modules/interpolation/Makefile.in
scilab/modules/intersci/Makefile.in
scilab/modules/io/Makefile.in
scilab/modules/javasci/Makefile.in
scilab/modules/jvm/Makefile.in
scilab/modules/linear_algebra/Makefile.in
scilab/modules/localization/Makefile.in
scilab/modules/m2sci/Makefile.in
scilab/modules/maple2scilab/Makefile.in
scilab/modules/matio/Makefile.in
scilab/modules/mexlib/Makefile.in
scilab/modules/modules_manager/Makefile.in
scilab/modules/mpi/Makefile.in
scilab/modules/optimization/Makefile.in
scilab/modules/output_stream/Makefile.in
scilab/modules/overloading/Makefile.in
scilab/modules/parallel/Makefile.in
scilab/modules/parameters/Makefile.in
scilab/modules/polynomials/Makefile.in
scilab/modules/pvm/Makefile.in
scilab/modules/randlib/Makefile.in
scilab/modules/renderer/Makefile.in
scilab/modules/scicos/Makefile.in
scilab/modules/scicos_blocks/Makefile.in
scilab/modules/scinotes/Makefile.in
scilab/modules/shell/Makefile.in
scilab/modules/shell/src/c/others/mainscic.c
scilab/modules/signal_processing/Makefile.in
scilab/modules/simulated_annealing/Makefile.in
scilab/modules/sound/Makefile.in
scilab/modules/sparse/Makefile.in
scilab/modules/special_functions/Makefile.in
scilab/modules/spreadsheet/Makefile.in
scilab/modules/statistics/Makefile.in
scilab/modules/string/Makefile.in
scilab/modules/symbolic/Makefile.in
scilab/modules/tclsci/Makefile.in
scilab/modules/texmacs/Makefile.in
scilab/modules/time/Makefile.in
scilab/modules/types/Makefile.in
scilab/modules/ui_data/Makefile.in
scilab/modules/umfpack/Makefile.in
scilab/modules/windows_tools/Makefile.in
scilab/modules/xcos/Makefile.in

Simple merge
@@@ -94,16 -98,16 +98,17 @@@ am__aclocal_m4_deps = $(top_srcdir)/m4/
        $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
        $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
-       $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
-       $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
-       $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-       $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+       $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+       $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+       $(top_srcdir)/m4/libxml2.m4 $(top_srcdir)/m4/ltoptions.m4 \
+       $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+       $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
 -      $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
 -      $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
 -      $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
 -      $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
 -      $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
 +      $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
 +      $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
 +      $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
 +      $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
 +      $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
 +      $(top_srcdir)/configure.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
  am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@@ -447,9 -454,10 +456,13 @@@ OCAMLDEP = @OCAMLDEP
  OCAMLLEX = @OCAMLLEX@
  OCAMLOPT = @OCAMLOPT@
  OCAMLYACC = @OCAMLYACC@
 +OPENMPI_CC = @OPENMPI_CC@
 +OPENMPI_FLAGS = @OPENMPI_FLAGS@
 +OPENMPI_LIBS = @OPENMPI_LIBS@
+ OPENMP_CFLAGS = @OPENMP_CFLAGS@
+ OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
+ OPENMP_ENABLE = @OPENMP_ENABLE@
+ OPENMP_LIBS = @OPENMP_LIBS@
  OTOOL = @OTOOL@
  OTOOL64 = @OTOOL64@
  PACKAGE = @PACKAGE@
@@@ -574,11 -586,11 +591,11 @@@ SUBDIRS = libs 
        contrib
  
  ACLOCAL_AMFLAGS = -I m4/
- changelogs = CHANGES CHANGES_5.1.X
+ changelogs = CHANGES_5.1.X CHANGES_5.2.X CHANGES_5.3.X
  bin_SCRIPTS = bin/scilab bin/scilab-adv-cli bin/scilab-cli
 -scilab_bin_LDFLAGS = $(am__append_1)
 -scilab_cli_bin_LDFLAGS = 
 +scilab_bin_LDFLAGS = $(OPENMPI_LIBS) $(am__append_1)
 +scilab_cli_bin_LDFLAGS = $(OPENMPI_LIBS)
- scilab_bin_CFLAGS = 
+ scilab_bin_CFLAGS = -I$(top_srcdir)/modules/io/includes       
  # --no-undefined --relax
  
  # libshell is mandatory here since main_linux.c depends on it.
@@@ -1,1 -1,1 +1,2 @@@
 -SCIVERSION=Scilab-Branch-5.3-GIT
 +SCIVERSION=Scilab-MPI-GIT
++
@@@ -3267,7 -3268,7 +3268,8 @@@ m4_include([m4/ltoptions.m4]
  m4_include([m4/ltsugar.m4])
  m4_include([m4/ltversion.m4])
  m4_include([m4/lt~obsolete.m4])
+ m4_include([m4/macosx.m4])
 +m4_include([m4/mpi.m4])
  m4_include([m4/ocaml.m4])
  m4_include([m4/pcre.m4])
  m4_include([m4/pkg.m4])
@@@ -9878,7 -10268,7 +10276,7 @@@ $as_echo "$ac_java_classpath" >&6; 
  $as_echo_n "checking to see if the java compiler works... " >&6; }
  
      cat << \EOF > conftest.java
- // #line 9881 "configure"
 -// #line 10271 "configure"
++// #line 10279 "configure"
  
  
  public class conftest {
@@@ -9938,7 -10334,7 +10342,7 @@@ $as_echo_n "checking type of jvm... " >
      if test "x$ac_java_jvm_name" = "x" ; then
  
      cat << \EOF > conftest.java
- // #line 9941 "configure"
 -// #line 10337 "configure"
++// #line 10345 "configure"
  import gnu.java.io.EncodingManager;
  
  public class conftest {
@@@ -9996,7 -10398,7 +10406,7 @@@ $as_echo_n "checking java API version..
  
  
      cat << \EOF > conftest.java
- // #line 9999 "configure"
 -// #line 10401 "configure"
++// #line 10409 "configure"
  import java.nio.charset.Charset;
  
  public class conftest {
  
  
      cat << \EOF > conftest.java
- // #line 10038 "configure"
 -// #line 10446 "configure"
++// #line 10454 "configure"
  import java.lang.StringBuilder;
  
  public class conftest {
@@@ -10084,6 -10498,6 +10506,7 @@@ $as_echo "$ac_java_jvm_version" >&6; 
  #     AC_JAVA_TOOLS
  
  
++
        # JAVA_HOME specificed, check if we can find jni.h in this path
        if test !  -z "$JAVA_HOME"; then
                ac_java_jvm_dir=$JAVA_HOME
@@@ -11288,7 -11814,7 +11823,7 @@@ $as_echo_n "checking jgraphx... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 11291 "configure"
 -// #line 11817 "configure"
++// #line 11826 "configure"
  import com.mxgraph.model.mxCell;
  
  public class conftest {
@@@ -11369,13 -11901,14 +11910,14 @@@ $as_echo "$as_me: WARNING: Could not fi
  
  
  
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking minimal version (1.2.0.7) of jgraphx" >&5
- $as_echo_n "checking minimal version (1.2.0.7) of jgraphx... " >&6; }
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking minimal version (1.4.1.0) of jgraphx" >&5
+ $as_echo_n "checking minimal version (1.4.1.0) of jgraphx... " >&6; }
     saved_ac_java_classpath=$ac_java_classpath
     export ac_java_classpath="$JGRAPHX:$ac_java_classpath"
+    if test "x=" == "x"; then
  
      cat << \EOF > conftest.java
- // #line 11378 "configure"
 -// #line 11911 "configure"
++// #line 11920 "configure"
  import com.mxgraph.view.mxGraph;
  
  public class conftest {
          echo "configure: failed program was:" >&5
          cat conftest.java >&5
          echo "configure: CLASSPATH was $CLASSPATH" >&5
-           as_fn_error $? "Wrong version of jgraphx. Expected at least 1.2.0.7" "$LINENO" 5
+           as_fn_error $? "Wrong version of jgraphx. Expected at least 1.4.1.0. Found $STDOUT" "$LINENO" 5
              fi
  
-    ac_java_classpath=$saved_ac_java_classpath
-                               # Docking system
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking flexdock" >&5
- $as_echo_n "checking flexdock... " >&6; }
-       PACKAGE_JAR_FILE=
-       found_jar=no
-       saved_ac_java_classpath=$ac_java_classpath
-       DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/ 2>/dev/null) $(ls -d /usr/lib64/*/ 2>/dev/null) $(ls -d /usr/lib/*/ 2>/dev/null)"
-     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/ /\\ /'`
- #     echo "protected $jar"
- #     jar_resolved=`ls $jar 2>/dev/null`
- #     echo "looking for $jar_resolved"
- # TODO check the behaviour when spaces
-       jars_resolved=`ls $jar 2>/dev/null`
-       for jar_resolved in $jars_resolved; do # If several jars matches
-         if test -e "$jar_resolved"; then
-           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+    else
  
      cat << \EOF > conftest.java
- // #line 11442 "configure"
- import org.flexdock.docking.DockingManager;
 -// #line 11962 "configure"
++// #line 11971 "configure"
+ import com.mxgraph.view.mxGraph;
  
  public class conftest {
      public static void main(String[] argv) {
@@@ -11641,8 -12036,8 +12045,8 @@@ $as_echo_n "checking jhdf5... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 11644 "configure"
- import com.jgoodies.looks.common.MenuItemRenderer;
 -// #line 12039 "configure"
++// #line 12048 "configure"
+ import ncsa.hdf.hdf5lib.HDF5Constants;
  
  public class conftest {
      public static void main(String[] argv) {
@@@ -11678,6 -12073,622 +12082,622 @@@ $as_echo "$jar_resolved" >&6; 
                        else
                        echo "configure: failed program was:" >&5
                                cat conftest.java >&5
+                 if test -s conftest.java.output; then
+                    STDOUT=`cat conftest.java.output`
+                 fi
+                       echo "configure: CLASSPATH was $CLASSPATH" >&5
+             ac_java_classpath=$saved_ac_java_classpath
+                                               fi
+               fi
+         if test -f conftest.java.output; then
+            rm conftest.java.output
+         fi
+     else
+         echo "configure: failed program was:" >&5
+         cat conftest.java >&5
+         echo "configure: CLASSPATH was $CLASSPATH" >&5
+             ac_java_classpath=$saved_ac_java_classpath
+             fi
+         fi
+         done
+         # If ls returns several results and the first one is OK, stop the search
+       if test "$found_jar" = "yes"; then
+         break
+       fi
+       done
+         # If found, no need to search in other directory
+       if test "$found_jar" = "yes"; then
+         break
+       fi
+     done
+     if test "$found_jar" = "no"; then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+         if test "" = "yes"; then
+               { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar jhdf5 used by HDF5 Java library (looking for package ncsa.hdf.hdf5lib.HDF5Constants)" >&5
+ $as_echo "$as_me: WARNING: Could not find or use the Java package/jar jhdf5 used by HDF5 Java library (looking for package ncsa.hdf.hdf5lib.HDF5Constants)" >&2;}
+         else
+                 as_fn_error $? "Could not find or use the Java package/jar jhdf5 used by HDF5 Java library (looking for package ncsa.hdf.hdf5lib.HDF5Constants)" "$LINENO" 5
+         fi
+     fi
+      JHDF5=$PACKAGE_JAR_FILE
+                       if test "$MACOSX" = 1; then
+                          echo "Check of the presence of libjhdf5.jnilib disabled under Mac OS X"
+                       else
+      LDFLAGS_save=$LDFLAGS
+    # Provide known paths where distribs/OS can store JNI libs
+         LDFLAGS="-L/usr/lib/jni -L/usr/lib64/jni/ -L$SCI_SRCDIR/bin/ -L$SCI_SRCDIR/thirdparty/  -lpthread $HDF5_LIBS"
+    # -lpthread because of packaging bug in jhdf5
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for h5JNIFatalError in -ljhdf5" >&5
+ $as_echo_n "checking for h5JNIFatalError in -ljhdf5... " >&6; }
+ if test "${ac_cv_lib_jhdf5_h5JNIFatalError+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ljhdf5  $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ /* Override any GCC internal prototype to avoid an error.
+    Use char because int might match the return type of a GCC
+    builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+ char h5JNIFatalError ();
+ int
+ main ()
+ {
+ return h5JNIFatalError ();
+   ;
+   return 0;
+ }
+ _ACEOF
+ if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_jhdf5_h5JNIFatalError=yes
+ else
+   ac_cv_lib_jhdf5_h5JNIFatalError=no
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jhdf5_h5JNIFatalError" >&5
+ $as_echo "$ac_cv_lib_jhdf5_h5JNIFatalError" >&6; }
+ if test "x$ac_cv_lib_jhdf5_h5JNIFatalError" = x""yes; then :
+   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
+ 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"
+       export LD_LIBRARY_PATH
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking minimal version (1.8.4) of hdf5" >&5
+ $as_echo_n "checking minimal version (1.8.4) of hdf5... " >&6; }
+    saved_ac_java_classpath=$ac_java_classpath
+    export ac_java_classpath="$JHDF5:$ac_java_classpath"
+    if test "x" == "x"; then
+     cat << \EOF > conftest.java
 -// #line 12188 "configure"
++// #line 12197 "configure"
+ import ncsa.hdf.hdf5lib.H5;
+ public class conftest {
+     public static void main(String[] argv) {
+         String minVersion="1.8.4";
+                             int[] vers = new int[3];
+                 try { H5.H5get_libversion(vers); }
+                 catch (Throwable ex) {System.exit(-1);}
+                 String ver = vers[0] + "."+ vers[1] +"."+vers[2];
+                             System.out.println(ver);
+                                   if (minVersion.compareTo(ver) > 0) {
+                                    System.exit(-1);
+                                 }
+     }
+ }
+ EOF
+     CLASSPATH=$ac_java_classpath
+     export CLASSPATH
+     cmd="$JAVAC ${JAVAC_FLAGS} conftest.java"
+     if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5) ; then
+        if test ""yes"" = "no"; then
+            echo "yes" >&5
+                  echo "yes"
+          else
+                  cmd="$JAVA conftest"
+                  if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5); then
+                  echo "yes" >&5
+                          echo "yes"
+                       else
+                       echo "configure: failed program was:" >&5
+                               cat conftest.java >&5
+                 if test -s conftest.java.output; then
+                    STDOUT=`cat conftest.java.output`
+                 fi
+                       echo "configure: CLASSPATH was $CLASSPATH" >&5
+                         as_fn_error $? "Wrong version of hdf5. Expected at least 1.8.4. Found $STDOUT" "$LINENO" 5
+                                               fi
+               fi
+         if test -f conftest.java.output; then
+            rm conftest.java.output
+         fi
+     else
+         echo "configure: failed program was:" >&5
+         cat conftest.java >&5
+         echo "configure: CLASSPATH was $CLASSPATH" >&5
+           as_fn_error $? "Wrong version of hdf5. Expected at least 1.8.4. Found $STDOUT" "$LINENO" 5
+             fi
+    else
+     cat << \EOF > conftest.java
 -// #line 12243 "configure"
++// #line 12252 "configure"
+ import ncsa.hdf.hdf5lib.H5;
+ public class conftest {
+     public static void main(String[] argv) {
+         String minVersion="1.8.4";
+                             int[] vers = new int[3];
+                 try { H5.H5get_libversion(vers); }
+                 catch (Throwable ex) {System.exit(-1);}
+                 String ver = vers[0] + "."+ vers[1] +"."+vers[2];
+                             System.out.println(ver);
+                                   if (minVersion.compareTo(ver) != 0) {
+                                    System.exit(-1);
+                                 }
+     }
+ }
+ EOF
+     CLASSPATH=$ac_java_classpath
+     export CLASSPATH
+     cmd="$JAVAC ${JAVAC_FLAGS} conftest.java"
+     if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5) ; then
+        if test ""yes"" = "no"; then
+            echo "yes" >&5
+                  echo "yes"
+          else
+                  cmd="$JAVA conftest"
+                  if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5); then
+                  echo "yes" >&5
+                          echo "yes"
+                       else
+                       echo "configure: failed program was:" >&5
+                               cat conftest.java >&5
+                 if test -s conftest.java.output; then
+                    STDOUT=`cat conftest.java.output`
+                 fi
+                       echo "configure: CLASSPATH was $CLASSPATH" >&5
+                         as_fn_error $? "Wrong version of hdf5. Expected exact version 1.8.4. Found $STDOUT" "$LINENO" 5
+                                               fi
+               fi
+         if test -f conftest.java.output; then
+            rm conftest.java.output
+         fi
+     else
+         echo "configure: failed program was:" >&5
+         cat conftest.java >&5
+         echo "configure: CLASSPATH was $CLASSPATH" >&5
+           as_fn_error $? "Wrong version of hdf5. Expected exact version 1.8.4. Found $STDOUT" "$LINENO" 5
+             fi
+     fi
+    ac_java_classpath=$saved_ac_java_classpath
+       unset LD_LIBRARY_PATH
+       LD_LIBRARY_PATH=$LD_LIBRARY_PATH_save
+                       fi
+                    fi #HDF5_ENABLE
+                 fi
+                 # Docking system
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking flexdock" >&5
+ $as_echo_n "checking flexdock... " >&6; }
+       PACKAGE_JAR_FILE=
+       found_jar=no
+       saved_ac_java_classpath=$ac_java_classpath
+       DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/ 2>/dev/null) $(ls -d /usr/lib64/*/ 2>/dev/null) $(ls -d /usr/lib/*/ 2>/dev/null)  $(ls -d /usr/share/*/lib/ 2>/dev/null)"
+     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/ /\\ /'`
+ #     echo "protected $jar"
+ #     jar_resolved=`ls $jar 2>/dev/null`
+ #     echo "looking for $jar_resolved"
+ # TODO check the behaviour when spaces
+       jars_resolved=`ls $jar 2>/dev/null`
+       for jar_resolved in $jars_resolved; do # If several jars matches
+         if test -e "$jar_resolved"; then
+           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+     cat << \EOF > conftest.java
 -// #line 12327 "configure"
++// #line 12336 "configure"
+ import org.flexdock.docking.DockingManager;
+ public class conftest {
+     public static void main(String[] argv) {
+     }
+ }
+ EOF
+     CLASSPATH=$ac_java_classpath
+     export CLASSPATH
+     cmd="$JAVAC ${JAVAC_FLAGS} conftest.java"
+     if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5) ; then
+        if test ""no"" = "no"; then
+            echo "yes" >&5
+             { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
+ $as_echo "$jar_resolved" >&6; }
+             found_jar=yes
+             PACKAGE_JAR_FILE=$jar_resolved
+             break
+          else
+                  cmd="$JAVA conftest"
+                  if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5); then
+                  echo "yes" >&5
+             { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
+ $as_echo "$jar_resolved" >&6; }
+             found_jar=yes
+             PACKAGE_JAR_FILE=$jar_resolved
+             break
+                       else
+                       echo "configure: failed program was:" >&5
+                               cat conftest.java >&5
+                 if test -s conftest.java.output; then
+                    STDOUT=`cat conftest.java.output`
+                 fi
+                       echo "configure: CLASSPATH was $CLASSPATH" >&5
+             ac_java_classpath=$saved_ac_java_classpath
+                                               fi
+               fi
+         if test -f conftest.java.output; then
+            rm conftest.java.output
+         fi
+     else
+         echo "configure: failed program was:" >&5
+         cat conftest.java >&5
+         echo "configure: CLASSPATH was $CLASSPATH" >&5
+             ac_java_classpath=$saved_ac_java_classpath
+             fi
+         fi
+         done
+         # If ls returns several results and the first one is OK, stop the search
+       if test "$found_jar" = "yes"; then
+         break
+       fi
+       done
+         # If found, no need to search in other directory
+       if test "$found_jar" = "yes"; then
+         break
+       fi
+     done
+     if test "$found_jar" = "no"; then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+         if test "" = "yes"; then
+               { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar flexdock used by Scilab Gui (looking for package org.flexdock.docking.DockingManager)" >&5
+ $as_echo "$as_me: WARNING: Could not find or use the Java package/jar flexdock used by Scilab Gui (looking for package org.flexdock.docking.DockingManager)" >&2;}
+         else
+                 as_fn_error $? "Could not find or use the Java package/jar flexdock used by Scilab Gui (looking for package org.flexdock.docking.DockingManager)" "$LINENO" 5
+         fi
+     fi
+                 FLEXDOCK=$PACKAGE_JAR_FILE
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking minimal version (0.5.2) of flexdock" >&5
+ $as_echo_n "checking minimal version (0.5.2) of flexdock... " >&6; }
+    saved_ac_java_classpath=$ac_java_classpath
+    export ac_java_classpath="$FLEXDOCK:$ac_java_classpath"
+    if test "x" == "x"; then
+     cat << \EOF > conftest.java
 -// #line 12421 "configure"
++// #line 12430 "configure"
+ import org.flexdock.util.Utilities;
+ public class conftest {
+     public static void main(String[] argv) {
+         String minVersion="0.5.2";
+                             System.out.println(Utilities.VERSION);
+                                   if (minVersion.compareTo(Utilities.VERSION) > 0) {
+                                    System.exit(-1);
+                                 }
+     }
+ }
+ EOF
+     CLASSPATH=$ac_java_classpath
+     export CLASSPATH
+     cmd="$JAVAC ${JAVAC_FLAGS} conftest.java"
+     if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5) ; then
+        if test ""yes"" = "no"; then
+            echo "yes" >&5
+                  echo "yes"
+          else
+                  cmd="$JAVA conftest"
+                  if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5); then
+                  echo "yes" >&5
+                          echo "yes"
+                       else
+                       echo "configure: failed program was:" >&5
+                               cat conftest.java >&5
+                 if test -s conftest.java.output; then
+                    STDOUT=`cat conftest.java.output`
+                 fi
+                       echo "configure: CLASSPATH was $CLASSPATH" >&5
+                         as_fn_error $? "Wrong version of flexdock. Expected at least 0.5.2. Found $STDOUT" "$LINENO" 5
+                                               fi
+               fi
+         if test -f conftest.java.output; then
+            rm conftest.java.output
+         fi
+     else
+         echo "configure: failed program was:" >&5
+         cat conftest.java >&5
+         echo "configure: CLASSPATH was $CLASSPATH" >&5
+           as_fn_error $? "Wrong version of flexdock. Expected at least 0.5.2. Found $STDOUT" "$LINENO" 5
+             fi
+    else
+     cat << \EOF > conftest.java
 -// #line 12472 "configure"
++// #line 12481 "configure"
+ import org.flexdock.util.Utilities;
+ public class conftest {
+     public static void main(String[] argv) {
+         String minVersion="0.5.2";
+                             System.out.println(Utilities.VERSION);
+                                   if (minVersion.compareTo(Utilities.VERSION) != 0) {
+                                    System.exit(-1);
+                                 }
+     }
+ }
+ EOF
+     CLASSPATH=$ac_java_classpath
+     export CLASSPATH
+     cmd="$JAVAC ${JAVAC_FLAGS} conftest.java"
+     if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5) ; then
+        if test ""yes"" = "no"; then
+            echo "yes" >&5
+                  echo "yes"
+          else
+                  cmd="$JAVA conftest"
+                  if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5); then
+                  echo "yes" >&5
+                          echo "yes"
+                       else
+                       echo "configure: failed program was:" >&5
+                               cat conftest.java >&5
+                 if test -s conftest.java.output; then
+                    STDOUT=`cat conftest.java.output`
+                 fi
+                       echo "configure: CLASSPATH was $CLASSPATH" >&5
+                         as_fn_error $? "Wrong version of flexdock. Expected exact version 0.5.2. Found $STDOUT" "$LINENO" 5
+                                               fi
+               fi
+         if test -f conftest.java.output; then
+            rm conftest.java.output
+         fi
+     else
+         echo "configure: failed program was:" >&5
+         cat conftest.java >&5
+         echo "configure: CLASSPATH was $CLASSPATH" >&5
+           as_fn_error $? "Wrong version of flexdock. Expected exact version 0.5.2. Found $STDOUT" "$LINENO" 5
+             fi
+     fi
+    ac_java_classpath=$saved_ac_java_classpath
+                 # Swing look&feel implementations
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking looks" >&5
+ $as_echo_n "checking looks... " >&6; }
+       PACKAGE_JAR_FILE=
+       found_jar=no
+       saved_ac_java_classpath=$ac_java_classpath
+       DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/ 2>/dev/null) $(ls -d /usr/lib64/*/ 2>/dev/null) $(ls -d /usr/lib/*/ 2>/dev/null)  $(ls -d /usr/share/*/lib/ 2>/dev/null)"
+     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/ /\\ /'`
+ #     echo "protected $jar"
+ #     jar_resolved=`ls $jar 2>/dev/null`
+ #     echo "looking for $jar_resolved"
+ # TODO check the behaviour when spaces
+       jars_resolved=`ls $jar 2>/dev/null`
+       for jar_resolved in $jars_resolved; do # If several jars matches
+         if test -e "$jar_resolved"; then
+           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+     cat << \EOF > conftest.java
 -// #line 12545 "configure"
++// #line 12554 "configure"
+ import com.jgoodies.looks.common.MenuItemRenderer;
+ public class conftest {
+     public static void main(String[] argv) {
+     }
+ }
+ EOF
+     CLASSPATH=$ac_java_classpath
+     export CLASSPATH
+     cmd="$JAVAC ${JAVAC_FLAGS} conftest.java"
+     if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5) ; then
+        if test ""no"" = "no"; then
+            echo "yes" >&5
+             { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
+ $as_echo "$jar_resolved" >&6; }
+             found_jar=yes
+             PACKAGE_JAR_FILE=$jar_resolved
+             break
+          else
+                  cmd="$JAVA conftest"
+                  if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5); then
+                  echo "yes" >&5
+             { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
+ $as_echo "$jar_resolved" >&6; }
+             found_jar=yes
+             PACKAGE_JAR_FILE=$jar_resolved
+             break
+                       else
+                       echo "configure: failed program was:" >&5
+                               cat conftest.java >&5
+                 if test -s conftest.java.output; then
+                    STDOUT=`cat conftest.java.output`
+                 fi
+                       echo "configure: CLASSPATH was $CLASSPATH" >&5
+             ac_java_classpath=$saved_ac_java_classpath
+                                               fi
+               fi
+         if test -f conftest.java.output; then
+            rm conftest.java.output
+         fi
+     else
+         echo "configure: failed program was:" >&5
+         cat conftest.java >&5
+         echo "configure: CLASSPATH was $CLASSPATH" >&5
+             ac_java_classpath=$saved_ac_java_classpath
+             fi
+         fi
+         done
+         # If ls returns several results and the first one is OK, stop the search
+       if test "$found_jar" = "yes"; then
+         break
+       fi
+       done
+         # If found, no need to search in other directory
+       if test "$found_jar" = "yes"; then
+         break
+       fi
+     done
+     if test "$found_jar" = "no"; then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+         if test ""yes"" = "yes"; then
+               { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar looks used by Scilab Gui - Look and feel (looking for package com.jgoodies.looks.common.MenuItemRenderer)" >&5
+ $as_echo "$as_me: WARNING: Could not find or use the Java package/jar looks used by Scilab Gui - Look and feel (looking for package com.jgoodies.looks.common.MenuItemRenderer)" >&2;}
+         else
+                 as_fn_error $? "Could not find or use the Java package/jar looks used by Scilab Gui - Look and feel (looking for package com.jgoodies.looks.common.MenuItemRenderer)" "$LINENO" 5
+         fi
+     fi
+                 LOOKS=$PACKAGE_JAR_FILE
+                 # Named differently under ArchLinux
+                 if test -z "$LOOKS"; then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking jgoodies-looks" >&5
+ $as_echo_n "checking jgoodies-looks... " >&6; }
+       PACKAGE_JAR_FILE=
+       found_jar=no
+       saved_ac_java_classpath=$ac_java_classpath
+       DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/ 2>/dev/null) $(ls -d /usr/lib64/*/ 2>/dev/null) $(ls -d /usr/lib/*/ 2>/dev/null)  $(ls -d /usr/share/*/lib/ 2>/dev/null)"
+     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/ /\\ /'`
+ #     echo "protected $jar"
+ #     jar_resolved=`ls $jar 2>/dev/null`
+ #     echo "looking for $jar_resolved"
+ # TODO check the behaviour when spaces
+       jars_resolved=`ls $jar 2>/dev/null`
+       for jar_resolved in $jars_resolved; do # If several jars matches
+         if test -e "$jar_resolved"; then
+           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+     cat << \EOF > conftest.java
 -// #line 12652 "configure"
++// #line 12661 "configure"
+ import com.jgoodies.looks.common.MenuItemRenderer;
+ public class conftest {
+     public static void main(String[] argv) {
+     }
+ }
+ EOF
+     CLASSPATH=$ac_java_classpath
+     export CLASSPATH
+     cmd="$JAVAC ${JAVAC_FLAGS} conftest.java"
+     if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5) ; then
+        if test ""no"" = "no"; then
+            echo "yes" >&5
+             { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
+ $as_echo "$jar_resolved" >&6; }
+             found_jar=yes
+             PACKAGE_JAR_FILE=$jar_resolved
+             break
+          else
+                  cmd="$JAVA conftest"
+                  if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5); then
+                  echo "yes" >&5
+             { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
+ $as_echo "$jar_resolved" >&6; }
+             found_jar=yes
+             PACKAGE_JAR_FILE=$jar_resolved
+             break
+                       else
+                       echo "configure: failed program was:" >&5
+                               cat conftest.java >&5
+                 if test -s conftest.java.output; then
+                    STDOUT=`cat conftest.java.output`
+                 fi
                        echo "configure: CLASSPATH was $CLASSPATH" >&5
  
              ac_java_classpath=$saved_ac_java_classpath
@@@ -11743,7 -12757,7 +12766,7 @@@ $as_echo_n "checking skinlf... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 11746 "configure"
 -// #line 12760 "configure"
++// #line 12769 "configure"
  import com.l2fprod.util.AccessUtils;
  
  public class conftest {
@@@ -11844,7 -12864,7 +12873,7 @@@ $as_echo_n "checking jogl... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 11847 "configure"
 -// #line 12867 "configure"
++// #line 12876 "configure"
  import javax.media.opengl.glu.GLUnurbs;
  
  public class conftest {
@@@ -12047,7 -13076,7 +13085,7 @@@ $as_echo_n "checking gluegen-rt... " >&
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 12050 "configure"
 -// #line 13079 "configure"
++// #line 13088 "configure"
  import com.sun.gluegen.runtime.CPU;
  
  public class conftest {
@@@ -12202,7 -13237,7 +13246,7 @@@ $as_echo_n "checking jhall... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 12205 "configure"
 -// #line 13240 "configure"
++// #line 13249 "configure"
  import javax.help.JHelp;
  
  public class conftest {
@@@ -12246,6 -13284,224 +13293,224 @@@ $as_echo "$jar_resolved" >&6; 
  
                                                fi
                fi
+         if test -f conftest.java.output; then
+            rm conftest.java.output
+         fi
+     else
+         echo "configure: failed program was:" >&5
+         cat conftest.java >&5
+         echo "configure: CLASSPATH was $CLASSPATH" >&5
+             ac_java_classpath=$saved_ac_java_classpath
+             fi
+         fi
+         done
+         # If ls returns several results and the first one is OK, stop the search
+       if test "$found_jar" = "yes"; then
+         break
+       fi
+       done
+         # If found, no need to search in other directory
+       if test "$found_jar" = "yes"; then
+         break
+       fi
+     done
+     if test "$found_jar" = "no"; then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+         if test ""yes"" = "yes"; then
+               { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar jhall used by Scilab Help Browser (looking for package javax.help.JHelp)" >&5
+ $as_echo "$as_me: WARNING: Could not find or use the Java package/jar jhall used by Scilab Help Browser (looking for package javax.help.JHelp)" >&2;}
+         else
+                 as_fn_error $? "Could not find or use the Java package/jar jhall used by Scilab Help Browser (looking for package javax.help.JHelp)" "$LINENO" 5
+         fi
+     fi
+                 JHALL=$PACKAGE_JAR_FILE
+                 # Named differently under Mandriva
+                 if test -z "$JHALL"; then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking javahelp2" >&5
+ $as_echo_n "checking javahelp2... " >&6; }
+       PACKAGE_JAR_FILE=
+       found_jar=no
+       saved_ac_java_classpath=$ac_java_classpath
+       DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/ 2>/dev/null) $(ls -d /usr/lib64/*/ 2>/dev/null) $(ls -d /usr/lib/*/ 2>/dev/null)  $(ls -d /usr/share/*/lib/ 2>/dev/null)"
+     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/ /\\ /'`
+ #     echo "protected $jar"
+ #     jar_resolved=`ls $jar 2>/dev/null`
+ #     echo "looking for $jar_resolved"
+ # TODO check the behaviour when spaces
+       jars_resolved=`ls $jar 2>/dev/null`
+       for jar_resolved in $jars_resolved; do # If several jars matches
+         if test -e "$jar_resolved"; then
+           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+     cat << \EOF > conftest.java
 -// #line 13347 "configure"
++// #line 13356 "configure"
+ import javax.help.JHelp;
+ public class conftest {
+     public static void main(String[] argv) {
+     }
+ }
+ EOF
+     CLASSPATH=$ac_java_classpath
+     export CLASSPATH
+     cmd="$JAVAC ${JAVAC_FLAGS} conftest.java"
+     if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5) ; then
+        if test ""no"" = "no"; then
+            echo "yes" >&5
+             { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
+ $as_echo "$jar_resolved" >&6; }
+             found_jar=yes
+             PACKAGE_JAR_FILE=$jar_resolved
+             break
+          else
+                  cmd="$JAVA conftest"
+                  if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5); then
+                  echo "yes" >&5
+             { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
+ $as_echo "$jar_resolved" >&6; }
+             found_jar=yes
+             PACKAGE_JAR_FILE=$jar_resolved
+             break
+                       else
+                       echo "configure: failed program was:" >&5
+                               cat conftest.java >&5
+                 if test -s conftest.java.output; then
+                    STDOUT=`cat conftest.java.output`
+                 fi
+                       echo "configure: CLASSPATH was $CLASSPATH" >&5
+             ac_java_classpath=$saved_ac_java_classpath
+                                               fi
+               fi
+         if test -f conftest.java.output; then
+            rm conftest.java.output
+         fi
+     else
+         echo "configure: failed program was:" >&5
+         cat conftest.java >&5
+         echo "configure: CLASSPATH was $CLASSPATH" >&5
+             ac_java_classpath=$saved_ac_java_classpath
+             fi
+         fi
+         done
+         # If ls returns several results and the first one is OK, stop the search
+       if test "$found_jar" = "yes"; then
+         break
+       fi
+       done
+         # If found, no need to search in other directory
+       if test "$found_jar" = "yes"; then
+         break
+       fi
+     done
+     if test "$found_jar" = "no"; then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+         if test "" = "yes"; then
+               { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar javahelp2 used by Scilab Help Browser (looking for package javax.help.JHelp)" >&5
+ $as_echo "$as_me: WARNING: Could not find or use the Java package/jar javahelp2 used by Scilab Help Browser (looking for package javax.help.JHelp)" >&2;}
+         else
+                 as_fn_error $? "Could not find or use the Java package/jar javahelp2 used by Scilab Help Browser (looking for package javax.help.JHelp)" "$LINENO" 5
+         fi
+     fi
+                     JHALL=$PACKAGE_JAR_FILE
+                 fi
+                 # Console API
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking jrosetta-API" >&5
+ $as_echo_n "checking jrosetta-API... " >&6; }
+       PACKAGE_JAR_FILE=
+       found_jar=no
+       saved_ac_java_classpath=$ac_java_classpath
+       DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/ 2>/dev/null) $(ls -d /usr/lib64/*/ 2>/dev/null) $(ls -d /usr/lib/*/ 2>/dev/null)  $(ls -d /usr/share/*/lib/ 2>/dev/null)"
+     for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
+       for jar in "$jardir/jrosetta-API.jar" "$jardir/libjrosetta-API.jar" "$jardir/libjrosetta-API-java.jar" "$jardir/jrosetta-API*.jar"; do
+ #     jar=`echo $jar|sed -e 's/ /\\ /'`
+ #     echo "protected $jar"
+ #     jar_resolved=`ls $jar 2>/dev/null`
+ #     echo "looking for $jar_resolved"
+ # TODO check the behaviour when spaces
+       jars_resolved=`ls $jar 2>/dev/null`
+       for jar_resolved in $jars_resolved; do # If several jars matches
+         if test -e "$jar_resolved"; then
+           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+     cat << \EOF > conftest.java
 -// #line 13455 "configure"
++// #line 13464 "configure"
+ import com.artenum.rosetta.interfaces.core.ConsoleConfiguration;
+ public class conftest {
+     public static void main(String[] argv) {
+     }
+ }
+ EOF
+     CLASSPATH=$ac_java_classpath
+     export CLASSPATH
+     cmd="$JAVAC ${JAVAC_FLAGS} conftest.java"
+     if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5) ; then
+        if test ""no"" = "no"; then
+            echo "yes" >&5
+             { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
+ $as_echo "$jar_resolved" >&6; }
+             found_jar=yes
+             PACKAGE_JAR_FILE=$jar_resolved
+             break
+          else
+                  cmd="$JAVA conftest"
+                  if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5); then
+                  echo "yes" >&5
+             { $as_echo "$as_me:${as_lineno-$LINENO}: result: $jar_resolved" >&5
+ $as_echo "$jar_resolved" >&6; }
+             found_jar=yes
+             PACKAGE_JAR_FILE=$jar_resolved
+             break
+                       else
+                       echo "configure: failed program was:" >&5
+                               cat conftest.java >&5
+                 if test -s conftest.java.output; then
+                    STDOUT=`cat conftest.java.output`
+                 fi
+                       echo "configure: CLASSPATH was $CLASSPATH" >&5
+             ac_java_classpath=$saved_ac_java_classpath
+                                               fi
+               fi
+         if test -f conftest.java.output; then
+            rm conftest.java.output
+         fi
      else
          echo "configure: failed program was:" >&5
          cat conftest.java >&5
@@@ -12303,8 -13559,8 +13568,8 @@@ $as_echo_n "checking jrosetta-engine..
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 12306 "configure"
- import javax.help.JHelp;
 -// #line 13562 "configure"
++// #line 13571 "configure"
+ import com.artenum.rosetta.core.action.AbstractConsoleAction;
  
  public class conftest {
      public static void main(String[] argv) {
@@@ -12405,8 -13668,8 +13677,8 @@@ $as_echo_n "checking jeuclid-core... " 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 12408 "configure"
- import com.artenum.rosetta.interfaces.core.ConsoleConfiguration;
 -// #line 13671 "configure"
++// #line 13680 "configure"
+ import net.sourceforge.jeuclid.LayoutContext;
  
  public class conftest {
      public static void main(String[] argv) {
@@@ -12506,8 -13777,8 +13786,8 @@@ $as_echo_n "checking fop... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 12509 "configure"
- import com.artenum.rosetta.core.action.AbstractConsoleAction;
 -// #line 13780 "configure"
++// #line 13789 "configure"
+ import org.apache.fop.pdf.PDFInfo;
  
  public class conftest {
      public static void main(String[] argv) {
@@@ -12609,8 -13884,8 +13893,8 @@@ $as_echo_n "checking batik-all... " >&6
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 12612 "configure"
- import net.sourceforge.jeuclid.LayoutContext;
 -// #line 13887 "configure"
++// #line 13896 "configure"
+ import org.apache.batik.parser.Parser;
  
  public class conftest {
      public static void main(String[] argv) {
@@@ -12712,8 -13991,8 +14000,8 @@@ $as_echo_n "checking batik... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 12715 "configure"
- import org.apache.fop.pdf.PDFInfo;
 -// #line 13994 "configure"
++// #line 14003 "configure"
+ import org.apache.batik.parser.Parser;
  
  public class conftest {
      public static void main(String[] argv) {
@@@ -12789,32 -14074,19 +14083,19 @@@ $as_echo "$as_me: WARNING: Could not fi
          fi
      fi
  
-                               FOP=$PACKAGE_JAR_FILE
+                    BATIK=$PACKAGE_JAR_FILE
+                 fi
  
-                               # xml.apache.org SVG Library (under mandriva for example)
  
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking batik-all" >&5
- $as_echo_n "checking batik-all... " >&6; }
-       PACKAGE_JAR_FILE=
-       found_jar=no
-       saved_ac_java_classpath=$ac_java_classpath
-       DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/ 2>/dev/null) $(ls -d /usr/lib64/*/ 2>/dev/null) $(ls -d /usr/lib/*/ 2>/dev/null)"
-     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/ /\\ /'`
- #     echo "protected $jar"
- #     jar_resolved=`ls $jar 2>/dev/null`
- #     echo "looking for $jar_resolved"
- # TODO check the behaviour when spaces
-       jars_resolved=`ls $jar 2>/dev/null`
-       for jar_resolved in $jars_resolved; do # If several jars matches
-         if test -e "$jar_resolved"; then
-           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking minimal version (1.7) of batik" >&5
+ $as_echo_n "checking minimal version (1.7) of batik... " >&6; }
+    saved_ac_java_classpath=$ac_java_classpath
+    export ac_java_classpath="$BATIK:$ac_java_classpath"
+    if test "x" == "x"; then
  
      cat << \EOF > conftest.java
- // #line 12816 "configure"
- import org.apache.batik.parser.Parser;
 -// #line 14088 "configure"
++// #line 14097 "configure"
+ import org.apache.batik.Version;
  
  public class conftest {
      public static void main(String[] argv) {
          echo "configure: failed program was:" >&5
          cat conftest.java >&5
          echo "configure: CLASSPATH was $CLASSPATH" >&5
+           as_fn_error $? "Wrong version of batik. Expected at least 1.7. Found $STDOUT" "$LINENO" 5
+             fi
  
-             ac_java_classpath=$saved_ac_java_classpath
+    else
  
+     cat << \EOF > conftest.java
 -// #line 14139 "configure"
++// #line 14148 "configure"
+ import org.apache.batik.Version;
  
-             fi
+ public class conftest {
+     public static void main(String[] argv) {
+         String minVersion="1.7";
+                             System.out.println(Version.getVersion());
+                                   if (minVersion.compareTo(Version.getVersion()) != 0) {
+                                    System.exit(-1);
+                                 }
+     }
+ }
+ EOF
  
+     CLASSPATH=$ac_java_classpath
+     export CLASSPATH
+     cmd="$JAVAC ${JAVAC_FLAGS} conftest.java"
+     if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5) ; then
+        if test ""yes"" = "no"; then
+            echo "yes" >&5
+                  echo "yes"
+          else
+                  cmd="$JAVA conftest"
+                  if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5); then
+                  echo "yes" >&5
+                          echo "yes"
+                       else
+                       echo "configure: failed program was:" >&5
+                               cat conftest.java >&5
+                 if test -s conftest.java.output; then
+                    STDOUT=`cat conftest.java.output`
+                 fi
+                       echo "configure: CLASSPATH was $CLASSPATH" >&5
+                         as_fn_error $? "Wrong version of batik. Expected exact version 1.7. Found $STDOUT" "$LINENO" 5
+                                               fi
+               fi
+         if test -f conftest.java.output; then
+            rm conftest.java.output
          fi
-         done
-         # If ls returns several results and the first one is OK, stop the search
-       if test "$found_jar" = "yes"; then
-         break
-       fi
-       done
-         # If found, no need to search in other directory
-       if test "$found_jar" = "yes"; then
-         break
-       fi
-     done
-     if test "$found_jar" = "no"; then
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
-         if test ""yes"" = "yes"; then
-               { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar batik-all used by Apache SVG Library (looking for package org.apache.batik.parser.Parser)" >&5
- $as_echo "$as_me: WARNING: Could not find or use the Java package/jar batik-all used by Apache SVG Library (looking for package org.apache.batik.parser.Parser)" >&2;}
-         else
-                 as_fn_error $? "Could not find or use the Java package/jar batik-all used by Apache SVG Library (looking for package org.apache.batik.parser.Parser)" "$LINENO" 5
-         fi
+     else
+         echo "configure: failed program was:" >&5
+         cat conftest.java >&5
+         echo "configure: CLASSPATH was $CLASSPATH" >&5
+           as_fn_error $? "Wrong version of batik. Expected exact version 1.7. Found $STDOUT" "$LINENO" 5
+             fi
      fi
+    ac_java_classpath=$saved_ac_java_classpath
  
-                               BATIK=$PACKAGE_JAR_FILE
  
-                               if test -z "$BATIK"; then
-                                  # Other other distribs
+                 # Commons I/O library
  
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking batik" >&5
- $as_echo_n "checking batik... " >&6; }
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking commons-io" >&5
+ $as_echo_n "checking commons-io... " >&6; }
        PACKAGE_JAR_FILE=
        found_jar=no
        saved_ac_java_classpath=$ac_java_classpath
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 12917 "configure"
- import org.apache.batik.parser.Parser;
 -// #line 14212 "configure"
++// #line 14221 "configure"
+ import org.apache.commons.io.output.CountingOutputStream;
  
  public class conftest {
      public static void main(String[] argv) {
@@@ -13016,8 -14316,8 +14325,8 @@@ $as_echo_n "checking xmlgraphics-common
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 13019 "configure"
- import org.apache.commons.io.output.CountingOutputStream;
 -// #line 14319 "configure"
++// #line 14328 "configure"
+ import org.apache.xmlgraphics.util.Service;
  
  public class conftest {
      public static void main(String[] argv) {
@@@ -13117,8 -14423,8 +14432,8 @@@ $as_echo_n "checking avalon-framework..
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 13120 "configure"
- import org.apache.xmlgraphics.util.Service;
 -// #line 14426 "configure"
++// #line 14435 "configure"
+ import org.apache.avalon.framework.configuration.ConfigurationException;
  
  public class conftest {
      public static void main(String[] argv) {
@@@ -13218,8 -14530,8 +14539,8 @@@ $as_echo_n "checking xml-apis-ext... " 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 13221 "configure"
- import org.apache.avalon.framework.configuration.ConfigurationException;
 -// #line 14533 "configure"
++// #line 14542 "configure"
+ import org.w3c.dom.svg.SVGDocument;
  
  public class conftest {
      public static void main(String[] argv) {
@@@ -13319,7 -14637,7 +14646,7 @@@ $as_echo_n "checking xml-commons-apis-e
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 13322 "configure"
 -// #line 14640 "configure"
++// #line 14649 "configure"
  import org.w3c.dom.svg.SVGDocument;
  
  public class conftest {
@@@ -13420,8 -14748,8 +14757,8 @@@ $as_echo_n "checking commons-logging..
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 13423 "configure"
- import org.w3c.dom.svg.SVGDocument;
 -// #line 14751 "configure"
++// #line 14760 "configure"
+ import org.apache.commons.logging.LogFactory;
  
  public class conftest {
      public static void main(String[] argv) {
@@@ -13527,8 -14855,8 +14864,8 @@@ $as_echo_n "checking jlatexmath... " >&
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 13530 "configure"
- import ncsa.hdf.hdf5lib.HDF5Constants;
 -// #line 14858 "configure"
++// #line 14867 "configure"
+ import org.scilab.forge.jlatexmath.TeXFormula;
  
  public class conftest {
      public static void main(String[] argv) {
@@@ -13604,33 -14938,19 +14947,19 @@@ $as_echo "$as_me: WARNING: Could not fi
          fi
      fi
  
-                                 JHDF5=$PACKAGE_JAR_FILE
+                 JLATEXMATH=$PACKAGE_JAR_FILE
  
-                               fi
  
-                               # Logging (flexdock dep)
  
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking commons-logging" >&5
- $as_echo_n "checking commons-logging... " >&6; }
-       PACKAGE_JAR_FILE=
-       found_jar=no
-       saved_ac_java_classpath=$ac_java_classpath
-       DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/ 2>/dev/null) $(ls -d /usr/lib64/*/ 2>/dev/null) $(ls -d /usr/lib/*/ 2>/dev/null)"
-     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/ /\\ /'`
- #     echo "protected $jar"
- #     jar_resolved=`ls $jar 2>/dev/null`
- #     echo "looking for $jar_resolved"
- # TODO check the behaviour when spaces
-       jars_resolved=`ls $jar 2>/dev/null`
-       for jar_resolved in $jars_resolved; do # If several jars matches
-         if test -e "$jar_resolved"; then
-           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking minimal version (0.9.4) of jlatexmath" >&5
+ $as_echo_n "checking minimal version (0.9.4) of jlatexmath... " >&6; }
+    saved_ac_java_classpath=$ac_java_classpath
+    export ac_java_classpath="$JLATEXMATH:$ac_java_classpath"
+    if test "x" == "x"; then
  
      cat << \EOF > conftest.java
- // #line 13632 "configure"
- import org.apache.commons.logging.LogFactory;
 -// #line 14952 "configure"
++// #line 14961 "configure"
+ import org.scilab.forge.jlatexmath.TeXFormula;
  
  public class conftest {
      public static void main(String[] argv) {
                        else
                        echo "configure: failed program was:" >&5
                                cat conftest.java >&5
+                 if test -s conftest.java.output; then
+                    STDOUT=`cat conftest.java.output`
+                 fi
                        echo "configure: CLASSPATH was $CLASSPATH" >&5
+                         as_fn_error $? "Wrong version of jlatexmath. Expected at least 0.9.4. Found $STDOUT" "$LINENO" 5
+                                               fi
+               fi
+         if test -f conftest.java.output; then
+            rm conftest.java.output
+         fi
+     else
+         echo "configure: failed program was:" >&5
+         cat conftest.java >&5
+         echo "configure: CLASSPATH was $CLASSPATH" >&5
+           as_fn_error $? "Wrong version of jlatexmath. Expected at least 0.9.4. Found $STDOUT" "$LINENO" 5
+             fi
  
-             ac_java_classpath=$saved_ac_java_classpath
+    else
+     cat << \EOF > conftest.java
 -// #line 15003 "configure"
++// #line 15012 "configure"
+ import org.scilab.forge.jlatexmath.TeXFormula;
+ public class conftest {
+     public static void main(String[] argv) {
+         String minVersion="0.9.4";
  
+                             System.out.println(TeXFormula.VERSION);
+                                   if (minVersion.compareTo(TeXFormula.VERSION) != 0) {
+                                    System.exit(-1);
+                                 }
  
+     }
+ }
+ EOF
+     CLASSPATH=$ac_java_classpath
+     export CLASSPATH
+     cmd="$JAVAC ${JAVAC_FLAGS} conftest.java"
+     if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5) ; then
+        if test ""yes"" = "no"; then
+            echo "yes" >&5
+                  echo "yes"
+          else
+                  cmd="$JAVA conftest"
+                  if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5); then
+                  echo "yes" >&5
+                          echo "yes"
+                       else
+                       echo "configure: failed program was:" >&5
+                               cat conftest.java >&5
+                 if test -s conftest.java.output; then
+                    STDOUT=`cat conftest.java.output`
+                 fi
+                       echo "configure: CLASSPATH was $CLASSPATH" >&5
+                         as_fn_error $? "Wrong version of jlatexmath. Expected exact version 0.9.4. Found $STDOUT" "$LINENO" 5
                                                fi
                fi
+         if test -f conftest.java.output; then
+            rm conftest.java.output
+         fi
      else
          echo "configure: failed program was:" >&5
          cat conftest.java >&5
@@@ -13730,8 -15079,8 +15088,8 @@@ $as_echo_n "checking checkstyle... " >&
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 13733 "configure"
- import org.scilab.forge.jlatexmath.TeXFormula;
 -// #line 15082 "configure"
++// #line 15091 "configure"
+ import com.puppycrawl.tools.checkstyle.CheckStyleTask;
  
  public class conftest {
      public static void main(String[] argv) {
@@@ -13887,8 -15186,8 +15195,8 @@@ $as_echo_n "checking commons-beanutils.
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 13890 "configure"
- import com.puppycrawl.tools.checkstyle.CheckStyleTask;
 -// #line 15189 "configure"
++// #line 15198 "configure"
+ import org.apache.commons.beanutils.Converter;
  
  public class conftest {
      public static void main(String[] argv) {
@@@ -13988,8 -15293,8 +15302,8 @@@ $as_echo_n "checking antlr... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 13991 "configure"
- import org.apache.commons.beanutils.Converter;
 -// #line 15296 "configure"
++// #line 15305 "configure"
+ import antlr.TokenStreamException;
  
  public class conftest {
      public static void main(String[] argv) {
@@@ -14190,7 -15400,7 +15409,7 @@@ $as_echo_n "checking testng... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14193 "configure"
 -// #line 15403 "configure"
++// #line 15412 "configure"
  import org.testng.TestNG;
  
  public class conftest {
@@@ -14291,7 -15507,7 +15516,7 @@@ $as_echo_n "checking qdox... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14294 "configure"
 -// #line 15510 "configure"
++// #line 15519 "configure"
  import com.thoughtworks.qdox.tools.QDoxTester;
  
  public class conftest {
@@@ -14392,7 -15614,7 +15623,7 @@@ $as_echo_n "checking bsh... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14395 "configure"
 -// #line 15617 "configure"
++// #line 15626 "configure"
  import bsh.Console;
  
  public class conftest {
@@@ -14493,7 -15721,7 +15730,7 @@@ $as_echo_n "checking junit... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14496 "configure"
 -// #line 15724 "configure"
++// #line 15733 "configure"
  import junit.framework.Assert;
  
  public class conftest {
@@@ -22924,7 -23743,7 +23918,7 @@@ CPPFLAGS="$CPPFLAGS -I$CHK_TCL_INCLUDE_
  { $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 22927 "configure"
 -#line 23746 "configure"
++#line 23921 "configure"
  #include "confdefs.h"
  
  #include "$CHK_TCL_INCLUDE_PATH/$CHK_TCL_INC_NAME"
@@@ -23234,7 -24053,7 +24228,7 @@@ CPPFLAGS="$CPPFLAGS $TCL_INC_PATH -I$CH
  $as_echo_n "checking if tk is version $CHK_TK_MAJOR.$CHK_TK_MINOR or later... " >&6; }
  
  cat > conftest.$ac_ext <<EOF
- #line 23237 "configure"
 -#line 24056 "configure"
++#line 24231 "configure"
  #include "confdefs.h"
  
  #include "$CHK_TK_INCLUDE_PATH/$CHK_TK_INC_NAME"
@@@ -23815,7 -24634,7 +24809,7 @@@ $as_echo_n "checking saxon... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 23818 "configure"
 -// #line 24637 "configure"
++// #line 24812 "configure"
  import com.icl.saxon.Loader;
  
  public class conftest {
@@@ -23916,7 -24741,7 +24916,7 @@@ $as_echo_n "checking jlatexmath-fop... 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 23919 "configure"
 -// #line 24744 "configure"
++// #line 24919 "configure"
  import org.scilab.forge.jlatexmath.fop.JLaTeXMathObj;
  
  public class conftest {
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<_LT_EOF
- #line 30189 "configure"
 -#line 31051 "configure"
++#line 31226 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<_LT_EOF
- #line 30295 "configure"
 -#line 31157 "configure"
++#line 31332 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
@@@ -36314,7 -37182,7 +37357,7 @@@ if test "$enable_stop_on_warning" = yes
     CXXFLAGS="$CXXFLAGS -Werror -O0"
  fi
  
- ac_config_files="$ac_config_files libs/MALLOC/Makefile libs/dynamiclibrary/Makefile libs/doublylinkedlist/Makefile libs/hashtable/Makefile libs/libst/Makefile contrib/Makefile modules/helptools/Makefile modules/helptools/macros/xmlfiletohtml.sci modules/data_structures/Makefile modules/differential_equations/Makefile modules/optimization/Makefile modules/elementary_functions/Makefile modules/special_functions/Makefile modules/io/Makefile modules/shell/Makefile modules/completion/Makefile modules/history_manager/Makefile modules/jvm/Makefile modules/sound/Makefile modules/statistics/Makefile modules/mexlib/Makefile modules/sparse/Makefile modules/linear_algebra/Makefile modules/polynomials/Makefile modules/symbolic/Makefile modules/signal_processing/Makefile modules/arnoldi/Makefile modules/interpolation/Makefile modules/intersci/Makefile modules/localization/Makefile modules/cacsd/Makefile modules/boolean/Makefile modules/integer/Makefile modules/double/Makefile modules/fileio/Makefile modules/spreadsheet/Makefile modules/string/Makefile modules/time/Makefile modules/graphics/Makefile modules/graphic_export/Makefile modules/renderer/Makefile modules/action_binding/Makefile modules/gui/Makefile modules/pvm/Makefile modules/mpi/Makefile modules/randlib/Makefile modules/tclsci/Makefile modules/windows_tools/Makefile modules/core/Makefile modules/api_scilab/Makefile modules/call_scilab/Makefile modules/hdf5/Makefile modules/fftw/Makefile modules/umfpack/Makefile modules/scicos/Makefile modules/scicos_blocks/Makefile modules/functions/Makefile modules/dynamic_link/Makefile modules/overloading/Makefile modules/javasci/Makefile modules/maple2scilab/Makefile modules/m2sci/Makefile modules/compatibility_functions/Makefile modules/texmacs/Makefile modules/development_tools/Makefile modules/output_stream/Makefile modules/console/Makefile modules/demo_tools/Makefile modules/genetic_algorithms/Makefile modules/simulated_annealing/Makefile modules/parameters/Makefile modules/matio/Makefile modules/atoms/Makefile modules/xcos/Makefile modules/xpad/Makefile modules/graph/Makefile modules/Makefile libs/Makefile Makefile scilab.pc etc/modules.xml etc/classpath.xml etc/jvm_options.xml scilab-lib.properties scilab-lib-doc.properties"
 -ac_config_files="$ac_config_files libs/MALLOC/Makefile libs/dynamiclibrary/Makefile libs/doublylinkedlist/Makefile libs/hashtable/Makefile libs/libst/Makefile contrib/Makefile modules/helptools/Makefile modules/helptools/macros/xmlfiletohtml.sci modules/data_structures/Makefile modules/differential_equations/Makefile modules/optimization/Makefile modules/elementary_functions/Makefile modules/special_functions/Makefile modules/io/Makefile modules/shell/Makefile modules/completion/Makefile modules/history_manager/Makefile modules/jvm/Makefile modules/commons/Makefile modules/sound/Makefile modules/statistics/Makefile modules/mexlib/Makefile modules/sparse/Makefile modules/linear_algebra/Makefile modules/polynomials/Makefile modules/symbolic/Makefile modules/signal_processing/Makefile modules/arnoldi/Makefile modules/interpolation/Makefile modules/intersci/Makefile modules/localization/Makefile modules/cacsd/Makefile modules/boolean/Makefile modules/integer/Makefile modules/double/Makefile modules/fileio/Makefile modules/spreadsheet/Makefile modules/string/Makefile modules/time/Makefile modules/graphics/Makefile modules/graphic_export/Makefile modules/renderer/Makefile modules/action_binding/Makefile modules/gui/Makefile modules/pvm/Makefile modules/randlib/Makefile modules/tclsci/Makefile modules/windows_tools/Makefile modules/core/Makefile modules/api_scilab/Makefile modules/call_scilab/Makefile modules/types/Makefile modules/hdf5/Makefile modules/fftw/Makefile modules/umfpack/Makefile modules/scicos/Makefile modules/scicos_blocks/Makefile modules/functions/Makefile modules/dynamic_link/Makefile modules/overloading/Makefile modules/javasci/Makefile modules/maple2scilab/Makefile modules/m2sci/Makefile modules/compatibility_functions/Makefile modules/texmacs/Makefile modules/development_tools/Makefile modules/output_stream/Makefile modules/console/Makefile modules/demo_tools/Makefile modules/genetic_algorithms/Makefile modules/simulated_annealing/Makefile modules/parameters/Makefile modules/matio/Makefile modules/atoms/Makefile modules/xcos/Makefile modules/scinotes/Makefile modules/ui_data/Makefile modules/graph/Makefile modules/parallel/Makefile modules/modules_manager/Makefile modules/history_browser/Makefile modules/Makefile libs/Makefile Makefile scilab.pc etc/modules.xml etc/classpath.xml etc/Info.plist scilab.properties scilab-lib.properties scilab-lib-doc.properties modules/helptools/etc/SciDocConf.xml modules/core/includes/version.h"
++ac_config_files="$ac_config_files libs/MALLOC/Makefile libs/dynamiclibrary/Makefile libs/doublylinkedlist/Makefile libs/hashtable/Makefile libs/libst/Makefile contrib/Makefile modules/helptools/Makefile modules/helptools/macros/xmlfiletohtml.sci modules/data_structures/Makefile modules/differential_equations/Makefile modules/optimization/Makefile modules/elementary_functions/Makefile modules/special_functions/Makefile modules/io/Makefile modules/shell/Makefile modules/completion/Makefile modules/history_manager/Makefile modules/jvm/Makefile modules/commons/Makefile modules/sound/Makefile modules/statistics/Makefile modules/mexlib/Makefile modules/sparse/Makefile modules/linear_algebra/Makefile modules/polynomials/Makefile modules/symbolic/Makefile modules/signal_processing/Makefile modules/arnoldi/Makefile modules/interpolation/Makefile modules/intersci/Makefile modules/localization/Makefile modules/cacsd/Makefile modules/boolean/Makefile modules/integer/Makefile modules/double/Makefile modules/fileio/Makefile modules/spreadsheet/Makefile modules/string/Makefile modules/time/Makefile modules/graphics/Makefile modules/graphic_export/Makefile modules/renderer/Makefile modules/action_binding/Makefile modules/gui/Makefile modules/pvm/Makefile modules/mpi/Makefile modules/randlib/Makefile modules/tclsci/Makefile modules/windows_tools/Makefile modules/core/Makefile modules/api_scilab/Makefile modules/call_scilab/Makefile modules/types/Makefile modules/hdf5/Makefile modules/fftw/Makefile modules/umfpack/Makefile modules/scicos/Makefile modules/scicos_blocks/Makefile modules/functions/Makefile modules/dynamic_link/Makefile modules/overloading/Makefile modules/javasci/Makefile modules/maple2scilab/Makefile modules/m2sci/Makefile modules/compatibility_functions/Makefile modules/texmacs/Makefile modules/development_tools/Makefile modules/output_stream/Makefile modules/console/Makefile modules/demo_tools/Makefile modules/genetic_algorithms/Makefile modules/simulated_annealing/Makefile modules/parameters/Makefile modules/matio/Makefile modules/atoms/Makefile modules/xcos/Makefile modules/scinotes/Makefile modules/ui_data/Makefile modules/graph/Makefile modules/parallel/Makefile modules/modules_manager/Makefile modules/history_browser/Makefile modules/Makefile libs/Makefile Makefile scilab.pc etc/modules.xml etc/classpath.xml etc/Info.plist scilab.properties scilab-lib.properties scilab-lib-doc.properties modules/helptools/etc/SciDocConf.xml modules/core/includes/version.h"
  
  
  # Detection of the module for the future version of Scilab 6
@@@ -645,186 -754,212 +754,213 @@@ AM_CONDITIONAL(XCOS, test "$XCOS_ENABLE
  ###########################
  
  if test "$with_javasci" != no -o "$with_gui" != no -o "$enable_build_help" != no; then
+    # Need MacosX Version to specify some path.
+    case "$host_os" in
+                    *Darwin* | *darwin*)
+                    AC_GET_MACOSX_VERSION;;
+   esac
     # See if --with-jdk command line argument is given
       # Try to detect the installed JVM, this could be controlled
-        # by the above --with options
-        AC_JAVA_WITH_JDK
-        AC_JAVA_DETECT_JVM
+      # by the above --with options
+      AC_JAVA_WITH_JDK
+      AC_JAVA_DETECT_JVM
     if test "$ac_java_jvm_name" = "jdk"; then
-               JAVA_HOME=$ac_java_jvm_dir
-           JAVA_VERSION=$ac_java_jvm_version
+         JAVA_HOME=$ac_java_jvm_dir
+         JAVA_VERSION=$ac_java_jvm_version
  #     AC_JAVA_TOOLS
-               AC_JAVA_JNI_INCLUDE
-               JAVA_JNI_INCLUDE=$ac_java_jvm_jni_include_flags
-               AC_JAVA_JNI_LIBS
-               JAVA_JNI_LIBS=$ac_java_jvm_jni_lib_flags
-               JAVA_JNI_LIBS_PRELOAD=$ac_java_jvm_ld_preload
-               AC_JAVA_CLASSPATH
-               JAVA_CLASSPATH=$ac_java_classpath
-               AC_JAVA_TOOLS
-               AC_JAVA_ANT
-               if test "$with_gui" != no; then
-                               # jgraphx
-                               AC_JAVA_CHECK_PACKAGE([jgraphx],[com.mxgraph.model.mxCell],[Diagram design])
-                               JGRAPHX=$PACKAGE_JAR_FILE
-                               AC_SUBST(JGRAPHX)
-                               AC_JAVA_CHECK_VERSION_PACKAGE([jgraphx],[import com.mxgraph.view.mxGraph;],$JGRAPHX,[1.2.0.7],[mxGraph.VERSION])
-                               # Docking system
-                               AC_JAVA_CHECK_PACKAGE([flexdock],[org.flexdock.docking.DockingManager],[Scilab Gui])
-                               FLEXDOCK=$PACKAGE_JAR_FILE
-                               AC_SUBST(FLEXDOCK)
-                               # Swing look&feel implementations
-                               AC_JAVA_CHECK_PACKAGE([looks],[com.jgoodies.looks.common.MenuItemRenderer],[Scilab Gui - Look and feel],"yes")
-                               LOOKS=$PACKAGE_JAR_FILE
-                               # Named differently under ArchLinux
-                               if test -z "$LOOKS"; then
-                                       AC_JAVA_CHECK_PACKAGE([jgoodies-looks],[com.jgoodies.looks.common.MenuItemRenderer],[Scilab Gui - Look and feel])
-                                       LOOKS=$PACKAGE_JAR_FILE
-                               fi
-                               AC_SUBST(LOOKS)
-                               #  Skin Look and Feel 
-                               AC_JAVA_CHECK_PACKAGE([skinlf],[com.l2fprod.util.AccessUtils],[Scilab Gui - Skin Look and Feel])
-                               SKINLF=$PACKAGE_JAR_FILE
-                               AC_SUBST(SKINLF)
-                               # JOGL
-                               AC_JAVA_CHECK_PACKAGE([jogl],[javax.media.opengl.glu.GLUnurbs],[Scilab 3D rendering - Version 1.1.1])
-                               JOGL=$PACKAGE_JAR_FILE
-                               AC_SUBST(JOGL)
-                               if test "$MACOSX" = 1; then
-                                  echo "Check of the presence of libjogl.jnilib and libjogl_awt.jnilib disabled under Mac OS X"
-                               else
-                                  LDFLAGS_save=$LDFLAGS
-                                  # Provide known paths where distribs/OS can store JNI libs
-                                  LDFLAGS="-L/usr/lib/jni -L/usr/lib64/jni/ -L$SCI_SRCDIR/thirdparty/ -L$SCI_SRCDIR/bin/"
-                                  AC_CHECK_LIB([jogl], [glTexParameterf], [JOGL_LIBS="-ljogl"],[AC_MSG_WARN([Could not link against -ljogl. Will try against -ljogl -lGL])])
-                                  if test -z "$JOGL_LIBS"; then # The previous test failed add more options to the LDFLAGS
-                                          LDFLAGS="$LDFLAGS -lGL "
-                                          # the space after "jogl" in the following line is on 
-                                          # purpose to disable the cache
-                                          AC_CHECK_LIB([jogl ], [glTexParameterf], 
-                                          [JOGL_LIBS="-ljogl -lGL"],
-                                          [AC_MSG_ERROR(["libjogl: Library missing (Cannot find symbol glTexParameterf). Check if libjogl - C/Java (JNI) interface for JOGL - or libGL are 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."])])
-                                  fi
-                                  LDFLAGS=$LDFLAGS_save
-                               fi
-                               # JoGL Native <=> Java connector
-                               AC_JAVA_CHECK_PACKAGE([gluegen-rt],[com.sun.gluegen.runtime.CPU],[Scilab 3D rendering])
-                               GLUEGEN_RT=$PACKAGE_JAR_FILE
-                               AC_SUBST(GLUEGEN_RT)
-                               if test "$MACOSX" = 1; then
-                                  echo "Check of the presence of libgluegen-rt.jnilib disabled under Mac OS X"
-                               else
-                                  LDFLAGS_save=$LDFLAGS
-                                  # Provide known paths where distribs/OS can store JNI libs
-                                  LDFLAGS="-L/usr/lib/jni -L/usr/lib64/jni/ -ldl -L$SCI_SRCDIR/thirdparty/ -L$SCI_SRCDIR/bin/"
-                                  symbol="Java_com_sun_gluegen_runtime_UnixDynamicLinkerImpl_dlclose__J"
-                                  AC_CHECK_LIB([gluegen-rt], [$symbol], [GLUEGEN_RT_LIBS="-lgluegen-rt"],
-                                  [AC_MSG_ERROR([libgluegen-rt: Library missing (Cannot find symbol glTexParameterf). Check if libgluegen-rt - C/Java (JNI) interface for GLUEGEN - is installed and if the version is correct. Note that you might have to update etc/librarypath.xml to provide the actual path the the JNI libraries.])])
-                                  LDFLAGS=$LDFLAGS_save
-                               fi
-                               # Jhall
-                               AC_JAVA_CHECK_PACKAGE([jhall],[javax.help.JHelp],[Scilab Help Browser],"yes")
-                               JHALL=$PACKAGE_JAR_FILE
-                               # Named differently under Mandriva
-                               if test -z "$JHALL"; then
-                                       AC_JAVA_CHECK_PACKAGE([javahelp2],[javax.help.JHelp],[Scilab Help Browser])
-                                       JHALL=$PACKAGE_JAR_FILE
-                               fi
-                               AC_SUBST(JHALL)
-                               # Console API
-                               AC_JAVA_CHECK_PACKAGE([jrosetta-API],[com.artenum.rosetta.interfaces.core.ConsoleConfiguration],[JRosetta : Console API Artenum / Scilab])
-                               JROSETTA_API=$PACKAGE_JAR_FILE
-                               AC_SUBST(JROSETTA_API)
-                               # Console Core
-                               AC_JAVA_CHECK_PACKAGE([jrosetta-engine],[com.artenum.rosetta.core.action.AbstractConsoleAction],[JRosetta : Console Core Artenum / Scilab])
-                               JROSETTA_ENGINE=$PACKAGE_JAR_FILE
-                               AC_SUBST(JROSETTA_ENGINE)
-                               # MathML rendering solution
-                               # Used in both graphic & help 
-                               AC_JAVA_CHECK_PACKAGE([jeuclid-core],[net.sourceforge.jeuclid.LayoutContext],[MathML rendering solution (at least version 3.1.X)])
-                               JEUCLID_CORE=$PACKAGE_JAR_FILE
-                               AC_SUBST(JEUCLID_CORE)
-                               ################ Mandatory for graphic_export features #####
-                               # XML to PDF/other Translator
-                               AC_JAVA_CHECK_PACKAGE([fop],[org.apache.fop.pdf.PDFInfo],[XML to PDF Translator (fop)])
-                               FOP=$PACKAGE_JAR_FILE
-                               AC_SUBST(FOP)
-                               # xml.apache.org SVG Library (under mandriva for example)
-                               AC_JAVA_CHECK_PACKAGE([batik-all],[org.apache.batik.parser.Parser],[Apache SVG Library],"yes")
-                               BATIK=$PACKAGE_JAR_FILE
-                               if test -z "$BATIK"; then
-                                  # Other other distribs
-                                  AC_JAVA_CHECK_PACKAGE([batik],[org.apache.batik.parser.Parser],[Apache SVG Library])
-                                  BATIK=$PACKAGE_JAR_FILE
-                               fi
-                               AC_SUBST(BATIK)
-                               # Commons I/O library
-                               AC_JAVA_CHECK_PACKAGE([commons-io],[org.apache.commons.io.output.CountingOutputStream],[Commons I/O library])
-                               COMMONS_IO=$PACKAGE_JAR_FILE
-                               AC_SUBST(COMMONS_IO)
-                               # XML graphics common
-                               AC_JAVA_CHECK_PACKAGE([xmlgraphics-commons],[org.apache.xmlgraphics.util.Service],[Commons graphics library])
-                               XMLGRAPHICS_COMMONS=$PACKAGE_JAR_FILE
-                               AC_SUBST(XMLGRAPHICS_COMMONS)
-                               # Avalon Framework (PDF)
-                               AC_JAVA_CHECK_PACKAGE([avalon-framework],[org.apache.avalon.framework.configuration.ConfigurationException],[Common framework for Java server application])
-                               AVALON_FRAMEWORK=$PACKAGE_JAR_FILE
-                               AC_SUBST(AVALON_FRAMEWORK)
-       # XML API EXT (conversion of a SVG => PNG)
-                               AC_JAVA_CHECK_PACKAGE([xml-apis-ext],[org.w3c.dom.svg.SVGDocument],[XML Commons external code],"yes")
-                               XML_APIS_EXT=$PACKAGE_JAR_FILE
-                               if test -z "$XML_APIS_EXT"; then
-                                       # Other other distribs (Ex: Fedora/Redhat)
-                                       AC_JAVA_CHECK_PACKAGE([xml-commons-apis-ext],[org.w3c.dom.svg.SVGDocument],[XML Commons external code])
-                                       XML_APIS_EXT=$PACKAGE_JAR_FILE
-                               fi
-                               AC_SUBST(XML_APIS_EXT)
-                               ################ END Mandatory for graphic_export features #####
-                               ############ XCOS ############
-                               if test $HDF5_ENABLE = yes;  then
-                               # HDF5 java lib
-                                 AC_JAVA_CHECK_PACKAGE([jhdf5],[ncsa.hdf.hdf5lib.HDF5Constants],[HDF5 Java library])
-                                 JHDF5=$PACKAGE_JAR_FILE
-                                 AC_SUBST(JHDF5)
-                               fi
-                               # Logging (flexdock dep)
-                               AC_JAVA_CHECK_PACKAGE([commons-logging],[org.apache.commons.logging.LogFactory],[Apache logging])
-                               COMMONS_LOGGING=$PACKAGE_JAR_FILE
-                               AC_SUBST(COMMONS_LOGGING)
-                               # JLaTeXMath
++
+         AC_JAVA_JNI_INCLUDE
+         JAVA_JNI_INCLUDE=$ac_java_jvm_jni_include_flags
+         AC_JAVA_JNI_LIBS
+         JAVA_JNI_LIBS=$ac_java_jvm_jni_lib_flags
+         JAVA_JNI_LIBS_PRELOAD=$ac_java_jvm_ld_preload
+         AC_JAVA_CLASSPATH
+         JAVA_CLASSPATH=$ac_java_classpath
+         AC_JAVA_TOOLS
+         AC_JAVA_ANT
+         case "$host_os" in
+              *Darwin* | *darwin*)
+                   JAVA_HOME=""
+              ;;
+         esac
+         if test "$with_gui" != no; then
+                 if test $XCOS_ENABLE = yes; then
+                    # jgraphx
+                    AC_JAVA_CHECK_PACKAGE([jgraphx],[com.mxgraph.model.mxCell],[Diagram design])
+                    JGRAPHX=$PACKAGE_JAR_FILE
+                    AC_SUBST(JGRAPHX)
+                    AC_JAVA_CHECK_VERSION_PACKAGE([jgraphx],[import com.mxgraph.view.mxGraph;],$JGRAPHX,[1.4.1.0],[mxGraph.VERSION],[],[=])
+                    # Java HDF5 is only needed for Xcos
+                    if test $HDF5_ENABLE = yes -a "$with_xcos" != no -a "$with_gui" != no;  then
+                       AC_JAVA_HDF5()
+                       if test "$MACOSX" = 1; then
+                          echo "Check of the presence of libjhdf5.jnilib disabled under Mac OS X"
+                       else
+                          AC_JNI_HDF5()
+                       fi
+                    fi #HDF5_ENABLE
+                 fi
+                 # Docking system
+                 AC_JAVA_CHECK_PACKAGE([flexdock],[org.flexdock.docking.DockingManager],[Scilab Gui])
+                 FLEXDOCK=$PACKAGE_JAR_FILE
+                 AC_SUBST(FLEXDOCK)
+                 AC_JAVA_CHECK_VERSION_PACKAGE([flexdock],[import org.flexdock.util.Utilities;],$FLEXDOCK,[0.5.2],[Utilities.VERSION])
+                 # Swing look&feel implementations
+                 AC_JAVA_CHECK_PACKAGE([looks],[com.jgoodies.looks.common.MenuItemRenderer],[Scilab Gui - Look and feel],"yes")
+                 LOOKS=$PACKAGE_JAR_FILE
+                 # Named differently under ArchLinux
+                 if test -z "$LOOKS"; then
+                     AC_JAVA_CHECK_PACKAGE([jgoodies-looks],[com.jgoodies.looks.common.MenuItemRenderer],[Scilab Gui - Look and feel])
+                     LOOKS=$PACKAGE_JAR_FILE
+                 fi
+                 AC_SUBST(LOOKS)
+                 #  Skin Look and Feel
+                 AC_JAVA_CHECK_PACKAGE([skinlf],[com.l2fprod.util.AccessUtils],[Scilab Gui - Skin Look and Feel])
+                 SKINLF=$PACKAGE_JAR_FILE
+                 AC_SUBST(SKINLF)
+                 # JOGL
+                 AC_JAVA_CHECK_PACKAGE([jogl],[javax.media.opengl.glu.GLUnurbs],[Scilab 3D rendering - Version 1.1.1])
+                 JOGL=$PACKAGE_JAR_FILE
+                 AC_SUBST(JOGL)
+                 if test "$MACOSX" = 1; then
+                    echo "Check of the presence of libjogl.jnilib and libjogl_awt.jnilib disabled under Mac OS X"
+                 else
+                    LDFLAGS_save=$LDFLAGS
+                    # Provide known paths where distribs/OS can store JNI libs
+                    LDFLAGS="-L/usr/lib/jni -L/usr/lib64/jni/ -L$SCI_SRCDIR/thirdparty/ -L$SCI_SRCDIR/bin/"
+                    AC_CHECK_LIB([jogl], [glTexParameterf], [JOGL_LIBS="-ljogl"],[AC_MSG_WARN([Could not link against -ljogl. Will try against -ljogl -lGL])])
+                    if test -z "$JOGL_LIBS"; then # The previous test failed add more options to the LDFLAGS
+                        # the space after "jogl" in the following line is on
+                        # purpose to disable the cache
+                           AC_CHECK_LIB([jogl ], [glTexParameterf],
+                        [JOGL_LIBS="-ljogl -lGL"],
+                        [AC_MSG_ERROR(["libjogl: Library
+ missing (Cannot find symbol glTexParameterf). Check if libjogl - C/Java (JNI)
+ interface for JOGL - or libGL are 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."])],
+                        [-lGL])
+                    fi
+                    LDFLAGS=$LDFLAGS_save
+                 fi
+                 # JoGL Native <=> Java connector
+                 AC_JAVA_CHECK_PACKAGE([gluegen-rt],[com.sun.gluegen.runtime.CPU],[Scilab 3D rendering])
+                 GLUEGEN_RT=$PACKAGE_JAR_FILE
+                 AC_SUBST(GLUEGEN_RT)
+                 if test "$MACOSX" = 1; then
+                    echo "Check of the presence of libgluegen-rt.jnilib disabled under Mac OS X"
+                 else
+                    LDFLAGS_save=$LDFLAGS
+                    # Provide known paths where distribs/OS can store JNI libs
+                    LDFLAGS="-L/usr/lib/jni -L/usr/lib64/jni/ -ldl -L$SCI_SRCDIR/thirdparty/ -L$SCI_SRCDIR/bin/"
+                    symbol="Java_com_sun_gluegen_runtime_UnixDynamicLinkerImpl_dlclose__J"
+                    AC_CHECK_LIB([gluegen-rt], [$symbol], [GLUEGEN_RT_LIBS="-lgluegen-rt"],
+                    [AC_MSG_ERROR([libgluegen-rt: Library missing (Cannot find symbol glTexParameterf). Check if libgluegen-rt - C/Java (JNI) interface for GLUEGEN - is installed and if the version is correct. Note that you might have to update etc/librarypath.xml to provide the actual path the the JNI libraries.])],
+                    [-ldl])
+                    LDFLAGS=$LDFLAGS_save
+                 fi
+                 # Jhall
+                 AC_JAVA_CHECK_PACKAGE([jhall],[javax.help.JHelp],[Scilab Help Browser],"yes")
+                 JHALL=$PACKAGE_JAR_FILE
+                 # Named differently under Mandriva
+                 if test -z "$JHALL"; then
+                     AC_JAVA_CHECK_PACKAGE([javahelp2],[javax.help.JHelp],[Scilab Help Browser])
+                     JHALL=$PACKAGE_JAR_FILE
+                 fi
+                 AC_SUBST(JHALL)
+                 # Console API
+                 AC_JAVA_CHECK_PACKAGE([jrosetta-API],[com.artenum.rosetta.interfaces.core.ConsoleConfiguration],[JRosetta : Console API Artenum / Scilab])
+                 JROSETTA_API=$PACKAGE_JAR_FILE
+                 AC_SUBST(JROSETTA_API)
+                 # Console Core
+                 AC_JAVA_CHECK_PACKAGE([jrosetta-engine],[com.artenum.rosetta.core.action.AbstractConsoleAction],[JRosetta : Console Core Artenum / Scilab])
+                 JROSETTA_ENGINE=$PACKAGE_JAR_FILE
+                 AC_SUBST(JROSETTA_ENGINE)
+                 # MathML rendering solution
+                 # Used in both graphic & help
+                 AC_JAVA_CHECK_PACKAGE([jeuclid-core],[net.sourceforge.jeuclid.LayoutContext],[MathML rendering solution (at least version 3.1.X)])
+                 JEUCLID_CORE=$PACKAGE_JAR_FILE
+                 AC_SUBST(JEUCLID_CORE)
+                 ################ Mandatory for graphic_export features #####
+                 # XML to PDF/other Translator
+                 AC_JAVA_CHECK_PACKAGE([fop],[org.apache.fop.pdf.PDFInfo],[XML to PDF Translator (fop)])
+                 FOP=$PACKAGE_JAR_FILE
+                 AC_SUBST(FOP)
+                 # xml.apache.org SVG Library (under mandriva for example)
+                 AC_JAVA_CHECK_PACKAGE([batik-all],[org.apache.batik.parser.Parser],[Apache SVG Library],"yes")
+                 BATIK=$PACKAGE_JAR_FILE
+                 if test -z "$BATIK"; then
+                    # Other other distribs
+                    AC_JAVA_CHECK_PACKAGE([batik],[org.apache.batik.parser.Parser],[Apache SVG Library])
+                    BATIK=$PACKAGE_JAR_FILE
+                 fi
+                 AC_SUBST(BATIK)
+                 AC_JAVA_CHECK_VERSION_PACKAGE([batik],[import org.apache.batik.Version;],$BATIK,[1.7],[Version.getVersion()])
+                 # Commons I/O library
+                 AC_JAVA_CHECK_PACKAGE([commons-io],[org.apache.commons.io.output.CountingOutputStream],[Commons I/O library])
+                 COMMONS_IO=$PACKAGE_JAR_FILE
+                 AC_SUBST(COMMONS_IO)
+                 # XML graphics common
+                 AC_JAVA_CHECK_PACKAGE([xmlgraphics-commons],[org.apache.xmlgraphics.util.Service],[Commons graphics library])
+                 XMLGRAPHICS_COMMONS=$PACKAGE_JAR_FILE
+                 AC_SUBST(XMLGRAPHICS_COMMONS)
+                 # Avalon Framework (PDF)
+                 AC_JAVA_CHECK_PACKAGE([avalon-framework],[org.apache.avalon.framework.configuration.ConfigurationException],[Common framework for Java server application])
+                 AVALON_FRAMEWORK=$PACKAGE_JAR_FILE
+                 AC_SUBST(AVALON_FRAMEWORK)
+                 # XML API EXT (conversion of a SVG => PNG)
+                 AC_JAVA_CHECK_PACKAGE([xml-apis-ext],[org.w3c.dom.svg.SVGDocument],[XML Commons external code],"yes")
+                 XML_APIS_EXT=$PACKAGE_JAR_FILE
+                 if test -z "$XML_APIS_EXT"; then
+                     # Other other distribs (Ex: Fedora/Redhat)
+                     AC_JAVA_CHECK_PACKAGE([xml-commons-apis-ext],[org.w3c.dom.svg.SVGDocument],[XML Commons external code])
+                     XML_APIS_EXT=$PACKAGE_JAR_FILE
+                 fi
+                 AC_SUBST(XML_APIS_EXT)
+                 ################ END Mandatory for graphic_export features #####
+                 # Logging (flexdock dep)
+                 AC_JAVA_CHECK_PACKAGE([commons-logging],[org.apache.commons.logging.LogFactory],[Apache logging])
+                 COMMONS_LOGGING=$PACKAGE_JAR_FILE
+                 AC_SUBST(COMMONS_LOGGING)
+                 # JLaTeXMath
                  AC_JAVA_CHECK_PACKAGE([jlatexmath],[org.scilab.forge.jlatexmath.TeXFormula],[LaTex Rendering])
                  JLATEXMATH=$PACKAGE_JAR_FILE
                  AC_SUBST(JLATEXMATH)
@@@ -48,16 -48,16 +48,17 @@@ am__aclocal_m4_deps = $(top_srcdir)/m4/
        $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
        $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
-       $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
-       $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
-       $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-       $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+       $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+       $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+       $(top_srcdir)/m4/libxml2.m4 $(top_srcdir)/m4/ltoptions.m4 \
+       $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+       $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
 -      $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
 -      $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
 -      $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
 -      $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
 -      $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
 +      $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
 +      $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
 +      $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
 +      $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
 +      $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
 +      $(top_srcdir)/configure.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
  mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@@ -190,9 -192,10 +194,13 @@@ OCAMLDEP = @OCAMLDEP
  OCAMLLEX = @OCAMLLEX@
  OCAMLOPT = @OCAMLOPT@
  OCAMLYACC = @OCAMLYACC@
 +OPENMPI_CC = @OPENMPI_CC@
 +OPENMPI_FLAGS = @OPENMPI_FLAGS@
 +OPENMPI_LIBS = @OPENMPI_LIBS@
+ OPENMP_CFLAGS = @OPENMP_CFLAGS@
+ OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
+ OPENMP_ENABLE = @OPENMP_ENABLE@
+ OPENMP_LIBS = @OPENMP_LIBS@
  OTOOL = @OTOOL@
  OTOOL64 = @OTOOL64@
  PACKAGE = @PACKAGE@
  <module name="parameters" activate="yes"/>
  <module name="atoms" activate="yes"/>
  <module name="matio" activate="@MATIO_ENABLE@"/>
+ <module name="types" activate="@JAVA_ENABLE@"/>
  <module name="hdf5" activate="yes"/>
  <module name="xcos" activate="@GUI_ENABLE@"/>
- <module name="xpad" activate="@GUI_ENABLE@"/>
 +<module name="mpi" activate="@MPI_ENABLE@"/>
+ <module name="scinotes" activate="@GUI_ENABLE@"/>
+ <module name="ui_data" activate="@GUI_ENABLE@"/>
  <module name="api_scilab" activate="yes"/>
  <module name="helptools" activate="@HELP_ENABLE@"/>
  <module name="graph" activate="@JAVA_ENABLE@"/>
@@@ -66,16 -66,16 +66,17 @@@ am__aclocal_m4_deps = $(top_srcdir)/m4/
        $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
        $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
-       $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
-       $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
-       $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-       $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+       $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+       $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+       $(top_srcdir)/m4/libxml2.m4 $(top_srcdir)/m4/ltoptions.m4 \
+       $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+       $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
 -      $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
 -      $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
 -      $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
 -      $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
 -      $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
 +      $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
 +      $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
 +      $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
 +      $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
 +      $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
 +      $(top_srcdir)/configure.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
  mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@@ -256,9 -258,10 +260,13 @@@ OCAMLDEP = @OCAMLDEP
  OCAMLLEX = @OCAMLLEX@
  OCAMLOPT = @OCAMLOPT@
  OCAMLYACC = @OCAMLYACC@
 +OPENMPI_CC = @OPENMPI_CC@
 +OPENMPI_FLAGS = @OPENMPI_FLAGS@
 +OPENMPI_LIBS = @OPENMPI_LIBS@
+ OPENMP_CFLAGS = @OPENMP_CFLAGS@
+ OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
+ OPENMP_ENABLE = @OPENMP_ENABLE@
+ OPENMP_LIBS = @OPENMP_LIBS@
  OTOOL = @OTOOL@
  OTOOL64 = @OTOOL64@
  PACKAGE = @PACKAGE@
@@@ -46,16 -46,16 +46,17 @@@ am__aclocal_m4_deps = $(top_srcdir)/m4/
        $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
        $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
-       $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
-       $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
-       $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-       $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+       $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+       $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+       $(top_srcdir)/m4/libxml2.m4 $(top_srcdir)/m4/ltoptions.m4 \
+       $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+       $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
 -      $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
 -      $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
 -      $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
 -      $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
 -      $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
 +      $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
 +      $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
 +      $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
 +      $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
 +      $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
 +      $(top_srcdir)/configure.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
  mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@@ -228,9 -230,10 +232,13 @@@ OCAMLDEP = @OCAMLDEP
  OCAMLLEX = @OCAMLLEX@
  OCAMLOPT = @OCAMLOPT@
  OCAMLYACC = @OCAMLYACC@
 +OPENMPI_CC = @OPENMPI_CC@
 +OPENMPI_FLAGS = @OPENMPI_FLAGS@
 +OPENMPI_LIBS = @OPENMPI_LIBS@
+ OPENMP_CFLAGS = @OPENMP_CFLAGS@
+ OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
+ OPENMP_ENABLE = @OPENMP_ENABLE@
+ OPENMP_LIBS = @OPENMP_LIBS@
  OTOOL = @OTOOL@
  OTOOL64 = @OTOOL64@
  PACKAGE = @PACKAGE@
@@@ -67,16 -67,16 +67,17 @@@ am__aclocal_m4_deps = $(top_srcdir)/m4/
        $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
        $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
-       $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
-       $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
-       $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-       $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+       $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+       $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+       $(top_srcdir)/m4/libxml2.m4 $(top_srcdir)/m4/ltoptions.m4 \
+       $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+       $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
 -      $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
 -      $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
 -      $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
 -      $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
 -      $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
 +      $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
 +      $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
 +      $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
 +      $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
 +      $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
 +      $(top_srcdir)/configure.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
  mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@@ -258,9 -260,10 +262,13 @@@ OCAMLDEP = @OCAMLDEP
  OCAMLLEX = @OCAMLLEX@
  OCAMLOPT = @OCAMLOPT@
  OCAMLYACC = @OCAMLYACC@
 +OPENMPI_CC = @OPENMPI_CC@
 +OPENMPI_FLAGS = @OPENMPI_FLAGS@
 +OPENMPI_LIBS = @OPENMPI_LIBS@
+ OPENMP_CFLAGS = @OPENMP_CFLAGS@
+ OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
+ OPENMP_ENABLE = @OPENMP_ENABLE@
+ OPENMP_LIBS = @OPENMP_LIBS@
  OTOOL = @OTOOL@
  OTOOL64 = @OTOOL64@
  PACKAGE = @PACKAGE@
@@@ -67,16 -67,16 +67,17 @@@ am__aclocal_m4_deps = $(top_srcdir)/m4/
        $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
        $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
-       $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
-       $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
-       $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-       $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+       $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+       $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+       $(top_srcdir)/m4/libxml2.m4 $(top_srcdir)/m4/ltoptions.m4 \
+       $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+       $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
 -      $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
 -      $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
 -      $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
 -      $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
 -      $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
 +      $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
 +      $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
 +      $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
 +      $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
 +      $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
 +      $(top_srcdir)/configure.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
  mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@@ -258,9 -260,10 +262,13 @@@ OCAMLDEP = @OCAMLDEP
  OCAMLLEX = @OCAMLLEX@
  OCAMLOPT = @OCAMLOPT@
  OCAMLYACC = @OCAMLYACC@
 +OPENMPI_CC = @OPENMPI_CC@
 +OPENMPI_FLAGS = @OPENMPI_FLAGS@
 +OPENMPI_LIBS = @OPENMPI_LIBS@
+ OPENMP_CFLAGS = @OPENMP_CFLAGS@
+ OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
+ OPENMP_ENABLE = @OPENMP_ENABLE@
+ OPENMP_LIBS = @OPENMP_LIBS@
  OTOOL = @OTOOL@
  OTOOL64 = @OTOOL64@
  PACKAGE = @PACKAGE@
@@@ -67,16 -67,16 +67,17 @@@ am__aclocal_m4_deps = $(top_srcdir)/m4/
        $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
        $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
-       $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
-       $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
-       $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-       $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+       $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+       $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+       $(top_srcdir)/m4/libxml2.m4 $(top_srcdir)/m4/ltoptions.m4 \
+       $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+       $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
 -      $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
 -      $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
 -      $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
 -      $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
 -      $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
 +      $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
 +      $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
 +      $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
 +      $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
 +      $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
 +      $(top_srcdir)/configure.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
  mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@@ -256,9 -258,10 +260,13 @@@ OCAMLDEP = @OCAMLDEP
  OCAMLLEX = @OCAMLLEX@
  OCAMLOPT = @OCAMLOPT@
  OCAMLYACC = @OCAMLYACC@
 +OPENMPI_CC = @OPENMPI_CC@
 +OPENMPI_FLAGS = @OPENMPI_FLAGS@
 +OPENMPI_LIBS = @OPENMPI_LIBS@
+ OPENMP_CFLAGS = @OPENMP_CFLAGS@
+ OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
+ OPENMP_ENABLE = @OPENMP_ENABLE@
+ OPENMP_LIBS = @OPENMP_LIBS@
  OTOOL = @OTOOL@
  OTOOL64 = @OTOOL64@
  PACKAGE = @PACKAGE@
@@@ -65,16 -65,16 +65,17 @@@ am__aclocal_m4_deps = $(top_srcdir)/m4/
        $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
        $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
-       $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
-       $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
-       $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-       $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+       $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+       $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+       $(top_srcdir)/m4/libxml2.m4 $(top_srcdir)/m4/ltoptions.m4 \
+       $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+       $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
 -      $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
 -      $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
 -      $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
 -      $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
 -      $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
 +      $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
 +      $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
 +      $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
 +      $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
 +      $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
 +      $(top_srcdir)/configure.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
  mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@@ -252,9 -254,10 +256,13 @@@ OCAMLDEP = @OCAMLDEP
  OCAMLLEX = @OCAMLLEX@
  OCAMLOPT = @OCAMLOPT@
  OCAMLYACC = @OCAMLYACC@
 +OPENMPI_CC = @OPENMPI_CC@
 +OPENMPI_FLAGS = @OPENMPI_FLAGS@
 +OPENMPI_LIBS = @OPENMPI_LIBS@
+ OPENMP_CFLAGS = @OPENMP_CFLAGS@
+ OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
+ OPENMP_ENABLE = @OPENMP_ENABLE@
+ OPENMP_LIBS = @OPENMP_LIBS@
  OTOOL = @OTOOL@
  OTOOL64 = @OTOOL64@
  PACKAGE = @PACKAGE@
@@@ -87,11 -92,11 +92,11 @@@ history_browse
  
  #umfpack
  
 -#if MPI
 -#SUBDIRS += mpi
 -#endif
 +if MPI
 +SUBDIRS += mpi
 +endif
  
- if SCICOS
+ if XCOS
  SUBDIRS += scicos_blocks
  endif
  
@@@ -200,12 -213,10 +213,14 @@@ ENGINE_LIBS_DYNAMIC_LOAD = 
        $(top_builddir)/modules/spreadsheet/libscispreadsheet.la \
        $(top_builddir)/modules/umfpack/libsciumfpack.la \
        $(top_builddir)/modules/matio/libscimatio.la \
-       $(top_builddir)/modules/helptools/libscihelptools.la
+       $(top_builddir)/modules/helptools/libscihelptools.la \
+       $(top_builddir)/modules/parallel/libsciparallel.la
  
 +if MPI
 +ENGINE_LIBS += $(top_builddir)/modules/mpi/libscimpi.la
 +endif
 +
  # Core modules
  libscilab_la_LIBADD = $(ENGINE_LIBS) $(OTHER_LIBS) $(EXTERNAL_LIBS)
  
@@@ -50,8 -53,11 +53,8 @@@ build_triplet = @build
  host_triplet = @host@
  
  #umfpack
 -
 -#if MPI
 -#SUBDIRS += mpi
 -#endif
 -@XCOS_TRUE@am__append_1 = scicos_blocks
 +@MPI_TRUE@am__append_1 = mpi
- @SCICOS_TRUE@am__append_2 = scicos_blocks
++@XCOS_TRUE@am__append_2 = scicos_blocks
  
  # javasci should be compile at the end because it needs libscilab.la
  # Don't forget that the order in subdirs does matter !!!
@@@ -70,16 -75,16 +73,17 @@@ am__aclocal_m4_deps = $(top_srcdir)/m4/
        $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
        $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
-       $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
-       $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
-       $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-       $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+       $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+       $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+       $(top_srcdir)/m4/libxml2.m4 $(top_srcdir)/m4/ltoptions.m4 \
+       $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+       $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
 -      $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
 -      $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
 -      $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
 -      $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
 -      $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
 +      $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
 +      $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
 +      $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
 +      $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
 +      $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
 +      $(top_srcdir)/configure.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
  mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@@ -161,8 -166,9 +165,9 @@@ DIST_SUBDIRS = output_stream arnoldi el
        windows_tools functions overloading maple2scilab m2sci texmacs \
        development_tools compatibility_functions helptools fftw \
        umfpack demo_tools genetic_algorithms simulated_annealing \
-       parameters matio atoms hdf5 graph xcos xpad mpi scicos_blocks \
+       parameters matio atoms types hdf5 graph xcos scinotes parallel \
 -      modules_manager ui_data history_browser scicos_blocks scicos . \
 -      javasci
++      modules_manager ui_data history_browser mpi scicos_blocks \
 +      scicos . javasci
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  am__relativize = \
    dir0=`pwd`; \
@@@ -312,9 -320,10 +320,13 @@@ OCAMLDEP = @OCAMLDEP
  OCAMLLEX = @OCAMLLEX@
  OCAMLOPT = @OCAMLOPT@
  OCAMLYACC = @OCAMLYACC@
 +OPENMPI_CC = @OPENMPI_CC@
 +OPENMPI_FLAGS = @OPENMPI_FLAGS@
 +OPENMPI_LIBS = @OPENMPI_LIBS@
+ OPENMP_CFLAGS = @OPENMP_CFLAGS@
+ OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
+ OPENMP_ENABLE = @OPENMP_ENABLE@
+ OPENMP_LIBS = @OPENMP_LIBS@
  OTOOL = @OTOOL@
  OTOOL64 = @OTOOL64@
  PACKAGE = @PACKAGE@
@@@ -448,8 -458,9 +461,9 @@@ SUBDIRS = output_stream arnoldi element
        maple2scilab m2sci texmacs development_tools \
        compatibility_functions helptools fftw umfpack demo_tools \
        genetic_algorithms simulated_annealing parameters matio atoms \
-       hdf5 graph xcos xpad $(am__append_1) $(am__append_2) scicos . \
-       $(am__append_3)
+       types hdf5 graph xcos scinotes parallel modules_manager \
 -      ui_data history_browser $(am__append_1) scicos . \
 -      $(am__append_2)
++      ui_data history_browser $(am__append_1) $(am__append_2) scicos \
++      . $(am__append_3)
  
  #### Basic files ####
  libscilab_la_rootdir = $(mydatadir)
@@@ -471,18 -482,26 +485,26 @@@ GUI_LIBS = $(top_builddir)/modules/gui/
        $(top_builddir)/modules/graphics/libscigraphics.la \
        $(top_builddir)/modules/graphic_export/libscigraphic_export.la \
        $(top_builddir)/modules/console/libsciconsole.la \
+       $(top_builddir)/modules/action_binding/libsciaction_binding.la \
        $(top_builddir)/modules/jvm/libscijvm.la \
-       $(top_builddir)/modules/xcos/libscixcos.la \
-       $(top_builddir)/modules/xpad/libscixpad.la $(am__append_4)
+       $(top_builddir)/modules/scinotes/libsciscinotes.la \
+       $(top_builddir)/modules/ui_data/libsciui_data.la \
+       $(top_builddir)/modules/history_browser/libscihistory_browser.la \
+       $(top_builddir)/modules/commons/libscicommons.la \
 -      $(top_builddir)/modules/tclsci/libscitclsci.la $(am__append_3)
++      $(top_builddir)/modules/tclsci/libscitclsci.la $(am__append_4)
  # HDF5 is here because it needs the JVM (see bug #5481)
  NO_GUI_LIBS = $(top_builddir)/modules/gui/libscigui-disable.la \
        $(top_builddir)/modules/graphics/libscigraphics-disable.la \
        $(top_builddir)/modules/graphic_export/libscigraphic_export-disable.la \
        $(top_builddir)/modules/console/libsciconsole-disable.la \
+       $(top_builddir)/modules/action_binding/libsciaction_binding-disable.la \
        $(top_builddir)/modules/jvm/libscijvm-disable.la \
        $(top_builddir)/modules/xcos/libscixcos-disable.la \
-       $(top_builddir)/modules/xpad/libscixpad-disable.la \
+       $(top_builddir)/modules/scinotes/libsciscinotes-disable.la \
+       $(top_builddir)/modules/ui_data/libsciui_data-disable.la \
+       $(top_builddir)/modules/history_browser/libscihistory_browser-disable.la \
+       $(top_builddir)/modules/commons/libscicommons-disable.la \
 -      $(am__append_4)
 +      $(am__append_5)
  # HDF5 is here because it needs the JVM (see bug #5481)
  ENGINE_LIBS = $(top_builddir)/modules/fileio/libscifileio.la \
        $(top_builddir)/modules/mexlib/libmex.la \
        $(top_builddir)/modules/shell/libscishell.la \
        $(top_builddir)/modules/completion/libscicompletion.la \
        $(top_builddir)/modules/history_manager/libscihistory_manager.la \
-       $(top_builddir)/modules/action_binding/libsciaction_binding.la \
        $(top_builddir)/modules/output_stream/libscioutput_stream.la \
        $(top_builddir)/modules/string/libscistring.la \
-       $(top_builddir)/modules/fftw/libscifftw.la \
-       $(top_builddir)/modules/hdf5/libscihdf5.la \
        $(top_builddir)/modules/functions/libscifunctions.la \
-       $(am__append_6)
+       $(top_builddir)/modules/hdf5/libscihdf5.la \
+       $(top_builddir)/modules/pvm/libscipvm.la \
 -      $(top_builddir)/modules/fftw/libscifftw.la
 -
++      $(top_builddir)/modules/fftw/libscifftw.la $(am__append_6)
  
  # These libraries are loaded dynamically from Scilab.
  ENGINE_LIBS_DYNAMIC_LOAD = \
@@@ -71,16 -72,16 +72,17 @@@ am__aclocal_m4_deps = $(top_srcdir)/m4/
        $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
        $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
-       $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
-       $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
-       $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-       $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+       $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+       $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+       $(top_srcdir)/m4/libxml2.m4 $(top_srcdir)/m4/ltoptions.m4 \
+       $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+       $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
 -      $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
 -      $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
 -      $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
 -      $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
 -      $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
 +      $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
 +      $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
 +      $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
 +      $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
 +      $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
 +      $(top_srcdir)/configure.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
  mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@@ -279,9 -306,10 +308,13 @@@ OCAMLDEP = @OCAMLDEP
  OCAMLLEX = @OCAMLLEX@
  OCAMLOPT = @OCAMLOPT@
  OCAMLYACC = @OCAMLYACC@
 +OPENMPI_CC = @OPENMPI_CC@
 +OPENMPI_FLAGS = @OPENMPI_FLAGS@
 +OPENMPI_LIBS = @OPENMPI_LIBS@
+ OPENMP_CFLAGS = @OPENMP_CFLAGS@
+ OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
+ OPENMP_ENABLE = @OPENMP_ENABLE@
+ OPENMP_LIBS = @OPENMP_LIBS@
  OTOOL = @OTOOL@
  OTOOL64 = @OTOOL64@
  PACKAGE = @PACKAGE@
@@@ -70,16 -70,16 +70,17 @@@ am__aclocal_m4_deps = $(top_srcdir)/m4/
        $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
        $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
-       $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
-       $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
-       $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-       $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+       $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+       $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+       $(top_srcdir)/m4/libxml2.m4 $(top_srcdir)/m4/ltoptions.m4 \
+       $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+       $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
 -      $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
 -      $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
 -      $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
 -      $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
 -      $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
 +      $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
 +      $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
 +      $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
 +      $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
 +      $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
 +      $(top_srcdir)/configure.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
  mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@@ -273,9 -274,10 +276,13 @@@ OCAMLDEP = @OCAMLDEP
  OCAMLLEX = @OCAMLLEX@
  OCAMLOPT = @OCAMLOPT@
  OCAMLYACC = @OCAMLYACC@
 +OPENMPI_CC = @OPENMPI_CC@
 +OPENMPI_FLAGS = @OPENMPI_FLAGS@
 +OPENMPI_LIBS = @OPENMPI_LIBS@
+ OPENMP_CFLAGS = @OPENMP_CFLAGS@
+ OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
+ OPENMP_ENABLE = @OPENMP_ENABLE@
+ OPENMP_LIBS = @OPENMP_LIBS@
  OTOOL = @OTOOL@
  OTOOL64 = @OTOOL64@
  PACKAGE = @PACKAGE@
@@@ -66,16 -66,16 +66,17 @@@ am__aclocal_m4_deps = $(top_srcdir)/m4/
        $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
        $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
-       $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
-       $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
-       $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-       $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+       $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+       $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+       $(top_srcdir)/m4/libxml2.m4 $(top_srcdir)/m4/ltoptions.m4 \
+       $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+       $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
 -      $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
 -      $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
 -      $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
 -      $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
 -      $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
 +      $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
 +      $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
 +      $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
 +      $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
 +      $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
 +      $(top_srcdir)/configure.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
  mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@@ -295,9 -296,10 +298,13 @@@ OCAMLDEP = @OCAMLDEP
  OCAMLLEX = @OCAMLLEX@
  OCAMLOPT = @OCAMLOPT@
  OCAMLYACC = @OCAMLYACC@
 +OPENMPI_CC = @OPENMPI_CC@
 +OPENMPI_FLAGS = @OPENMPI_FLAGS@
 +OPENMPI_LIBS = @OPENMPI_LIBS@
+ OPENMP_CFLAGS = @OPENMP_CFLAGS@
+ OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
+ OPENMP_ENABLE = @OPENMP_ENABLE@
+ OPENMP_LIBS = @OPENMP_LIBS@
  OTOOL = @OTOOL@
  OTOOL64 = @OTOOL64@
  PACKAGE = @PACKAGE@
@@@ -69,16 -69,16 +69,17 @@@ am__aclocal_m4_deps = $(top_srcdir)/m4/
        $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
        $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
-       $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
-       $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
-       $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-       $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+       $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+       $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+       $(top_srcdir)/m4/libxml2.m4 $(top_srcdir)/m4/ltoptions.m4 \
+       $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+       $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
 -      $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
 -      $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
 -      $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
 -      $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
 -      $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
 +      $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
 +      $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
 +      $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
 +      $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
 +      $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
 +      $(top_srcdir)/configure.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
  mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@@ -235,9 -239,10 +241,13 @@@ OCAMLDEP = @OCAMLDEP
  OCAMLLEX = @OCAMLLEX@
  OCAMLOPT = @OCAMLOPT@
  OCAMLYACC = @OCAMLYACC@
 +OPENMPI_CC = @OPENMPI_CC@
 +OPENMPI_FLAGS = @OPENMPI_FLAGS@
 +OPENMPI_LIBS = @OPENMPI_LIBS@
+ OPENMP_CFLAGS = @OPENMP_CFLAGS@
+ OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
+ OPENMP_ENABLE = @OPENMP_ENABLE@
+ OPENMP_LIBS = @OPENMP_LIBS@
  OTOOL = @OTOOL@
  OTOOL64 = @OTOOL64@
  PACKAGE = @PACKAGE@
@@@ -66,16 -66,16 +66,17 @@@ am__aclocal_m4_deps = $(top_srcdir)/m4/
        $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
        $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
-       $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
-       $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
-       $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-       $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+       $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+       $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+       $(top_srcdir)/m4/libxml2.m4 $(top_srcdir)/m4/ltoptions.m4 \
+       $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+       $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
 -      $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
 -      $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
 -      $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
 -      $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
 -      $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
 +      $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
 +      $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
 +      $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
 +      $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
 +      $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
 +      $(top_srcdir)/configure.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
  mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@@ -274,9 -276,10 +278,13 @@@ OCAMLDEP = @OCAMLDEP
  OCAMLLEX = @OCAMLLEX@
  OCAMLOPT = @OCAMLOPT@
  OCAMLYACC = @OCAMLYACC@
 +OPENMPI_CC = @OPENMPI_CC@
 +OPENMPI_FLAGS = @OPENMPI_FLAGS@
 +OPENMPI_LIBS = @OPENMPI_LIBS@
+ OPENMP_CFLAGS = @OPENMP_CFLAGS@
+ OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
+ OPENMP_ENABLE = @OPENMP_ENABLE@
+ OPENMP_LIBS = @OPENMP_LIBS@
  OTOOL = @OTOOL@
  OTOOL64 = @OTOOL64@
  PACKAGE = @PACKAGE@
@@@ -66,16 -66,16 +66,17 @@@ am__aclocal_m4_deps = $(top_srcdir)/m4/
        $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
        $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
-       $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
-       $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
-       $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-       $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+       $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+       $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+       $(top_srcdir)/m4/libxml2.m4 $(top_srcdir)/m4/ltoptions.m4 \
+       $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+       $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
 -      $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
 -      $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
 -      $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
 -      $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
 -      $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
 +      $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
 +      $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
 +      $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
 +      $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
 +      $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
 +      $(top_srcdir)/configure.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
  mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@@ -369,9 -370,10 +372,13 @@@ OCAMLDEP = @OCAMLDEP
  OCAMLLEX = @OCAMLLEX@
  OCAMLOPT = @OCAMLOPT@
  OCAMLYACC = @OCAMLYACC@
 +OPENMPI_CC = @OPENMPI_CC@
 +OPENMPI_FLAGS = @OPENMPI_FLAGS@
 +OPENMPI_LIBS = @OPENMPI_LIBS@
+ OPENMP_CFLAGS = @OPENMP_CFLAGS@
+ OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
+ OPENMP_ENABLE = @OPENMP_ENABLE@
+ OPENMP_LIBS = @OPENMP_LIBS@
  OTOOL = @OTOOL@
  OTOOL64 = @OTOOL64@
  PACKAGE = @PACKAGE@
@@@ -68,16 -68,16 +68,17 @@@ am__aclocal_m4_deps = $(top_srcdir)/m4/
        $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
        $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
-       $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
-       $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
-       $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-       $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+       $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+       $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+       $(top_srcdir)/m4/libxml2.m4 $(top_srcdir)/m4/ltoptions.m4 \
+       $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+       $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
 -      $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
 -      $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
 -      $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
 -      $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
 -      $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
 +      $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
 +      $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
 +      $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
 +      $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
 +      $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
 +      $(top_srcdir)/configure.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
  mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@@ -270,9 -271,10 +273,13 @@@ OCAMLDEP = @OCAMLDEP
  OCAMLLEX = @OCAMLLEX@
  OCAMLOPT = @OCAMLOPT@
  OCAMLYACC = @OCAMLYACC@
 +OPENMPI_CC = @OPENMPI_CC@
 +OPENMPI_FLAGS = @OPENMPI_FLAGS@
 +OPENMPI_LIBS = @OPENMPI_LIBS@
+ OPENMP_CFLAGS = @OPENMP_CFLAGS@
+ OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
+ OPENMP_ENABLE = @OPENMP_ENABLE@
+ OPENMP_LIBS = @OPENMP_LIBS@
  OTOOL = @OTOOL@
  OTOOL64 = @OTOOL64@
  PACKAGE = @PACKAGE@
@@@ -76,16 -73,16 +73,17 @@@ am__aclocal_m4_deps = $(top_srcdir)/m4/
        $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
        $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
-       $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
-       $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
-       $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-       $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-       $(top_srcdir)/m4/macosx.m4 $(top_srcdir)/m4/mpi.m4 \
-       $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
-       $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
-       $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
-       $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
-       $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+       $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+       $(top_srcdir)/m4/libxml2.m4 $(top_srcdir)/m4/ltoptions.m4 \
+       $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+       $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
 -      $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
 -      $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
 -      $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
 -      $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
 -      $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
++      $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
++      $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
++      $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
++      $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
++      $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
++      $(top_srcdir)/configure.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
  mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@@ -66,16 -66,16 +66,17 @@@ am__aclocal_m4_deps = $(top_srcdir)/m4/
        $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
        $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
-       $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
-       $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
-       $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-       $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+       $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+       $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+       $(top_srcdir)/m4/libxml2.m4 $(top_srcdir)/m4/ltoptions.m4 \
+       $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+       $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
 -      $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
 -      $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
 -      $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
 -      $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
 -      $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
 +      $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
 +      $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
 +      $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
 +      $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
 +      $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
 +      $(top_srcdir)/configure.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
  mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@@ -234,9 -236,10 +238,13 @@@ OCAMLDEP = @OCAMLDEP
  OCAMLLEX = @OCAMLLEX@
  OCAMLOPT = @OCAMLOPT@
  OCAMLYACC = @OCAMLYACC@
 +OPENMPI_CC = @OPENMPI_CC@
 +OPENMPI_FLAGS = @OPENMPI_FLAGS@
 +OPENMPI_LIBS = @OPENMPI_LIBS@
+ OPENMP_CFLAGS = @OPENMP_CFLAGS@
+ OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
+ OPENMP_ENABLE = @OPENMP_ENABLE@
+ OPENMP_LIBS = @OPENMP_LIBS@
  OTOOL = @OTOOL@
  OTOOL64 = @OTOOL64@
  PACKAGE = @PACKAGE@
@@@ -72,16 -72,16 +72,17 @@@ am__aclocal_m4_deps = $(top_srcdir)/m4/
        $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
        $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
-       $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
-       $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
-       $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-       $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+       $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+       $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+       $(top_srcdir)/m4/libxml2.m4 $(top_srcdir)/m4/ltoptions.m4 \
+       $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+       $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
 -      $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
 -      $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
 -      $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
 -      $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
 -      $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
 +      $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
 +      $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
 +      $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
 +      $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
 +      $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
 +      $(top_srcdir)/configure.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
  mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@@ -296,9 -298,10 +300,13 @@@ OCAMLDEP = @OCAMLDEP
  OCAMLLEX = @OCAMLLEX@
  OCAMLOPT = @OCAMLOPT@
  OCAMLYACC = @OCAMLYACC@
 +OPENMPI_CC = @OPENMPI_CC@
 +OPENMPI_FLAGS = @OPENMPI_FLAGS@
 +OPENMPI_LIBS = @OPENMPI_LIBS@
+ OPENMP_CFLAGS = @OPENMP_CFLAGS@
+ OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
+ OPENMP_ENABLE = @OPENMP_ENABLE@
+ OPENMP_LIBS = @OPENMP_LIBS@
  OTOOL = @OTOOL@
  OTOOL64 = @OTOOL64@
  PACKAGE = @PACKAGE@
@@@ -78,16 -78,16 +78,17 @@@ am__aclocal_m4_deps = $(top_srcdir)/m4/
        $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
        $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
-       $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
-       $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
-       $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-       $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+       $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+       $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+       $(top_srcdir)/m4/libxml2.m4 $(top_srcdir)/m4/ltoptions.m4 \
+       $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+       $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
 -      $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
 -      $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
 -      $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
 -      $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
 -      $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
 +      $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
 +      $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
 +      $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
 +      $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
 +      $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
 +      $(top_srcdir)/configure.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
  mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@@ -308,9 -310,10 +312,13 @@@ OCAMLDEP = @OCAMLDEP
  OCAMLLEX = @OCAMLLEX@
  OCAMLOPT = @OCAMLOPT@
  OCAMLYACC = @OCAMLYACC@
 +OPENMPI_CC = @OPENMPI_CC@
 +OPENMPI_FLAGS = @OPENMPI_FLAGS@
 +OPENMPI_LIBS = @OPENMPI_LIBS@
+ OPENMP_CFLAGS = @OPENMP_CFLAGS@
+ OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
+ OPENMP_ENABLE = @OPENMP_ENABLE@
+ OPENMP_LIBS = @OPENMP_LIBS@
  OTOOL = @OTOOL@
  OTOOL64 = @OTOOL64@
  PACKAGE = @PACKAGE@
@@@ -78,16 -78,16 +78,17 @@@ am__aclocal_m4_deps = $(top_srcdir)/m4/
        $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
        $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
-       $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
-       $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
-       $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-       $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+       $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+       $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+       $(top_srcdir)/m4/libxml2.m4 $(top_srcdir)/m4/ltoptions.m4 \
+       $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+       $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
 -      $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
 -      $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
 -      $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
 -      $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
 -      $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
 +      $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
 +      $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
 +      $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
 +      $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
 +      $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
 +      $(top_srcdir)/configure.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
  mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@@ -508,9 -511,10 +513,13 @@@ OCAMLDEP = @OCAMLDEP
  OCAMLLEX = @OCAMLLEX@
  OCAMLOPT = @OCAMLOPT@
  OCAMLYACC = @OCAMLYACC@
 +OPENMPI_CC = @OPENMPI_CC@
 +OPENMPI_FLAGS = @OPENMPI_FLAGS@
 +OPENMPI_LIBS = @OPENMPI_LIBS@
+ OPENMP_CFLAGS = @OPENMP_CFLAGS@
+ OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
+ OPENMP_ENABLE = @OPENMP_ENABLE@
+ OPENMP_LIBS = @OPENMP_LIBS@
  OTOOL = @OTOOL@
  OTOOL64 = @OTOOL64@
  PACKAGE = @PACKAGE@
  /* 60 */                                              #include "dynamic_gateways.h" /* helptools */
  /* 61 */                                              #include "../../call_scilab/includes/gw_call_scilab.h"
  /* 62 */                                              #include "dynamic_gateways.h" /* hdf5 */
- /* 63 */                                              #include "dynamic_gateways.h" /* xpad */
+ /* 63 */                                              #include "dynamic_gateways.h" /* scinotes */
  /* 64 */                                              #include "dynamic_gateways.h" /* xcos */
- /* 65 */                                              #include "dynamic_gateways.h" /* MPI */
+ /* 65 */                                              #include "dynamic_gateways.h" /* action_binding */
+ /* 66 */                        #include "dynamic_parallel.h" /* parallel */
+ /* 67 */                        #include "dynamic_gateways.h" /* ui_data */
++/* 68 */                                              #include "dynamic_gateways.h" /* MPI */
  
  /*-------------------------------------
   * long jump to stop interface computation
@@@ -13,9 -13,9 +13,9 @@@
  #define SCI_VERSION_H
  
  #define SCI_VERSION_MAJOR 5
--#define SCI_VERSION_MINOR 3
 -#define SCI_VERSION_MAINTENANCE 2
 -#define SCI_VERSION_STRING "scilab-branch-5.3"
++#define SCI_VERSION_MINOR 4
 +#define SCI_VERSION_MAINTENANCE 0
 +#define SCI_VERSION_STRING "scilab-branch-MPI"
  /* SCI_VERSION_REVISION --> hash key commit */
  #define SCI_VERSION_REVISION 0
  #define SCI_VERSION_TIMESTAMP 0
@@@ -33,7 -36,7 +36,8 @@@ static void sci_sigint_addinter(int n)
   ** Watch out the positions are crutial !!!
   ** @TODO : Make this less crappy...
   **/
- #define INTERFACES_MAX 65
 -#define INTERFACES_MAX 67
++
++#define INTERFACES_MAX 68
  static OpTab Interfaces[INTERFACES_MAX] = {
      /* 01  */ {gw_user}, /* free position may be used */
        /* 02  */ {gw_linear_algebra},
        /* 60  */ {gw_dynamic_helptools},
        /* 61  */ {gw_call_scilab},
        /* 62  */ {gw_dynamic_hdf5},
-       /* 63  */ {gw_dynamic_xpad},
+       /* 63  */ {gw_dynamic_scinotes},
        /* 64  */ {gw_dynamic_xcos},
-       /* 65  */ {gw_dynamic_mpi}
+     /* 65  */ {gw_dynamic_action_binding},
+     /* 66  */ {gw_dynamic_parallel},
 -      /* 67  */ {gw_dynamic_ui_data}
++      /* 67  */ {gw_dynamic_ui_data},
++      /* 68  */ {gw_dynamic_mpi}
  };
  /*--------------------------------------------------------------------------*/
  static int sig_ok = 0;
@@@ -248,13 -266,12 +266,13 @@@ static char* gatewayname_functions = NU
  /*--------------------------------------------------------------------------*/
  int gw_dynamic_functions(void)
  {
-       return gw_dynamic_generic(FUNCTIONS_MODULE_NAME,
-               &dynlibname_functions,
-               &gatewayname_functions,
-               &hFunctionsLib,
-               &ptr_gw_functions);
+     return gw_dynamic_generic(FUNCTIONS_MODULE_NAME,
+         &dynlibname_functions,
+         &gatewayname_functions,
+         &hFunctionsLib,
+         &ptr_gw_functions);
  }
 +
  /*--------------------------------------------------------------------------*/
  /* xcos module */
  #define XCOS_MODULE_NAME "xcos"
@@@ -328,32 -344,175 +345,194 @@@ static char* gatewayname_graphic_expor
  int gw_dynamic_graphic_export(void)
  {
  #ifdef _MSC_VER
-       if (dynlibname_graphic_export == NULL)
-       {
-               dynlibname_graphic_export = buildModuleDynLibraryName(GRAPHIC_EXPORT_MODULE_NAME, DYNLIB_NAME_FORMAT_2);
-       }
+     if (dynlibname_graphic_export == NULL)
+     {
+         dynlibname_graphic_export = buildModuleDynLibraryName(GRAPHIC_EXPORT_MODULE_NAME, DYNLIB_NAME_FORMAT_2);
+     }
+ #endif
+     return gw_dynamic_generic(GRAPHIC_EXPORT_MODULE_NAME,
+         &dynlibname_graphic_export,
+         &gatewayname_graphic_export,
+         &hGraphic_exportLib ,
+         &ptr_gw_graphic_export);
+ }
+ /*--------------------------------------------------------------------------*/
+ /* graphic_exports module */
+ #define ACTION_BINDING_MODULE_NAME "action_binding"
+ static DynLibHandle hAction_bindingLib = NULL;
+ static PROC_GATEWAY ptr_gw_action_binding = NULL;
+ static char* dynlibname_action_binding = NULL;
+ static char* gatewayname_action_binding = NULL;
+ /*--------------------------------------------------------------------------*/
+ int gw_dynamic_action_binding(void)
+ {
+ #ifdef _MSC_VER
+     if (dynlibname_action_binding == NULL)
+     {
+         dynlibname_action_binding = buildModuleDynLibraryName(ACTION_BINDING_MODULE_NAME, DYNLIB_NAME_FORMAT_2);
+     }
  #endif
-       return gw_dynamic_generic(GRAPHIC_EXPORT_MODULE_NAME,
-               &dynlibname_graphic_export,
-               &gatewayname_graphic_export,
-               &hGraphic_exportLib ,
-               &ptr_gw_graphic_export);
+     return gw_dynamic_generic(ACTION_BINDING_MODULE_NAME,
+         &dynlibname_action_binding,
+         &gatewayname_action_binding,
+         &hAction_bindingLib ,
+         &ptr_gw_action_binding);
  }
  /*--------------------------------------------------------------------------*/
+ /* ui_data module */
+ #define UI_DATA_MODULE_NAME "ui_data"
+ static DynLibHandle hUi_dataLib = NULL;
+ static PROC_GATEWAY ptr_gw_ui_data = NULL;
+ static char* dynlibname_ui_data = NULL;
+ static char* gatewayname_ui_data = NULL;
+ /*--------------------------------------------------------------------------*/
+ int gw_dynamic_ui_data(void)
+ {
+ #ifdef _MSC_VER
+     if (dynlibname_ui_data == NULL)
+     {
+         dynlibname_ui_data = buildModuleDynLibraryName(UI_DATA_MODULE_NAME, DYNLIB_NAME_FORMAT_2);
+     }
+ #endif
+     return gw_dynamic_generic(UI_DATA_MODULE_NAME,
+         &dynlibname_ui_data,
+         &gatewayname_ui_data,
+         &hUi_dataLib,
+         &ptr_gw_ui_data);
+ }
 +
 +/*--------------------------------------------------------------------------*/
 +/* MPI module */
 +#define MPI_MODULE_NAME "mpi"
 +static DynLibHandle hMpiLib = NULL;
 +static PROC_GATEWAY ptr_gw_mpi = NULL;
 +static char* dynlibname_mpi = NULL;
 +static char* gatewayname_mpi = NULL;
 +/*--------------------------------------------------------------------------*/
 +int gw_dynamic_mpi(void)
 +{
 +      return gw_dynamic_generic(MPI_MODULE_NAME,
 +              &dynlibname_mpi,
 +              &gatewayname_mpi,
 +              &hMpiLib,
 +              &ptr_gw_mpi);
 +}
++
+ /*--------------------------------------------------------------------------*/
+ void freeAllDynamicGateways(void)
+ {
+     freeDynamicGateway(&dynlibname_special_functions,
+         &gatewayname_special_functions,
+         &hSpecial_functionsLib,
+         &ptr_gw_special_functions);
+     freeDynamicGateway(&dynlibname_pvm,
+         &gatewayname_pvm,
+         &hPvmLib,
+         &ptr_gw_pvm);
+     freeDynamicGateway(&dynlibname_helptools,
+         &gatewayname_helptools,
+         &hHelptoolsLib,
+         &ptr_gw_helptools);
+     freeDynamicGateway(&dynlibname_optimization,
+         &gatewayname_optimization,
+         &hOptimizationLib,
+         &ptr_gw_optimization);
+     freeDynamicGateway(&dynlibname_matio,
+         &gatewayname_matio,&hMatioLib,
+         &ptr_gw_matio);
+     freeDynamicGateway(&dynlibname_umfpack,
+         &gatewayname_umfpack,
+         &hUmfpackLib,
+         &ptr_gw_umfpack);
+     freeDynamicGateway(&dynlibname_spreadsheet,
+         &gatewayname_spreadsheet,
+         &hSpreadsheetLib,
+         &ptr_gw_spreadsheet);
+     freeDynamicGateway(&dynlibname_sound,
+         &gatewayname_sound,
+         &hSoundLib,
+         &ptr_gw_sound);
+     freeDynamicGateway(&dynlibname_scicos,
+         &gatewayname_scicos,
+         &hScicosLib,
+         &ptr_gw_scicos);
+     freeDynamicGateway(&dynlibname_randlib,
+         &gatewayname_randlib,
+         &hRandlibLib,
+         &ptr_gw_randlib);
+     freeDynamicGateway(&dynlibname_arnoldi,
+         &gatewayname_arnoldi,
+         &hArnoldiLib,
+         &ptr_gw_arnoldi);
+     freeDynamicGateway(&dynlibname_symbolic,
+         &gatewayname_symbolic,
+         &hSymbolicLib,
+         &ptr_gw_symbolic);
+     freeDynamicGateway(&dynlibname_interpolation,
+         &gatewayname_interpolation,
+         &hInterpolationLib,
+         &ptr_gw_interpolation);
+     freeDynamicGateway(&dynlibname_statistics,
+         &gatewayname_statistics,
+         &hStatisticsLib,
+         &ptr_gw_statistics);
+     freeDynamicGateway(&dynlibname_signal_processing,
+         &gatewayname_signal_processing,
+         &hSignal_processingLib,
+         &ptr_gw_signal_processing);
+     freeDynamicGateway(&dynlibname_functions,
+         &gatewayname_functions,
+         &hFunctionsLib,
+         &ptr_gw_functions);
+     freeDynamicGateway(&dynlibname_xcos,
+         &gatewayname_xcos,
+         &hXcosLib,
+         &ptr_gw_xcos);
+     freeDynamicGateway(&dynlibname_scinotes,
+         &gatewayname_scinotes,
+         &hSciNotesLib,
+         &ptr_gw_scinotes);
+     freeDynamicGateway(&dynlibname_hdf5,
+         &gatewayname_hdf5,
+         &hHdf5Lib,
+         &ptr_gw_hdf5);
+     freeDynamicGateway(&dynlibname_graphic_export,
+         &gatewayname_graphic_export,
+         &hGraphic_exportLib,
+         &ptr_gw_graphic_export);
+     freeDynamicGateway(&dynlibname_action_binding,
+         &gatewayname_action_binding,
+         &hAction_bindingLib,
+         &ptr_gw_action_binding);
+     dynTerminateParallel();
+     freeDynamicGateway(&dynlibname_ui_data,
+         &gatewayname_ui_data,
+         &hUi_dataLib,
+         &ptr_gw_ui_data);
+ }
+ /*--------------------------------------------------------------------------*/
++>>>>>>> origin/5.3
@@@ -28,18 -47,11 +47,18 @@@ int gw_dynamic_pvm(void)
  int gw_dynamic_xcos(void);
  
  /**
 +* mpi gateway
 +* mpi is loaded dynamically at runtime
 +* load gw_mpi in SCI/modules/mpi/sci_gateway/gw_mpi.c
 +*/
 +int gw_dynamic_mpi(void);
 +
 +/**
- * xpad gateway
+ * scinotes gateway
  * functions is loaded dynamically at runtime
- * load gw_functions in SCI/modules/xpad/sci_gateway/gw_xpad.c
+ * load gw_functions in SCI/modules/scinotes/sci_gateway/gw_scinotes.c
  */
- int gw_dynamic_xpad(void);
+ int gw_dynamic_scinotes(void);
  
  /**
  * functions gateway
@@@ -157,12 -169,12 +176,19 @@@ int gw_dynamic_hdf5(void)
  int gw_dynamic_graphic_export(void);
  
  /**
 +* mpi gateway
 +* mpi is loaded dynamically at runtime
 +* load gw_mpi in SCI/modules/mpi/sci_gateway/gw_mpi.c
 +*/
 +int gw_dynamic_mpi(void);
 +
++/*
+ * action_binding gateway
+ * action_binding is loaded dynamically at runtime
+ * load gw_action_binding in SCI/modules/action_binding/sci_gateway/gw_action_binding.c
+ */
+ int gw_dynamic_action_binding(void);
  #endif /* __DYNAMIC_GATEWAYS_H__ */
  /*--------------------------------------------------------------------------*/
  
@@@ -66,16 -66,16 +66,17 @@@ am__aclocal_m4_deps = $(top_srcdir)/m4/
        $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
        $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
-       $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
-       $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
-       $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-       $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+       $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+       $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+       $(top_srcdir)/m4/libxml2.m4 $(top_srcdir)/m4/ltoptions.m4 \
+       $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+       $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
 -      $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
 -      $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
 -      $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
 -      $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
 -      $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
 +      $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
 +      $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
 +      $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
 +      $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
 +      $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
 +      $(top_srcdir)/configure.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
  mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@@ -305,9 -306,10 +308,13 @@@ OCAMLDEP = @OCAMLDEP
  OCAMLLEX = @OCAMLLEX@
  OCAMLOPT = @OCAMLOPT@
  OCAMLYACC = @OCAMLYACC@
 +OPENMPI_CC = @OPENMPI_CC@
 +OPENMPI_FLAGS = @OPENMPI_FLAGS@
 +OPENMPI_LIBS = @OPENMPI_LIBS@
+ OPENMP_CFLAGS = @OPENMP_CFLAGS@
+ OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
+ OPENMP_ENABLE = @OPENMP_ENABLE@
+ OPENMP_LIBS = @OPENMP_LIBS@
  OTOOL = @OTOOL@
  OTOOL64 = @OTOOL64@
  PACKAGE = @PACKAGE@
@@@ -65,16 -65,16 +65,17 @@@ am__aclocal_m4_deps = $(top_srcdir)/m4/
        $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
        $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
-       $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
-       $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
-       $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-       $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+       $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+       $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+       $(top_srcdir)/m4/libxml2.m4 $(top_srcdir)/m4/ltoptions.m4 \
+       $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+       $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
 -      $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
 -      $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
 -      $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
 -      $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
 -      $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
 +      $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
 +      $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
 +      $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
 +      $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
 +      $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
 +      $(top_srcdir)/configure.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
  mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@@ -233,9 -235,10 +237,13 @@@ OCAMLDEP = @OCAMLDEP
  OCAMLLEX = @OCAMLLEX@
  OCAMLOPT = @OCAMLOPT@
  OCAMLYACC = @OCAMLYACC@
 +OPENMPI_CC = @OPENMPI_CC@
 +OPENMPI_FLAGS = @OPENMPI_FLAGS@
 +OPENMPI_LIBS = @OPENMPI_LIBS@
+ OPENMP_CFLAGS = @OPENMP_CFLAGS@
+ OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
+ OPENMP_ENABLE = @OPENMP_ENABLE@
+ OPENMP_LIBS = @OPENMP_LIBS@
  OTOOL = @OTOOL@
  OTOOL64 = @OTOOL64@
  PACKAGE = @PACKAGE@
@@@ -65,16 -65,16 +65,17 @@@ am__aclocal_m4_deps = $(top_srcdir)/m4/
        $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
        $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
-       $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
-       $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
-       $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-       $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+       $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+       $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+       $(top_srcdir)/m4/libxml2.m4 $(top_srcdir)/m4/ltoptions.m4 \
+       $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+       $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
 -      $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
 -      $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
 -      $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
 -      $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
 -      $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
 +      $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
 +      $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
 +      $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
 +      $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
 +      $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
 +      $(top_srcdir)/configure.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
  mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@@ -232,9 -234,10 +236,13 @@@ OCAMLDEP = @OCAMLDEP
  OCAMLLEX = @OCAMLLEX@
  OCAMLOPT = @OCAMLOPT@
  OCAMLYACC = @OCAMLYACC@
 +OPENMPI_CC = @OPENMPI_CC@
 +OPENMPI_FLAGS = @OPENMPI_FLAGS@
 +OPENMPI_LIBS = @OPENMPI_LIBS@
+ OPENMP_CFLAGS = @OPENMP_CFLAGS@
+ OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
+ OPENMP_ENABLE = @OPENMP_ENABLE@
+ OPENMP_LIBS = @OPENMP_LIBS@
  OTOOL = @OTOOL@
  OTOOL64 = @OTOOL64@
  PACKAGE = @PACKAGE@
@@@ -1438,36 -1440,36 +1440,88 @@@ function msg = st_launchthecommand ( fi
    //     Or launch the following command :
    //     - exec("C:\path\scilab\modules\optimization\tests\unit_testseldermeadeldermead_configure.tst")
    // Workaround for bug #4827
 +  msg(1) = "     Or launch the following command :"
 +  msg(2) = "     - exec(""" + filename + """);"
 +endfunction
 +
 +// st_comparethefiles
 +// -----------------------------------------------------------------------------
 +
 +function msg = st_comparethefiles ( filename1 , filename2 )
 +  // Returns a 3-by-1 matrix of strings, containing a message such as:
 +  //     Compare the following files :
 +  //     - C:\path\scilab\modules\optimization\tests\unit_testseldermeadeldermead_configure.dia
 +  //     - C:\path\scilab\modules\optimization\tests\unit_testseldermeadeldermead_configure.dia.ref
 +  // Workaround for bug #4827
 +  msg(1) = "     Compare the following files :"
 +  msg(2) = "     - "+filename1
 +  msg(3) = "     - "+filename2
 +endfunction
 +
 +// st_createthefile
 +// -----------------------------------------------------------------------------
 +
 +function msg = st_createthefile ( filename )
 +  // Returns a 2-by-1 matrix of strings, containing a message such as:
 +  //     Add or create the following file :
 +  //     - C:\path\scilab\modules\optimization\tests\unit_testseldermeadeldermead_configure.dia.ref
 +  // Workaround for bug #4827
 +  msg(1) = "     Add or create the following file : "
 +  msg(2) = "     - "+filename
 +endfunction
 +
++// st_checkthefile
++// -----------------------------------------------------------------------------
++
++function msg = st_checkthefile ( filename )
++  // Returns a 2-by-1 matrix of strings, containing a message such as:
++  //     Check the following file :
++  //     - C:\path\scilab\modules\optimization\tests\unit_testseldermeadeldermead_configure.tst
++  // Workaround for bug #4827
++  msg(1) = "     Check the following file :"
++  msg(2) = "     - "+filename
++endfunction
++
++
++
++// st_launchthecommand
++// -----------------------------------------------------------------------------
++
++function msg = st_launchthecommand ( filename )
++  // Returns a 2-by-1 matrix of strings, containing a message such as:
++  //     Or launch the following command :
++  //     - exec("C:\path\scilab\modules\optimization\tests\unit_testseldermeadeldermead_configure.tst")
++  // Workaround for bug #4827
+   msg(1) = "     Or launch the following command :"
+   msg(2) = "     - exec(""" + filename + """);"
+ endfunction
+ // st_comparethefiles
+ // -----------------------------------------------------------------------------
+ function msg = st_comparethefiles ( filename1 , filename2 )
+   // Returns a 3-by-1 matrix of strings, containing a message such as:
+   //     Compare the following files :
+   //     - C:\path\scilab\modules\optimization\tests\unit_testseldermeadeldermead_configure.dia
+   //     - C:\path\scilab\modules\optimization\tests\unit_testseldermeadeldermead_configure.dia.ref
+   // Workaround for bug #4827
+   msg(1) = "     Compare the following files :"
+   msg(2) = "     - "+filename1
+   msg(3) = "     - "+filename2
+ endfunction
+ // st_createthefile
+ // -----------------------------------------------------------------------------
+ function msg = st_createthefile ( filename )
+   // Returns a 2-by-1 matrix of strings, containing a message such as:
+   //     Add or create the following file :
+   //     - C:\path\scilab\modules\optimization\tests\unit_testseldermeadeldermead_configure.dia.ref
+   // Workaround for bug #4827
+   msg(1) = "     Add or create the following file : "
+   msg(2) = "     - "+filename
+ endfunction
  
  
  
@@@ -41,16 -41,16 +41,17 @@@ am__aclocal_m4_deps = $(top_srcdir)/m4/
        $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
        $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
-       $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
-       $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
-       $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-       $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+       $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+       $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+       $(top_srcdir)/m4/libxml2.m4 $(top_srcdir)/m4/ltoptions.m4 \
+       $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+       $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
 -      $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
 -      $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
 -      $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
 -      $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
 -      $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
 +      $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
 +      $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
 +      $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
 +      $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
 +      $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
 +      $(top_srcdir)/configure.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
  mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@@ -183,9 -185,10 +187,13 @@@ OCAMLDEP = @OCAMLDEP
  OCAMLLEX = @OCAMLLEX@
  OCAMLOPT = @OCAMLOPT@
  OCAMLYACC = @OCAMLYACC@
 +OPENMPI_CC = @OPENMPI_CC@
 +OPENMPI_FLAGS = @OPENMPI_FLAGS@
 +OPENMPI_LIBS = @OPENMPI_LIBS@
+ OPENMP_CFLAGS = @OPENMP_CFLAGS@
+ OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
+ OPENMP_ENABLE = @OPENMP_ENABLE@
+ OPENMP_LIBS = @OPENMP_LIBS@
  OTOOL = @OTOOL@
  OTOOL64 = @OTOOL64@
  PACKAGE = @PACKAGE@
@@@ -66,16 -66,16 +66,17 @@@ am__aclocal_m4_deps = $(top_srcdir)/m4/
        $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
        $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
-       $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
-       $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
-       $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-       $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+       $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+       $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+       $(top_srcdir)/m4/libxml2.m4 $(top_srcdir)/m4/ltoptions.m4 \
+       $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+       $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
 -      $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
 -      $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
 -      $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
 -      $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
 -      $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
 +      $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
 +      $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
 +      $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
 +      $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
 +      $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
 +      $(top_srcdir)/configure.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
  mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@@ -316,9 -316,10 +318,13 @@@ OCAMLDEP = @OCAMLDEP
  OCAMLLEX = @OCAMLLEX@
  OCAMLOPT = @OCAMLOPT@
  OCAMLYACC = @OCAMLYACC@
 +OPENMPI_CC = @OPENMPI_CC@
 +OPENMPI_FLAGS = @OPENMPI_FLAGS@
 +OPENMPI_LIBS = @OPENMPI_LIBS@
+ OPENMP_CFLAGS = @OPENMP_CFLAGS@
+ OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
+ OPENMP_ENABLE = @OPENMP_ENABLE@
+ OPENMP_LIBS = @OPENMP_LIBS@
  OTOOL = @OTOOL@
  OTOOL64 = @OTOOL64@
  PACKAGE = @PACKAGE@
@@@ -66,16 -66,16 +66,17 @@@ am__aclocal_m4_deps = $(top_srcdir)/m4/
        $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
        $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
-       $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
-       $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
-       $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-       $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+       $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+       $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+       $(top_srcdir)/m4/libxml2.m4 $(top_srcdir)/m4/ltoptions.m4 \
+       $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+       $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
 -      $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
 -      $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
 -      $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
 -      $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
 -      $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
 +      $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
 +      $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
 +      $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
 +      $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
 +      $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
 +      $(top_srcdir)/configure.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
  mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@@ -274,9 -275,10 +277,13 @@@ OCAMLDEP = @OCAMLDEP
  OCAMLLEX = @OCAMLLEX@
  OCAMLOPT = @OCAMLOPT@
  OCAMLYACC = @OCAMLYACC@
 +OPENMPI_CC = @OPENMPI_CC@
 +OPENMPI_FLAGS = @OPENMPI_FLAGS@
 +OPENMPI_LIBS = @OPENMPI_LIBS@
+ OPENMP_CFLAGS = @OPENMP_CFLAGS@
+ OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
+ OPENMP_ENABLE = @OPENMP_ENABLE@
+ OPENMP_LIBS = @OPENMP_LIBS@
  OTOOL = @OTOOL@
  OTOOL64 = @OTOOL64@
  PACKAGE = @PACKAGE@
@@@ -67,16 -67,16 +67,17 @@@ am__aclocal_m4_deps = $(top_srcdir)/m4/
        $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
        $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
-       $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
-       $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
-       $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-       $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+       $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+       $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+       $(top_srcdir)/m4/libxml2.m4 $(top_srcdir)/m4/ltoptions.m4 \
+       $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+       $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
 -      $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
 -      $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
 -      $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
 -      $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
 -      $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
 +      $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
 +      $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
 +      $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
 +      $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
 +      $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
 +      $(top_srcdir)/configure.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
  mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@@ -291,9 -293,10 +295,13 @@@ OCAMLDEP = @OCAMLDEP
  OCAMLLEX = @OCAMLLEX@
  OCAMLOPT = @OCAMLOPT@
  OCAMLYACC = @OCAMLYACC@
 +OPENMPI_CC = @OPENMPI_CC@
 +OPENMPI_FLAGS = @OPENMPI_FLAGS@
 +OPENMPI_LIBS = @OPENMPI_LIBS@
+ OPENMP_CFLAGS = @OPENMP_CFLAGS@
+ OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
+ OPENMP_ENABLE = @OPENMP_ENABLE@
+ OPENMP_LIBS = @OPENMP_LIBS@
  OTOOL = @OTOOL@
  OTOOL64 = @OTOOL64@
  PACKAGE = @PACKAGE@
@@@ -66,16 -66,16 +66,17 @@@ am__aclocal_m4_deps = $(top_srcdir)/m4/
        $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
        $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
-       $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
-       $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
-       $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-       $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+       $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+       $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+       $(top_srcdir)/m4/libxml2.m4 $(top_srcdir)/m4/ltoptions.m4 \
+       $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+       $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
 -      $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
 -      $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
 -      $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
 -      $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
 -      $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
 +      $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
 +      $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
 +      $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
 +      $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
 +      $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
 +      $(top_srcdir)/configure.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
  mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@@ -640,9 -645,10 +647,13 @@@ OCAMLDEP = @OCAMLDEP
  OCAMLLEX = @OCAMLLEX@
  OCAMLOPT = @OCAMLOPT@
  OCAMLYACC = @OCAMLYACC@
 +OPENMPI_CC = @OPENMPI_CC@
 +OPENMPI_FLAGS = @OPENMPI_FLAGS@
 +OPENMPI_LIBS = @OPENMPI_LIBS@
+ OPENMP_CFLAGS = @OPENMP_CFLAGS@
+ OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
+ OPENMP_ENABLE = @OPENMP_ENABLE@
+ OPENMP_LIBS = @OPENMP_LIBS@
  OTOOL = @OTOOL@
  OTOOL64 = @OTOOL64@
  PACKAGE = @PACKAGE@
@@@ -71,16 -71,16 +71,17 @@@ am__aclocal_m4_deps = $(top_srcdir)/m4/
        $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
        $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
-       $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
-       $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
-       $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-       $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+       $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+       $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+       $(top_srcdir)/m4/libxml2.m4 $(top_srcdir)/m4/ltoptions.m4 \
+       $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+       $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
 -      $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
 -      $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
 -      $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
 -      $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
 -      $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
 +      $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
 +      $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
 +      $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
 +      $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
 +      $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
 +      $(top_srcdir)/configure.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
  mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@@ -293,9 -294,10 +296,13 @@@ OCAMLDEP = @OCAMLDEP
  OCAMLLEX = @OCAMLLEX@
  OCAMLOPT = @OCAMLOPT@
  OCAMLYACC = @OCAMLYACC@
 +OPENMPI_CC = @OPENMPI_CC@
 +OPENMPI_FLAGS = @OPENMPI_FLAGS@
 +OPENMPI_LIBS = @OPENMPI_LIBS@
+ OPENMP_CFLAGS = @OPENMP_CFLAGS@
+ OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
+ OPENMP_ENABLE = @OPENMP_ENABLE@
+ OPENMP_LIBS = @OPENMP_LIBS@
  OTOOL = @OTOOL@
  OTOOL64 = @OTOOL64@
  PACKAGE = @PACKAGE@
@@@ -66,16 -67,16 +67,17 @@@ am__aclocal_m4_deps = $(top_srcdir)/m4/
        $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
        $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
-       $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
-       $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
-       $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-       $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+       $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+       $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+       $(top_srcdir)/m4/libxml2.m4 $(top_srcdir)/m4/ltoptions.m4 \
+       $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+       $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
 -      $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
 -      $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
 -      $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
 -      $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
 -      $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
 +      $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
 +      $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
 +      $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
 +      $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
 +      $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
 +      $(top_srcdir)/configure.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
  mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@@ -323,9 -329,10 +331,13 @@@ OCAMLDEP = @OCAMLDEP
  OCAMLLEX = @OCAMLLEX@
  OCAMLOPT = @OCAMLOPT@
  OCAMLYACC = @OCAMLYACC@
 +OPENMPI_CC = @OPENMPI_CC@
 +OPENMPI_FLAGS = @OPENMPI_FLAGS@
 +OPENMPI_LIBS = @OPENMPI_LIBS@
+ OPENMP_CFLAGS = @OPENMP_CFLAGS@
+ OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
+ OPENMP_ENABLE = @OPENMP_ENABLE@
+ OPENMP_LIBS = @OPENMP_LIBS@
  OTOOL = @OTOOL@
  OTOOL64 = @OTOOL64@
  PACKAGE = @PACKAGE@
@@@ -66,16 -66,16 +66,17 @@@ am__aclocal_m4_deps = $(top_srcdir)/m4/
        $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
        $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
-       $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
-       $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
-       $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-       $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+       $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+       $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+       $(top_srcdir)/m4/libxml2.m4 $(top_srcdir)/m4/ltoptions.m4 \
+       $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+       $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
 -      $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
 -      $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
 -      $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
 -      $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
 -      $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
 +      $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
 +      $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
 +      $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
 +      $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
 +      $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
 +      $(top_srcdir)/configure.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
  mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@@ -283,9 -284,10 +286,13 @@@ OCAMLDEP = @OCAMLDEP
  OCAMLLEX = @OCAMLLEX@
  OCAMLOPT = @OCAMLOPT@
  OCAMLYACC = @OCAMLYACC@
 +OPENMPI_CC = @OPENMPI_CC@
 +OPENMPI_FLAGS = @OPENMPI_FLAGS@
 +OPENMPI_LIBS = @OPENMPI_LIBS@
+ OPENMP_CFLAGS = @OPENMP_CFLAGS@
+ OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
+ OPENMP_ENABLE = @OPENMP_ENABLE@
+ OPENMP_LIBS = @OPENMP_LIBS@
  OTOOL = @OTOOL@
  OTOOL64 = @OTOOL64@
  PACKAGE = @PACKAGE@
@@@ -69,16 -69,16 +69,17 @@@ am__aclocal_m4_deps = $(top_srcdir)/m4/
        $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
        $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
-       $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
-       $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
-       $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-       $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+       $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+       $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+       $(top_srcdir)/m4/libxml2.m4 $(top_srcdir)/m4/ltoptions.m4 \
+       $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+       $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
 -      $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
 -      $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
 -      $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
 -      $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
 -      $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
 +      $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
 +      $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
 +      $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
 +      $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
 +      $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
 +      $(top_srcdir)/configure.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
  mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@@ -236,9 -238,10 +240,13 @@@ OCAMLDEP = @OCAMLDEP
  OCAMLLEX = @OCAMLLEX@
  OCAMLOPT = @OCAMLOPT@
  OCAMLYACC = @OCAMLYACC@
 +OPENMPI_CC = @OPENMPI_CC@
 +OPENMPI_FLAGS = @OPENMPI_FLAGS@
 +OPENMPI_LIBS = @OPENMPI_LIBS@
+ OPENMP_CFLAGS = @OPENMP_CFLAGS@
+ OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
+ OPENMP_ENABLE = @OPENMP_ENABLE@
+ OPENMP_LIBS = @OPENMP_LIBS@
  OTOOL = @OTOOL@
  OTOOL64 = @OTOOL64@
  PACKAGE = @PACKAGE@
@@@ -73,16 -73,16 +73,17 @@@ am__aclocal_m4_deps = $(top_srcdir)/m4/
        $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
        $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
-       $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
-       $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
-       $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-       $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+       $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+       $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+       $(top_srcdir)/m4/libxml2.m4 $(top_srcdir)/m4/ltoptions.m4 \
+       $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+       $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
 -      $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
 -      $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
 -      $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
 -      $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
 -      $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
 +      $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
 +      $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
 +      $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
 +      $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
 +      $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
 +      $(top_srcdir)/configure.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
  mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@@ -273,9 -274,10 +276,13 @@@ OCAMLDEP = @OCAMLDEP
  OCAMLLEX = @OCAMLLEX@
  OCAMLOPT = @OCAMLOPT@
  OCAMLYACC = @OCAMLYACC@
 +OPENMPI_CC = @OPENMPI_CC@
 +OPENMPI_FLAGS = @OPENMPI_FLAGS@
 +OPENMPI_LIBS = @OPENMPI_LIBS@
+ OPENMP_CFLAGS = @OPENMP_CFLAGS@
+ OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
+ OPENMP_ENABLE = @OPENMP_ENABLE@
+ OPENMP_LIBS = @OPENMP_LIBS@
  OTOOL = @OTOOL@
  OTOOL64 = @OTOOL64@
  PACKAGE = @PACKAGE@
@@@ -74,16 -74,16 +74,17 @@@ am__aclocal_m4_deps = $(top_srcdir)/m4/
        $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
        $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
-       $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
-       $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
-       $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-       $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+       $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+       $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+       $(top_srcdir)/m4/libxml2.m4 $(top_srcdir)/m4/ltoptions.m4 \
+       $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+       $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
 -      $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
 -      $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
 -      $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
 -      $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
 -      $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
 +      $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
 +      $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
 +      $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
 +      $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
 +      $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
 +      $(top_srcdir)/configure.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
  mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@@ -310,9 -311,10 +313,13 @@@ OCAMLDEP = @OCAMLDEP
  OCAMLLEX = @OCAMLLEX@
  OCAMLOPT = @OCAMLOPT@
  OCAMLYACC = @OCAMLYACC@
 +OPENMPI_CC = @OPENMPI_CC@
 +OPENMPI_FLAGS = @OPENMPI_FLAGS@
 +OPENMPI_LIBS = @OPENMPI_LIBS@
+ OPENMP_CFLAGS = @OPENMP_CFLAGS@
+ OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
+ OPENMP_ENABLE = @OPENMP_ENABLE@
+ OPENMP_LIBS = @OPENMP_LIBS@
  OTOOL = @OTOOL@
  OTOOL64 = @OTOOL64@
  PACKAGE = @PACKAGE@
@@@ -74,16 -74,16 +74,17 @@@ am__aclocal_m4_deps = $(top_srcdir)/m4/
        $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
        $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
-       $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
-       $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
-       $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-       $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+       $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+       $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+       $(top_srcdir)/m4/libxml2.m4 $(top_srcdir)/m4/ltoptions.m4 \
+       $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+       $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
 -      $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
 -      $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
 -      $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
 -      $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
 -      $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
 +      $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
 +      $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
 +      $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
 +      $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
 +      $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
 +      $(top_srcdir)/configure.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
  mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@@ -645,9 -646,10 +648,13 @@@ OCAMLDEP = @OCAMLDEP
  OCAMLLEX = @OCAMLLEX@
  OCAMLOPT = @OCAMLOPT@
  OCAMLYACC = @OCAMLYACC@
 +OPENMPI_CC = @OPENMPI_CC@
 +OPENMPI_FLAGS = @OPENMPI_FLAGS@
 +OPENMPI_LIBS = @OPENMPI_LIBS@
+ OPENMP_CFLAGS = @OPENMP_CFLAGS@
+ OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
+ OPENMP_ENABLE = @OPENMP_ENABLE@
+ OPENMP_LIBS = @OPENMP_LIBS@
  OTOOL = @OTOOL@
  OTOOL64 = @OTOOL64@
  PACKAGE = @PACKAGE@
@@@ -76,16 -77,16 +77,17 @@@ am__aclocal_m4_deps = $(top_srcdir)/m4/
        $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
        $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
-       $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
-       $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
-       $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-       $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+       $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+       $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+       $(top_srcdir)/m4/libxml2.m4 $(top_srcdir)/m4/ltoptions.m4 \
+       $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+       $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
 -      $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
 -      $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
 -      $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
 -      $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
 -      $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
 +      $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
 +      $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
 +      $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
 +      $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
 +      $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
 +      $(top_srcdir)/configure.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
  mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@@ -398,9 -401,10 +403,13 @@@ OCAMLDEP = @OCAMLDEP
  OCAMLLEX = @OCAMLLEX@
  OCAMLOPT = @OCAMLOPT@
  OCAMLYACC = @OCAMLYACC@
 +OPENMPI_CC = @OPENMPI_CC@
 +OPENMPI_FLAGS = @OPENMPI_FLAGS@
 +OPENMPI_LIBS = @OPENMPI_LIBS@
+ OPENMP_CFLAGS = @OPENMP_CFLAGS@
+ OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
+ OPENMP_ENABLE = @OPENMP_ENABLE@
+ OPENMP_LIBS = @OPENMP_LIBS@
  OTOOL = @OTOOL@
  OTOOL64 = @OTOOL64@
  PACKAGE = @PACKAGE@
@@@ -74,16 -74,16 +74,17 @@@ am__aclocal_m4_deps = $(top_srcdir)/m4/
        $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
        $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
-       $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
-       $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
-       $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-       $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+       $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+       $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+       $(top_srcdir)/m4/libxml2.m4 $(top_srcdir)/m4/ltoptions.m4 \
+       $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+       $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
 -      $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
 -      $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
 -      $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
 -      $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
 -      $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
 +      $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
 +      $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
 +      $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
 +      $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
 +      $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
 +      $(top_srcdir)/configure.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
  mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@@ -324,9 -326,10 +328,13 @@@ OCAMLDEP = @OCAMLDEP
  OCAMLLEX = @OCAMLLEX@
  OCAMLOPT = @OCAMLOPT@
  OCAMLYACC = @OCAMLYACC@
 +OPENMPI_CC = @OPENMPI_CC@
 +OPENMPI_FLAGS = @OPENMPI_FLAGS@
 +OPENMPI_LIBS = @OPENMPI_LIBS@
+ OPENMP_CFLAGS = @OPENMP_CFLAGS@
+ OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
+ OPENMP_ENABLE = @OPENMP_ENABLE@
+ OPENMP_LIBS = @OPENMP_LIBS@
  OTOOL = @OTOOL@
  OTOOL64 = @OTOOL64@
  PACKAGE = @PACKAGE@
@@@ -66,16 -66,16 +66,17 @@@ am__aclocal_m4_deps = $(top_srcdir)/m4/
        $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
        $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
-       $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
-       $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
-       $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-       $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+       $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+       $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+       $(top_srcdir)/m4/libxml2.m4 $(top_srcdir)/m4/ltoptions.m4 \
+       $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+       $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
 -      $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
 -      $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
 -      $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
 -      $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
 -      $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
 +      $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
 +      $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
 +      $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
 +      $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
 +      $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
 +      $(top_srcdir)/configure.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
  mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@@ -298,9 -301,10 +303,13 @@@ OCAMLDEP = @OCAMLDEP
  OCAMLLEX = @OCAMLLEX@
  OCAMLOPT = @OCAMLOPT@
  OCAMLYACC = @OCAMLYACC@
 +OPENMPI_CC = @OPENMPI_CC@
 +OPENMPI_FLAGS = @OPENMPI_FLAGS@
 +OPENMPI_LIBS = @OPENMPI_LIBS@
+ OPENMP_CFLAGS = @OPENMP_CFLAGS@
+ OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
+ OPENMP_ENABLE = @OPENMP_ENABLE@
+ OPENMP_LIBS = @OPENMP_LIBS@
  OTOOL = @OTOOL@
  OTOOL64 = @OTOOL64@
  PACKAGE = @PACKAGE@
@@@ -76,16 -73,16 +73,17 @@@ am__aclocal_m4_deps = $(top_srcdir)/m4/
        $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
        $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
-       $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
-       $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
-       $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-       $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-       $(top_srcdir)/m4/macosx.m4 $(top_srcdir)/m4/mpi.m4 \
-       $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
-       $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
-       $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
-       $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
-       $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+       $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+       $(top_srcdir)/m4/libxml2.m4 $(top_srcdir)/m4/ltoptions.m4 \
+       $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+       $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
 -      $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
 -      $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
 -      $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
 -      $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
 -      $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
++      $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
++      $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
++      $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
++      $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
++      $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
++      $(top_srcdir)/configure.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
  mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@@ -71,16 -71,16 +71,17 @@@ am__aclocal_m4_deps = $(top_srcdir)/m4/
        $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
        $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
-       $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
-       $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
-       $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-       $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+       $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+       $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+       $(top_srcdir)/m4/libxml2.m4 $(top_srcdir)/m4/ltoptions.m4 \
+       $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+       $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
 -      $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
 -      $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
 -      $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
 -      $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
 -      $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
 +      $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
 +      $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
 +      $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
 +      $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
 +      $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
 +      $(top_srcdir)/configure.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
  mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@@ -321,9 -322,10 +324,13 @@@ OCAMLDEP = @OCAMLDEP
  OCAMLLEX = @OCAMLLEX@
  OCAMLOPT = @OCAMLOPT@
  OCAMLYACC = @OCAMLYACC@
 +OPENMPI_CC = @OPENMPI_CC@
 +OPENMPI_FLAGS = @OPENMPI_FLAGS@
 +OPENMPI_LIBS = @OPENMPI_LIBS@
+ OPENMP_CFLAGS = @OPENMP_CFLAGS@
+ OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
+ OPENMP_ENABLE = @OPENMP_ENABLE@
+ OPENMP_LIBS = @OPENMP_LIBS@
  OTOOL = @OTOOL@
  OTOOL64 = @OTOOL64@
  PACKAGE = @PACKAGE@
@@@ -66,16 -66,16 +66,17 @@@ am__aclocal_m4_deps = $(top_srcdir)/m4/
        $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
        $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
-       $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
-       $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
-       $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-       $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+       $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+       $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+       $(top_srcdir)/m4/libxml2.m4 $(top_srcdir)/m4/ltoptions.m4 \
+       $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+       $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
 -      $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
 -      $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
 -      $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
 -      $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
 -      $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
 +      $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
 +      $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
 +      $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
 +      $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
 +      $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
 +      $(top_srcdir)/configure.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
  mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@@ -309,9 -309,10 +311,13 @@@ OCAMLDEP = @OCAMLDEP
  OCAMLLEX = @OCAMLLEX@
  OCAMLOPT = @OCAMLOPT@
  OCAMLYACC = @OCAMLYACC@
 +OPENMPI_CC = @OPENMPI_CC@
 +OPENMPI_FLAGS = @OPENMPI_FLAGS@
 +OPENMPI_LIBS = @OPENMPI_LIBS@
+ OPENMP_CFLAGS = @OPENMP_CFLAGS@
+ OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
+ OPENMP_ENABLE = @OPENMP_ENABLE@
+ OPENMP_LIBS = @OPENMP_LIBS@
  OTOOL = @OTOOL@
  OTOOL64 = @OTOOL64@
  PACKAGE = @PACKAGE@
@@@ -70,16 -70,16 +70,17 @@@ am__aclocal_m4_deps = $(top_srcdir)/m4/
        $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
        $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
-       $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
-       $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
-       $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-       $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+       $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+       $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+       $(top_srcdir)/m4/libxml2.m4 $(top_srcdir)/m4/ltoptions.m4 \
+       $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+       $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
 -      $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
 -      $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
 -      $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
 -      $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
 -      $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
 +      $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
 +      $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
 +      $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
 +      $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
 +      $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
 +      $(top_srcdir)/configure.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
  mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@@ -291,9 -291,10 +293,13 @@@ OCAMLDEP = @OCAMLDEP
  OCAMLLEX = @OCAMLLEX@
  OCAMLOPT = @OCAMLOPT@
  OCAMLYACC = @OCAMLYACC@
 +OPENMPI_CC = @OPENMPI_CC@
 +OPENMPI_FLAGS = @OPENMPI_FLAGS@
 +OPENMPI_LIBS = @OPENMPI_LIBS@
+ OPENMP_CFLAGS = @OPENMP_CFLAGS@
+ OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
+ OPENMP_ENABLE = @OPENMP_ENABLE@
+ OPENMP_LIBS = @OPENMP_LIBS@
  OTOOL = @OTOOL@
  OTOOL64 = @OTOOL64@
  PACKAGE = @PACKAGE@
@@@ -70,16 -70,16 +70,17 @@@ am__aclocal_m4_deps = $(top_srcdir)/m4/
        $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
        $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
-       $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
-       $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
-       $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-       $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+       $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+       $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+       $(top_srcdir)/m4/libxml2.m4 $(top_srcdir)/m4/ltoptions.m4 \
+       $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+       $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
 -      $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
 -      $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
 -      $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
 -      $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
 -      $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
 +      $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
 +      $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
 +      $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
 +      $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
 +      $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
 +      $(top_srcdir)/configure.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
  mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@@ -274,9 -276,10 +278,13 @@@ OCAMLDEP = @OCAMLDEP
  OCAMLLEX = @OCAMLLEX@
  OCAMLOPT = @OCAMLOPT@
  OCAMLYACC = @OCAMLYACC@
 +OPENMPI_CC = @OPENMPI_CC@
 +OPENMPI_FLAGS = @OPENMPI_FLAGS@
 +OPENMPI_LIBS = @OPENMPI_LIBS@
+ OPENMP_CFLAGS = @OPENMP_CFLAGS@
+ OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
+ OPENMP_ENABLE = @OPENMP_ENABLE@
+ OPENMP_LIBS = @OPENMP_LIBS@
  OTOOL = @OTOOL@
  OTOOL64 = @OTOOL64@
  PACKAGE = @PACKAGE@
@@@ -66,16 -66,16 +66,17 @@@ am__aclocal_m4_deps = $(top_srcdir)/m4/
        $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
        $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
-       $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
-       $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
-       $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-       $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+       $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+       $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+       $(top_srcdir)/m4/libxml2.m4 $(top_srcdir)/m4/ltoptions.m4 \
+       $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+       $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
 -      $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
 -      $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
 -      $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
 -      $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
 -      $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
 +      $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
 +      $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
 +      $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
 +      $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
 +      $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
 +      $(top_srcdir)/configure.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
  mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@@ -295,9 -288,10 +290,13 @@@ OCAMLDEP = @OCAMLDEP
  OCAMLLEX = @OCAMLLEX@
  OCAMLOPT = @OCAMLOPT@
  OCAMLYACC = @OCAMLYACC@
 +OPENMPI_CC = @OPENMPI_CC@
 +OPENMPI_FLAGS = @OPENMPI_FLAGS@
 +OPENMPI_LIBS = @OPENMPI_LIBS@
+ OPENMP_CFLAGS = @OPENMP_CFLAGS@
+ OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
+ OPENMP_ENABLE = @OPENMP_ENABLE@
+ OPENMP_LIBS = @OPENMP_LIBS@
  OTOOL = @OTOOL@
  OTOOL64 = @OTOOL64@
  PACKAGE = @PACKAGE@
@@@ -73,16 -74,16 +74,17 @@@ am__aclocal_m4_deps = $(top_srcdir)/m4/
        $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
        $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
-       $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
-       $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
-       $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-       $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+       $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+       $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+       $(top_srcdir)/m4/libxml2.m4 $(top_srcdir)/m4/ltoptions.m4 \
+       $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+       $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
 -      $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
 -      $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
 -      $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
 -      $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
 -      $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
 +      $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
 +      $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
 +      $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
 +      $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
 +      $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
 +      $(top_srcdir)/configure.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
  mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@@ -286,9 -302,10 +304,13 @@@ OCAMLDEP = @OCAMLDEP
  OCAMLLEX = @OCAMLLEX@
  OCAMLOPT = @OCAMLOPT@
  OCAMLYACC = @OCAMLYACC@
 +OPENMPI_CC = @OPENMPI_CC@
 +OPENMPI_FLAGS = @OPENMPI_FLAGS@
 +OPENMPI_LIBS = @OPENMPI_LIBS@
+ OPENMP_CFLAGS = @OPENMP_CFLAGS@
+ OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
+ OPENMP_ENABLE = @OPENMP_ENABLE@
+ OPENMP_LIBS = @OPENMP_LIBS@
  OTOOL = @OTOOL@
  OTOOL64 = @OTOOL64@
  PACKAGE = @PACKAGE@
@@@ -76,16 -76,16 +76,17 @@@ am__aclocal_m4_deps = $(top_srcdir)/m4/
        $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
        $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
-       $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
-       $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
-       $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-       $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+       $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+       $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+       $(top_srcdir)/m4/libxml2.m4 $(top_srcdir)/m4/ltoptions.m4 \
+       $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+       $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
 -      $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
 -      $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
 -      $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
 -      $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
 -      $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
 +      $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
 +      $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
 +      $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
 +      $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
 +      $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
 +      $(top_srcdir)/configure.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
  mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@@ -301,9 -303,10 +305,13 @@@ OCAMLDEP = @OCAMLDEP
  OCAMLLEX = @OCAMLLEX@
  OCAMLOPT = @OCAMLOPT@
  OCAMLYACC = @OCAMLYACC@
 +OPENMPI_CC = @OPENMPI_CC@
 +OPENMPI_FLAGS = @OPENMPI_FLAGS@
 +OPENMPI_LIBS = @OPENMPI_LIBS@
+ OPENMP_CFLAGS = @OPENMP_CFLAGS@
+ OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
+ OPENMP_ENABLE = @OPENMP_ENABLE@
+ OPENMP_LIBS = @OPENMP_LIBS@
  OTOOL = @OTOOL@
  OTOOL64 = @OTOOL64@
  PACKAGE = @PACKAGE@
@@@ -66,16 -66,16 +66,17 @@@ am__aclocal_m4_deps = $(top_srcdir)/m4/
        $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
        $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
-       $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
-       $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
-       $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-       $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+       $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+       $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+       $(top_srcdir)/m4/libxml2.m4 $(top_srcdir)/m4/ltoptions.m4 \
+       $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+       $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
 -      $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
 -      $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
 -      $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
 -      $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
 -      $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
 +      $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
 +      $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
 +      $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
 +      $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
 +      $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
 +      $(top_srcdir)/configure.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
  mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@@ -311,9 -312,10 +314,13 @@@ OCAMLDEP = @OCAMLDEP
  OCAMLLEX = @OCAMLLEX@
  OCAMLOPT = @OCAMLOPT@
  OCAMLYACC = @OCAMLYACC@
 +OPENMPI_CC = @OPENMPI_CC@
 +OPENMPI_FLAGS = @OPENMPI_FLAGS@
 +OPENMPI_LIBS = @OPENMPI_LIBS@
+ OPENMP_CFLAGS = @OPENMP_CFLAGS@
+ OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
+ OPENMP_ENABLE = @OPENMP_ENABLE@
+ OPENMP_LIBS = @OPENMP_LIBS@
  OTOOL = @OTOOL@
  OTOOL64 = @OTOOL64@
  PACKAGE = @PACKAGE@
@@@ -76,16 -78,16 +78,17 @@@ am__aclocal_m4_deps = $(top_srcdir)/m4/
        $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
        $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
-       $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
-       $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
-       $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-       $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+       $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+       $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+       $(top_srcdir)/m4/libxml2.m4 $(top_srcdir)/m4/ltoptions.m4 \
+       $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+       $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
 -      $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
 -      $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
 -      $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
 -      $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
 -      $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
 +      $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
 +      $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
 +      $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
 +      $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
 +      $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
 +      $(top_srcdir)/configure.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
  mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@@ -298,9 -305,10 +307,13 @@@ OCAMLDEP = @OCAMLDEP
  OCAMLLEX = @OCAMLLEX@
  OCAMLOPT = @OCAMLOPT@
  OCAMLYACC = @OCAMLYACC@
 +OPENMPI_CC = @OPENMPI_CC@
 +OPENMPI_FLAGS = @OPENMPI_FLAGS@
 +OPENMPI_LIBS = @OPENMPI_LIBS@
+ OPENMP_CFLAGS = @OPENMP_CFLAGS@
+ OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
+ OPENMP_ENABLE = @OPENMP_ENABLE@
+ OPENMP_LIBS = @OPENMP_LIBS@
  OTOOL = @OTOOL@
  OTOOL64 = @OTOOL64@
  PACKAGE = @PACKAGE@
@@@ -65,16 -65,16 +65,17 @@@ am__aclocal_m4_deps = $(top_srcdir)/m4/
        $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
        $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
-       $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
-       $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
-       $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-       $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+       $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+       $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+       $(top_srcdir)/m4/libxml2.m4 $(top_srcdir)/m4/ltoptions.m4 \
+       $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+       $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
 -      $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
 -      $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
 -      $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
 -      $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
 -      $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
 +      $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
 +      $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
 +      $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
 +      $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
 +      $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
 +      $(top_srcdir)/configure.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
  mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@@ -231,9 -233,10 +235,13 @@@ OCAMLDEP = @OCAMLDEP
  OCAMLLEX = @OCAMLLEX@
  OCAMLOPT = @OCAMLOPT@
  OCAMLYACC = @OCAMLYACC@
 +OPENMPI_CC = @OPENMPI_CC@
 +OPENMPI_FLAGS = @OPENMPI_FLAGS@
 +OPENMPI_LIBS = @OPENMPI_LIBS@
+ OPENMP_CFLAGS = @OPENMP_CFLAGS@
+ OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
+ OPENMP_ENABLE = @OPENMP_ENABLE@
+ OPENMP_LIBS = @OPENMP_LIBS@
  OTOOL = @OTOOL@
  OTOOL64 = @OTOOL64@
  PACKAGE = @PACKAGE@
@@@ -65,16 -65,16 +65,17 @@@ am__aclocal_m4_deps = $(top_srcdir)/m4/
        $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
        $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
-       $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
-       $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
-       $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-       $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+       $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+       $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+       $(top_srcdir)/m4/libxml2.m4 $(top_srcdir)/m4/ltoptions.m4 \
+       $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+       $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
 -      $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
 -      $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
 -      $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
 -      $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
 -      $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
 +      $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
 +      $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
 +      $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
 +      $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
 +      $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
 +      $(top_srcdir)/configure.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
  mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@@ -231,9 -233,10 +235,13 @@@ OCAMLDEP = @OCAMLDEP
  OCAMLLEX = @OCAMLLEX@
  OCAMLOPT = @OCAMLOPT@
  OCAMLYACC = @OCAMLYACC@
 +OPENMPI_CC = @OPENMPI_CC@
 +OPENMPI_FLAGS = @OPENMPI_FLAGS@
 +OPENMPI_LIBS = @OPENMPI_LIBS@
+ OPENMP_CFLAGS = @OPENMP_CFLAGS@
+ OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
+ OPENMP_ENABLE = @OPENMP_ENABLE@
+ OPENMP_LIBS = @OPENMP_LIBS@
  OTOOL = @OTOOL@
  OTOOL64 = @OTOOL64@
  PACKAGE = @PACKAGE@
@@@ -67,16 -67,16 +67,17 @@@ am__aclocal_m4_deps = $(top_srcdir)/m4/
        $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
        $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
-       $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
-       $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
-       $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-       $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+       $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+       $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+       $(top_srcdir)/m4/libxml2.m4 $(top_srcdir)/m4/ltoptions.m4 \
+       $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+       $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
 -      $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
 -      $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
 -      $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
 -      $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
 -      $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
 +      $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
 +      $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
 +      $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
 +      $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
 +      $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
 +      $(top_srcdir)/configure.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
  mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@@ -298,9 -300,10 +302,13 @@@ OCAMLDEP = @OCAMLDEP
  OCAMLLEX = @OCAMLLEX@
  OCAMLOPT = @OCAMLOPT@
  OCAMLYACC = @OCAMLYACC@
 +OPENMPI_CC = @OPENMPI_CC@
 +OPENMPI_FLAGS = @OPENMPI_FLAGS@
 +OPENMPI_LIBS = @OPENMPI_LIBS@
+ OPENMP_CFLAGS = @OPENMP_CFLAGS@
+ OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
+ OPENMP_ENABLE = @OPENMP_ENABLE@
+ OPENMP_LIBS = @OPENMP_LIBS@
  OTOOL = @OTOOL@
  OTOOL64 = @OTOOL64@
  PACKAGE = @PACKAGE@
@@@ -67,16 -67,16 +67,17 @@@ am__aclocal_m4_deps = $(top_srcdir)/m4/
        $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
        $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
-       $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
-       $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
-       $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-       $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+       $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+       $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+       $(top_srcdir)/m4/libxml2.m4 $(top_srcdir)/m4/ltoptions.m4 \
+       $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+       $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
 -      $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
 -      $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
 -      $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
 -      $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
 -      $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
 +      $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
 +      $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
 +      $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
 +      $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
 +      $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
 +      $(top_srcdir)/configure.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
  mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@@ -275,9 -277,10 +279,13 @@@ OCAMLDEP = @OCAMLDEP
  OCAMLLEX = @OCAMLLEX@
  OCAMLOPT = @OCAMLOPT@
  OCAMLYACC = @OCAMLYACC@
 +OPENMPI_CC = @OPENMPI_CC@
 +OPENMPI_FLAGS = @OPENMPI_FLAGS@
 +OPENMPI_LIBS = @OPENMPI_LIBS@
+ OPENMP_CFLAGS = @OPENMP_CFLAGS@
+ OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
+ OPENMP_ENABLE = @OPENMP_ENABLE@
+ OPENMP_LIBS = @OPENMP_LIBS@
  OTOOL = @OTOOL@
  OTOOL64 = @OTOOL64@
  PACKAGE = @PACKAGE@
@@@ -68,16 -65,16 +65,17 @@@ am__aclocal_m4_deps = $(top_srcdir)/m4/
        $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
        $(top_srcdir)/m4/intel_compiler.m4 \
        $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
-       $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
-       $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
-       $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-       $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-       $(top_srcdir)/m4/macosx.m4 $(top_srcdir)/m4/mpi.m4 \
-       $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
-       $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
-       $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
-       $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
-       $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
+       $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
+       $(top_srcdir)/m4/libxml2.m4 $(top_srcdir)/m4/ltoptions.m4 \
+       $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+       $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
 -      $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
 -      $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
 -      $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
 -      $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
 -      $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
++      $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
++      $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
++      $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
++      $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
++      $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
++      $(top_srcdir)/configure.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
  mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
index f6e0974,0000000..4fdd89f
mode 100644,000000..100644
--- /dev/null
@@@ -1,1446 -1,0 +1,1474 @@@
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
 +# @configure_input@
 +
 +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
 +# This Makefile.in is free software; the Free Software Foundation
 +# gives unlimited permission to copy and/or distribute it,
 +# with or without modifications, as long as this notice is preserved.
 +
 +# This program is distributed in the hope that it will be useful,
 +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
 +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 +# PARTICULAR PURPOSE.
 +
 +@SET_MAKE@
 +
 +# Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
 +# Copyright (C) 2006-2008 - INRIA - Sylvestre LEDRU
 +# Copyright (C) 2009 - DIGITEO - Sylvestre LEDRU
 +#
 +# This file must be used under the terms of the CeCILL.
 +# This source file is licensed as described in the file COPYING, which
 +# you should have received as part of this distribution.  The terms
 +# are also available at
 +# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
 +
 +# List of the c files
 +#MPI_C_SOURCES = src/c/s_mpi_irecv.c \
 +#src/c/build_buff_type.c \
 +#src/c/s_mpi_recv.c \
 +#src/c/s_mpi_send.c \
 +#src/c/s_mpi_isend.c
 +
 +# List of the fortran files
 +#MPI_FORTRAN_SOURCES = src/fortran/intsmpi_isend.f \
 +#src/fortran/intmpi.f \
 +#src/fortran/intsmpi_send.f \
 +#src/fortran/intsmpi_recv.f \
 +#src/fortran/intsmpi_comm_rank.f \
 +#src/fortran/intsmpi_irecv.f \
 +#src/fortran/intsmpi_init.f \
 +#src/fortran/intsmpi_finalize.f \
 +#src/fortran/intsmpi_comm_size.f
 +#src/fortran/mpi_init.f
 +
 +# Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
 +# Copyright (C) 2006-2008 - INRIA - Sylvestre LEDRU <sylvestre.ledru@inria.fr>
 +# Copyright (C) 2008      - INRIA - Pierre MARECHAL <pierre.marechal@inria.fr>
 +#
 +# This file must be used under the terms of the CeCILL.
 +# This source file is licensed as described in the file COPYING, which
 +# you should have received as part of this distribution.  The terms
 +# are also available at
 +# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
 +#
 +
 +##########
 +### Makefile included stuff
 +### Target, variable, suffixes which are supposed to be usefull in every makefile.am
 +##########
 +
 +
 +
 +
 +VPATH = @srcdir@
 +pkgdatadir = $(datadir)/@PACKAGE@
 +pkgincludedir = $(includedir)/@PACKAGE@
 +pkglibdir = $(libdir)/@PACKAGE@
 +pkglibexecdir = $(libexecdir)/@PACKAGE@
 +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 +install_sh_DATA = $(install_sh) -c -m 644
 +install_sh_PROGRAM = $(install_sh) -c
 +install_sh_SCRIPT = $(install_sh) -c
 +INSTALL_HEADER = $(INSTALL_DATA)
 +transform = $(program_transform_name)
 +NORMAL_INSTALL = :
 +PRE_INSTALL = :
 +POST_INSTALL = :
 +NORMAL_UNINSTALL = :
 +PRE_UNINSTALL = :
 +POST_UNINSTALL = :
 +build_triplet = @build@
 +host_triplet = @host@
 +bin_PROGRAMS = mpitest$(EXEEXT) mpi_pi$(EXEEXT) \
 +      mpi_test_scilab_data$(EXEEXT) mpitest_contiguous$(EXEEXT) \
 +      mpitest_scilab_pack$(EXEEXT)
 +DIST_COMMON = $(libscimpi_la_include_HEADERS) $(srcdir)/Makefile.am \
 +      $(srcdir)/Makefile.in $(top_srcdir)/Makefile.incl.am TODO
 +@NEED_JAVA_TRUE@am__append_1 = java
 +subdir = modules/mpi
 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 +am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
 +      $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
 +      $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
 +      $(top_srcdir)/m4/intel_compiler.m4 \
 +      $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
-       $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
-       $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
-       $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-       $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
++      $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
++      $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
++      $(top_srcdir)/m4/libxml2.m4 $(top_srcdir)/m4/ltoptions.m4 \
++      $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
++      $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
 +      $(top_srcdir)/m4/mpi.m4 $(top_srcdir)/m4/ocaml.m4 \
 +      $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
 +      $(top_srcdir)/m4/pvm.m4 $(top_srcdir)/m4/relocatable.m4 \
 +      $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
 +      $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
 +      $(top_srcdir)/configure.ac
 +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 +      $(ACLOCAL_M4)
 +mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
 +CONFIG_HEADER = $(top_builddir)/modules/core/includes/machine.h
 +CONFIG_CLEAN_FILES =
 +CONFIG_CLEAN_VPATH_FILES =
 +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 +am__vpath_adj = case $$p in \
 +    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
 +    *) f=$$p;; \
 +  esac;
 +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
 +am__install_max = 40
 +am__nobase_strip_setup = \
 +  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
 +am__nobase_strip = \
 +  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
 +am__nobase_list = $(am__nobase_strip_setup); \
 +  for p in $$list; do echo "$$p $$p"; done | \
 +  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
 +  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
 +    if (++n[$$2] == $(am__install_max)) \
 +      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
 +    END { for (dir in files) print dir, files[dir] }'
 +am__base_list = \
 +  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
 +  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 +am__installdirs = "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(bindir)" \
 +      "$(DESTDIR)$(libscimpi_la_etcdir)" \
 +      "$(DESTDIR)$(libscimpi_la_rootdir)" \
 +      "$(DESTDIR)$(libscimpi_la_sci_gatewaydir)" \
 +      "$(DESTDIR)$(libscimpi_la_includedir)"
 +LTLIBRARIES = $(pkglib_LTLIBRARIES)
 +libscimpi_la_DEPENDENCIES =  \
 +      $(top_builddir)/modules/localization/libscilocalization.la \
 +      $(top_builddir)/modules/core/libscicore.la
 +am__objects_1 = libscimpi_la-sci_mpi_init.lo \
 +      libscimpi_la-sci_mpi_finalize.lo \
 +      libscimpi_la-sci_mpi_comm_size.lo \
 +      libscimpi_la-sci_mpi_comm_rank.lo libscimpi_la-gw_mpi.lo \
 +      libscimpi_la-sci_mpi_recv.lo libscimpi_la-sci_mpi_send.lo \
 +      libscimpi_la-sci_mpi_serialize.lo \
 +      libscimpi_la-sci_mpi_unserialize.lo \
 +      libscimpi_la-build_buff_type.lo \
 +      libscimpi_la-pre_send_recv_metadata.lo \
 +      libscimpi_la-s_mpi_recv.lo libscimpi_la-s_mpi_send.lo
 +am__objects_2 = libscimpi_la-mappingScilabMPI.lo
 +am_libscimpi_la_OBJECTS = $(am__objects_1) $(am__objects_2)
 +libscimpi_la_OBJECTS = $(am_libscimpi_la_OBJECTS)
 +libscimpi_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 +      $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libscimpi_la_CFLAGS) \
 +      $(CFLAGS) $(libscimpi_la_LDFLAGS) $(LDFLAGS) -o $@
 +PROGRAMS = $(bin_PROGRAMS)
 +am__objects_3 = mpi_pi_send.$(OBJEXT) dboard.$(OBJEXT)
 +am_mpi_pi_OBJECTS = $(am__objects_3)
 +mpi_pi_OBJECTS = $(am_mpi_pi_OBJECTS)
 +mpi_pi_LDADD = $(LDADD)
 +mpi_pi_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 +      --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(mpi_pi_LDFLAGS) \
 +      $(LDFLAGS) -o $@
 +am_mpi_test_scilab_data_OBJECTS = mpitest_scilab_data.$(OBJEXT)
 +mpi_test_scilab_data_OBJECTS = $(am_mpi_test_scilab_data_OBJECTS)
 +mpi_test_scilab_data_LDADD = $(LDADD)
 +mpi_test_scilab_data_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 +      $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 +      $(mpi_test_scilab_data_LDFLAGS) $(LDFLAGS) -o $@
 +am__objects_4 = mpitest.$(OBJEXT)
 +am_mpitest_OBJECTS = $(am__objects_4)
 +mpitest_OBJECTS = $(am_mpitest_OBJECTS)
 +mpitest_LDADD = $(LDADD)
 +mpitest_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 +      --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(mpitest_LDFLAGS) \
 +      $(LDFLAGS) -o $@
 +am_mpitest_contiguous_OBJECTS = mpitest_contiguous.$(OBJEXT)
 +mpitest_contiguous_OBJECTS = $(am_mpitest_contiguous_OBJECTS)
 +mpitest_contiguous_LDADD = $(LDADD)
 +am_mpitest_scilab_pack_OBJECTS = mpitest_scilab_pack.$(OBJEXT)
 +mpitest_scilab_pack_OBJECTS = $(am_mpitest_scilab_pack_OBJECTS)
 +mpitest_scilab_pack_LDADD = $(LDADD)
 +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/modules/core/includes
 +depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 +am__depfiles_maybe = depfiles
 +am__mv = mv -f
 +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 +      $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 +LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 +      --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 +      $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 +CCLD = $(CC)
 +LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 +      --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 +      $(LDFLAGS) -o $@
 +SOURCES = $(libscimpi_la_SOURCES) $(mpi_pi_SOURCES) \
 +      $(mpi_test_scilab_data_SOURCES) $(mpitest_SOURCES) \
 +      $(mpitest_contiguous_SOURCES) $(mpitest_scilab_pack_SOURCES)
 +DIST_SOURCES = $(libscimpi_la_SOURCES) $(mpi_pi_SOURCES) \
 +      $(mpi_test_scilab_data_SOURCES) $(mpitest_SOURCES) \
 +      $(mpitest_contiguous_SOURCES) $(mpitest_scilab_pack_SOURCES)
 +DATA = $(libscimpi_la_etc_DATA) $(libscimpi_la_root_DATA) \
 +      $(libscimpi_la_sci_gateway_DATA)
 +HEADERS = $(libscimpi_la_include_HEADERS)
 +ETAGS = etags
 +CTAGS = ctags
 +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 +ACLOCAL = @ACLOCAL@
 +ALL_LINGUAS = @ALL_LINGUAS@
 +AMTAR = @AMTAR@
 +ANT = @ANT@
 +ANTLR = @ANTLR@
 +AR = @AR@
 +AUTOCONF = @AUTOCONF@
 +AUTOHEADER = @AUTOHEADER@
 +AUTOMAKE = @AUTOMAKE@
 +AVALON_FRAMEWORK = @AVALON_FRAMEWORK@
 +AWK = @AWK@
 +BATIK = @BATIK@
 +BLAS_LIBS = @BLAS_LIBS@
 +BSH = @BSH@
 +
 +#sci_gateway/c/sci_mpi_isend.c \
 +#sci_gateway/c/sci_mpi_irecv.c \
 +#sci_gateway/c/sci_mpi_comm_rank.c \
 +#sci_gateway/c/sci_mpi_comm_size.c
 +
 +# Includes need for the compilation
 +# MPI code needs to be compile with the openmpi 'compiler' (it is a wrapper)
 +CC = $(OPENMPI_CC)
 +CCDEPMODE = @CCDEPMODE@
 +CFLAGS = @CFLAGS@
 +CHECKSTYLE = @CHECKSTYLE@
 +COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
 +COMMONS_IO = @COMMONS_IO@
 +COMMONS_LOGGING = @COMMONS_LOGGING@
 +CPP = @CPP@
 +CPPFLAGS = @CPPFLAGS@
 +CXX = @CXX@
 +CXXCPP = @CXXCPP@
 +CXXDEPMODE = @CXXDEPMODE@
 +CXXFLAGS = @CXXFLAGS@
 +CYGPATH_W = @CYGPATH_W@
 +DEFS = @DEFS@
 +DEMOTOOLS_ENABLE = @DEMOTOOLS_ENABLE@
 +DEPDIR = @DEPDIR@
 +DOCBOOK_ROOT = @DOCBOOK_ROOT@
 +DSYMUTIL = @DSYMUTIL@
 +DUMPBIN = @DUMPBIN@
 +ECHO_C = @ECHO_C@
 +ECHO_N = @ECHO_N@
 +ECHO_T = @ECHO_T@
 +EGREP = @EGREP@
 +EXEEXT = @EXEEXT@
 +F77 = @F77@
 +FFLAGS = @FFLAGS@
 +FFTW3_LIB = @FFTW3_LIB@
 +FFTW_ENABLE = @FFTW_ENABLE@
 +FGREP = @FGREP@
 +FLEXDOCK = @FLEXDOCK@
 +FLIBS = @FLIBS@
 +FOP = @FOP@
++GENHTML = @GENHTML@
 +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 +GIWS_BIN = @GIWS_BIN@
 +GLUEGEN_RT = @GLUEGEN_RT@
 +GMSGFMT = @GMSGFMT@
 +GMSGFMT_015 = @GMSGFMT_015@
 +GRAPHICS_ENABLE = @GRAPHICS_ENABLE@
 +GREP = @GREP@
 +GUI_ENABLE = @GUI_ENABLE@
 +HDF5_CFLAGS = @HDF5_CFLAGS@
 +HDF5_ENABLE = @HDF5_ENABLE@
 +HDF5_LIBS = @HDF5_LIBS@
 +HELP_ENABLE = @HELP_ENABLE@
 +INSTALL = @INSTALL@
 +INSTALL_DATA = @INSTALL_DATA@
 +INSTALL_PROGRAM = @INSTALL_PROGRAM@
 +INSTALL_SCRIPT = @INSTALL_SCRIPT@
 +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 +INTLLIBS = @INTLLIBS@
 +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 +JAR = @JAR@
 +JAVA = @JAVA@
 +JAVAC = @JAVAC@
++JAVAC_DEBUG = @JAVAC_DEBUG@
++JAVADOC = @JAVADOC@
 +JAVAH = @JAVAH@
 +JAVASCI_ENABLE = @JAVASCI_ENABLE@
- JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
 +JAVA_ENABLE = @JAVA_ENABLE@
 +JAVA_G = @JAVA_G@
 +JAVA_HOME = @JAVA_HOME@
 +JAVA_JNI_INCLUDE = @JAVA_JNI_INCLUDE@
 +JAVA_JNI_LIBS = @JAVA_JNI_LIBS@
 +JDB = @JDB@
 +JEUCLID_CORE = @JEUCLID_CORE@
 +JGRAPHX = @JGRAPHX@
 +JHALL = @JHALL@
 +JHDF5 = @JHDF5@
 +JLATEXMATH = @JLATEXMATH@
 +JLATEXMATH_FOP = @JLATEXMATH_FOP@
 +JOGL = @JOGL@
 +JROSETTA_API = @JROSETTA_API@
 +JROSETTA_ENGINE = @JROSETTA_ENGINE@
 +JUNIT = @JUNIT@
 +LAPACK_LIBS = @LAPACK_LIBS@
++LCOV = @LCOV@
 +LD = @LD@
 +LDFLAGS = @LDFLAGS@
 +LIBICONV = @LIBICONV@
 +LIBINTL = @LIBINTL@
 +LIBM = @LIBM@
 +LIBOBJS = @LIBOBJS@
 +LIBS = @LIBS@
 +LIBTOOL = @LIBTOOL@
 +LIPO = @LIPO@
 +LN_S = @LN_S@
 +LOOKS = @LOOKS@
 +LTLIBICONV = @LTLIBICONV@
 +LTLIBINTL = @LTLIBINTL@
 +LTLIBOBJS = @LTLIBOBJS@
 +MAINT = @MAINT@
 +MAKEINFO = @MAKEINFO@
 +MATIO_CFLAGS = @MATIO_CFLAGS@
 +MATIO_ENABLE = @MATIO_ENABLE@
 +MATIO_LIBS = @MATIO_LIBS@
 +MKDIR_P = @MKDIR_P@
 +MPI_ENABLE = @MPI_ENABLE@
 +MSGCAT = @MSGCAT@
 +MSGFMT = @MSGFMT@
 +MSGFMT_015 = @MSGFMT_015@
 +MSGMERGE = @MSGMERGE@
 +NM = @NM@
 +NMEDIT = @NMEDIT@
 +OBJDUMP = @OBJDUMP@
 +OBJEXT = @OBJEXT@
 +OCAMLC = @OCAMLC@
 +OCAMLDEP = @OCAMLDEP@
 +OCAMLLEX = @OCAMLLEX@
 +OCAMLOPT = @OCAMLOPT@
 +OCAMLYACC = @OCAMLYACC@
 +OPENMPI_CC = @OPENMPI_CC@
 +OPENMPI_FLAGS = @OPENMPI_FLAGS@
 +OPENMPI_LIBS = @OPENMPI_LIBS@
++OPENMP_CFLAGS = @OPENMP_CFLAGS@
++OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
++OPENMP_ENABLE = @OPENMP_ENABLE@
++OPENMP_LIBS = @OPENMP_LIBS@
 +OTOOL = @OTOOL@
 +OTOOL64 = @OTOOL64@
 +PACKAGE = @PACKAGE@
 +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 +PACKAGE_NAME = @PACKAGE_NAME@
 +PACKAGE_STRING = @PACKAGE_STRING@
 +PACKAGE_TARNAME = @PACKAGE_TARNAME@
 +PACKAGE_URL = @PACKAGE_URL@
 +PACKAGE_VERSION = @PACKAGE_VERSION@
 +PATH_SEPARATOR = @PATH_SEPARATOR@
 +PCRE_CFLAGS = @PCRE_CFLAGS@
 +PCRE_CONFIG = @PCRE_CONFIG@
 +PCRE_LIBS = @PCRE_LIBS@
 +PCRE_VERSION = @PCRE_VERSION@
 +PKG_CONFIG = @PKG_CONFIG@
 +POSUB = @POSUB@
 +POW_LIB = @POW_LIB@
 +PVMGETARCH = @PVMGETARCH@
 +PVM_ARCH = @PVM_ARCH@
 +PVM_ENABLE = @PVM_ENABLE@
 +PVM_INCLUDE = @PVM_INCLUDE@
 +PVM_LIB = @PVM_LIB@
 +PYTHON = @PYTHON@
 +QDOX = @QDOX@
 +RANLIB = @RANLIB@
 +RELOCATABLE = @RELOCATABLE@
 +RT_LIB = @RT_LIB@
 +SAXON = @SAXON@
- SCICOS_ENABLE = @SCICOS_ENABLE@
++SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@
 +SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@
++SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@
++SCILAB_VERSION_MAJOR = @SCILAB_VERSION_MAJOR@
++SCILAB_VERSION_MINOR = @SCILAB_VERSION_MINOR@
 +SED = @SED@
 +SET_MAKE = @SET_MAKE@
 +SET_RELOCATABLE = @SET_RELOCATABLE@
 +SHELL = @SHELL@
 +SKINLF = @SKINLF@
 +SPLINT = @SPLINT@
 +STRIP = @STRIP@
 +SWIG_BIN = @SWIG_BIN@
 +SWIG_JAVA = @SWIG_JAVA@
 +SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@
 +TCLTK_LIBS = @TCLTK_LIBS@
 +TCL_INC_PATH = @TCL_INC_PATH@
 +TESTNG = @TESTNG@
 +TK_INC_PATH = @TK_INC_PATH@
 +UMFPACK_ENABLE = @UMFPACK_ENABLE@
 +UMFPACK_LIB = @UMFPACK_LIB@
 +USE_NLS = @USE_NLS@
 +VERSION = @VERSION@
 +WITH_OCAML = @WITH_OCAML@
 +WITH_TKSCI = @WITH_TKSCI@
++XCOS_ENABLE = @XCOS_ENABLE@
 +XGETTEXT = @XGETTEXT@
 +XGETTEXT_015 = @XGETTEXT_015@
 +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 +XMKMF = @XMKMF@
 +XMLGRAPHICS_COMMONS = @XMLGRAPHICS_COMMONS@
 +XML_APIS_EXT = @XML_APIS_EXT@
 +XML_CONFIG = @XML_CONFIG@
 +XML_FLAGS = @XML_FLAGS@
 +XML_LIBS = @XML_LIBS@
 +XML_VERSION = @XML_VERSION@
 +X_CFLAGS = @X_CFLAGS@
 +X_EXTRA_LIBS = @X_EXTRA_LIBS@
 +X_LIBS = @X_LIBS@
 +X_PRE_LIBS = @X_PRE_LIBS@
 +abs_builddir = @abs_builddir@
 +abs_srcdir = @abs_srcdir@
 +abs_top_builddir = @abs_top_builddir@
 +abs_top_srcdir = @abs_top_srcdir@
 +ac_ct_CC = @ac_ct_CC@
 +ac_ct_CXX = @ac_ct_CXX@
 +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 +ac_ct_F77 = @ac_ct_F77@
 +am__include = @am__include@
 +am__leading_dot = @am__leading_dot@
 +am__quote = @am__quote@
 +am__tar = @am__tar@
 +am__untar = @am__untar@
 +bindir = @bindir@
 +build = @build@
 +build_alias = @build_alias@
 +build_cpu = @build_cpu@
 +build_os = @build_os@
 +build_vendor = @build_vendor@
 +builddir = @builddir@
 +cxx_present = @cxx_present@
 +datadir = @datadir@
 +datarootdir = @datarootdir@
 +docdir = @docdir@
 +dvidir = @dvidir@
 +exec_prefix = @exec_prefix@
 +host = @host@
 +host_alias = @host_alias@
 +host_cpu = @host_cpu@
 +host_os = @host_os@
 +host_vendor = @host_vendor@
 +htmldir = @htmldir@
 +includedir = @includedir@
 +infodir = @infodir@
 +install_sh = @install_sh@
 +libdir = @libdir@
 +libexecdir = @libexecdir@
 +localedir = @localedir@
 +localstatedir = @localstatedir@
 +mandir = @mandir@
 +mkdir_p = @mkdir_p@
 +oldincludedir = @oldincludedir@
 +pdfdir = @pdfdir@
 +prefix = @prefix@
 +program_transform_name = @program_transform_name@
 +psdir = @psdir@
 +sbindir = @sbindir@
 +sharedstatedir = @sharedstatedir@
 +srcdir = @srcdir@
 +sysconfdir = @sysconfdir@
 +target_alias = @target_alias@
 +top_build_prefix = @top_build_prefix@
 +top_builddir = @top_builddir@
 +top_srcdir = @top_srcdir@
 +MPI_TEST_EXE_SOURCES = src/c/mpitest.c 
 +mpitest_SOURCES = $(MPI_TEST_EXE_SOURCES)
 +mpitest_LDFLAGS = $(OPENMPI_LIBS)
 +mpitest_scilab_pack_SOURCES = src/c/mpitest_scilab_pack.c
 +mpi_test_scilab_data_SOURCES = src/c/mpitest_scilab_data.c
 +mpi_test_scilab_data_LDFLAGS = $(OPENMPI_LIBS)
 +MPI_PI_SOURCES = src/c/mpi_pi_send.c src/c/dboard.c
 +mpi_pi_SOURCES = $(MPI_PI_SOURCES)
 +mpi_pi_LDFLAGS = $(OPENMPI_LIBS)
 +MPI_C_SOURCES = src/c/mappingScilabMPI.c
 +mpitest_contiguous_SOURCES = src/c/mpitest_contiguous.c
 +
 +# List of the gateway c files
 +GATEWAY_C_SOURCES = sci_gateway/c/sci_mpi_init.c \
 +sci_gateway/c/sci_mpi_finalize.c \
 +sci_gateway/c/sci_mpi_comm_size.c \
 +sci_gateway/c/sci_mpi_comm_rank.c \
 +sci_gateway/c/gw_mpi.c \
 +sci_gateway/c/sci_mpi_recv.c \
 +sci_gateway/c/sci_mpi_send.c \
 +sci_gateway/c/sci_mpi_serialize.c \
 +sci_gateway/c/sci_mpi_unserialize.c \
 +src/c/build_buff_type.c \
 +src/c/pre_send_recv_metadata.c \
 +src/c/s_mpi_recv.c \
 +src/c/s_mpi_send.c
 +
 +libscimpi_la_CFLAGS = -Iincludes/ \
 +      -Isrc/c/ \
 +      -I$(top_srcdir)/libs/MALLOC/includes/ \
 +      -I$(top_srcdir)/modules/output_stream/includes \
 +      -I$(top_srcdir)/modules/api_scilab/includes \
 +      -DDEBUG
 +
 +libscimpi_la_LDFLAGS = $(OPENMPI_LIBS)
 +# $(LAMPI_LDFLAGS)
 +
 +# Name of the future library (.la will be replace by .so, .a, etc regarding 
 +# the system)
 +pkglib_LTLIBRARIES = libscimpi.la
 +
 +# All the sources needed by libscimpi.la
 +libscimpi_la_SOURCES = $(GATEWAY_C_SOURCES)  $(MPI_C_SOURCES)
 +#$(GATEWAY_FORTRAN_SOURCES) $(MPI_FORTRAN_SOURCES)
 +libscimpi_la_LIBADD = \
 +      $(top_builddir)/modules/localization/libscilocalization.la \
 +      $(top_builddir)/modules/core/libscicore.la
 +
 +#     $(top_builddir)/libs/MALLOC/libscimalloc.la
 +
 +#### Target ######
 +
 +#### mpi : Conf files ####
 +libscimpi_la_rootdir = $(mydatadir)
 +libscimpi_la_root_DATA = changelog.txt licence.txt readme.txt VERSION
 +
 +#### mpi : init scripts #### 
 +libscimpi_la_etcdir = $(mydatadir)/etc
 +libscimpi_la_etc_DATA = etc/mpi.quit etc/mpi.start
 +
 +#### mpi : gateway declaration #### 
 +libscimpi_la_sci_gatewaydir = $(mydatadir)/sci_gateway
 +libscimpi_la_sci_gateway_DATA = sci_gateway/mpi_gateway.xml
 +
 +#### mpi : include files ####
 +libscimpi_la_includedir = $(pkgincludedir)/mpi
 +libscimpi_la_include_HEADERS = includes/gw_mpi.h
 +
 +# Where all the Scilab stuff is installed (macros, help, ...)
 +mydatadir = $(pkgdatadir)/modules/$(modulename)
 +
 +# splint options
 +SPLINT_OPTIONS = -weak -booltype BOOL
 +
 +########################### JAVA ######################################
 +#### We are delegating java compilation to ant... Thanks to that
 +#### the procedure will be the same with Microsoft Windows (C)
 +#### and Linux/Unix
 +#######################################################################
 +TARGETS_ALL = $(am__append_1)
 +
 +################ MACROS ######################
 +# Rule to build a macro
 +# NOT USED  AT THE MOMENT
 +SUFFIXES = .sci 
 +
 +########### INSTALL DOCUMENTATION ###################
 +
 +# Install documentation files into the right target
 +# We do not use the automake mechanism (libxxxx_la_help_fr_DATA) because
 +# automake needs the html files to be present which is not the case when
 +# we are building Scilab
 +
 +# Where it should be installed
 +pkgdocdir = $(mydatadir)
 +
 +# What is the mask of the help source
 +DOCMASKXML = *.xml
 +
 +# What is the mask of the MathML sources
 +DOCMASKMML = *.mml
 +
 +########### INSTALL DATA ###################
 +# Install macros, help & demos
 +# Where it should be installed
 +pkgmacrosdir = $(mydatadir)
 +# Which directory we process
 +MACRODIRS = macros/
 +# Mask of the Scilab sources macros
 +MACROMASK = *.sci
 +# Mask of the Scilab executable sources macros
 +MACROBUILDMASK = *.sce
 +# Mask of the Scilab compiled macros
 +MACROBINMASK = *.bin
 +# List of the standard directory for tests
- TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests
++TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 +# Where the demos should be installed
 +pkgdemosdir = $(mydatadir)
 +# List of the standard directory for demos
 +DEMOS_DIR = demos
 +# List of the standard directory for examples
 +EXAMPLES_DIR = examples
 +# Where to export JAVA archives (.jar)
 +JARDIR = jar/
 +# JAR files mask
 +JARMASK = *.jar
 +# Chapter file 
 +HELP_CHAPTERDIR = help/
 +HELP_CHAPTERFILE = addchapter.sce
 +HELP_CHAPTERLANG = en_US fr_FR pt_BR
 +all: all-am
 +
 +.SUFFIXES:
 +.SUFFIXES: .sci .bin .c .lo .o .obj
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.incl.am $(am__configure_deps)
 +      @for dep in $?; do \
 +        case '$(am__configure_deps)' in \
 +          *$$dep*) \
 +            ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
 +              && { if test -f $@; then exit 0; else break; fi; }; \
 +            exit 1;; \
 +        esac; \
 +      done; \
 +      echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign modules/mpi/Makefile'; \
 +      $(am__cd) $(top_srcdir) && \
 +        $(AUTOMAKE) --foreign modules/mpi/Makefile
 +.PRECIOUS: Makefile
 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 +      @case '$?' in \
 +        *config.status*) \
 +          cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 +        *) \
 +          echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
 +          cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 +      esac;
 +
 +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 +      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 +      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 +      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(am__aclocal_m4_deps):
 +install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
 +      @$(NORMAL_INSTALL)
 +      test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)"
 +      @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
 +      list2=; for p in $$list; do \
 +        if test -f $$p; then \
 +          list2="$$list2 $$p"; \
 +        else :; fi; \
 +      done; \
 +      test -z "$$list2" || { \
 +        echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \
 +        $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \
 +      }
 +
 +uninstall-pkglibLTLIBRARIES:
 +      @$(NORMAL_UNINSTALL)
 +      @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
 +      for p in $$list; do \
 +        $(am__strip_dir) \
 +        echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \
 +        $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \
 +      done
 +
 +clean-pkglibLTLIBRARIES:
 +      -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
 +      @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
 +        dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
 +        test "$$dir" != "$$p" || dir=.; \
 +        echo "rm -f \"$${dir}/so_locations\""; \
 +        rm -f "$${dir}/so_locations"; \
 +      done
 +libscimpi.la: $(libscimpi_la_OBJECTS) $(libscimpi_la_DEPENDENCIES) 
 +      $(libscimpi_la_LINK) -rpath $(pkglibdir) $(libscimpi_la_OBJECTS) $(libscimpi_la_LIBADD) $(LIBS)
 +install-binPROGRAMS: $(bin_PROGRAMS)
 +      @$(NORMAL_INSTALL)
 +      test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 +      @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
 +      for p in $$list; do echo "$$p $$p"; done | \
 +      sed 's/$(EXEEXT)$$//' | \
 +      while read p p1; do if test -f $$p || test -f $$p1; \
 +        then echo "$$p"; echo "$$p"; else :; fi; \
 +      done | \
 +      sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
 +          -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
 +      sed 'N;N;N;s,\n, ,g' | \
 +      $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
 +        { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
 +          if ($$2 == $$4) files[d] = files[d] " " $$1; \
 +          else { print "f", $$3 "/" $$4, $$1; } } \
 +        END { for (d in files) print "f", d, files[d] }' | \
 +      while read type dir files; do \
 +          if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
 +          test -z "$$files" || { \
 +          echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
 +          $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
 +          } \
 +      ; done
 +
 +uninstall-binPROGRAMS:
 +      @$(NORMAL_UNINSTALL)
 +      @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
 +      files=`for p in $$list; do echo "$$p"; done | \
 +        sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
 +            -e 's/$$/$(EXEEXT)/' `; \
 +      test -n "$$list" || exit 0; \
 +      echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
 +      cd "$(DESTDIR)$(bindir)" && rm -f $$files
 +
 +clean-binPROGRAMS:
 +      @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
 +      echo " rm -f" $$list; \
 +      rm -f $$list || exit $$?; \
 +      test -n "$(EXEEXT)" || exit 0; \
 +      list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 +      echo " rm -f" $$list; \
 +      rm -f $$list
 +mpi_pi$(EXEEXT): $(mpi_pi_OBJECTS) $(mpi_pi_DEPENDENCIES) 
 +      @rm -f mpi_pi$(EXEEXT)
 +      $(mpi_pi_LINK) $(mpi_pi_OBJECTS) $(mpi_pi_LDADD) $(LIBS)
 +mpi_test_scilab_data$(EXEEXT): $(mpi_test_scilab_data_OBJECTS) $(mpi_test_scilab_data_DEPENDENCIES) 
 +      @rm -f mpi_test_scilab_data$(EXEEXT)
 +      $(mpi_test_scilab_data_LINK) $(mpi_test_scilab_data_OBJECTS) $(mpi_test_scilab_data_LDADD) $(LIBS)
 +mpitest$(EXEEXT): $(mpitest_OBJECTS) $(mpitest_DEPENDENCIES) 
 +      @rm -f mpitest$(EXEEXT)
 +      $(mpitest_LINK) $(mpitest_OBJECTS) $(mpitest_LDADD) $(LIBS)
 +mpitest_contiguous$(EXEEXT): $(mpitest_contiguous_OBJECTS) $(mpitest_contiguous_DEPENDENCIES) 
 +      @rm -f mpitest_contiguous$(EXEEXT)
 +      $(LINK) $(mpitest_contiguous_OBJECTS) $(mpitest_contiguous_LDADD) $(LIBS)
 +mpitest_scilab_pack$(EXEEXT): $(mpitest_scilab_pack_OBJECTS) $(mpitest_scilab_pack_DEPENDENCIES) 
 +      @rm -f mpitest_scilab_pack$(EXEEXT)
 +      $(LINK) $(mpitest_scilab_pack_OBJECTS) $(mpitest_scilab_pack_LDADD) $(LIBS)
 +
 +mostlyclean-compile:
 +      -rm -f *.$(OBJEXT)
 +
 +distclean-compile:
 +      -rm -f *.tab.c
 +
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dboard.Po@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscimpi_la-build_buff_type.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscimpi_la-gw_mpi.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscimpi_la-mappingScilabMPI.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscimpi_la-pre_send_recv_metadata.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscimpi_la-s_mpi_recv.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscimpi_la-s_mpi_send.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscimpi_la-sci_mpi_comm_rank.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscimpi_la-sci_mpi_comm_size.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscimpi_la-sci_mpi_finalize.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscimpi_la-sci_mpi_init.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscimpi_la-sci_mpi_recv.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscimpi_la-sci_mpi_send.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscimpi_la-sci_mpi_serialize.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscimpi_la-sci_mpi_unserialize.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpi_pi_send.Po@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpitest.Po@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpitest_contiguous.Po@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpitest_scilab_data.Po@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpitest_scilab_pack.Po@am__quote@
 +
 +.c.o:
 +@am__fastdepCC_TRUE@  $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 +@am__fastdepCC_TRUE@  $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCC_FALSE@ $(COMPILE) -c $<
 +
 +.c.obj:
 +@am__fastdepCC_TRUE@  $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 +@am__fastdepCC_TRUE@  $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
 +
 +.c.lo:
 +@am__fastdepCC_TRUE@  $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 +@am__fastdepCC_TRUE@  $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
 +
 +libscimpi_la-sci_mpi_init.lo: sci_gateway/c/sci_mpi_init.c
 +@am__fastdepCC_TRUE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscimpi_la_CFLAGS) $(CFLAGS) -MT libscimpi_la-sci_mpi_init.lo -MD -MP -MF $(DEPDIR)/libscimpi_la-sci_mpi_init.Tpo -c -o libscimpi_la-sci_mpi_init.lo `test -f 'sci_gateway/c/sci_mpi_init.c' || echo '$(srcdir)/'`sci_gateway/c/sci_mpi_init.c
 +@am__fastdepCC_TRUE@  $(am__mv) $(DEPDIR)/libscimpi_la-sci_mpi_init.Tpo $(DEPDIR)/libscimpi_la-sci_mpi_init.Plo
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     source='sci_gateway/c/sci_mpi_init.c' object='libscimpi_la-sci_mpi_init.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCC_FALSE@ $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscimpi_la_CFLAGS) $(CFLAGS) -c -o libscimpi_la-sci_mpi_init.lo `test -f 'sci_gateway/c/sci_mpi_init.c' || echo '$(srcdir)/'`sci_gateway/c/sci_mpi_init.c
 +
 +libscimpi_la-sci_mpi_finalize.lo: sci_gateway/c/sci_mpi_finalize.c
 +@am__fastdepCC_TRUE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscimpi_la_CFLAGS) $(CFLAGS) -MT libscimpi_la-sci_mpi_finalize.lo -MD -MP -MF $(DEPDIR)/libscimpi_la-sci_mpi_finalize.Tpo -c -o libscimpi_la-sci_mpi_finalize.lo `test -f 'sci_gateway/c/sci_mpi_finalize.c' || echo '$(srcdir)/'`sci_gateway/c/sci_mpi_finalize.c
 +@am__fastdepCC_TRUE@  $(am__mv) $(DEPDIR)/libscimpi_la-sci_mpi_finalize.Tpo $(DEPDIR)/libscimpi_la-sci_mpi_finalize.Plo
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     source='sci_gateway/c/sci_mpi_finalize.c' object='libscimpi_la-sci_mpi_finalize.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCC_FALSE@ $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscimpi_la_CFLAGS) $(CFLAGS) -c -o libscimpi_la-sci_mpi_finalize.lo `test -f 'sci_gateway/c/sci_mpi_finalize.c' || echo '$(srcdir)/'`sci_gateway/c/sci_mpi_finalize.c
 +
 +libscimpi_la-sci_mpi_comm_size.lo: sci_gateway/c/sci_mpi_comm_size.c
 +@am__fastdepCC_TRUE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscimpi_la_CFLAGS) $(CFLAGS) -MT libscimpi_la-sci_mpi_comm_size.lo -MD -MP -MF $(DEPDIR)/libscimpi_la-sci_mpi_comm_size.Tpo -c -o libscimpi_la-sci_mpi_comm_size.lo `test -f 'sci_gateway/c/sci_mpi_comm_size.c' || echo '$(srcdir)/'`sci_gateway/c/sci_mpi_comm_size.c
 +@am__fastdepCC_TRUE@  $(am__mv) $(DEPDIR)/libscimpi_la-sci_mpi_comm_size.Tpo $(DEPDIR)/libscimpi_la-sci_mpi_comm_size.Plo
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     source='sci_gateway/c/sci_mpi_comm_size.c' object='libscimpi_la-sci_mpi_comm_size.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCC_FALSE@ $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscimpi_la_CFLAGS) $(CFLAGS) -c -o libscimpi_la-sci_mpi_comm_size.lo `test -f 'sci_gateway/c/sci_mpi_comm_size.c' || echo '$(srcdir)/'`sci_gateway/c/sci_mpi_comm_size.c
 +
 +libscimpi_la-sci_mpi_comm_rank.lo: sci_gateway/c/sci_mpi_comm_rank.c
 +@am__fastdepCC_TRUE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscimpi_la_CFLAGS) $(CFLAGS) -MT libscimpi_la-sci_mpi_comm_rank.lo -MD -MP -MF $(DEPDIR)/libscimpi_la-sci_mpi_comm_rank.Tpo -c -o libscimpi_la-sci_mpi_comm_rank.lo `test -f 'sci_gateway/c/sci_mpi_comm_rank.c' || echo '$(srcdir)/'`sci_gateway/c/sci_mpi_comm_rank.c
 +@am__fastdepCC_TRUE@  $(am__mv) $(DEPDIR)/libscimpi_la-sci_mpi_comm_rank.Tpo $(DEPDIR)/libscimpi_la-sci_mpi_comm_rank.Plo
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     source='sci_gateway/c/sci_mpi_comm_rank.c' object='libscimpi_la-sci_mpi_comm_rank.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCC_FALSE@ $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscimpi_la_CFLAGS) $(CFLAGS) -c -o libscimpi_la-sci_mpi_comm_rank.lo `test -f 'sci_gateway/c/sci_mpi_comm_rank.c' || echo '$(srcdir)/'`sci_gateway/c/sci_mpi_comm_rank.c
 +
 +libscimpi_la-gw_mpi.lo: sci_gateway/c/gw_mpi.c
 +@am__fastdepCC_TRUE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscimpi_la_CFLAGS) $(CFLAGS) -MT libscimpi_la-gw_mpi.lo -MD -MP -MF $(DEPDIR)/libscimpi_la-gw_mpi.Tpo -c -o libscimpi_la-gw_mpi.lo `test -f 'sci_gateway/c/gw_mpi.c' || echo '$(srcdir)/'`sci_gateway/c/gw_mpi.c
 +@am__fastdepCC_TRUE@  $(am__mv) $(DEPDIR)/libscimpi_la-gw_mpi.Tpo $(DEPDIR)/libscimpi_la-gw_mpi.Plo
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     source='sci_gateway/c/gw_mpi.c' object='libscimpi_la-gw_mpi.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCC_FALSE@ $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscimpi_la_CFLAGS) $(CFLAGS) -c -o libscimpi_la-gw_mpi.lo `test -f 'sci_gateway/c/gw_mpi.c' || echo '$(srcdir)/'`sci_gateway/c/gw_mpi.c
 +
 +libscimpi_la-sci_mpi_recv.lo: sci_gateway/c/sci_mpi_recv.c
 +@am__fastdepCC_TRUE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscimpi_la_CFLAGS) $(CFLAGS) -MT libscimpi_la-sci_mpi_recv.lo -MD -MP -MF $(DEPDIR)/libscimpi_la-sci_mpi_recv.Tpo -c -o libscimpi_la-sci_mpi_recv.lo `test -f 'sci_gateway/c/sci_mpi_recv.c' || echo '$(srcdir)/'`sci_gateway/c/sci_mpi_recv.c
 +@am__fastdepCC_TRUE@  $(am__mv) $(DEPDIR)/libscimpi_la-sci_mpi_recv.Tpo $(DEPDIR)/libscimpi_la-sci_mpi_recv.Plo
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     source='sci_gateway/c/sci_mpi_recv.c' object='libscimpi_la-sci_mpi_recv.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCC_FALSE@ $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscimpi_la_CFLAGS) $(CFLAGS) -c -o libscimpi_la-sci_mpi_recv.lo `test -f 'sci_gateway/c/sci_mpi_recv.c' || echo '$(srcdir)/'`sci_gateway/c/sci_mpi_recv.c
 +
 +libscimpi_la-sci_mpi_send.lo: sci_gateway/c/sci_mpi_send.c
 +@am__fastdepCC_TRUE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscimpi_la_CFLAGS) $(CFLAGS) -MT libscimpi_la-sci_mpi_send.lo -MD -MP -MF $(DEPDIR)/libscimpi_la-sci_mpi_send.Tpo -c -o libscimpi_la-sci_mpi_send.lo `test -f 'sci_gateway/c/sci_mpi_send.c' || echo '$(srcdir)/'`sci_gateway/c/sci_mpi_send.c
 +@am__fastdepCC_TRUE@  $(am__mv) $(DEPDIR)/libscimpi_la-sci_mpi_send.Tpo $(DEPDIR)/libscimpi_la-sci_mpi_send.Plo
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     source='sci_gateway/c/sci_mpi_send.c' object='libscimpi_la-sci_mpi_send.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCC_FALSE@ $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscimpi_la_CFLAGS) $(CFLAGS) -c -o libscimpi_la-sci_mpi_send.lo `test -f 'sci_gateway/c/sci_mpi_send.c' || echo '$(srcdir)/'`sci_gateway/c/sci_mpi_send.c
 +
 +libscimpi_la-sci_mpi_serialize.lo: sci_gateway/c/sci_mpi_serialize.c
 +@am__fastdepCC_TRUE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscimpi_la_CFLAGS) $(CFLAGS) -MT libscimpi_la-sci_mpi_serialize.lo -MD -MP -MF $(DEPDIR)/libscimpi_la-sci_mpi_serialize.Tpo -c -o libscimpi_la-sci_mpi_serialize.lo `test -f 'sci_gateway/c/sci_mpi_serialize.c' || echo '$(srcdir)/'`sci_gateway/c/sci_mpi_serialize.c
 +@am__fastdepCC_TRUE@  $(am__mv) $(DEPDIR)/libscimpi_la-sci_mpi_serialize.Tpo $(DEPDIR)/libscimpi_la-sci_mpi_serialize.Plo
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     source='sci_gateway/c/sci_mpi_serialize.c' object='libscimpi_la-sci_mpi_serialize.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCC_FALSE@ $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscimpi_la_CFLAGS) $(CFLAGS) -c -o libscimpi_la-sci_mpi_serialize.lo `test -f 'sci_gateway/c/sci_mpi_serialize.c' || echo '$(srcdir)/'`sci_gateway/c/sci_mpi_serialize.c
 +
 +libscimpi_la-sci_mpi_unserialize.lo: sci_gateway/c/sci_mpi_unserialize.c
 +@am__fastdepCC_TRUE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscimpi_la_CFLAGS) $(CFLAGS) -MT libscimpi_la-sci_mpi_unserialize.lo -MD -MP -MF $(DEPDIR)/libscimpi_la-sci_mpi_unserialize.Tpo -c -o libscimpi_la-sci_mpi_unserialize.lo `test -f 'sci_gateway/c