Fix some issues when --enable-mpi is activated 57/12457/1
Sylvestre Ledru [Fri, 6 Sep 2013 12:55:27 +0000 (14:55 +0200)]
Change-Id: I1107c14b751478438e887766ea7035731a596809

87 files changed:
scilab/Makefile.am
scilab/Makefile.in
scilab/configure
scilab/contrib/Makefile.in
scilab/desktop/Makefile.in
scilab/desktop/images/icons/Makefile.in
scilab/m4/mpi.m4
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/console/src/c/others/initMPI.c
scilab/modules/core/Makefile.in
scilab/modules/data_structures/Makefile.in
scilab/modules/demo_tools/Makefile.in
scilab/modules/development_tools/Makefile.in
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/external_objects/Makefile.in
scilab/modules/external_objects_java/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/graphic_objects/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/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/prebuildjava/Makefile.in
scilab/modules/preferences/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/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/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/xml/Makefile.in

index 6434cd0..83c3ff1 100644 (file)
@@ -82,7 +82,9 @@ scilab_cli_bin_LDADD  = $(COMMON_LIBS) $(top_builddir)/modules/libscilab-cli.la
 if MPI
 CXX = $(OPENMPI_CXX)
 scilab_bin_SOURCES += $(top_srcdir)/modules/console/src/c/others/initMPI.c
+scilab_bin_CPPFLAGS += $(OPENMPI_CXXFLAGS)
 scilab_cli_bin_SOURCES += $(top_srcdir)/modules/console/src/c/others/initMPI.c
+scilab_cli_bin_CPPFLAGS += $(OPENMPI_CXXFLAGS)
 endif
 
 
index 26810f6..18c351d 100644 (file)
@@ -116,11 +116,13 @@ bin_PROGRAMS = scilab-bin$(EXEEXT) scilab-cli-bin$(EXEEXT)
 #-static-libgfortran
 @IS_MACOSX_TRUE@am__append_6 = -framework Cocoa
 @MPI_TRUE@am__append_7 = $(top_srcdir)/modules/console/src/c/others/initMPI.c
-@MPI_TRUE@am__append_8 = $(top_srcdir)/modules/console/src/c/others/initMPI.c
+@MPI_TRUE@am__append_8 = $(OPENMPI_CXXFLAGS)
+@MPI_TRUE@am__append_9 = $(top_srcdir)/modules/console/src/c/others/initMPI.c
+@MPI_TRUE@am__append_10 = $(OPENMPI_CXXFLAGS)
 
 #  The user wants to compile the localization files
-@GENERATE_LOCALIZATION_FILES_TRUE@am__append_9 = localization
-@COMPILATION_TESTS_TRUE@am__append_10 = check-java
+@GENERATE_LOCALIZATION_FILES_TRUE@am__append_11 = localization
+@COMPILATION_TESTS_TRUE@am__append_12 = check-java
 DIST_COMMON = $(top_srcdir)/Makefile.call_scilab.am \
        $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
        $(top_srcdir)/configure $(am__configure_deps) \
@@ -628,8 +630,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
@@ -778,10 +781,9 @@ scilab_bin_LDFLAGS = $(AM_LDFLAGS) $(OPENMPI_LIBS) $(am__append_2) \
 scilab_cli_bin_LDFLAGS = $(AM_LDFLAGS) $(OPENMPI_LIBS) $(am__append_3) \
        $(am__append_5)
 scilab_bin_CPPFLAGS = -I$(top_srcdir)/modules/io/includes/ \
-                    -I$(top_srcdir)/modules/console/includes/ \
-                    -I$(top_srcdir)/modules/localization/includes/ \
-                    $(AM_CPPFLAGS)
-
+       -I$(top_srcdir)/modules/console/includes/ \
+       -I$(top_srcdir)/modules/localization/includes/ $(AM_CPPFLAGS) \
+       $(am__append_8)
 # --no-undefined --relax
 
 # Localization dep already exists because of the `exportLocaleToSystem' symbol
@@ -795,11 +797,12 @@ scilab_bin_LDADD = $(COMMON_LIBS) $(top_builddir)/modules/libscilab.la $(FLIBS)
 # Match scilab -nwni (ie command line without graphics)
 scilab_cli_bin_SOURCES =  \
        $(top_srcdir)/modules/console/src/c/others/mainscic.cpp \
-       $(am__append_8)
-scilab_cli_bin_CPPFLAGS = -DWITHOUT_GUI $(scilab_bin_CPPFLAGS)
+       $(am__append_9)
+scilab_cli_bin_CPPFLAGS = -DWITHOUT_GUI $(scilab_bin_CPPFLAGS) \
+       $(am__append_10)
 scilab_cli_bin_LDADD = $(COMMON_LIBS) $(top_builddir)/modules/libscilab-cli.la $(FLIBS)
 LANG_DOMAIN = scilab
-TARGETS_ALL = macros $(am__append_9) $(am__append_10)
+TARGETS_ALL = macros $(am__append_11) $(am__append_12)
 
 # check is performed with scilab, so use the serial-tests on purpose
 TESTS_ENVIRONMENT = LANG=C $(top_builddir)/bin/scilab-cli -nb -noatomsautoload -f
index 1124533..b408d9d 100755 (executable)
@@ -730,7 +730,8 @@ MPI_FALSE
 MPI_TRUE
 MPI_ENABLE
 OPENMPI_LIBS
-OPENMPI_FLAGS
+OPENMPI_CXXFLAGS
+OPENMPI_CFLAGS
 OPENMPI_CXX
 OPENMPI_CC
 FFTW_FALSE
@@ -10886,7 +10887,7 @@ $as_echo "$ac_java_classpath" >&6; }
 $as_echo_n "checking to see if the java compiler works... " >&6; }
 
     cat << \EOF > conftest.java
-// #line 10889 "configure"
+// #line 10890 "configure"
 import java.util.regex.Pattern;
 
 
@@ -10973,7 +10974,7 @@ $as_echo_n "checking type of jvm... " >&6; }
     if test "x$ac_java_jvm_name" = "x" ; then
 
     cat << \EOF > conftest.java
-// #line 10976 "configure"
+// #line 10977 "configure"
 import java.util.regex.Pattern;
 
 import gnu.java.io.EncodingManager;
@@ -11057,7 +11058,7 @@ $as_echo_n "checking java API version... " >&6; }
     # The class java.nio.charset.Charset is new to 1.4
 
     cat << \EOF > conftest.java
-// #line 11060 "configure"
+// #line 11061 "configure"
 import java.util.regex.Pattern;
 
 import java.nio.charset.Charset;
@@ -11122,7 +11123,7 @@ EOF
     # The class java.lang.StringBuilder is new to 1.5
 
     cat << \EOF > conftest.java
-// #line 11125 "configure"
+// #line 11126 "configure"
 import java.util.regex.Pattern;
 
 import java.lang.StringBuilder;
@@ -11187,7 +11188,7 @@ EOF
     # The class java.util.ArrayDeque is new to 1.6
 
     cat << \EOF > conftest.java
-// #line 11190 "configure"
+// #line 11191 "configure"
 import java.util.regex.Pattern;
 
 import java.util.ArrayDeque;
@@ -11252,7 +11253,7 @@ EOF
     # The class java.nio.file.Path is new to 1.7
 
     cat << \EOF > conftest.java
-// #line 11255 "configure"
+// #line 11256 "configure"
 import java.util.regex.Pattern;
 
 import java.nio.file.Path;
@@ -12630,7 +12631,7 @@ $as_echo_n "checking jgraphx... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 12633 "configure"
+// #line 12634 "configure"
 import java.util.regex.Pattern;
 
 import com.mxgraph.model.mxCell;
@@ -12737,7 +12738,7 @@ $as_echo_n "checking minimal version (2.0.0.1) of jgraphx... " >&6; }
    if test "x" == "x"; then
 
     cat << \EOF > conftest.java
-// #line 12740 "configure"
+// #line 12741 "configure"
 import java.util.regex.Pattern;
 
 import com.mxgraph.view.mxGraph;
@@ -12809,7 +12810,7 @@ EOF
    else
 
     cat << \EOF > conftest.java
-// #line 12812 "configure"
+// #line 12813 "configure"
 import java.util.regex.Pattern;
 
 import com.mxgraph.view.mxGraph;
@@ -12903,7 +12904,7 @@ $as_echo_n "checking scirenderer... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 12906 "configure"
+// #line 12907 "configure"
 import java.util.regex.Pattern;
 
 import org.scilab.forge.scirenderer.PackageInfo;
@@ -13010,7 +13011,7 @@ $as_echo_n "checking minimal version (1.1.0) of scirenderer... " >&6; }
    if test "x" == "x"; then
 
     cat << \EOF > conftest.java
-// #line 13013 "configure"
+// #line 13014 "configure"
 import java.util.regex.Pattern;
 
 import org.scilab.forge.scirenderer.PackageInfo;
@@ -13082,7 +13083,7 @@ EOF
    else
 
     cat << \EOF > conftest.java
-// #line 13085 "configure"
+// #line 13086 "configure"
 import java.util.regex.Pattern;
 
 import org.scilab.forge.scirenderer.PackageInfo;
@@ -13181,7 +13182,7 @@ $as_echo_n "checking flexdock... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 13184 "configure"
+// #line 13185 "configure"
 import java.util.regex.Pattern;
 
 import org.flexdock.docking.DockingManager;
@@ -13288,7 +13289,7 @@ $as_echo_n "checking minimal version (1.2.4) of flexdock... " >&6; }
    if test "x" == "x"; then
 
     cat << \EOF > conftest.java
-// #line 13291 "configure"
+// #line 13292 "configure"
 import java.util.regex.Pattern;
 
 import org.flexdock.util.Utilities;
@@ -13360,7 +13361,7 @@ EOF
    else
 
     cat << \EOF > conftest.java
-// #line 13363 "configure"
+// #line 13364 "configure"
 import java.util.regex.Pattern;
 
 import org.flexdock.util.Utilities;
@@ -13451,7 +13452,7 @@ $as_echo_n "checking looks... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 13454 "configure"
+// #line 13455 "configure"
 import java.util.regex.Pattern;
 
 import com.jgoodies.looks.common.MenuItemRenderer;
@@ -13568,7 +13569,7 @@ $as_echo_n "checking jgoodies-looks... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 13571 "configure"
+// #line 13572 "configure"
 import java.util.regex.Pattern;
 
 import com.jgoodies.looks.common.MenuItemRenderer;
@@ -13686,7 +13687,7 @@ $as_echo_n "checking skinlf... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 13689 "configure"
+// #line 13690 "configure"
 import java.util.regex.Pattern;
 
 import com.l2fprod.util.AccessUtils;
@@ -13803,7 +13804,7 @@ $as_echo_n "checking jogl2... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 13806 "configure"
+// #line 13807 "configure"
 import java.util.regex.Pattern;
 
 import javax.media.opengl.glu.GLUnurbs;
@@ -14026,7 +14027,7 @@ $as_echo_n "checking gluegen2-rt... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 14029 "configure"
+// #line 14030 "configure"
 import java.util.regex.Pattern;
 
 import jogamp.common.os.MachineDescriptionRuntime;
@@ -14200,7 +14201,7 @@ $as_echo_n "checking jhall... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 14203 "configure"
+// #line 14204 "configure"
 import java.util.regex.Pattern;
 
 import javax.help.JHelp;
@@ -14317,7 +14318,7 @@ $as_echo_n "checking javahelp2... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 14320 "configure"
+// #line 14321 "configure"
 import java.util.regex.Pattern;
 
 import javax.help.JHelp;
@@ -14435,7 +14436,7 @@ $as_echo_n "checking jrosetta-API... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 14438 "configure"
+// #line 14439 "configure"
 import java.util.regex.Pattern;
 
 import com.artenum.rosetta.interfaces.core.ConsoleConfiguration;
@@ -14550,7 +14551,7 @@ $as_echo_n "checking jrosetta-api... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 14553 "configure"
+// #line 14554 "configure"
 import java.util.regex.Pattern;
 
 import com.artenum.rosetta.interfaces.core.ConsoleConfiguration;
@@ -14668,7 +14669,7 @@ $as_echo_n "checking jrosetta-engine... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 14671 "configure"
+// #line 14672 "configure"
 import java.util.regex.Pattern;
 
 import com.artenum.rosetta.core.action.AbstractConsoleAction;
@@ -14774,7 +14775,7 @@ $as_echo_n "checking minimal version (1.0.4) of jrosetta-engine... " >&6; }
    if test "x" == "x"; then
 
     cat << \EOF > conftest.java
-// #line 14777 "configure"
+// #line 14778 "configure"
 import java.util.regex.Pattern;
 
 import com.artenum.rosetta.util.ConfigurationBuilder;
@@ -14846,7 +14847,7 @@ EOF
    else
 
     cat << \EOF > conftest.java
-// #line 14849 "configure"
+// #line 14850 "configure"
 import java.util.regex.Pattern;
 
 import com.artenum.rosetta.util.ConfigurationBuilder;
@@ -14939,7 +14940,7 @@ $as_echo_n "checking jeuclid-core... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 14942 "configure"
+// #line 14943 "configure"
 import java.util.regex.Pattern;
 
 import net.sourceforge.jeuclid.LayoutContext;
@@ -15058,7 +15059,7 @@ $as_echo_n "checking fop... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 15061 "configure"
+// #line 15062 "configure"
 import java.util.regex.Pattern;
 
 import org.apache.fop.pdf.PDFInfo;
@@ -15175,7 +15176,7 @@ $as_echo_n "checking batik-all... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 15178 "configure"
+// #line 15179 "configure"
 import java.util.regex.Pattern;
 
 import org.apache.batik.parser.Parser;
@@ -15292,7 +15293,7 @@ $as_echo_n "checking batik... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 15295 "configure"
+// #line 15296 "configure"
 import java.util.regex.Pattern;
 
 import org.apache.batik.parser.Parser;
@@ -15399,7 +15400,7 @@ $as_echo_n "checking minimal version (1.7) of batik... " >&6; }
    if test "x" == "x"; then
 
     cat << \EOF > conftest.java
-// #line 15402 "configure"
+// #line 15403 "configure"
 import java.util.regex.Pattern;
 
 import org.apache.batik.Version;
@@ -15471,7 +15472,7 @@ EOF
    else
 
     cat << \EOF > conftest.java
-// #line 15474 "configure"
+// #line 15475 "configure"
 import java.util.regex.Pattern;
 
 import org.apache.batik.Version;
@@ -15562,7 +15563,7 @@ $as_echo_n "checking commons-io... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 15565 "configure"
+// #line 15566 "configure"
 import java.util.regex.Pattern;
 
 import org.apache.commons.io.output.CountingOutputStream;
@@ -15679,7 +15680,7 @@ $as_echo_n "checking xmlgraphics-commons... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 15682 "configure"
+// #line 15683 "configure"
 import java.util.regex.Pattern;
 
 import org.apache.xmlgraphics.util.Service;
@@ -15796,7 +15797,7 @@ $as_echo_n "checking avalon-framework... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 15799 "configure"
+// #line 15800 "configure"
 import java.util.regex.Pattern;
 
 import org.apache.avalon.framework.configuration.ConfigurationException;
@@ -15913,7 +15914,7 @@ $as_echo_n "checking xml-apis-ext... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 15916 "configure"
+// #line 15917 "configure"
 import java.util.regex.Pattern;
 
 import org.w3c.dom.svg.SVGDocument;
@@ -16030,7 +16031,7 @@ $as_echo_n "checking xml-commons-apis-ext... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 16033 "configure"
+// #line 16034 "configure"
 import java.util.regex.Pattern;
 
 import org.w3c.dom.svg.SVGDocument;
@@ -16151,7 +16152,7 @@ $as_echo_n "checking commons-logging... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 16154 "configure"
+// #line 16155 "configure"
 import java.util.regex.Pattern;
 
 import org.apache.commons.logging.LogFactory;
@@ -16268,7 +16269,7 @@ $as_echo_n "checking jlatexmath... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 16271 "configure"
+// #line 16272 "configure"
 import java.util.regex.Pattern;
 
 import org.scilab.forge.jlatexmath.TeXFormula;
@@ -16375,7 +16376,7 @@ $as_echo_n "checking minimal version (1.0.2) of jlatexmath... " >&6; }
    if test "x" == "x"; then
 
     cat << \EOF > conftest.java
-// #line 16378 "configure"
+// #line 16379 "configure"
 import java.util.regex.Pattern;
 
 import org.scilab.forge.jlatexmath.TeXFormula;
@@ -16447,7 +16448,7 @@ EOF
    else
 
     cat << \EOF > conftest.java
-// #line 16450 "configure"
+// #line 16451 "configure"
 import java.util.regex.Pattern;
 
 import org.scilab.forge.jlatexmath.TeXFormula;
@@ -16538,7 +16539,7 @@ $as_echo_n "checking jlatexmath-fop... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 16541 "configure"
+// #line 16542 "configure"
 import java.util.regex.Pattern;
 
 import org.scilab.forge.jlatexmath.fop.JLaTeXMathObj;
@@ -16661,7 +16662,7 @@ $as_echo_n "checking checkstyle... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 16664 "configure"
+// #line 16665 "configure"
 import java.util.regex.Pattern;
 
 import com.puppycrawl.tools.checkstyle.CheckStyleTask;
@@ -16778,7 +16779,7 @@ $as_echo_n "checking commons-beanutils... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 16781 "configure"
+// #line 16782 "configure"
 import java.util.regex.Pattern;
 
 import org.apache.commons.beanutils.Converter;
@@ -16895,7 +16896,7 @@ $as_echo_n "checking antlr... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 16898 "configure"
+// #line 16899 "configure"
 import java.util.regex.Pattern;
 
 import antlr.TokenStreamException;
@@ -17012,7 +17013,7 @@ $as_echo_n "checking junit4... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 17015 "configure"
+// #line 17016 "configure"
 import java.util.regex.Pattern;
 
 import org.junit.Assert;
@@ -17129,7 +17130,7 @@ $as_echo_n "checking cobertura... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 17132 "configure"
+// #line 17133 "configure"
 import java.util.regex.Pattern;
 
 import net.sourceforge.cobertura.merge.Main;
@@ -17246,7 +17247,7 @@ $as_echo_n "checking asm3... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 17249 "configure"
+// #line 17250 "configure"
 import java.util.regex.Pattern;
 
 import org.objectweb.asm.Type;
@@ -17362,7 +17363,7 @@ $as_echo_n "checking asm... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 17365 "configure"
+// #line 17366 "configure"
 import java.util.regex.Pattern;
 
 import org.objectweb.asm.Type;
@@ -21448,6 +21449,7 @@ test -n "$OPENMPI_CXX" || OPENMPI_CXX="no"
                fi
 #fi
 saved_cflags=$CFLAGS
+saved_cxxflags=$CXXFLAGS
 saved_LIBS="$LIBS"
 
 CFLAGS=`$OPENMPI_CC --showme:compile`
@@ -21456,7 +21458,7 @@ LIBS=`$OPENMPI_CC --showme:link`
 
 ac_fn_c_check_header_mongrel "$LINENO" "mpi.h" "ac_cv_header_mpi_h" "$ac_includes_default"
 if test "x$ac_cv_header_mpi_h" = xyes; then :
-  OPENMPI_CFLAGS=$CFLAGS
+  OPENMPI_CFLAGS=$CFLAGS; OPENMPI_CXXFLAGS=$CXXFLAGS
 else
   as_fn_error $? "Cannot find headers of the library OpenMPI. Please install the dev package (Debian : openmpi-dev)" "$LINENO" 5
 fi
@@ -21507,18 +21509,14 @@ else
 fi
 
 
-#OPENMPI_CPPFLAGS="-I$openmpi_dir/include"
-#OPENMPI_LDFLAGS="-L$openmpi_dir/lib/"
-
-#OPENMPI_HEADER="$openmpi_dir/include/mpi.h"
-#OPENMPI_DIR="$openmpi_dir"
-
 
 $as_echo "#define ENABLE_MPI /**/" >>confdefs.h
 
 
 LIBS="$saved_LIBS"
 CFLAGS=$saved_cflags
+CXXFLAGS=$saved_cppflags
+
 
 
 
@@ -25848,7 +25846,7 @@ CPPFLAGS="$CPPFLAGS -I$CHK_TCL_INCLUDE_PATH"
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later" >&5
 $as_echo_n "checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later... " >&6; }
 cat > conftest.$ac_ext <<EOF
-#line 25851 "configure"
+#line 25849 "configure"
 #include "confdefs.h"
 
 #include "$CHK_TCL_INCLUDE_PATH/$CHK_TCL_INC_NAME"
@@ -26159,7 +26157,7 @@ CPPFLAGS="$CPPFLAGS $TCL_INC_PATH -I$CHK_TK_INCLUDE_PATH $X_CFLAGS"
 $as_echo_n "checking if tk is version $CHK_TK_MAJOR.$CHK_TK_MINOR or later... " >&6; }
 
 cat > conftest.$ac_ext <<EOF
-#line 26162 "configure"
+#line 26160 "configure"
 #include "confdefs.h"
 
 #include "$CHK_TK_INCLUDE_PATH/$CHK_TK_INC_NAME"
@@ -26743,7 +26741,7 @@ $as_echo_n "checking saxon9he... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 26746 "configure"
+// #line 26744 "configure"
 import java.util.regex.Pattern;
 
 import net.sf.saxon.Version;
@@ -26858,7 +26856,7 @@ $as_echo_n "checking saxon... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 26861 "configure"
+// #line 26859 "configure"
 import java.util.regex.Pattern;
 
 import net.sf.saxon.Version;
@@ -26974,7 +26972,7 @@ $as_echo_n "checking saxon... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 26977 "configure"
+// #line 26975 "configure"
 import java.util.regex.Pattern;
 
 import com.icl.saxon.Loader;
@@ -33401,7 +33399,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 33404 "configure"
+#line 33402 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -33507,7 +33505,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 33510 "configure"
+#line 33508 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
index d55d520..706ba44 100644 (file)
@@ -268,8 +268,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index bb59f33..13c2847 100644 (file)
@@ -362,8 +362,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index 5360566..8f1c4fe 100644 (file)
@@ -302,8 +302,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index 24c8927..272c3ef 100644 (file)
@@ -50,6 +50,7 @@ AC_DEFUN([AC_OPENMPI], [
                fi
 #fi
 saved_cflags=$CFLAGS
+saved_cxxflags=$CXXFLAGS
 saved_LIBS="$LIBS"
 
 CFLAGS=`$OPENMPI_CC --showme:compile`
@@ -57,7 +58,7 @@ CXXFLAGS=`$OPENMPI_CXX --showme:compile`
 LIBS=`$OPENMPI_CC --showme:link`
 
 AC_CHECK_HEADER([mpi.h],
-       [OPENMPI_CFLAGS=$CFLAGS],
+       [OPENMPI_CFLAGS=$CFLAGS; OPENMPI_CXXFLAGS=$CXXFLAGS],
        [AC_MSG_ERROR([Cannot find headers of the library OpenMPI. Please install the dev package (Debian : openmpi-dev)])])
 
 AC_CHECK_LIB([mpi], [MPI_Init],
@@ -65,18 +66,14 @@ AC_CHECK_LIB([mpi], [MPI_Init],
                [AC_MSG_ERROR([openmpi : library missing. (Cannot find symbol MPI_Init in -lmpi). Check if OpenMPI is installed])]
                )
 
-#OPENMPI_CPPFLAGS="-I$openmpi_dir/include"
-#OPENMPI_LDFLAGS="-L$openmpi_dir/lib/"
-
-#OPENMPI_HEADER="$openmpi_dir/include/mpi.h"
-#OPENMPI_DIR="$openmpi_dir"
-
 AC_DEFINE([ENABLE_MPI],[],[Have MPI features])
 
 LIBS="$saved_LIBS"
 CFLAGS=$saved_cflags
+CXXFLAGS=$saved_cppflags
 
-AC_SUBST(OPENMPI_FLAGS)
+AC_SUBST(OPENMPI_CFLAGS)
+AC_SUBST(OPENMPI_CXXFLAGS)
 AC_SUBST(OPENMPI_LIBS)
 
 #CFLAGS="$CFLAGS $OPENMPI_FLAGS"
index b691ae9..ee6ed75 100644 (file)
@@ -434,8 +434,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index 1e4aedb..b1efa5a 100644 (file)
@@ -423,8 +423,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index f78296f..21b0aaf 100644 (file)
@@ -388,8 +388,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index adfae40..6991347 100644 (file)
@@ -379,8 +379,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index 035df32..38f2cb7 100644 (file)
@@ -320,8 +320,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index d6dee3c..279e3a5 100644 (file)
@@ -398,8 +398,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index 4411ac1..85ce614 100644 (file)
@@ -436,8 +436,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index 99a9bda..d733c2b 100644 (file)
@@ -385,8 +385,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index 4e0460d..b60b161 100644 (file)
@@ -427,8 +427,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index 8ebcf52..42c2ea7 100644 (file)
@@ -317,8 +317,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index ccd8149..9ba603e 100644 (file)
@@ -445,8 +445,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index 56b6496..04f67db 100644 (file)
@@ -485,8 +485,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index ca08b88..88af695 100644 (file)
  *
  */
 
-#include <mpi.h>
+#include <stdio.h>
+#include <mpi.h>                        // for MPI_Error_string, MPI_Init, etc
+#include <stddef.h>                     // for NULL
+#include "localization.h"               // for _
 
 MPI_Errhandler errhdl;
 
@@ -34,4 +37,5 @@ int initScilabMPI()
         /* MPI Not yet initialized */
         MPI_Init(NULL, NULL);
     }
+    return 0;
 }
index d433eda..ac8d897 100644 (file)
@@ -633,8 +633,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index 406effd..caebcc0 100644 (file)
@@ -433,8 +433,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index d3b8080..629a299 100644 (file)
@@ -316,8 +316,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index 4d4dfb1..bf494e7 100644 (file)
@@ -317,8 +317,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index 77d844f..45665b7 100644 (file)
@@ -261,8 +261,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index e878a09..40e3c6d 100644 (file)
@@ -442,8 +442,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index b8d40ed..2b63f14 100644 (file)
@@ -392,8 +392,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index 5f3f38c..3a2717d 100644 (file)
@@ -418,8 +418,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index ed257f1..1295deb 100644 (file)
@@ -533,8 +533,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index 03185f5..e0ac1e6 100644 (file)
@@ -490,8 +490,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index d9f5496..b73d4f0 100644 (file)
@@ -452,8 +452,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index 101c34e..13109ec 100644 (file)
@@ -422,8 +422,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index ba94f6d..1d4136e 100644 (file)
@@ -463,8 +463,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index f9490a0..9ffcd26 100644 (file)
@@ -402,8 +402,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index 84f4f1c..25ace75 100644 (file)
@@ -319,8 +319,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index 864353a..952cda0 100644 (file)
@@ -320,8 +320,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index 441651e..2d62d7c 100644 (file)
@@ -429,8 +429,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index 1068b3b..f70906d 100644 (file)
@@ -450,8 +450,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index 854576c..92281dd 100644 (file)
@@ -746,8 +746,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index 3ce5ef7..0e5ed45 100644 (file)
@@ -515,8 +515,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index ac3fe1e..4d9080e 100644 (file)
@@ -442,8 +442,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index 3ebbd9e..03f276d 100644 (file)
@@ -423,8 +423,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index da35944..2c32f44 100644 (file)
@@ -422,8 +422,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index a97c657..719318e 100644 (file)
@@ -427,8 +427,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index 2b32691..0c7fcc4 100644 (file)
@@ -449,8 +449,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index 91dd8d8..4ed3613 100644 (file)
@@ -409,8 +409,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index fd59d88..15c14f9 100644 (file)
@@ -382,8 +382,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index c4d67f0..6cd644b 100644 (file)
@@ -404,8 +404,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index bbd0b30..dcbf035 100644 (file)
@@ -380,8 +380,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index 2ce552c..8e45e17 100644 (file)
@@ -417,8 +417,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index 4b28b97..04226c3 100644 (file)
@@ -436,8 +436,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index e6bd903..c126e61 100644 (file)
@@ -423,8 +423,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index e405c8b..8481e41 100644 (file)
@@ -314,8 +314,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index 1b2dd81..aa181b4 100644 (file)
@@ -417,8 +417,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index 33d2204..19cb91e 100644 (file)
@@ -385,8 +385,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index e743a6c..9ee3cbb 100644 (file)
@@ -315,8 +315,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index 60f1be1..9a52f2a 100644 (file)
@@ -391,8 +391,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index 0647376..4ae1fcc 100644 (file)
@@ -420,8 +420,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index bff8a1d..7e64ec2 100644 (file)
@@ -455,8 +455,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index 64ad8ec..75e780f 100644 (file)
@@ -315,8 +315,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index 03cd766..58d9001 100644 (file)
@@ -406,8 +406,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index 63df7d3..7cf23ee 100644 (file)
@@ -375,8 +375,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index d72928c..eab0998 100644 (file)
@@ -426,8 +426,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index 3f79846..bd59bc6 100644 (file)
@@ -289,8 +289,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index 2c8e48d..02c0dd9 100644 (file)
@@ -429,8 +429,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index 945a837..4388d0f 100644 (file)
@@ -399,8 +399,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index 8407116..7b7daad 100644 (file)
@@ -383,8 +383,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index 602a77d..c2fa207 100644 (file)
@@ -684,8 +684,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index bd840a3..fc52866 100644 (file)
@@ -775,8 +775,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index 7c472dc..a31a41f 100644 (file)
@@ -420,8 +420,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index 9365b3c..c57661b 100644 (file)
@@ -419,8 +419,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index 6c40b40..1697d5c 100644 (file)
@@ -319,8 +319,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index 325f3e4..820dfd3 100644 (file)
@@ -369,8 +369,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index 652455b..16c6548 100644 (file)
@@ -432,8 +432,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index f652f52..7087d19 100644 (file)
@@ -428,8 +428,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index 137df0c..3d5285e 100644 (file)
@@ -399,8 +399,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index fa07a67..c87ca72 100644 (file)
@@ -415,8 +415,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index a4a75b6..0c3669c 100644 (file)
@@ -442,8 +442,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index a823597..ca56ddc 100644 (file)
@@ -398,8 +398,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index 9057b38..446fa93 100644 (file)
@@ -426,8 +426,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index 9bd5ab8..24678b4 100644 (file)
@@ -383,8 +383,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index 477b85a..7046afc 100644 (file)
@@ -419,8 +419,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index d6a668e..8cb2641 100644 (file)
@@ -428,8 +428,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index 20d60ed..a7d1487 100644 (file)
@@ -423,8 +423,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index ef08a1f..7dfa551 100644 (file)
@@ -372,8 +372,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index a521acb..3a76d08 100644 (file)
@@ -426,8 +426,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
index b2b8b83..1b70383 100644 (file)
@@ -440,8 +440,9 @@ OCAMLLEX = @OCAMLLEX@
 OCAMLOPT = @OCAMLOPT@
 OCAMLYACC = @OCAMLYACC@
 OPENMPI_CC = @OPENMPI_CC@
+OPENMPI_CFLAGS = @OPENMPI_CFLAGS@
 OPENMPI_CXX = @OPENMPI_CXX@
-OPENMPI_FLAGS = @OPENMPI_FLAGS@
+OPENMPI_CXXFLAGS = @OPENMPI_CXXFLAGS@
 OPENMPI_LIBS = @OPENMPI_LIBS@
 OPENMP_CFLAGS = @OPENMP_CFLAGS@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@