- fixed using not initialized ctxt with pop_ctxt() in mds_lock_and_check_slave()

[fs/lustre-release.git] / build / autoconf / lustre-build-linux.m4

diff --git a/build/autoconf/lustre-build-linux.m4 b/build/autoconf/lustre-build-linux.m4
index 9320139..9bef9e6 100644 (file)
--- a/build/autoconf/lustre-build-linux.m4
+++ b/build/autoconf/lustre-build-linux.m4
@@ -4,7 +4,7 @@
 # Set things accordingly for a 2.5 kernel
 #
 AC_DEFUN([LB_LINUX_VERSION],
-[AC_CHECK_FILE([$LINUX/include/linux/namei.h],
+[LB_CHECK_FILE([$LINUX/include/linux/namei.h],
        [
                linux25="yes"
                KMODEXT=".ko"
@@ -36,7 +36,7 @@ else
 fi
 
 AC_SUBST(MODULE_TARGET)
-AC_SUBST(LINUX25)
+AC_SUBST(linux25)
 AC_SUBST(KMODEXT)
 ])
 
@@ -122,22 +122,22 @@ AC_ARG_WITH([linux-config],
        [LINUX_CONFIG=$LINUX_OBJ/.config])
 AC_SUBST(LINUX_CONFIG)
 
-AC_CHECK_FILE([/boot/kernel.h],
+LB_CHECK_FILE([/boot/kernel.h],
        [KERNEL_SOURCE_HEADER='/boot/kernel.h'],
-       [AC_CHECK_FILE([/var/adm/running-kernel.h]),
-               [KERNEL_SOURCE_HEADER='/var/adm/running-kernel.h']])
+       [LB_CHECK_FILE([/var/adm/running-kernel.h],
+               [KERNEL_SOURCE_HEADER='/var/adm/running-kernel.h'])])
 
 AC_ARG_WITH([kernel-source-header],
        AC_HELP_STRING([--with-kernel-source-header=path],
-                       [Use a different kernel version header.  Consult README.kernel-source for details.]),
+                       [Use a different kernel version header.  Consult build/README.kernel-source for details.]),
        [KERNEL_SOURCE_HEADER=$with_kernel_source_header])
 
 # ------------ .config exists ----------------
-AC_CHECK_FILE([$LINUX_CONFIG],[],
-       [AC_MSG_ERROR([Kernel config could not be found.  If you are building from a kernel-source rpm consult README.kernel-source])])
+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])])
 
 # ----------- make dep run? ------------------
-AC_CHECK_FILES([$LINUX_OBJ/include/linux/autoconf.h
+LB_CHECK_FILES([$LINUX_OBJ/include/linux/autoconf.h
                $LINUX_OBJ/include/linux/version.h
                $LINUX/include/linux/config.h],[],
        [AC_MSG_ERROR([Run make config in $LINUX.])])
@@ -153,13 +153,13 @@ if grep rhconfig $LINUX_OBJ/include/linux/version.h >/dev/null ; then
        # This is a clean kernel-source tree, we need to
        # enable extensive workarounds to get this to build
        # modules
-       AC_CHECK_FILE([$KERNEL_SOURCE_HEADER],
+       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 README.kernel-source for details.])
+                       AC_MSG_WARN([Consult build/README.kernel-source for details.])
                fi],
-               [AC_MSG_ERROR([$KERNEL_SOURCE_HEADER not found.  Consult README.kernel-source for details.])])
+               [AC_MSG_ERROR([$KERNEL_SOURCE_HEADER not found.  Consult build/README.kernel-source for details.])])
        EXTRA_KCFLAGS="-include $KERNEL_SOURCE_HEADER $EXTRA_KCFLAGS"
 fi
 
@@ -173,8 +173,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 README.kernel-source])
-       AC_MSG_ERROR([Kernel modules could not be built.])
+       AC_MSG_WARN([If you are trying to build with a kernel-source rpm, consult build/README.kernel-source])
 ])
 
 LB_LINUX_RELEASE