From c064bdee95583102e216354bbdece4818d59b644 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Fri, 22 Jul 2011 14:23:12 -0700 Subject: [PATCH] Fix the configure CONFIG_* option detection The latest kernels no longer define AUTOCONF_INCLUDED which was being used to detect the new style autoconf.h kernel configure options. This results in the CONFIG_* checks always failing incorrectly for newer kernels. The fix for this is a simplification of the testing method. Rather than attempting to explicitly include to renamed config header. It is simpler to unconditionally include which must pick up the correctly named header. Signed-off-by: Brian Behlendorf Closes #320 --- config/spl-build.m4 | 4 +--- configure | 8 ++------ 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/config/spl-build.m4 b/config/spl-build.m4 index ea50785071..f4652bce12 100644 --- a/config/spl-build.m4 +++ b/config/spl-build.m4 @@ -540,9 +540,7 @@ dnl # AC_DEFUN([SPL_LINUX_CONFIG], [AC_MSG_CHECKING([whether Linux was built with CONFIG_$1]) SPL_LINUX_TRY_COMPILE([ - #ifndef AUTOCONF_INCLUDED - #include - #endif + #include ],[ #ifndef CONFIG_$1 #error CONFIG_$1 not #defined diff --git a/configure b/configure index cf396e4848..72bef74a38 100755 --- a/configure +++ b/configure @@ -11819,9 +11819,7 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #ifndef AUTOCONF_INCLUDED - #include - #endif + #include int main (void) @@ -16019,9 +16017,7 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #ifndef AUTOCONF_INCLUDED - #include - #endif + #include int main (void)