b=6336

disable qswnal if neither CONFIG_QSNET nor CONFIG_QSNET_MODULES is
defined (ie on ppc64).

diff --git a/lnet/autoconf/lustre-lnet.m4 b/lnet/autoconf/lustre-lnet.m4
index c85d8c9..ba0fffc 100644 (file)
--- a/lnet/autoconf/lustre-lnet.m4
+++ b/lnet/autoconf/lustre-lnet.m4
@@ -107,6 +107,14 @@ if test -d $QSNET/drivers/net/qsnet ; then
                        QSWCPPFLAGS="-I$QSNET/include/linux"
                fi
        fi
                        QSWCPPFLAGS="-I$QSNET/include/linux"
                fi
        fi

+
+       LB_LINUX_CONFIG([QSNET],[],[
+               LB_LINUX_CONFIG([QSNET_MODULE],[],[
+                       AC_MSG_WARN([QSNET is not enabled in this kernel; not building qswnal.])
+                       QSWNAL=""
+                       QSWCPPFLAGS=""
+               ])
+       ])

 else
        AC_MSG_RESULT([no])
        QSWNAL=""
 else
        AC_MSG_RESULT([no])
        QSWNAL=""