* 5602 fix improves checks that NID is set correctly and causes incorrect

[fs/lustre-release.git] / lnet / autoconf / lustre-lnet.m4

diff --git a/lnet/autoconf/lustre-lnet.m4 b/lnet/autoconf/lustre-lnet.m4
index 2c20b92..06bdf39 100644 (file)
--- a/lnet/autoconf/lustre-lnet.m4
+++ b/lnet/autoconf/lustre-lnet.m4
@@ -151,7 +151,8 @@ AC_ARG_WITH([openib],
 if test $ENABLEOPENIB -eq 0; then
        AC_MSG_RESULT([disabled])
 elif test ! \( -f ${OPENIBPATH}/include/ts_ib_core.h -a \
-               -f ${OPENIBPATH}/include/ts_ib_sa_client.h \); then
+               -f ${OPENIBPATH}/include/ts_ib_cm.h -a\
+              -f ${OPENIBPATH}/include/ts_ib_sa_client.h \); then
        AC_MSG_RESULT([no])
        case $ENABLEOPENIB in
        1) ;;
@@ -170,10 +171,16 @@ else
        EXTRA_KCFLAGS="$EXTRA_KCFLAGS $OPENIBCPPFLAGS"
        LB_LINUX_TRY_COMPILE([
                #include <ts_ib_core.h>
-               #include <ts_ib_sa_client.h>
+               #include <ts_ib_cm.h>
+               #include <ts_ib_sa_client.h>
        ],[
-                       struct ib_device_properties props;
-               struct ib_common_attrib_services svc;
+                       struct ib_device_properties dev_props;
+               struct ib_cm_active_param   cm_active_params;
+               tTS_IB_CLIENT_QUERY_TID     tid;
+               int                         enum1 = IB_QP_ATTRIBUTE_STATE;
+               int                         enum2 = IB_ACCESS_LOCAL_WRITE;
+               int                         enum3 = IB_CQ_CALLBACK_INTERRUPT;
+               int                         enum4 = IB_CQ_PROVIDER_REARM;
                return 0;
        ],[
                AC_MSG_RESULT([yes])
@@ -271,7 +278,7 @@ AC_DEFUN([LP_CONFIG_RANAL],
 [#### Rapid Array
 AC_MSG_CHECKING([if RapidArray kernel headers are present])
 # placeholder
-RACPPFLAGS="-I/tmp"
+RACPPFLAGS="-I${LINUX}/drivers/xd1/include"
 EXTRA_KCFLAGS_save="$EXTRA_KCFLAGS"
 EXTRA_KCFLAGS="$EXTRA_KCFLAGS $RACPPFLAGS"
 LB_LINUX_TRY_COMPILE([