Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
This commit is contained in:
commit
67ff84aba7
|
@ -3,6 +3,7 @@ dnl # Default ZFS user configuration
|
||||||
dnl #
|
dnl #
|
||||||
AC_DEFUN([ZFS_AC_CONFIG_USER], [
|
AC_DEFUN([ZFS_AC_CONFIG_USER], [
|
||||||
ZFS_AC_CONFIG_USER_IOCTL
|
ZFS_AC_CONFIG_USER_IOCTL
|
||||||
|
ZFS_AC_CONFIG_USER_LIBEFI
|
||||||
])
|
])
|
||||||
|
|
||||||
AC_DEFINE(ZFS_AC_CONFIG_USER_IOCTL], [
|
AC_DEFINE(ZFS_AC_CONFIG_USER_IOCTL], [
|
||||||
|
@ -18,3 +19,9 @@ AC_DEFINE(ZFS_AC_CONFIG_USER_IOCTL], [
|
||||||
[AC_DEFINE([HAVE_IOCTL_IN_STROPTS_H], 1,
|
[AC_DEFINE([HAVE_IOCTL_IN_STROPTS_H], 1,
|
||||||
[Define to 1 if ioctl() is defined in <stropts.h> header])])
|
[Define to 1 if ioctl() is defined in <stropts.h> header])])
|
||||||
])
|
])
|
||||||
|
|
||||||
|
AC_DEFUN([ZFS_AC_CONFIG_USER_LIBEFI], [
|
||||||
|
AC_CHECK_LIB([efi], [efi_alloc_and_init],
|
||||||
|
[AC_DEFINE([HAVE_LIBEFI], 1,
|
||||||
|
[Define to 1 if 'libefi' library available])])
|
||||||
|
])
|
||||||
|
|
Loading…
Reference in New Issue