Merge pull request #832 from jsquyres/pr/fortran-sizeof-fix

fortran sizeof fixes

config/ompi_setup_mpi_fortran.m4

@@ -309,7 +309,8 @@ AC_DEFUN([OMPI_SETUP_MPI_FORTRAN],[
 
     # We need INTERFACE, ISO_FORTRAN_ENV, and STORAGE_SIZE() support
     # to build MPI_SIZEOF support
-    AS_IF([test $OMPI_FORTRAN_HAVE_INTERFACE -eq 1 && \
+    AS_IF([test $ompi_fortran_happy -eq 1 && \
+           test $OMPI_FORTRAN_HAVE_INTERFACE -eq 1 && \
            test $OMPI_FORTRAN_HAVE_ISO_FORTRAN_ENV -eq 1 && \
            test $OMPI_FORTRAN_HAVE_STORAGE_SIZE -eq 1],
           [OMPI_FORTRAN_BUILD_SIZEOF=1],

ompi/mpi/fortran/mpif-h/profile/Makefile.am

@@ -45,8 +45,6 @@ AM_CPPFLAGS = -DOMPI_PROFILE_LAYER=1 -DOMPI_COMPILING_FORTRAN_WRAPPERS=1
 noinst_LTLIBRARIES =
 if BUILD_PMPI_FORTRAN_MPIFH_BINDINGS_LAYER
 noinst_LTLIBRARIES += libmpi_mpifh_pmpi.la
-else
-noinst_LTLIBRARIES +=
 endif
 
 headers = \
@@ -439,12 +437,12 @@ CLEANFILES += psizeof_f.f90
 # Build the MPI_SIZEOF code in a separate convenience library (see
 # lengthy comment in ompi/mpi/fortran/mpif-h/Makefile.am for an
 # explanation why).
-#if BUILD_FORTRAN_SIZEOF
+if BUILD_FORTRAN_SIZEOF
 noinst_LTLIBRARIES += libmpi_mpifh_psizeof.la
 # Do not dist this file; it is generated
 nodist_libmpi_mpifh_psizeof_la_SOURCES = psizeof_f.f90
 libmpi_mpifh_pmpi_la_LIBADD += libmpi_mpifh_psizeof.la
-#endif
+endif
 
 sizeof_pl=$(top_srcdir)/ompi/mpi/fortran/base/gen-mpi-sizeof.pl