Conflict
This commit is contained in:
commit
c798730bdd
|
@ -1 +1 @@
|
|||
EXTRA_DIST = zfs-build.m4 zfs-meta.m4 kernel.m4 user.m4 Rules.am
|
||||
EXTRA_DIST = *.m4 Rules.am
|
||||
|
|
|
@ -3,10 +3,5 @@ dnl # Default ZFS user configuration
|
|||
dnl #
|
||||
AC_DEFUN([ZFS_AC_CONFIG_USER], [
|
||||
ZFS_AC_CONFIG_USER_LIBEFI
|
||||
])
|
||||
|
||||
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])])
|
||||
ZFS_AC_CONFIG_USER_IOCTL
|
||||
])
|
||||
|
|
Loading…
Reference in New Issue