Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Conflict

This commit is contained in:
Brian Behlendorf 2008-12-15 16:34:48 -08:00
parent 06418073d4 2712912cb8
commit c798730bdd
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/Makefile.am
View File

@ -1 +1 @@
EXTRA_DIST = zfs-build.m4 zfs-meta.m4 kernel.m4 user.m4 Rules.am EXTRA_DIST = *.m4 Rules.am

7
config/user.m4
View File

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