diff options
author | Chunwei Chen <[email protected]> | 2016-05-18 13:48:08 -0700 |
---|---|---|
committer | Brian Behlendorf <[email protected]> | 2016-05-20 11:09:00 -0700 |
commit | e42d46664e81136f3e9b7030fe77f0550e615c3f (patch) | |
tree | b00bc1033bda26d47c5800d155da49926b839ab7 | |
parent | 68e8f59afb0fa1b388c7dbb8720ac6756d390146 (diff) |
Fix config for posix_acl_release() GPL test
The GPL test for posix_acl_release() didn't include <linux/module.h>.
Also run this test only when posix_acl_release() exists.
Signed-off-by: Chunwei Chen <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Issue #4665
-rw-r--r-- | config/kernel-acl.m4 | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/config/kernel-acl.m4 b/config/kernel-acl.m4 index 1cb28b25a..ffb6a0254 100644 --- a/config/kernel-acl.m4 +++ b/config/kernel-acl.m4 @@ -16,26 +16,27 @@ AC_DEFUN([ZFS_AC_KERNEL_POSIX_ACL_RELEASE], [ AC_MSG_RESULT(yes) AC_DEFINE(HAVE_POSIX_ACL_RELEASE, 1, [posix_acl_release() is available]) - ],[ - AC_MSG_RESULT(no) - ]) - AC_MSG_CHECKING([whether posix_acl_release() is GPL-only]) - ZFS_LINUX_TRY_COMPILE([ - #include <linux/cred.h> - #include <linux/fs.h> - #include <linux/posix_acl.h> + AC_MSG_CHECKING([whether posix_acl_release() is GPL-only]) + ZFS_LINUX_TRY_COMPILE([ + #include <linux/module.h> + #include <linux/cred.h> + #include <linux/fs.h> + #include <linux/posix_acl.h> - MODULE_LICENSE("$ZFS_META_LICENSE"); - ],[ - struct posix_acl* tmp = posix_acl_alloc(1, 0); - posix_acl_release(tmp); + MODULE_LICENSE("$ZFS_META_LICENSE"); + ],[ + struct posix_acl* tmp = posix_acl_alloc(1, 0); + posix_acl_release(tmp); + ],[ + AC_MSG_RESULT(no) + ],[ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_POSIX_ACL_RELEASE_GPL_ONLY, 1, + [posix_acl_release() is GPL-only]) + ]) ],[ AC_MSG_RESULT(no) - ],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_POSIX_ACL_RELEASE_GPL_ONLY, 1, - [posix_acl_release() is GPL-only]) ]) ]) |