From 59befefa30b4e0e3742a8b5c40a1a31be1a642a4 Mon Sep 17 00:00:00 2001
From: Jeff Squyres <jsquyres@cisco.com>
Date: Tue, 15 Jun 2004 23:56:18 +0000
Subject: [PATCH] Enable compiling MCA components as dynamic modules

This commit was SVN r1292.
---
 config/ompi_mca.m4 |  4 +---
 configure.ac       | 17 +++++++++++++++++
 src/Makefile.am    |  1 +
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/config/ompi_mca.m4 b/config/ompi_mca.m4
index 2640b3aeaf..fc1fe9df1e 100644
--- a/config/ompi_mca.m4
+++ b/config/ompi_mca.m4
@@ -338,10 +338,8 @@ if test "$HAPPY" = "1"; then
 	"$LOADABLE_MODULE_all" = "1"; then
 	compile_mode="dynamic"
 	echo $m >> $outfile.dynamic
-	ls -l "src/mca/dynamic/$type/$m"
 	$LN_S "$OMPI_TOP_BUILDDIR/src/mca/$type/$m" \
-	    "src/mca/dynamic/$type/$m"
-	ls -l "src/mca/dynamic/$type/$m"
+	    "src/dynamic-mca/$type/$m"
     else
 	static_ltlibs="$m/libmca_${type}_${m}.la $static_ltlibs"
 	echo "extern const mca_base_module_t mca_${type}_${m}_module;" >> $outfile.extern
diff --git a/configure.ac b/configure.ac
index 5dedc7b0f9..38a6594e2c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -843,6 +843,23 @@ AC_CONFIG_FILES([
     src/mca/topo/base/Makefile
     src/mca/gpr/Makefile
 
+    src/dynamic-mca/common/Makefile
+
+    src/dynamic-mca/oob/Makefile
+    src/dynamic-mca/pcm/Makefile
+    src/dynamic-mca/registry/Makefile
+
+    src/dynamic-mca/Makefile
+    src/dynamic-mca/allocator/Makefile
+    src/dynamic-mca/coll/Makefile
+    src/dynamic-mca/io/Makefile
+    src/dynamic-mca/mpool/Makefile
+    src/dynamic-mca/one/Makefile
+    src/dynamic-mca/pml/Makefile
+    src/dynamic-mca/ptl/Makefile
+    src/dynamic-mca/topo/Makefile
+    src/dynamic-mca/gpr/Makefile
+
     src/mpi/Makefile
     src/mpi/c/Makefile
     src/mpi/c/profile/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 953224e11f..2ed610ace6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -29,6 +29,7 @@ SUBDIRS = \
         util \
         win \
         . \
+        dynamic-mca \
         tools
 # JMS Temporary hack to make "make dist" function properly.  Directories
 # mentioned here will eventually move into SUBDIRS.