Resolve conflict

This commit is contained in:
Brian Behlendorf 2008-12-15 10:57:47 -08:00
commit 3ae13f718f
1 changed files with 7 additions and 0 deletions

View File

@ -3,6 +3,7 @@ dnl # Default ZFS user configuration
dnl #
AC_DEFUN([ZFS_AC_CONFIG_USER], [
ZFS_AC_CONFIG_USER_IOCTL
ZFS_AC_CONFIG_USER_LIBEFI
])
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,
[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])])
])