From 5df64827c8af726345f0e3c42d99753960219402 Mon Sep 17 00:00:00 2001
From: George Bosilca <bosilca@icl.utk.edu>
Date: Tue, 6 Sep 2005 03:11:42 +0000
Subject: [PATCH] The MX BTL and PTL does not require the same version of the
 MX library. The BTL accept the default version while the PTL require a
 patched version (iwith the mx_register_match_callback function).

This commit was SVN r7188.
---
 ompi/mca/ptl/mx/configure.m4 | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/ompi/mca/ptl/mx/configure.m4 b/ompi/mca/ptl/mx/configure.m4
index 562bf7ffbc..ed5ee56612 100644
--- a/ompi/mca/ptl/mx/configure.m4
+++ b/ompi/mca/ptl/mx/configure.m4
@@ -24,6 +24,34 @@ AC_DEFUN([MCA_ptl_mx_CONFIG],[
                      [ptl_mx_happy="yes"],
                      [ptl_mx_happy="no"])
 
+    if [ test "$ptl_mx_happy" = "yes" ]; then
+        #
+        # Save a copy of the flags
+        #
+        ompi_check_mx_callback_CPPFLAGS="$CPPFLAGS"
+        ompi_check_mx_callback_LDFLAGS="$LDFLAGS"
+        ompi_check_mx_callback_LIBS="$LIBS"
+        #
+        # Set the value allowing MX compilation
+        #
+        CPPFLAGS="$CPPFLAGS $ptl_mx_CPPFLAGS"
+        LDFLAGS="$LDFLAGS $ptl_mx_LDFLAGS"
+        LIBS="$LIBS $ptl_mx_LIBS"
+
+        AC_MSG_CHECKING([for a MX version with mx_register_match_callback])
+        AC_TRY_COMPILE([#include <myriexpress.h>],
+             [mx_register_match_callback(0, 0, 0);],
+             [ptl_mx_happy="yes"],
+             [ptl_mx_happy="no"])
+        AC_MSG_RESULT([$ptl_mx_happy])
+        #
+        # Restore the original flags
+        #
+        CPPFLAGS="$ompi_check_mx_callback_CPPFLAGS"
+        LDFLAGS="$ompi_check_mx_callback_LDFLAGS"
+        LIBS="$ompi_check_mx_callback_LIBS"
+    fi
+
     AS_IF([test "$ptl_mx_happy" = "yes"],
           [ptl_mx_WRAPPER_EXTRA_LDFLAGS="$ptl_mx_LDFLAGS"
            ptl_mx_WRAPPER_EXTRA_LIBS="$ptl_mx_LIBS"