* 11293 - removed LP_PROG_LINUX leftover from portals builds

[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 f96e0c5..a837556 100644 (file)
--- a/build/autoconf/lustre-build-linux.m4
+++ b/build/autoconf/lustre-build-linux.m4
@@ -55,8 +55,13 @@ AC_DEFUN([LB_LINUX_RELEASE],
 [LINUXRELEASE=
 rm -f build/conftest.i
 AC_MSG_CHECKING([for Linux release])
+if test -s $LINUX_OBJ/include/linux/utsrelease.h ; then
+       LINUXRELEASEHEADER=utsrelease.h
+else
+       LINUXRELEASEHEADER=version.h
+fi
 LB_LINUX_TRY_MAKE([
-       #include <linux/version.h>
+       #include <linux/$LINUXRELEASEHEADER>
 ],[
        char *LINUXRELEASE;
        LINUXRELEASE=UTS_RELEASE;
@@ -110,6 +115,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 +129,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)])],
@@ -275,6 +284,26 @@ $3
 ])
 
 #
+# LB_LINUX_CONFIG_IM
+#
+# check if a given config option is builtin or as module
+#
+AC_DEFUN([LB_LINUX_CONFIG_IM],
+[AC_MSG_CHECKING([if Linux was built with CONFIG_$1 in or as module])
+LB_LINUX_TRY_COMPILE([#include <linux/config.h>],[
+#if !(defined(CONFIG_$1) || defined(CONFIG_$1_MODULE))
+#error CONFIG_$1 and CONFIG_$1_MODULE not #defined
+#endif
+],[
+AC_MSG_RESULT([yes])
+$2
+],[
+AC_MSG_RESULT([no])
+$3
+])
+])
+
+#
 # LB_LINUX_TRY_MAKE
 #
 # like LB_LINUX_TRY_COMPILE, but with different arguments
@@ -327,13 +356,20 @@ if test "x$ARCH_UM" = "x" ; then
 fi
 ])
 
-LB_LINUX_CONFIG_BIG_STACK
+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
 
-# Portals tests
-LP_PROG_LINUX
+# LNet tests
+LN_PROG_LINUX
 
 # Lustre tests
 LC_PROG_LINUX
+
 ])
 
 #
@@ -344,3 +380,4 @@ LC_PROG_LINUX
 AC_DEFUN([LB_LINUX_CONDITIONALS],
 [AM_CONDITIONAL(LINUX25, test x$linux25 = xyes)
 ])
+