X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=build%2Fautoconf%2Flustre-build-linux.m4;h=b1262e26afefcb38058757eb13358b844367aea9;hb=abacb84cb0c3800716a6f00b7f577b0f149cf415;hp=c6a78de3b6e31301fbf68bb2011b8b02b30fda2b;hpb=573e001be52f3e60c29c0a8bf661c47038872984;p=fs%2Flustre-release.git

diff --git a/build/autoconf/lustre-build-linux.m4 b/build/autoconf/lustre-build-linux.m4
index c6a78de..b1262e2 100644
--- a/build/autoconf/lustre-build-linux.m4
+++ b/build/autoconf/lustre-build-linux.m4
@@ -110,6 +110,10 @@ AC_ARG_WITH([linux],
 AC_MSG_RESULT([$LINUX])
 AC_SUBST(LINUX)
 
+# -------- check for linux --------
+LB_CHECK_FILE([$LINUX],[],
+	[AC_MSG_ERROR([Kernel source $LINUX could not be found.])])
+
 # -------- linux objects (for 2.6) --
 AC_MSG_CHECKING([for Linux objects dir])
 AC_ARG_WITH([linux-obj],
@@ -120,7 +124,7 @@ AC_ARG_WITH([linux-obj],
 AC_MSG_RESULT([$LINUX_OBJ])
 AC_SUBST(LINUX_OBJ)
 
-# -------- check for .confg --------
+# -------- check for .config --------
 AC_ARG_WITH([linux-config],
 	[AC_HELP_STRING([--with-linux-config=path],
 			[set path to Linux .conf (default=$LINUX_OBJ/.config)])],
@@ -283,6 +287,27 @@ 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
@@ -306,11 +331,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
 ])
 
 #