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

Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol

This commit is contained in:
Brian Behlendorf 2009-10-09 16:43:13 -07:00
parent f0e7c21dfc cb91bbe6ce
commit bbe79ef2eb
5 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/zpool/Makefile.am
View File

@ -2,6 +2,7 @@ include $(top_srcdir)/config/Rules.am
DEFAULT_INCLUDES += \ DEFAULT_INCLUDES += \
-I${top_srcdir}/lib/libspl/include \ -I${top_srcdir}/lib/libspl/include \
-I${top_srcdir}/lib/libefi/include \
-I${top_srcdir}/lib/libuutil/include \ -I${top_srcdir}/lib/libuutil/include \
-I${top_srcdir}/lib/libzfs/include \ -I${top_srcdir}/lib/libzfs/include \
-I${top_srcdir}/lib/libnvpair/include \ -I${top_srcdir}/lib/libnvpair/include \

8
config/user-libefi.m4
View File

@ -1,8 +0,0 @@
dnl #
dnl # Check for libefi
dnl #
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])])
])

1
config/user.m4
View File

@ -3,7 +3,6 @@ dnl # Default ZFS user configuration
dnl # dnl #
AC_DEFUN([ZFS_AC_CONFIG_USER], [ AC_DEFUN([ZFS_AC_CONFIG_USER], [
ZFS_AC_CONFIG_USER_ARCH ZFS_AC_CONFIG_USER_ARCH
ZFS_AC_CONFIG_USER_LIBEFI
ZFS_AC_CONFIG_USER_LIBDISKMGT ZFS_AC_CONFIG_USER_LIBDISKMGT
ZFS_AC_CONFIG_USER_LIBSHARE ZFS_AC_CONFIG_USER_LIBSHARE
ZFS_AC_CONFIG_USER_IOCTL ZFS_AC_CONFIG_USER_IOCTL

1
configure.ac
View File

@ -55,6 +55,7 @@ AC_CONFIG_FILES([
doc/Makefile doc/Makefile
lib/Makefile lib/Makefile
lib/libavl/Makefile lib/libavl/Makefile
lib/libefi/Makefile
lib/libnvpair/Makefile lib/libnvpair/Makefile
lib/libunicode/Makefile lib/libunicode/Makefile
lib/libuutil/Makefile lib/libuutil/Makefile

1
lib/libzfs/Makefile.am
View File

@ -6,6 +6,7 @@ DEFAULT_INCLUDES += \
-I${top_srcdir}/lib/libspl/include \ -I${top_srcdir}/lib/libspl/include \
-I${top_srcdir}/lib/libnvpair/include \ -I${top_srcdir}/lib/libnvpair/include \
-I${top_srcdir}/lib/libuutil/include \ -I${top_srcdir}/lib/libuutil/include \
-I${top_srcdir}/lib/libefi/include \
-I${top_srcdir}/module/zfs \ -I${top_srcdir}/module/zfs \
-I${top_srcdir}/module/zfs/include \ -I${top_srcdir}/module/zfs/include \
-I${top_srcdir}/module/zcommon/include \ -I${top_srcdir}/module/zcommon/include \