From: scjody <scjody>
Date: Tue, 12 Jun 2007 23:39:31 +0000 (+0000)
Subject: Branch b1_6
X-Git-Tag: v1_7_100~68
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=0e0c5e3779226f4ec115254810274b075fbf0124;p=fs%2Flustre-release.git

Branch b1_6

Add --disable-modules to fix LTS build failure.

b=12068
---

diff --git a/ldiskfs/configure.ac b/ldiskfs/configure.ac
index 7ae8f16..c63a847 100644
--- a/ldiskfs/configure.ac
+++ b/ldiskfs/configure.ac
@@ -15,7 +15,20 @@ AC_PROG_CC
 LB_CANONICAL_SYSTEM
 LB_INCLUDE_RULES
 LB_PROG_CC
-LB_PROG_LINUX
+
+AC_MSG_CHECKING([whether to build kernel modules])
+AC_ARG_ENABLE([modules],
+	AC_HELP_STRING([--disable-modules],
+			[disable building of Lustre kernel modules]),
+	[],[
+		enable_modules='yes'
+	])
+AC_MSG_RESULT([$enable_modules])
+
+if test x$enable_modules = xyes ; then
+	LB_PROG_LINUX
+fi
+
 LB_CONFIG_HEADERS
 
 # These allow Lustre Makefiles and autoMakefiles to be used unchanged.