X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=build%2Fautoconf%2Flustre-build-linux.m4;h=9a5465ae359d8d966124aa06e9b6d4a6103f6f08;hb=a48cf7f8035a0f827272d2d777a7092eebb098b5;hp=87d5b5218ba6527acdee351016bdd44df3439a6d;hpb=50d4551080dc6fa601708c21140c8dccd53fe5c5;p=fs%2Flustre-release.git diff --git a/build/autoconf/lustre-build-linux.m4 b/build/autoconf/lustre-build-linux.m4 index 87d5b52..9a5465a 100644 --- 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 ],[ +#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 @@ -368,3 +384,4 @@ fi AC_DEFUN([LB_LINUX_CONDITIONALS], [AM_CONDITIONAL(LINUX25, test x$linux25 = xyes) ]) +