diff --git a/ompi/mca/btl/mx/.ompi_ignore b/ompi/mca/btl/mx/.ompi_ignore
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/ompi/mca/btl/mx/Makefile.am b/ompi/mca/btl/mx/Makefile.am
index 0b20d4e53e..77daf1276d 100644
--- a/ompi/mca/btl/mx/Makefile.am
+++ b/ompi/mca/btl/mx/Makefile.am
@@ -18,38 +18,30 @@
 
 include $(top_ompi_srcdir)/config/Makefile.options
 
-sources = \
-    btl_mx.c \
-    btl_mx.h \
-    btl_mx_component.c \
-    btl_mx_endpoint.c \
-    btl_mx_endpoint.h \
-    btl_mx_frag.c \
-    btl_mx_frag.h \
-    btl_mx_proc.c \
-    btl_mx_proc.h
+AM_CPPFLAGS = $(btl_mx_CPPFLAGS)
+
+btl_mx_sources = btl_mx.c btl_mx.h btl_mx_component.c btl_mx_endpoint.c \
+    btl_mx_endpoint.h btl_mx_frag.c btl_mx_frag.h btl_mx_proc.c btl_mx_proc.h
      
 # Make the output library in this directory, and name it either
 # mca_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la
 # (for static builds).
 
 if OMPI_BUILD_btl_mx_DSO
-lib =
-lib_sources =
-component = mca_btl_mx.la
-component_sources = $(sources)
+component_noinst =
+component_install = mca_btl_mx.la
 else
-lib = libmca_btl_mx.la
-lib_sources = $(sources)
-component =
-component_sources =
+component_noinst = libmca_btl_mx.la
+component_install =
 endif
 
 mcacomponentdir = $(libdir)/openmpi
-mcacomponent_LTLIBRARIES = $(component)
-mca_btl_mx_la_SOURCES = $(component_sources)
-mca_btl_mx_la_LDFLAGS = -module -avoid-version
+mcacomponent_LTLIBRARIES = $(component_install)
+mca_btl_mx_la_SOURCES = $(btl_mx_sources)
+mca_btl_mx_la_LIBADD = $(btl_mx_LIBX)
+mca_btl_mx_la_LDFLAGS = -module -avoid-version $(btl_mx_LDFLAGS)
 
-noinst_LTLIBRARIES = $(lib)
-libmca_btl_mx_la_SOURCES = $(lib_sources)
-libmca_btl_mx_la_LDFLAGS = -module -avoid-version
+noinst_LTLIBRARIES = $(component_noinst)
+libmca_btl_mx_la_SOURCES = $(btl_mx_sources)
+libmca_btl_mx_la_LIBADD = $(btl_mx_LIBS)
+libmca_btl_mx_la_LDFLAGS = -module -avoid-version $(btl_mx_LDFLAGS)
diff --git a/ompi/mca/btl/mx/configure.m4 b/ompi/mca/btl/mx/configure.m4
new file mode 100644
index 0000000000..29c35dfe5a
--- /dev/null
+++ b/ompi/mca/btl/mx/configure.m4
@@ -0,0 +1,39 @@
+# -*- shell-script -*-
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University.
+#                         All rights reserved.
+# Copyright (c) 2004-2005 The Trustees of the University of Tennessee.
+#                         All rights reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+
+# MCA_btl_mx_CONFIG([action-if-can-compile],
+#                      [action-if-cant-compile])
+# ------------------------------------------------
+AC_DEFUN([MCA_btl_mx_CONFIG],[
+    OMPI_CHECK_MX([btl_mx],
+                     [btl_mx_happy="yes"],
+                     [btl_mx_happy="no"])
+
+    AS_IF([test "$btl_mx_happy" = "yes"],
+          [btl_mx_WRAPPER_EXTRA_LDFLAGS="$btl_mx_LDFLAGS"
+           btl_mx_WRAPPER_EXTRA_LIBS="$btl_mx_LIBS"
+           $1],
+          [$2])
+
+    # substitute in the things needed to build mx
+    AC_SUBST([btl_mx_CFLAGS])
+    AC_SUBST([btl_mx_CPPFLAGS])
+    AC_SUBST([btl_mx_LDFLAGS])
+    AC_SUBST([btl_mx_LIBS])
+])dnl
+
diff --git a/ompi/mca/btl/mx/configure.params b/ompi/mca/btl/mx/configure.params
index 9fa97c4e80..508cef53ac 100644
--- a/ompi/mca/btl/mx/configure.params
+++ b/ompi/mca/btl/mx/configure.params
@@ -18,5 +18,4 @@
 # Specific to this module
 
 PARAM_INIT_FILE=btl_mx.c
-PARAM_CONFIG_HEADER_FILE="mx_config.h"
 PARAM_CONFIG_FILES="Makefile"