From: jacob <jacob>
Date: Thu, 19 May 2005 20:33:32 +0000 (+0000)
Subject: b=6336
X-Git-Tag: v1_7_100~1309
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;ds=sidebyside;h=c7901e599233a86613714346e60f5428dc8ac62d;p=fs%2Flustre-release.git

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
--- 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
+
+	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=""