Always build MPI1 compat functions

This patch is similar to 4aa91e1, applied to v4.x, to re-enable
building the removed MPI-1 functions and maintain C/mpi-f.h ABI
compliance from 3.0.0 through master.

Signed-off-by: Brian Barrett <[email protected]>

Author: bwbarrett

ompi/include/mpi.h.in

@@ -3043,7 +3043,7 @@ OMPI_DECLSPEC int OMPI_C_MPI_NULL_DELETE_FN( MPI_Comm comm, int comm_keyval,
                                              void* extra_state )
             __mpi_interface_deprecated__("MPI_NULL_DELETE_FN was deprecated in MPI-2.0; use MPI_COMM_NULL_DELETE_FN instead.");
 
-#if !OMPI_OMIT_MPI1_COMPAT_DECLS
+#if (!OMPI_OMIT_MPI1_COMPAT_DECLS || OMPI_BUILDING)
 /*
  * Removed typedefs.  These typedefs are only available if Open MPI
  * was configured with --enable-mpi1-compatibility.

ompi/mpi/c/Makefile.am

@@ -484,7 +484,10 @@ interface_profile_sources = \
         win_unlock_all.c \
         win_wait.c
 
-if OMPI_ENABLE_MPI1_COMPAT
+# The following functions were removed from the MPI standard, but are
+# retained for ABI compliance reasons.  They are listed independently
+# of the other MPI functions in case we one day change behavior around
+# ABI compliance.
 interface_profile_sources += \
         address.c \
         errhandler_create.c \
@@ -496,7 +499,6 @@ interface_profile_sources += \
         type_lb.c \
         type_struct.c \
         type_ub.c
-endif
 
 libmpi_c_profile_la_SOURCES = $(interface_profile_sources)
 libmpi_c_profile_la_CPPFLAGS = -DOMPI_BUILD_MPI_PROFILING=1

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

@@ -531,8 +531,10 @@ lib@OMPI_LIBMPI_NAME@_mpifh_la_SOURCES += \
         win_flush_local_f.c \
         win_flush_local_all_f.c
 
-
-if OMPI_ENABLE_MPI1_COMPAT
+# The following functions were removed from the MPI standard, but are
+# retained for ABI compliance reasons.  They are listed independently
+# of the other MPI functions in case we one day change behavior around
+# ABI compliance.
 lib@OMPI_LIBMPI_NAME@_mpifh_la_SOURCES += \
         address_f.c \
         errhandler_create_f.c \
@@ -545,7 +547,6 @@ lib@OMPI_LIBMPI_NAME@_mpifh_la_SOURCES += \
         type_struct_f.c \
         type_ub_f.c
 endif
-endif
 
 #
 # Conditionally install the header files

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

@@ -443,7 +443,10 @@ linked_files = \
         pwin_flush_local_f.c \
         pwin_flush_local_all_f.c
 
-if OMPI_ENABLE_MPI1_COMPAT
+# The following functions were removed from the MPI standard, but are
+# retained for ABI compliance reasons.  They are listed independently
+# of the other MPI functions in case we one day change behavior around
+# ABI compliance.
 linked_files += \
         paddress_f.c \
         perrhandler_create_f.c \
@@ -455,7 +458,6 @@ linked_files += \
         ptype_lb_f.c \
         ptype_struct_f.c \
         ptype_ub_f.c
-endif
 
 #
 # Sym link in the sources from the real MPI directory