X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=config%2Flustre-build-linux.m4;h=ce0de5e47209bc1311e4e7aac0900eb6d42cd828;hb=ffc62b1d8a51f53d51fc4e77375e0400accfdde5;hp=894101ce71d926a83e566011e39b6fcf4b4e5bfc;hpb=2412a8b68573909237bf8d8a0f8ede04e918db0c;p=fs%2Flustre-release.git

diff --git a/config/lustre-build-linux.m4 b/config/lustre-build-linux.m4
index 894101c..ce0de5e 100644
--- a/config/lustre-build-linux.m4
+++ b/config/lustre-build-linux.m4
@@ -56,13 +56,16 @@ AC_DEFUN([LB_LINUX_UTSRELEASE], [
 		              ${utsrelease})
 		AS_IF([test -z "$UTS_RELEASE"], [
 			AC_MSG_RESULT([Not found])
-			AC_MSG_ERROR([*** Cannot determine kernel version.])
+			AC_MSG_ERROR([Cannot determine kernel version.])
 		])
 	], [
 		AC_MSG_RESULT([Not found])
 		AC_MSG_ERROR([
-	*** Cannot find UTS_RELEASE definition.
-	*** This is often provided by the kernel-devel package.])
+
+Cannot find UTS_RELEASE definition.
+
+This is often provided by the kernel-devel package.
+])
 	])
 
 	AC_MSG_RESULT([${UTS_RELEASE}])
@@ -234,7 +237,13 @@ AC_ARG_WITH([kernel-source-header],
 
 # ------------ .config exists ----------------
 LB_CHECK_FILE([$LINUX_CONFIG],[],
-	[AC_MSG_ERROR([Kernel config could not be found.  If you are building from a kernel-source rpm consult build/README.kernel-source])])
+	[AC_MSG_ERROR([
+
+Kernel config could not be found.
+
+If you are building from a kernel-source rpm consult build/README.kernel-source
+])
+])
 
 # ----------- make dep run? ------------------
 # at 2.6.19 # $LINUX/include/linux/config.h is removed
@@ -272,9 +281,13 @@ if grep rhconfig $LINUX_OBJ/include/$VERSION_HDIR/version.h >/dev/null ; then
 	# modules
 	LB_CHECK_FILE([$KERNEL_SOURCE_HEADER],
 		[if test $KERNEL_SOURCE_HEADER = '/boot/kernel.h' ; then
-			AC_MSG_WARN([Using /boot/kernel.h from RUNNING kernel.])
-			AC_MSG_WARN([If this is not what you want, use --with-kernel-source-header.])
-			AC_MSG_WARN([Consult build/README.kernel-source for details.])
+			AC_MSG_WARN([
+
+Using /boot/kernel.h from RUNNING kernel.
+
+If this is not what you want, use --with-kernel-source-header.
+Consult build/README.kernel-source for details.
+])
 		fi],
 		[AC_MSG_ERROR([$KERNEL_SOURCE_HEADER not found.  Consult build/README.kernel-source for details.])])
 	EXTRA_KCFLAGS="-include $KERNEL_SOURCE_HEADER $EXTRA_KCFLAGS"
@@ -290,9 +303,13 @@ LB_LINUX_TRY_COMPILE([],[],[
 	AC_MSG_RESULT([yes])
 ],[
 	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 built.])
+	AC_MSG_ERROR([
+
+Kernel modules cannot be built. Consult config.log for details.
+
+If you are trying to build with a kernel-source rpm,
+consult build/README.kernel-source
+])
 ])
 
 LB_LINUX_RELEASE
@@ -389,21 +406,6 @@ rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.
 ])
 
 #
-# LB_LINUX_ARCH
-#
-# Determine the kernel's idea of the current architecture
-#
-AC_DEFUN([LB_LINUX_ARCH],
-         [AC_MSG_CHECKING([Linux kernel architecture])
-          AS_IF([rm -f $PWD/build/arch
-                 make -s --no-print-directory echoarch -f $PWD/build/Makefile \
-                     LUSTRE_LINUX_CONFIG=$LINUX_CONFIG -C $LINUX $CROSS_VARS  \
-                     ARCHFILE=$PWD/build/arch && LINUX_ARCH=`cat $PWD/build/arch`],
-                [AC_MSG_RESULT([$LINUX_ARCH])],
-                [AC_MSG_ERROR([Could not determine the kernel architecture.])])
-          rm -f build/arch])
-
-#
 # LB_LINUX_TRY_COMPILE
 #
 # like AC_TRY_COMPILE
@@ -494,9 +496,10 @@ LB_LINUX_TRY_MAKE([
 		  [kernel module loading is possible])
 ],[
 	AC_MSG_RESULT(no)
-	AC_MSG_WARN([])
-	AC_MSG_WARN([Kernel module loading support is highly recommended.])
-	AC_MSG_WARN([])
+	AC_MSG_WARN([
+
+Kernel module loading support is highly recommended.
+])
 ])
 ])
 
@@ -507,18 +510,23 @@ LB_LINUX_TRY_MAKE([
 #
 AC_DEFUN([LB_PROG_LINUX],
 [LB_LINUX_PATH
-LB_LINUX_ARCH
 LB_LINUX_SYMVERFILE
 
 
 LB_LINUX_CONFIG([MODULES],[],[
-	AC_MSG_ERROR([module support is required to build Lustre kernel modules.])
+	AC_MSG_ERROR([
+
+module support is required to build Lustre kernel modules.
+])
 ])
 
 LB_LINUX_CONFIG([MODVERSIONS])
 
 LB_LINUX_CONFIG([KALLSYMS],[],[
-	AC_MSG_ERROR([Lustre requires that CONFIG_KALLSYMS is enabled in your kernel.])
+	AC_MSG_ERROR([
+
+Lustre requires that CONFIG_KALLSYMS is enabled in your kernel.
+])
 ])
 
 # 2.6.28