X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=build%2Fautoconf%2Flustre-build-linux.m4;h=43f711eb56cabc78bec986130f51163688250da4;hb=bbf352545f275c194f195f1a702e931412fbbe76;hp=9bef9e6fa2639699a474dc7b89a6f2b3e3e1fcd5;hpb=6d91ce2e218d015a751a4a0f3e721b525f561143;p=fs%2Flustre-release.git

diff --git a/build/autoconf/lustre-build-linux.m4 b/build/autoconf/lustre-build-linux.m4
index 9bef9e6..43f711e 100644
--- a/build/autoconf/lustre-build-linux.m4
+++ b/build/autoconf/lustre-build-linux.m4
@@ -26,11 +26,17 @@ if test $linux25 = "yes" ; then
 		[
 			AC_MSG_RESULT([no])
 		],[
-			AC_MSG_RESULT([yes])
 			makerule="_module_$makerule"
 			MODULE_TARGET="M"
+			LB_LINUX_TRY_MAKE([],[],
+				[$makerule LUSTRE_KERNEL_TEST=conftest.i],
+				[test -s build/conftest.i],
+				[
+					AC_MSG_RESULT([yes])
+				],[
+					AC_MSG_ERROR([unknown; check config.log for details])
+				])
 		])
-
 else
 	makerule="_dir_$PWD/build"
 fi
@@ -164,6 +170,7 @@ if grep rhconfig $LINUX_OBJ/include/linux/version.h >/dev/null ; then
 fi
 
 # this is needed before we can build modules
+LB_LINUX_UML
 LB_LINUX_VERSION
 
 # --- check that we can build modules at all
@@ -174,6 +181,7 @@ LB_LINUX_TRY_COMPILE([],[],[
 	AC_MSG_RESULT([no])
 	AC_MSG_WARN([Consult config.log for details.])
 	AC_MSG_WARN([If you are trying to build with a kernel-source rpm, consult build/README.kernel-source])
+	AC_MSG_ERROR([Kernel modules cannot be build.])
 ])
 
 LB_LINUX_RELEASE
@@ -275,13 +283,33 @@ AC_DEFUN([LB_LINUX_TRY_MAKE],
 [LB_LINUX_COMPILE_IFELSE([AC_LANG_PROGRAM([[$1]], [[$2]])], [$3], [$4], [$5], [$6])])
 
 #
+# LB_LINUX_CONFIG_BIG_STACK
+#
+# check for big stack patch
+#
+AC_DEFUN([LB_LINUX_CONFIG_BIG_STACK],
+[if test "x$ARCH_UM" = "x" -a "x$linux25" = "xno" ; then
+	case $target_cpu in
+		i?86 | x86_64)
+			LB_LINUX_CONFIG([STACK_SIZE_16KB],[],[
+				LB_LINUX_CONFIG([STACK_SIZE_32KB],[],[
+					LB_LINUX_CONFIG([STACK_SIZE_64KB],[],[
+						AC_MSG_ERROR([Lustre requires that Linux is configured with at least a 16KB stack.])
+					])
+				])
+			])
+			;;
+	esac
+fi
+])
+
+#
 # LB_PROG_LINUX
 #
 # linux tests
 #
 AC_DEFUN([LB_PROG_LINUX],
 [LB_LINUX_PATH
-LB_LINUX_UML
 
 LB_LINUX_CONFIG([MODULES],[],[
 	AC_MSG_ERROR([module support is required to build Lustre kernel modules.])
@@ -299,11 +327,24 @@ if test "x$ARCH_UM" = "x" ; then
 fi
 ])
 
-# Portals tests
-LP_PROG_LINUX
+LB_LINUX_CONFIG([KMOD],[],[
+	AC_MSG_WARN([])
+	AC_MSG_WARN([Kernel module loading support is highly recommended.])
+	AC_MSG_WARN([])
+])
+
+#LB_LINUX_CONFIG_BIG_STACK
+
+# LNet tests
+LN_PROG_LINUX
 
 # Lustre tests
 LC_PROG_LINUX
+
+# Portals tests
+if test "$PORTALS" ; then
+	LP_PROG_LINUX
+fi
 ])
 
 #
@@ -312,6 +353,5 @@ LC_PROG_LINUX
 # AM_CONDITIONALS for linux
 #
 AC_DEFUN([LB_LINUX_CONDITIONALS],
-[AM_CONDITIONAL(INKERNEL, test x$enable_inkernel = xyes)
-AM_CONDITIONAL(LINUX25, test x$linux25 = xyes)
+[AM_CONDITIONAL(LINUX25, test x$linux25 = xyes)
 ])