fix problems with makefiles and some symbols

being doubly defined in the profile/non-profile abi mpi libs.

Signed-off-by: Howard Pritchard <[email protected]>

Author: hppritcha

ompi/mpi/c/Makefile_abi.include

@@ -39,13 +39,13 @@ endif
 BUILT_SOURCES = abi.h standard_abi/mpi.h
 
 libmpi_c_abi_la_SOURCES = \
-        attr_fn.c
+        attr_fn.c \
+        ompi_isendrecv.c \
+        ompi_sendrecv.c
 
 extra_abi_fns = \
         abi_get_info.c \
         abi_get_version.c \
-        ompi_isendrecv.c \
-        ompi_sendrecv.c \
         pcontrol.c \
         wtick.c
 

ompi/mpi/c/abi_get_version.c

@@ -21,6 +21,13 @@
 #include "ompi/mpi/c/abi.h"
 #endif
 
+#if OMPI_BUILD_MPI_PROFILING
+#if OPAL_HAVE_WEAK_SYMBOLS
+#pragma weak MPI_Abi_get_version = PMPI_Abi_get_version
+#endif
+#define MPI_Abi_get_version PMPI_Abi_get_version
+#endif
+
 int MPI_Abi_get_version(int *abi_major, int *abi_minor)
 {
     /* 0.1 */