[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.1rc2-77-g5711e32

[mysql vizuser]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "MPICH primary repository".

The branch, master has been updated
       via  5711e32d3597f48bc57d092d30b40950134fc40c (commit)
      from  1c70aae3f0ee9cafb88e5e640f04f60fe257dfce (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.mpich.org/mpich.git/commitdiff/5711e32d3597f48bc57d092d30b40950134fc40c

commit 5711e32d3597f48bc57d092d30b40950134fc40c
Author: Masamichi Takagi <masamichi.takagi at gmail.com>
Date:   Mon Dec 9 18:57:24 2013 +0900

    Auto-detect IB libraries for the DCFA netmod
    
    The configure auto-detects IB libraries in the following order.
    1. If libdcfa.so is found, it's selected automatically.
    2. If libibverbs.so is found, it's selected automatically.
    Note that the search path can be specified by using
    --with-dcfa=<path> option.
    
    Signed-off-by: Pavan Balaji <balaji at mcs.anl.gov>

diff --git a/src/mpid/ch3/channels/nemesis/netmod/dcfa/subconfigure.m4 b/src/mpid/ch3/channels/nemesis/netmod/dcfa/subconfigure.m4
index 9274887..b7a5d08 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/dcfa/subconfigure.m4
+++ b/src/mpid/ch3/channels/nemesis/netmod/dcfa/subconfigure.m4
@@ -17,14 +17,17 @@ AC_DEFUN([PAC_SUBCFG_BODY_]PAC_SUBCFG_AUTO_SUFFIX,[
 AM_COND_IF([BUILD_NEMESIS_NETMOD_DCFA],[
     AC_MSG_NOTICE([RUNNING CONFIGURE FOR ch3:nemesis:dcfa])
 
-    AC_ARG_ENABLE(dcfa, [--enable-dcfa - use DCFA library instead of IB Verbs library for MPICH/DCFA/McKernel/MIC],,enable_dcfa=no)
-    if test "$enable_dcfa" = "yes" ; then
-        AC_MSG_NOTICE([--enable-dcfa detected])
-        PAC_CHECK_HEADER_LIB_FATAL(dcfa, dcfa.h, dcfa, ibv_open_device)
-# see confdb/aclocal_libs.m4
-    else   
-        PAC_CHECK_HEADER_LIB_FATAL(ib, infiniband/verbs.h, ibverbs, ibv_open_device)
-    fi                 
+    PAC_CHECK_HEADER_LIB(dcfa.h,dcfa,ibv_open_device,dcfa_found=yes,dcfa_found=no)
+    if test "${dcfa_found}" = "yes" ; then
+        AC_MSG_NOTICE([libdcfa is going to be linked.])
+    else
+        PAC_CHECK_HEADER_LIB([infiniband/verbs.h],ibverbs,ibv_open_device,ibverbs_found=yes,ibverbs_found=no)
+        if test "${ibverbs_found}" = "yes" ; then
+            AC_MSG_NOTICE([libibverbs is going to be linked.])
+        else
+            AC_MSG_ERROR([Internal error: neither ibverbs nor dcfa was found])
+        fi
+    fi
 
     AC_DEFINE([MPID_NEM_DCFA_VERSION], ["0.9.0"], [Version of netmod/DCFA])
     AC_DEFINE([MPID_NEM_DCFA_RELEASE_DATE], ["2013-11-18"], [Release date of netmod/DCFA])

-----------------------------------------------------------------------

Summary of changes:
 .../channels/nemesis/netmod/dcfa/subconfigure.m4   |   19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
MPICH primary repository