c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-12-27 03:19:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix the configure CONFIG_* option detection

Browse Source 
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 <linux/module.h>
which must pick up the correctly named header.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #320
This commit is contained in:
Brian Behlendorf 2011-07-22 14:10:38 -07:00
parent 22872ff5da
commit 0da7869690
2 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/kernel.m4
View File

@ -380,9 +380,7 @@ dnl #
AC_DEFUN([ZFS_LINUX_CONFIG], AC_DEFUN([ZFS_LINUX_CONFIG],
[AC_MSG_CHECKING([whether Linux was built with CONFIG_$1]) [AC_MSG_CHECKING([whether Linux was built with CONFIG_$1])
ZFS_LINUX_TRY_COMPILE([ ZFS_LINUX_TRY_COMPILE([
#ifndef AUTOCONF_INCLUDED #include <linux/module.h>
#include <linux/config.h>
#endif
],[ ],[
#ifndef CONFIG_$1 #ifndef CONFIG_$1
#error CONFIG_$1 not #defined #error CONFIG_$1 not #defined

16
configure vendored
View File

@ -12233,9 +12233,7 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */ /* end confdefs.h. */
#ifndef AUTOCONF_INCLUDED #include <linux/module.h>
#include <linux/config.h>
#endif
int int
main (void) main (void)
@ -12306,9 +12304,7 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */ /* end confdefs.h. */
#ifndef AUTOCONF_INCLUDED #include <linux/module.h>
#include <linux/config.h>
#endif
int int
main (void) main (void)
@ -16507,9 +16503,7 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */ /* end confdefs.h. */
#ifndef AUTOCONF_INCLUDED #include <linux/module.h>
#include <linux/config.h>
#endif
int int
main (void) main (void)
@ -16580,9 +16574,7 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */ /* end confdefs.h. */
#ifndef AUTOCONF_INCLUDED #include <linux/module.h>
#include <linux/config.h>
#endif
int int
main (void) main (void)