From cb91bbe6ce7fb45ffb7568c7be85a06ba3d415d8 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Fri, 9 Oct 2009 16:37:32 -0700 Subject: [PATCH] Additional set of build system tweaks for libefi library. --- cmd/zpool/Makefile.am | 1 + config/user-libefi.m4 | 8 -------- config/user.m4 | 1 - configure.ac | 1 + lib/libzfs/Makefile.am | 1 + 5 files changed, 3 insertions(+), 9 deletions(-) delete mode 100644 config/user-libefi.m4 diff --git a/cmd/zpool/Makefile.am b/cmd/zpool/Makefile.am index d1178dc0a7..076954c039 100644 --- a/cmd/zpool/Makefile.am +++ b/cmd/zpool/Makefile.am @@ -2,6 +2,7 @@ include $(top_srcdir)/config/Rules.am DEFAULT_INCLUDES += \ -I${top_srcdir}/lib/libspl/include \ + -I${top_srcdir}/lib/libefi/include \ -I${top_srcdir}/lib/libuutil/include \ -I${top_srcdir}/lib/libzfs/include \ -I${top_srcdir}/lib/libnvpair/include \ diff --git a/config/user-libefi.m4 b/config/user-libefi.m4 deleted file mode 100644 index aebc1d5412..0000000000 --- a/config/user-libefi.m4 +++ /dev/null @@ -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])]) -]) diff --git a/config/user.m4 b/config/user.m4 index febc2941d8..7ecc241afe 100644 --- a/config/user.m4 +++ b/config/user.m4 @@ -3,7 +3,6 @@ dnl # Default ZFS user configuration dnl # AC_DEFUN([ZFS_AC_CONFIG_USER], [ ZFS_AC_CONFIG_USER_ARCH - ZFS_AC_CONFIG_USER_LIBEFI ZFS_AC_CONFIG_USER_LIBDISKMGT ZFS_AC_CONFIG_USER_LIBSHARE ZFS_AC_CONFIG_USER_IOCTL diff --git a/configure.ac b/configure.ac index 770a15c060..97ab137297 100644 --- a/configure.ac +++ b/configure.ac @@ -55,6 +55,7 @@ AC_CONFIG_FILES([ doc/Makefile lib/Makefile lib/libavl/Makefile + lib/libefi/Makefile lib/libnvpair/Makefile lib/libunicode/Makefile lib/libuutil/Makefile diff --git a/lib/libzfs/Makefile.am b/lib/libzfs/Makefile.am index 93871aad82..7ffd81cf28 100644 --- a/lib/libzfs/Makefile.am +++ b/lib/libzfs/Makefile.am @@ -6,6 +6,7 @@ DEFAULT_INCLUDES += \ -I${top_srcdir}/lib/libspl/include \ -I${top_srcdir}/lib/libnvpair/include \ -I${top_srcdir}/lib/libuutil/include \ + -I${top_srcdir}/lib/libefi/include \ -I${top_srcdir}/module/zfs \ -I${top_srcdir}/module/zfs/include \ -I${top_srcdir}/module/zcommon/include \