Merge pull request #3503 from roystgnr/no_mpi_fix

Fix "make check" with MetaPhysicL without MPI

Author: roystgnr

configure

@@ -56942,6 +56942,11 @@ fi
 
                  { $as_echo "$as_me:${as_lineno-$LINENO}: result: <<< Configuring library with built-in MetaPhysicL support >>>" >&5
 $as_echo "<<< Configuring library with built-in MetaPhysicL support >>>" >&6; }
+                 if test "x$prefix" = "xNONE"; then :
+  future_timpi_prefix=$ac_abs_top_builddir/contrib/timpi/src/
+else
+  future_timpi_prefix=$prefix
+fi
 
 
   # Various preliminary checks.
@@ -57034,7 +57039,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
       as_fn_append ax_args " '--with-cxx-std=20$acsm_cxx_version'"
       as_fn_append ax_args " 'CPPFLAGS=-I$my_top_srcdir/contrib/timpi/src/algorithms/include/ -I$my_top_srcdir/contrib/timpi/src/parallel/include/ -I$my_top_srcdir/contrib/timpi/src/utilities/include/ -I$ac_abs_top_builddir/contrib/timpi/src/utilities/include/ $CPPFLAGS'"
       as_fn_append ax_args " 'LDFLAGS=-L$ac_abs_top_builddir/contrib/timpi/src/ $LDFLAGS'"
-      as_fn_append ax_args " '--with-future-timpi-dir=$prefix'"
+      as_fn_append ax_args " '--with-future-timpi-dir=$future_timpi_prefix'"
       as_fn_append ax_args " '--with-timpi-method=$my_method'"
 
       # New options that may need to be merged with existing options.

contrib/metaphysicl

@@ -124,7 +124,10 @@ AC_DEFUN([CONFIGURE_METAPHYSICL],
           AS_IF([test "x$build_metaphysicl" = "xyes"],
                 [
                  AC_MSG_RESULT(<<< Configuring library with built-in MetaPhysicL support >>>)
-                 AX_SUBDIRS_CONFIGURE([contrib/metaphysicl],[[--with-cxx-std=20$acsm_cxx_version],[CPPFLAGS=-I$my_top_srcdir/contrib/timpi/src/algorithms/include/ -I$my_top_srcdir/contrib/timpi/src/parallel/include/ -I$my_top_srcdir/contrib/timpi/src/utilities/include/ -I$ac_abs_top_builddir/contrib/timpi/src/utilities/include/ $CPPFLAGS],[LDFLAGS=-L$ac_abs_top_builddir/contrib/timpi/src/ $LDFLAGS],[--with-future-timpi-dir=$prefix],[--with-timpi-method=$my_method]])
+                 AS_IF([test "x$prefix" = "xNONE"],
+                       [future_timpi_prefix=$ac_abs_top_builddir/contrib/timpi/src/],
+                       [future_timpi_prefix=$prefix])
+                 AX_SUBDIRS_CONFIGURE([contrib/metaphysicl],[[--with-cxx-std=20$acsm_cxx_version],[CPPFLAGS=-I$my_top_srcdir/contrib/timpi/src/algorithms/include/ -I$my_top_srcdir/contrib/timpi/src/parallel/include/ -I$my_top_srcdir/contrib/timpi/src/utilities/include/ -I$ac_abs_top_builddir/contrib/timpi/src/utilities/include/ $CPPFLAGS],[LDFLAGS=-L$ac_abs_top_builddir/contrib/timpi/src/ $LDFLAGS],[--with-future-timpi-dir=$future_timpi_prefix],[--with-timpi-method=$my_method]])
                 ],
                 [AC_MSG_RESULT(<<< Configuring library with external MetaPhysicL support >>>)])
         ],