Enable builds without Fortran compiler.

* Just set FC=no.

configure.ac

@@ -75,10 +75,14 @@ AX_PTHREAD([AC_DEFINE([HAVE_PTHREAD],1,[Define if you have POSIX threads librari
    CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
    CC="$PTHREAD_CC"])
 ACX_TLS_XLC_RETRY
+if test "X$FC" != Xno ; then
 m4_pushdef([_AC_F95_FC],[mpifort mpiifort mpxlf_r mpxlf95_r mpxlf_r mpixlf95_r mpif90 mpif77 ]m4_dquote(m4_defn(
-  [_AC_F95_FC])))
+  [_AC_F95_FC])))dnl
 AC_PROG_FC
-m4_popdef([_AC_F95_FC])
+m4_popdef([_AC_F95_FC])dnl
+fi
+m4_define([test_with_fortran],[test -n "$FC" && test "X$FC" != Xno])dnl
+if test_with_fortran ; then
 AC_FC_SRCEXT([f90])
 AC_FC_FREEFORM
 AC_LANG_PUSH([Fortran])
@@ -95,52 +99,57 @@ dnl '-eT' flag instead of '-eZ' (the original intention for switching the flag
 dnl was to get rid of intermediate *.i files generated by the compiler).
 FCFLAGS_f90="$FCFLAGS_f90 $FC_FPP_FLAG"
 AC_PROG_FPP
+AC_PROG_FC_C_O
 AC_LANG_POP([Fortran])
+fi
+AM_CONDITIONAL([with_fortran], [test_with_fortran])
+
 AC_PROG_MKDIR_P
 AX_WITH_PERL([/bin/false], $PATH:$prefix/bin:/usr/bin:/usr/local/bin)
 AX_PROG_PERL_VERSION([5.0005],[],
         AC_MSG_ERROR([Perl (version>=5.0005) is required]))
 AC_CHECK_PROGS([M4],[m4 gm4 gnum4],[false],,)
 AM_PROG_CC_C_O
-AC_PROG_FC_C_O
 # Set up libtool.
 ACX_USE_LIBTOOL_CONFIGURATION
 AC_SUBST([lt_cv_nm_interface])
 dnl ######################################################################
 dnl Properties of the compiler
 dnl ######################################################################
-ACX_SL_FC_MOD_SUFFIX(,[AC_MSG_ERROR(dnl
-[Fortran module file extension must be known to install F90 modules.])])
-AM_CONDITIONAL([FC_MOD_UPPERCASE],
-  [test x$ac_fc_mod_uppercase = xyes])
+if test_with_fortran ; then
+ACX_SL_FC_MOD_SUFFIX(,
+  [AC_MSG_ERROR([Fortran module file extension must be known to install F90 modules.])])
 AC_LANG_PUSH([Fortran])
 ACX_SL_FC_CHECK_MOD_PATH_FLAG
 AC_LANG_POP([Fortran])
 ACX_FC_VOLATILE([FCFLAGS="${FCFLAGS} ${FPP_DEFOPT}HAVE_VOLATILE"])
 AC_FC_DUMMY_MAIN(,[:])
 AC_FC_WRAPPERS
-ACX_FC_LOGICAL_INTEROP([HAVE_FC_LOGICAL_INTEROP=yes
-  FCFLAGS="${FCFLAGS+$FCFLAGS }${FPP_DEFOPT}HAVE_FC_LOGICAL_INTEROP"])
+ACX_FC_LOGICAL_INTEROP([HAVE_FC_LOGICAL_INTEROP=yes ;dnl
+ FCFLAGS="${FCFLAGS+$FCFLAGS }${FPP_DEFOPT}HAVE_FC_LOGICAL_INTEROP"])
 ACX_FC_LOGICAL_C_BOOL(
   [FCFLAGS="${FCFLAGS+$FCFLAGS }${FPP_DEFOPT}HAVE_FC_LOGICAL_C_BOOL"])
 dnl
 dnl check if the compiler supports pointer bounds remapping
 ACX_FC_POINTER_BOUNDS_REMAP([HAVE_POINTER_REMAP=yes],[HAVE_POINTER_REMAP=no])
-AS_IF([test $HAVE_POINTER_REMAP = yes],
+AS_VAR_IF([HAVE_POINTER_REMAP],[yes],
   [ACX_FC_POINTER_HUGE_BOUNDS_REMAP(,
-     [AC_MSG_NOTICE([Disabling native low-bounds mapping, $FC has a known defective implementation.])
-      HAVE_POINTER_REMAP=no])])
+  [AC_MSG_NOTICE([Disabling native low-bounds mapping, $FC has a known defective implementation.])
+   HAVE_POINTER_REMAP=no])])
 AS_IF([test $HAVE_POINTER_REMAP = yes],
   [FCFLAGS="${FCFLAGS+$FCFLAGS }${FPP_DEFOPT}HAVE_FC_PTR_BOUND_REMAP"])
 dnl Do we need helper functions for contiguous arrays?
 ACX_FC_HAVE_IS_CONTIGUOUS([HAVE_FC_IS_CONTIGUOUS=yes
   FCFLAGS="${FCFLAGS+$FCFLAGS }${FPP_DEFOPT}HAVE_FC_IS_CONTIGUOUS"
-  AC_DEFINE([HAVE_FC_IS_CONTIGUOUS],[1])])
-AH_TEMPLATE([HAVE_FC_IS_CONTIGUOUS],
-  [Defined to 1 iff Fortran compiler supports IS_CONTIGUOUS query])dnl
+AC_DEFINE([HAVE_FC_IS_CONTIGUOUS],[1])])
 ACX_FC_HAVE_C_LOC_OF_SLICE([HAVE_FC_C_LOC_OF_SLICE=yes
   FCFLAGS="${FCFLAGS+$FCFLAGS }${FPP_DEFOPT}HAVE_FC_C_LOC_OF_SLICE"
   AC_DEFINE([HAVE_FC_C_LOC_OF_SLICE],[1])])
+fi
+AM_CONDITIONAL([FC_MOD_UPPERCASE],
+  [test x$ac_fc_mod_uppercase = xyes])
+AH_TEMPLATE([HAVE_FC_IS_CONTIGUOUS],
+  [Defined to 1 iff Fortran compiler supports IS_CONTIGUOUS query])dnl
 AH_TEMPLATE([HAVE_FC_C_LOC_OF_SLICE],
   [Defined to 1 iff Fortran compiler supports C_LOC of an array slice])dnl
 dnl Check whether char is unsigned by default
@@ -196,9 +205,11 @@ AC_CACHE_CHECK([whether __builtin_clzll is declared],
 dnl ######################################################################
 dnl Test whether cfortran.h works correctly
 dnl ######################################################################
+if test_with_fortran ; then
 ACX_FIND_CFORTRAN_DEF
 ACX_XLF_QEXTNAME_ADD_APPENDUS
 ACX_CHECK_CFORTRAN
+fi
 
 dnl ######################################################################
 dnl Checks for header files.
@@ -216,12 +227,14 @@ ACX_C_PACKAGE([MPI],[mpi.h],,,
   [AC_MSG_ERROR([Required header mpi.h not found or not compilable.])],
   [MPI_Waitall],[mpi mpich],,,
   [AC_MSG_ERROR([Cannot link C MPI programs.])])
+if test_with_fortran ; then
 ACX_F90_PACKAGE([MPI],[mpi],,,
   [AC_MSG_ERROR([Required Fortran 90 module not found or incompatible.])],
   [mpi_waitall],[mpi mpi_f90 mpi_f77 mpich],[[-lmpi_f77 -lmpi],[-lmpi]],,
   [AC_MSG_ERROR([Cannot link Fortran 90 MPI programs.])],,
-[      INTEGER :: req(1), stat(mpi_status_size, 1), ierror
+  [      INTEGER :: req(1), stat(mpi_status_size, 1), ierror
 ],[(1, req, stat, ierror)])
+fi
 
 save_CFLAGS=$CFLAGS
 CFLAGS="$CFLAGS $MPI_C_INCLUDE"
@@ -326,8 +339,10 @@ dnl              TYPE_C_PRINTF_FMT, TYPE_C_ABS, TYPE_C_CLZ)
 m4_define([vartype_setq],[$1][_MPIDT=$4
      AC_CHECK_SIZEOF([$2])
      $1][_FC_KIND=$3
+     if test_with_fortran ; then
      ACX_FORTRAN_TYPE_KIND([integer],[$3],[$2],
        [      use iso_c_binding],,$1[_FC_KIND=$acx_fortran_kind_subst])
+     fi
      $1][_MAX=$5
      $1][_MIN=$6
      $1][_FMT=$7
@@ -338,6 +353,7 @@ m4_define([vartype_setq],[$1][_MPIDT=$4
 
 dnl
 dnl test if MPI_INTEGER[248] are available
+if test_with_fortran ; then
 save_FCFLAGS=$FCFLAGS
 AC_LANG_PUSH([Fortran])
 FCFLAGS="$MPI_FC_MOD $FCFLAGS"
@@ -355,6 +371,7 @@ for mpi_int2test in MPI_INTEGER2 MPI_INTEGER4 MPI_INTEGER8; do
 done
 FCFLAGS=$save_FCFLAGS
 AC_LANG_POP([Fortran])
+fi
 
 m4_foreach([substtype],[[XT_INT]],
   [AS_CASE(["$substtype"],
@@ -557,11 +574,14 @@ dnl created the dummy Fortran dependency files, we enforce their
 dnl regeneration at the build time by updating the timestamps of the
 dnl corresponding Makefiles, which the Fortran dependency file have as
 dnl prerequisites.
-AC_CONFIG_COMMANDS([force_dep_regeneration],[$MKDIR_P "tests/${DEPDIR}" "src/${DEPDIR}"
+AC_CONFIG_COMMANDS([force_dep_regeneration],[if test x"$with_fortran" = xyes; then
+$MKDIR_P "tests/${DEPDIR}" "src/${DEPDIR}"
 touch "tests/${DEPDIR}/FC.deps" "src/${DEPDIR}/FC.deps"
 sleep 1
-touch tests/Makefile src/Makefile],
-[DEPDIR="${DEPDIR}"])
+touch tests/Makefile src/Makefile
+fi],
+[with_fortran=`test -z "${with_fortran_TRUE}" && echo yes || echo no`
+DEPDIR="${DEPDIR}"])
 
 AC_OUTPUT
 dnl

examples/Makefile.am

@@ -38,9 +38,14 @@ EXTRA_PROGRAMS = 						\
 	idxlist_examples					\
 	idxsection_examples					\
 	row2col							\
+	tr_gp2fs
+
+
+if with_fortran
+EXTRA_PROGRAMS += 						\
 	row2col_f						\
-	tr_gp2fs						\
 	unstruct_halo_exchange_f
+endif
 
 noinst_PROGRAMS =
 if with_example_programs

inst_headers/Makefile.am

@@ -38,8 +38,12 @@ nodist_include_HEADERS = yaxt.h
 
 BUILT_SOURCES = yaxt.h
 
-SUBDIRS = . f90
-DIST_SUBDIRS = f90 .
+SUBDIRS =
+DIST_SUBDIRS =
+if with_fortran
+SUBDIRS += . f90
+DIST_SUBDIRS += f90 .
+endif
 
 ../src/xtinclude_Makefile.inc:
 	(cd ../src ; if test -r Makefile ; then \
@@ -77,6 +81,9 @@ clean-local:
 	rm -rf xt yaxt.h
 
 distclean-local:
+if ! with_fortran
+	rm f90/Makefile
+endif
 	-test "$(abs_builddir)" = "$(abs_srcdir)" || rmdir f90
 
 install-data-local: yaxt.h $(xtinclude_HEADERS)

perf/Makefile.am

@@ -34,8 +34,12 @@
 #
 
 EXTRA_PROGRAMS = 						\
-	perf_idxsection_get_positions_of_indices		\
+	perf_idxsection_get_positions_of_indices
+
+if with_fortran
+EXTRA_PROGRAMS += 						\
 	perf_sparse_array_gather
+endif
 
 noinst_PROGRAMS =
 if with_perf_programs

src/Makefile.am

@@ -34,7 +34,12 @@
 
 AM_CPPFLAGS = -I../include -I$(srcdir)/../include $(MPI_C_INCLUDE)
 AM_FCFLAGS  = $(MPI_FC_MOD)
-lib_LTLIBRARIES =  libyaxt_c.la libyaxt.la
+lib_LTLIBRARIES = libyaxt_c.la
+if with_fortran
+lib_LTLIBRARIES += libyaxt.la
+else
+AM_CPPFLAGS += -DWITHOUT_FORTRAN
+endif
 
 # headers from subdir xt will be installed (after substituting
 # definitions from config.h). These must be listed in a sequence in
@@ -336,6 +341,10 @@ clean-local:
 # the directory stamps are deleted by introducing a dependency on
 # 'distclean-generic'. Second, we delete the pkgconfig files, which, otherwise,
 # are deleted later by the top-level Makefile.
+PKG_CFG_FILES = pkgconfig/yaxt_c.pc
+if with_fortran
+PKG_CFG_FILES += pkgconfig/yaxt.pc
+endif
 distclean-local: mostlyclean distclean-generic
 	-rm -f xtinclude_Makefile.inc
 	-rm -rf '$(DEPDIR)' 'core/$(DEPDIR)'
@@ -344,7 +353,7 @@ distclean-local: mostlyclean distclean-generic
 
 install-exec-local:
 	$(mkinstalldirs) "$(DESTDIR)$(libdir)/pkgconfig"
-	for pc in pkgconfig/yaxt.pc pkgconfig/yaxt_c.pc ; do \
+	for pc in $(PKG_CFG_FILES) ; do \
 		$(install_sh_DATA) "$$pc" "$(DESTDIR)$(libdir)/$$pc" ; done
 
 uninstall-local:
@@ -352,6 +361,7 @@ uninstall-local:
 		"$(DESTDIR)$(libdir)/pkgconfig/yaxt_c.pc"
 	-rmdir "$(DESTDIR)$(libdir)/pkgconfig"
 
+if with_fortran
 ./$(DEPDIR)/FC.deps: $(libyaxt_la_SOURCES) Makefile
 	@unique=`for i in $(SOURCES); do \
 	  if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
@@ -376,6 +386,7 @@ uninstall-local:
 	  && touch ./$(DEPDIR)/FC.deps
 
 @am__include@ @am__quote@./$(DEPDIR)/FC.deps@am__quote@ # am--include-marker
+endif
 
 #
 # Local Variables:

src/core/core.c

@@ -53,21 +53,23 @@
  * Code:
  */
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#  include <config.h>
 #endif
 #include <stdio.h>
-#if defined __clang__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wreserved-id-macro"
-#pragma GCC diagnostic ignored "-Wstrict-prototypes"
+#include <stdlib.h>
+#ifndef WITHOUT_FORTRAN
+#  if defined __clang__
+#    pragma GCC diagnostic push
+#    pragma GCC diagnostic ignored "-Wreserved-id-macro"
+#    pragma GCC diagnostic ignored "-Wstrict-prototypes"
+#  endif
+#  include <cfortran.h>
+#  if defined __clang__
+#    pragma GCC diagnostic pop
+#  endif
 #endif
-#include <cfortran.h>
-#if defined __clang__
-#pragma GCC diagnostic pop
-#endif
-
 #ifdef USE_MPI
-#include <mpi.h>
+#  include <mpi.h>
 #endif
 
 #include "core/ppm_visibility.h"
@@ -76,6 +78,7 @@
 
 MPI_Comm SymPrefix(default_comm) = MPI_COMM_WORLD;
 
+#ifndef WITHOUT_FORTRAN
 #define F2C_Data COMMON_BLOCK(SYMPREFIX(F2C_DATA),symprefix(f2c_data))
 
 typedef struct
@@ -86,18 +89,21 @@ typedef struct
 COMMON_BLOCK_DEF(SymPrefix(F2C_Def),F2C_Data);
 
 SymPrefix(F2C_Def) F2C_Data;
+#endif
 
 void
 SymPrefix(set_default_comm)(MPI_Comm comm)
 {
+#ifndef WITHOUT_FORTRAN
   MPI_Fint comm_f;
-#if defined(USE_MPI)
+#  if defined(USE_MPI)
   comm_f = MPI_Comm_c2f(comm);
-#else
+#  else
   comm_f = comm;
+#  endif
+  F2C_Data.symprefix(default_comm) = comm_f;
 #endif
   SymPrefix(default_comm) = comm;
-  F2C_Data.symprefix(default_comm) = comm_f;
 }
 
 void

tests/Makefile.am

@@ -34,72 +34,78 @@
 #
 
 check_PROGRAMS = 						\
-	test_misc_f						\
 	test_mpi_generate_datatype				\
 	test_mpi_smartdedup					\
 	test_exchanger_parallel					\
 	test_handles						\
 	test_arithmetic_long					\
 	test_idxempty						\
-	test_idxempty_f						\
 	test_idxvec						\
-	test_idxvec_f						\
 	test_idxlist_collection					\
-	test_idxlist_collection_f				\
 	test_idxmod						\
-	test_idxmod_f						\
 	test_idxsection						\
-	test_idxsection_f					\
 	test_idxstripes						\
-	test_idxstripes_f					\
 	test_redist_single_array_base				\
-	test_redist_single_array_base_f				\
 	test_redist_single_array_base_parallel			\
-	test_redist_single_array_base_parallel_f		\
 	test_redist_collection					\
-	test_redist_collection_f				\
 	test_redist_collection_parallel				\
-	test_redist_collection_parallel_f			\
 	test_redist_collection_static				\
-	test_redist_collection_static_f				\
 	test_redist_collection_static_parallel			\
-	test_redist_collection_static_parallel_f		\
 	test_redist_p2p						\
-	test_redist_p2p_f					\
 	test_redist_p2p_parallel				\
-	test_redist_p2p_parallel_f				\
 	test_redist_repeat					\
-	test_redist_repeat_f					\
 	test_redist_repeat_parallel				\
-	test_redist_repeat_parallel_f				\
 	test_request_parallel					\
 	test_xmap_all2all					\
-	test_xmap_all2all_f					\
 	test_xmap_all2all_fail					\
-	test_xmap_all2all_fail_f				\
 	test_xmap_all2all_parallel				\
-	test_xmap_all2all_parallel_f				\
 	test_xmap_all2all_intercomm_parallel			\
-	test_xmap_all2all_intercomm_parallel_f			\
 	test_xmap_dist_dir					\
-	test_xmap_dist_dir_f					\
 	test_xmap_dist_dir_parallel				\
-	test_xmap_dist_dir_parallel_f				\
 	test_xmap_dist_dir_intercomm_parallel			\
-	test_xmap_dist_dir_intercomm_parallel_f			\
 	test_xmap_intersection_parallel				\
-	test_xmap_intersection_parallel_f			\
 	test_initialized_finalized				\
+	test_sort						\
+	test_uid
+
+check_LTLIBRARIES = libtestutil.la
+
+if with_fortran
+check_PROGRAMS += 						\
+	test_misc_f						\
+	test_idxempty_f						\
+	test_idxvec_f						\
+	test_idxlist_collection_f				\
+	test_idxmod_f						\
+	test_idxsection_f					\
+	test_idxstripes_f					\
+	test_redist_single_array_base_f				\
+	test_redist_single_array_base_parallel_f		\
+	test_redist_collection_f				\
+	test_redist_collection_parallel_f			\
+	test_redist_collection_static_f				\
+	test_redist_collection_static_parallel_f		\
+	test_redist_p2p_f					\
+	test_redist_p2p_parallel_f				\
+	test_redist_repeat_f					\
+	test_redist_repeat_parallel_f				\
+	test_xmap_all2all_f					\
+	test_xmap_all2all_fail_f				\
+	test_xmap_all2all_parallel_f				\
+	test_xmap_all2all_intercomm_parallel_f			\
+	test_xmap_dist_dir_f					\
+	test_xmap_dist_dir_parallel_f				\
+	test_xmap_dist_dir_intercomm_parallel_f			\
+	test_xmap_intersection_parallel_f			\
 	test_initialized_finalized_f				\
 	test_ut							\
 	test_perf						\
 	test_perf_stripes					\
-	test_sort						\
-	test_uid						\
 	test_yaxt
 
+check_LTLIBRARIES += libtestutil_f.la
+endif
 
-check_LTLIBRARIES = libtestutil.la libtestutil_f.la
 
 if ! with_on_demand_check_programs
 all: $(check_LTLIBRARIES) $(check_PROGRAMS)
@@ -300,6 +306,7 @@ AUTOMAKE_OPTIONS = color-tests
 
 EXTRA_DIST = core
 
+if with_fortran
 ./$(DEPDIR)/FC.deps: $(SOURCES) Makefile
 	@unique=`for i in $(SOURCES); do \
 	  if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
@@ -327,6 +334,7 @@ EXTRA_DIST = core
 	  || ln -f ./$(DEPDIR)/FC.deps.temp ./$(DEPDIR)/FC.deps
 
 @am__include@ @am__quote@./$(DEPDIR)/FC.deps@am__quote@ # am--include-marker
+endif
 
 clean-local:
 	-rm -f *.$(FCMODEXT) *.i *.dbg

tests/test_idxempty_run.in

@@ -5,8 +5,8 @@ export LIBC_FATAL_STDERR_
 [ x"@MPI_LAUNCH@" != xtrue ] || exit 77
 @abs_top_builddir@/libtool --mode=execute \
   @MPI_LAUNCH@ -n 1 @abs_builddir@/test_idxempty
-@abs_top_builddir@/libtool --mode=execute \
-  @MPI_LAUNCH@ -n 1 @abs_builddir@/test_idxempty_f
+@with_fortran_TRUE@@abs_top_builddir@/libtool --mode=execute \
+@with_fortran_TRUE@  @MPI_LAUNCH@ -n 1 @abs_builddir@/test_idxempty_f
 #
 # Local Variables:
 # mode: sh

tests/test_idxlist_collection_run.in

@@ -5,8 +5,8 @@ export LIBC_FATAL_STDERR_
 [ x"@MPI_LAUNCH@" != xtrue ] || exit 77
 @abs_top_builddir@/libtool --mode=execute \
   @MPI_LAUNCH@ -n 1 @abs_builddir@/test_idxlist_collection
-@abs_top_builddir@/libtool --mode=execute \
-  @MPI_LAUNCH@ -n 1 @abs_builddir@/test_idxlist_collection_f
+@with_fortran_TRUE@@abs_top_builddir@/libtool --mode=execute \
+@with_fortran_TRUE@  @MPI_LAUNCH@ -n 1 @abs_builddir@/test_idxlist_collection_f
 #
 # Local Variables:
 # mode: sh

tests/test_idxmod_run.in

@@ -5,8 +5,8 @@ export LIBC_FATAL_STDERR_
 [ x"@MPI_LAUNCH@" != xtrue ] || exit 77
 @abs_top_builddir@/libtool --mode=execute \
   @MPI_LAUNCH@ -n 1 @abs_builddir@/test_idxmod
-@abs_top_builddir@/libtool --mode=execute \
-  @MPI_LAUNCH@ -n 1 @abs_builddir@/test_idxmod_f
+@with_fortran_TRUE@@abs_top_builddir@/libtool --mode=execute \
+@with_fortran_TRUE@  @MPI_LAUNCH@ -n 1 @abs_builddir@/test_idxmod_f
 #
 # Local Variables:
 # mode: sh

tests/test_idxsection_run.in

@@ -5,8 +5,8 @@ export LIBC_FATAL_STDERR_
 [ x"@MPI_LAUNCH@" != xtrue ] || exit 77
 @abs_top_builddir@/libtool --mode=execute \
   @MPI_LAUNCH@ -n 1 @abs_builddir@/test_idxsection
-@abs_top_builddir@/libtool --mode=execute \
-  @MPI_LAUNCH@ -n 1 @abs_builddir@/test_idxsection_f
+@with_fortran_TRUE@@abs_top_builddir@/libtool --mode=execute \
+@with_fortran_TRUE@  @MPI_LAUNCH@ -n 1 @abs_builddir@/test_idxsection_f
 #
 # Local Variables:
 # mode: sh

tests/test_idxstripes_run.in

@@ -5,8 +5,8 @@ export LIBC_FATAL_STDERR_
 [ x"@MPI_LAUNCH@" != xtrue ] || exit 77
 @abs_top_builddir@/libtool --mode=execute \
   @MPI_LAUNCH@ -n 1 @abs_builddir@/test_idxstripes
-@abs_top_builddir@/libtool --mode=execute \
-  @MPI_LAUNCH@ -n 1 @abs_builddir@/test_idxstripes_f
+@with_fortran_TRUE@@abs_top_builddir@/libtool --mode=execute \
+@with_fortran_TRUE@  @MPI_LAUNCH@ -n 1 @abs_builddir@/test_idxstripes_f
 #
 # Local Variables:
 # mode: sh

tests/test_idxvec_run.in

@@ -5,8 +5,8 @@ export LIBC_FATAL_STDERR_
 [ x"@MPI_LAUNCH@" != xtrue ] || exit 77
 @abs_top_builddir@/libtool --mode=execute \
   @MPI_LAUNCH@ -n 1 @abs_builddir@/test_idxvec
-@abs_top_builddir@/libtool --mode=execute \
-  @MPI_LAUNCH@ -n 1 @abs_builddir@/test_idxvec_f
+@with_fortran_TRUE@@abs_top_builddir@/libtool --mode=execute \
+@with_fortran_TRUE@  @MPI_LAUNCH@ -n 1 @abs_builddir@/test_idxvec_f
 #
 # Local Variables:
 # mode: sh

tests/test_initialized_finalized_run.in

@@ -5,8 +5,9 @@ export LIBC_FATAL_STDERR_
 [ x"@MPI_LAUNCH@" != xtrue ] || exit 77
 @abs_top_builddir@/libtool --mode=execute \
   @MPI_LAUNCH@ -n 1 @abs_builddir@/test_initialized_finalized
-@abs_top_builddir@/libtool --mode=execute \
-  @MPI_LAUNCH@ -n 1 @abs_builddir@/test_initialized_finalized_f
+@with_fortran_TRUE@@abs_top_builddir@/libtool --mode=execute \
+@with_fortran_TRUE@  @MPI_LAUNCH@ -n 1 \
+@with_fortran_TRUE@  @abs_builddir@/test_initialized_finalized_f
 #
 # Local Variables:
 # mode: sh

tests/test_misc_run.in

 #! @SHELL@
 set -e
+@with_fortran_FALSE@exit 77
 LIBC_FATAL_STDERR_=1
 export LIBC_FATAL_STDERR_
 [ x"@MPI_LAUNCH@" != xtrue ] || exit 77

tests/test_perf_run.in

@@ -3,6 +3,7 @@ set -e
 LIBC_FATAL_STDERR_=1
 export LIBC_FATAL_STDERR_
 [ x"@MPI_LAUNCH@" != xtrue ] || exit 77
+@with_fortran_FALSE@ exit 77
 export YAXT_TEST_PERF_GRID=TEST
 for num_tasks in 1 2 3 4 ; do
   @abs_top_builddir@/libtool --mode=execute \

tests/test_perf_stripes_run.in

@@ -3,6 +3,7 @@ set -e
 LIBC_FATAL_STDERR_=1
 export LIBC_FATAL_STDERR_
 [ x"@MPI_LAUNCH@" != xtrue ] || exit 77
+@with_fortran_FALSE@ exit 77
 export YAXT_TEST_PERF_GRID=TEST
 for num_tasks in 1 2 3 4 ; do
   @abs_top_builddir@/libtool --mode=execute \

tests/test_redist_collection_parallel_run.in

@@ -7,9 +7,10 @@ for nprocs in 2 3 4 8 ; do
   @abs_top_builddir@/libtool --mode=execute \
     @MPI_LAUNCH@ -n $nprocs @abs_builddir@/test_redist_collection_parallel \
     "$@"
-  @abs_top_builddir@/libtool --mode=execute \
-    @MPI_LAUNCH@ -n $nprocs @abs_builddir@/test_redist_collection_parallel_f \
-    "$@"
+  @with_fortran_TRUE@@abs_top_builddir@/libtool --mode=execute \
+  @with_fortran_TRUE@  @MPI_LAUNCH@ -n $nprocs \
+  @with_fortran_TRUE@  @abs_builddir@/test_redist_collection_parallel_f \
+  @with_fortran_TRUE@  "$@"
 done
 #
 # Local Variables:

tests/test_redist_collection_run.in

@@ -5,8 +5,9 @@ export LIBC_FATAL_STDERR_
 [ x"@MPI_LAUNCH@" != xtrue ] || exit 77
 @abs_top_builddir@/libtool --mode=execute \
   @MPI_LAUNCH@ -n 1 @abs_builddir@/test_redist_collection "$@"
-@abs_top_builddir@/libtool --mode=execute \
-  @MPI_LAUNCH@ -n 1 @abs_builddir@/test_redist_collection_f "$@"
+@with_fortran_TRUE@@abs_top_builddir@/libtool --mode=execute \
+@with_fortran_TRUE@  @MPI_LAUNCH@ -n 1 \
+@with_fortran_TRUE@  @abs_builddir@/test_redist_collection_f "$@"
 #
 # Local Variables:
 # mode: sh

tests/test_redist_collection_static_parallel_run.in

@@ -7,9 +7,10 @@ for nprocs in 2 3 4 8 ; do
   @abs_top_builddir@/libtool --mode=execute \
     @MPI_LAUNCH@ -n $nprocs \
     @abs_builddir@/test_redist_collection_static_parallel "$@"
-  @abs_top_builddir@/libtool --mode=execute \
-    @MPI_LAUNCH@ -n $nprocs \
-    @abs_builddir@/test_redist_collection_static_parallel_f "$@"
+  @with_fortran_TRUE@@abs_top_builddir@/libtool --mode=execute \
+  @with_fortran_TRUE@  @MPI_LAUNCH@ -n $nprocs \
+  @with_fortran_TRUE@  @abs_builddir@/test_redist_collection_static_parallel_f \
+  @with_fortran_TRUE@  "$@"
 done
 #
 # Local Variables: