* Fix up some direct-calling issues for the PML/MTL

This commit was SVN r10676.

ompi/mca/mtl/mtl_direct_call.h.in

@@ -10,11 +10,11 @@
  */
 
 
-#ifndef MCA_PML_DIRECT_CALL_H_
-#define MCA_PML_DIRECT_CALL_H_
+#ifndef MCA_MTL_DIRECT_CALL_H_
+#define MCA_MTL_DIRECT_CALL_H_
 
-#if MCA_pml_DIRECT_CALL
-#include @MCA_pml_DIRECT_CALL_HEADER@
+#if MCA_mtl_DIRECT_CALL
+#include @MCA_mtl_DIRECT_CALL_HEADER@
 #endif
 
 #endif

ompi/mca/mtl/mx/Makefile.am

@@ -18,6 +18,7 @@
 
 # Use the top-level Makefile.options
 
+EXTRA_DIST = post_configure.sh
 
 
 AM_CPPFLAGS = $(mtl_mx_CPPFLAGS)

ompi/mca/mtl/mx/post_configure.sh

@@ -0,0 +1 @@
+DIRECT_CALL_HEADER="ompi/mca/mtl/mx/mtl_mx.h"

ompi/mca/pml/cm/Makefile.am

@@ -12,6 +12,8 @@
 # mca_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la
 # (for static builds).
 
+EXTRA_DIST = post_configure.sh
+
 if OMPI_BUILD_pml_cm_DSO
 component_noinst =
 component_install = mca_pml_cm.la

ompi/mca/pml/cm/pml_cm.h

@@ -25,6 +25,8 @@
 extern "C" {
 #endif
 
+struct mca_mtl_request_t;
+
 struct ompi_pml_cm_t {
     mca_pml_base_module_t super;
     /** free list of send request structures */
@@ -35,9 +37,6 @@ struct ompi_pml_cm_t {
 typedef struct ompi_pml_cm_t ompi_pml_cm_t;
 extern ompi_pml_cm_t ompi_pml_cm;
 
-extern mca_pml_base_component_1_0_0_t mca_pml_cm_component;
-
-
 /* PML interface functions */
 extern int mca_pml_cm_add_procs(struct ompi_proc_t **procs, size_t nprocs);
 extern int mca_pml_cm_del_procs(struct ompi_proc_t **procs, size_t nprocs);

ompi/mca/pml/cm/post_configure.sh

@@ -0,0 +1 @@
+DIRECT_CALL_HEADER="ompi/mca/pml/cm/pml_cm.h"