Properly add the soh framework in all the places it needs to be. Left

the src/mca/soh/base/*.c files out of the default build because
they're uncompilable right now -- don't want to step on any of Ralph's
local changes.

This commit was SVN r3837.

autogen.sh

@@ -853,6 +853,7 @@ MCA_cofs_NO_CONFIGURE_SUBDIRS=""
 MCA_pcm_NO_CONFIGURE_SUBDIRS=""
 MCA_gpr_NO_CONFIGURE_SUBDIRS=""
 MCA_ns_NO_CONFIGURE_SUBDIRS=""
+MCA_soh_NO_CONFIGURE_SUBDIRS=""
 
 MCA_allocator_NO_CONFIGURE_SUBDIRS=""
 MCA_coll_NO_CONFIGURE_SUBDIRS=""

config/ompi_mca.m4

@@ -65,7 +65,7 @@ fi
 # The list of MCA types (it's fixed)
 
 AC_MSG_CHECKING([for MCA types])
-found_types="common allocator coll gpr io llm mpool ns one oob op pcm pcmclient pml ptl svc topo"
+found_types="common allocator coll gpr io llm mpool ns one oob op pcm pcmclient pml ptl soh svc topo"
 AC_MSG_RESULT([$found_types])
 
 # Get the list of all the non-configure MCA components that were found by
@@ -391,6 +391,11 @@ AC_SUBST(MCA_ptl_STATIC_SUBDIRS)
 AC_SUBST(MCA_ptl_DSO_SUBDIRS)
 AC_SUBST(MCA_ptl_STATIC_LTLIBS)
 
+AC_SUBST(MCA_soh_ALL_SUBDIRS)
+AC_SUBST(MCA_soh_STATIC_SUBDIRS)
+AC_SUBST(MCA_soh_DSO_SUBDIRS)
+AC_SUBST(MCA_soh_STATIC_LTLIBS)
+
 AC_SUBST(MCA_svc_ALL_SUBDIRS)
 AC_SUBST(MCA_svc_STATIC_SUBDIRS)
 AC_SUBST(MCA_svc_DSO_SUBDIRS)

configure.ac

@@ -1123,6 +1123,7 @@ AC_CONFIG_FILES([
     src/dynamic-mca/pcm/Makefile
     src/dynamic-mca/pcmclient/Makefile
     src/dynamic-mca/llm/Makefile
+    src/dynamic-mca/soh/Makefile
     src/dynamic-mca/svc/Makefile
 
     src/dynamic-mca/Makefile

src/Makefile.am

@@ -117,6 +117,7 @@ libmpi_la_LIBADD = \
         mca/pcmclient/base/libmca_pcmclient_base.la $(MCA_pcmclient_STATIC_LTLIBS) \
         mca/pml/base/libmca_pml_base.la $(MCA_pml_STATIC_LTLIBS) \
         mca/ptl/base/libmca_ptl_base.la $(MCA_ptl_STATIC_LTLIBS) \
+        mca/soh/base/libmca_soh_base.la $(MCA_soh_STATIC_LTLIBS) \
         mca/topo/base/libmca_topo_base.la $(MCA_topo_STATIC_LTLIBS) \
         mpi/c/libmpi_c.la $(c_mpi_lib) $(c_pmpi_lib) \
         $(f77_base_lib) $(f77_mpi_lib) $(f77_pmpi_lib) \

src/dynamic-mca/Makefile.am

@@ -29,5 +29,6 @@ SUBDIRS = \
 	pcmclient \
         pml \
         ptl \
+        soh \
         svc \
         topo

src/mca/Makefile.am

@@ -30,6 +30,7 @@ SUBDIRS = \
 	pcmclient \
         pml \
         ptl \
+        soh \
         svc \
         topo
 

src/mca/soh/base/Makefile.am

@@ -14,7 +14,7 @@
 
 include $(top_srcdir)/config/Makefile.options
 
-noinst_LTLIBRARIES = libmca_ns_base.la
+noinst_LTLIBRARIES = libmca_soh_base.la
 
 # For VPATH builds, have to specify where static-modules.h will be found
 
@@ -27,18 +27,19 @@ headers = \
 
 # Library
 
-libmca_ns_base_la_SOURCES = \
+libmca_soh_base_la_SOURCES = \
-        $(headers) \
+        $(headers)
-        ns_base_close.c \
+
-        ns_base_select.c \
+for_ralph_to_fix = \
-        ns_base_open.c \
+        soh_base_close.c \
-        ns_base_local_fns.c
+        soh_base_select.c \
+        soh_base_open.c
 
 
 # Conditionally install the header files
 
 if WANT_INSTALL_HEADERS
-ompidir = $(includedir)/openmpi/mca/ns/base
+ompidir = $(includedir)/openmpi/mca/soh/base
 ompi_HEADERS = $(headers)
 else
 ompidir = $(includedir)

src/tools/ompi_info/components.cc

@@ -38,6 +38,8 @@
 #include "mca/pml/base/base.h"
 #include "mca/ptl/ptl.h"
 #include "mca/ptl/base/base.h"
+#include "mca/soh/soh.h"
+#include "mca/soh/base/base.h"
 #include "mca/coll/coll.h"
 #include "mca/coll/base/base.h"
 #include "mca/ns/ns.h"
@@ -161,6 +163,12 @@ void ompi_info::open_components()
   mca_ptl_base_open();
   component_map["ptl"] = &mca_ptl_base_components_opened;
 
+#if 0
+  // JMS waiting for ralph to finish
+  mca_soh_base_open();
+  component_map["soh"] = &mca_soh_base_components_available;
+#endif
+
   mca_topo_base_open();
   component_map["topo"] = &mca_topo_base_components_opened;
 
@@ -177,6 +185,10 @@ void ompi_info::close_components()
     mca_oob_base_close();
     mca_ns_base_close();
     mca_gpr_base_close();
+#if 0
+    // JMS waiting for ralph to finish
+    mca_soh_base_close();
+#endif
     mca_coll_base_close();
     mca_pml_base_close();
     mca_ptl_base_close();