git://git.camperquake.de
/
zfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Linux 3.3 compat, sops->show_options()
[zfs.git]
/
config
/
kernel.m4
diff --git
a/config/kernel.m4
b/config/kernel.m4
index
45e9b14
..
10a2cdb
100644
(file)
--- a/
config/kernel.m4
+++ b/
config/kernel.m4
@@
-32,6
+32,7
@@
AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [
ZFS_AC_KERNEL_CONST_XATTR_HANDLER
ZFS_AC_KERNEL_XATTR_HANDLER_GET
ZFS_AC_KERNEL_XATTR_HANDLER_SET
ZFS_AC_KERNEL_CONST_XATTR_HANDLER
ZFS_AC_KERNEL_XATTR_HANDLER_GET
ZFS_AC_KERNEL_XATTR_HANDLER_SET
+ ZFS_AC_KERNEL_SHOW_OPTIONS
ZFS_AC_KERNEL_FSYNC
ZFS_AC_KERNEL_EVICT_INODE
ZFS_AC_KERNEL_NR_CACHED_OBJECTS
ZFS_AC_KERNEL_FSYNC
ZFS_AC_KERNEL_EVICT_INODE
ZFS_AC_KERNEL_NR_CACHED_OBJECTS
@@
-270,9
+271,9
@@
AC_DEFUN([ZFS_AC_SPL], [
fgrep -q SPL_META_VERSION $splbuild/spl_config.h], [
splsrcver=`(echo "#include <spl_config.h>";
fgrep -q SPL_META_VERSION $splbuild/spl_config.h], [
splsrcver=`(echo "#include <spl_config.h>";
- echo "splsrcver=SPL_META_VERSION") |
+ echo "splsrcver=SPL_META_VERSION
-SPL_META_RELEASE
") |
cpp -I $splbuild |
cpp -I $splbuild |
- grep "^splsrcver=" |
cut -d \" -f
2`
+ grep "^splsrcver=" |
tr -d \" | cut -d= -f
2`
])
AS_IF([test -z "$splsrcver"], [
])
AS_IF([test -z "$splsrcver"], [