* 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 87d5b52..a837556 100644 (file)
--- a/build/autoconf/lustre-build-linux.m4
+++ b/build/autoconf/lustre-build-linux.m4
@@ -284,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
@@ -342,10 +362,6 @@ LB_LINUX_CONFIG([KMOD],[],[
        AC_MSG_WARN([])
 ])
 
-LB_LINUX_CONFIG([CRYPTO],[],[
-       AC_MSG_ERROR([Lustre require that CONFIG_CRYPTO is enabled in your kernel.])
-])
-
 #LB_LINUX_CONFIG_BIG_STACK
 
 # LNet tests
@@ -354,10 +370,6 @@ LN_PROG_LINUX
 # Lustre tests
 LC_PROG_LINUX
 
-# Portals tests
-if test "$PORTALS" ; then
-       LP_PROG_LINUX
-fi
 ])
 
 #
@@ -368,3 +380,4 @@ fi
 AC_DEFUN([LB_LINUX_CONDITIONALS],
 [AM_CONDITIONAL(LINUX25, test x$linux25 = xyes)
 ])
+