o Forgot to put get_f_mpi_in_place where it won't get compiled if no …

…PMPI

configure.ac

@@ -6,7 +6,7 @@
 AC_PREREQ([2.59])
 
 # Initialize autoconf.
-AC_INIT([GPTL], [8.1.0], [[email protected]])
+AC_INIT([GPTL], [8.1.1], [[email protected]])
 
 # Find out about the host we're building on.
 AC_CANONICAL_HOST

fortran/src/Makefile.am

@@ -16,7 +16,7 @@ lib_LTLIBRARIES = libgptlf.la
 libgptlf_la_LDFLAGS = -version-info 0:0:0
 
 # These are the source files.
-libgptlf_la_SOURCES = gptlf.F90 process_namelist.F90 get_f_mpi_in_place.F90 f_wrappers.c
+libgptlf_la_SOURCES = gptlf.F90 process_namelist.F90 f_wrappers.c
 
 if HAVE_PAPI
 libgptlf_la_FCFLAGS += -DHAVE_PAPI
@@ -25,15 +25,15 @@ endif
 if HAVE_LIBMPI
 libgptlf_la_FCFLAGS += -DHAVE_LIBMPI
 if ENABLE_PMPI
-libgptlf_la_SOURCES += f_wrappers_pmpi.c
+libgptlf_la_SOURCES += f_wrappers_pmpi.c get_f_mpi_in_place.F90
 endif
 endif
 
 # Enforce serial build here or bad things happen due to .mod file issues
 .NOTPARALLEL:
 
 # Install these in the include directory.
-include_HEADERS = gptl.mod
+include_HEADERS = gptl.mod 
 
 # Remove module files
 CLEANFILES = *.$(FC_MODEXT)

fortran/tests/Makefile.am

@@ -25,6 +25,9 @@ endif
 
 MODFILE = ${top_builddir}/fortran/src/gptl.$(FC_MODEXT)
 
+# Enforce serial build here or bad things happen due to .mod file issues
+.NOTPARALLEL:
+
 # These programs will be built but not installed.
 noinst_PROGRAMS = overhead handle utrtest
 
@@ -88,7 +91,7 @@ if ENABLE_PMPI
 check_PROGRAMS += pmpi inplace
 TESTS          += run_par_pmpi_test.sh run_par_inplace_test.sh
 pmpi_SOURCES = pmpi.F90 ${MODFILE}
-inplace_SOURCES = inplace_subs.F90 inplace.F90 inplace_subs.mod ${MODFILE}
+inplace_SOURCES = inplace_subs.F90 inplace.F90 ${MODFILE}
 endif
 endif