From 0da78696904f6e0e7cfedd2a0296879f47717f4f Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Fri, 22 Jul 2011 14:10:38 -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/kernel.m4 | 4 +--- configure | 16 ++++------------ 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/config/kernel.m4 b/config/kernel.m4 index 90dc6c0..5eaa4d8 100644 --- a/config/kernel.m4 +++ b/config/kernel.m4 @@ -380,9 +380,7 @@ dnl # AC_DEFUN([ZFS_LINUX_CONFIG], [AC_MSG_CHECKING([whether Linux was built with CONFIG_$1]) ZFS_LINUX_TRY_COMPILE([ - #ifndef AUTOCONF_INCLUDED - #include - #endif + #include ],[ #ifndef CONFIG_$1 #error CONFIG_$1 not #defined diff --git a/configure b/configure index 381e22d..cb17d5c 100755 --- a/configure +++ b/configure @@ -12233,9 +12233,7 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #ifndef AUTOCONF_INCLUDED - #include - #endif + #include int main (void) @@ -12306,9 +12304,7 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #ifndef AUTOCONF_INCLUDED - #include - #endif + #include int main (void) @@ -16507,9 +16503,7 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #ifndef AUTOCONF_INCLUDED - #include - #endif + #include int main (void) @@ -16580,9 +16574,7 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #ifndef AUTOCONF_INCLUDED - #include - #endif + #include int main (void) -- 1.8.3.1