mpifort: only -lompi_mpifh if Fortran bindings built

We will install mpifort (and friends) if we find a Fortran compiler,
even if we're not building the Fortran MPI bindings (e.g., if gfortran
is available, but the user specified --disable-mpi-fortran).

NOTE: the user can explicitly disable installing mpifort (and friends)
-- even if there is a Fortran compiler available -- via:

    ./configure FC=no ...

Signed-off-by: Jeff Squyres <jsquyres@cisco.com>

Author: jsquyres

config/ompi_setup_mpi_fortran.m4

@@ -649,6 +649,18 @@ end type test_mpi_handle],
                        [$OMPI_FORTRAN_HAVE_STORAGE_SIZE],
                        [Whether the compiler supports STORAGE_SIZE on relevant types])
 
+    # This token is used in the mpifort wrapper compiler data file.
+    # If we are building the Fortran bindings, then include
+    # -lompi_mpifh in the link line.  If we're not building the
+    # Fortran bindings, then do not include that token in the link
+    # line (because we'll still install mpifort to link Fortran
+    # applications with the C bindings, even if the Fortran MPI
+    # bindings are not being built).
+    AS_IF([test $OMPI_BUILD_FORTRAN_BINDINGS -gt $OMPI_FORTRAN_NO_BINDINGS],
+          [OMPI_FORTRAN_MPIFH_LINK=-l${OMPI_LIBMPI_NAME}_mpifh],
+          [OMPI_FORTRAN_MPIFH_LINK=])
+    AC_SUBST(OMPI_FORTRAN_MPIFH_LINK)
+
     # This conditional is used to determine whether we compile the
     # various .f90 files that contain MPI_SIZEOF implementations.
     AM_CONDITIONAL([BUILD_FORTRAN_SIZEOF],

ompi/tools/wrappers/mpifort-wrapper-data.txt.in

@@ -19,8 +19,8 @@ linker_flags=@OMPI_WRAPPER_EXTRA_FC_LDFLAGS@
 # intentionally only link in the MPI libraries (OPAL, etc. are
 # pulled in implicitly) because we intend MPI applications to only use
 # the MPI API.
-libs=@OMPI_FORTRAN_USEMPIF08_LIB@ @OMPI_FORTRAN_USEMPI_LIB@ -l@OMPI_LIBMPI_NAME@_mpifh -l@OMPI_LIBMPI_NAME@
-libs_static=@OMPI_FORTRAN_USEMPIF08_LIB@ @OMPI_FORTRAN_USEMPI_LIB@ -l@OMPI_LIBMPI_NAME@_mpifh -l@OMPI_LIBMPI_NAME@ -l@OPAL_LIB_PREFIX@open-pal  @OMPI_WRAPPER_EXTRA_LIBS@
+libs=@OMPI_FORTRAN_USEMPIF08_LIB@ @OMPI_FORTRAN_USEMPI_LIB@ @OMPI_FORTRAN_MPIFH_LINK@ -l@OMPI_LIBMPI_NAME@
+libs_static=@OMPI_FORTRAN_USEMPIF08_LIB@ @OMPI_FORTRAN_USEMPI_LIB@ @OMPI_FORTRAN_MPIFH_LINK@ -l@OMPI_LIBMPI_NAME@ -l@OPAL_LIB_PREFIX@open-pal  @OMPI_WRAPPER_EXTRA_LIBS@
 dyn_lib_file=lib@OMPI_LIBMPI_NAME@.@OPAL_DYN_LIB_SUFFIX@
 static_lib_file=lib@OMPI_LIBMPI_NAME@.a
 required_file=@OMPI_WRAPPER_FORTRAN_REQUIRED_FILE@

ompi/tools/wrappers/ompi-fort.pc.in

@@ -16,6 +16,6 @@ pkgincludedir=@opalincludedir@
 # static linking (they're pulled in by libopen-rte.so's implicit
 # dependencies), so only list these in Libs.private.
 #
-Libs: -L${libdir} @OMPI_PKG_CONFIG_LDFLAGS@ @OMPI_FORTRAN_USEMPIF08_LIB@ @OMPI_FORTRAN_USEMPI_LIB@ -l@OMPI_LIBMPI_NAME@_mpifh -l@OMPI_LIBMPI_NAME@
+Libs: -L${libdir} @OMPI_PKG_CONFIG_LDFLAGS@ @OMPI_FORTRAN_USEMPIF08_LIB@ @OMPI_FORTRAN_USEMPI_LIB@ @OMPI_FORTRAN_MPIFH_LINK@ -l@OMPI_LIBMPI_NAME@
 Libs.private: -lopen-rte -lopen-pal @OMPI_WRAPPER_EXTRA_LIBS@
 Cflags: -I${includedir} @OMPI_WRAPPER_EXTRA_CPPFLAGS@ @OMPI_WRAPPER_EXTRA_FCFLAGS@