# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: address@hidden
# target_branch: http://bzr.savannah.gnu.org/r/grub/trunk/grub/
# testament_sha1: 174b6ca637f4fda2819cb82c07bb55424dee8f5a
# timestamp: 2012-02-04 14:48:49 -0500
# base_revision_id: address@hidden
# 
# Begin patch
=== modified file 'configure.ac'
--- configure.ac	2012-01-22 15:43:14 +0000
+++ configure.ac	2012-02-04 19:48:08 +0000
@@ -968,16 +968,21 @@
                         [Define to 1 if you have the LZMA library.])],)
 AC_SUBST([LIBLZMA])
 
-AC_CHECK_LIB([zfs], [libzfs_init],
-             [LIBZFS="-lzfs"
-              AC_DEFINE([HAVE_LIBZFS], [1],
-                        [Define to 1 if you have the ZFS library.])],)
+AC_ARG_ENABLE([zfs],
+              [AS_HELP_STRING([--disable-zfs], [Disable ZFS support.])])
+
+if test x"$enable_zfs" != xno; then
+  AC_CHECK_LIB([zfs], [libzfs_init],
+               [LIBZFS="-lzfs"
+                AC_DEFINE([HAVE_LIBZFS], [1],
+                          [Define to 1 if you have the ZFS library.])],)
+
+  AC_CHECK_LIB([nvpair], [nvlist_print],
+               [LIBNVPAIR="-lnvpair"
+                AC_DEFINE([HAVE_LIBNVPAIR], [1],
+                          [Define to 1 if you have the NVPAIR library.])],)
+fi
 AC_SUBST([LIBZFS])
-
-AC_CHECK_LIB([nvpair], [nvlist_print],
-             [LIBNVPAIR="-lnvpair"
-              AC_DEFINE([HAVE_LIBNVPAIR], [1],
-                        [Define to 1 if you have the NVPAIR library.])],)
 AC_SUBST([LIBNVPAIR])
 
 LIBS=""

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWdTBFGYAAab/gAAcAQB0Z///
f+/dGr/v//BQBB7stwO3Zu2NdLbhKIp6mTTRogybITT1M0hpkGmgxNDIbSNAlII0yaNTZJ6po9JP
SMmjTQAGhkAAPUGSDRRminkgDanpAaBoAANAGgyHNMjIZMENGEwRpo0YgaZMjAAEEkiNCYjJknpl
MRHlNlGjRoADQ9Qep6j0k1eg+m+77F8l2VVDE+/OX6JZrJAgwZ446YsGc9z5EhMIE8e5ngqBEEqx
RkfG8LVtc14EEhIYwM8jHkaPfL+EJR0aOLcqN+WEBiUixuKz8RJbj1cctLfTQaqEXl4ngqxR7LjG
IiN2XqxOG0TlMpgjxlcvzvVhHJdIG2qVEclkMJNbJPfZxKTd3GMkcQkhIfwCppAccLhmLiAoiDAd
RKut6ZqI3d65GMC74RnbmK6NNA+KgRkY3ba5CZR5SRWqL/2FYZbumIlmZDlN9CusXAEcILQLli02
lMknrJODEuqRIWF6KTUrmfsG2HC7ZV5K9a0wM1IxrluUmFiBt3v1k9BL8iEKcQUb51TK2vfO3XTU
YD39oTkExuauyJcZQzZYOXlIGuyLXuJmshFj770vyos0E3HAky3ASUWYCSgYl1rVahdzsR8mEIvf
AsmrAyICM0QXewFVMWROLbAtJpg5pjOOpo2Nq1cKxq0cDKKuHwecsuWuvply4bdSNi4VsaenEiTB
PViM5+J/Yvs6eBXMyY/Lw9kow9DiVUHGXEZ+A6TkYl3hNJXOcRGcH9C0F4xKIIiTVpUZlFzNSZKP
SSTNoLEdDWwNFSVCobmFmcY0nGDE26U+piYsVaBzPEiGx28kSWnL0U2A1mtg2vkMg4Mhmoe72YaU
NdNIbKa387rIdgONT/A6T+C7pEREqsPDTYs3cYmqxqgOypbEPUvxvvLDOfKJxAxjfBUw2Bjp0exX
VXsz45G4wklLU7GNTxQn1hyH1LWfOpcJbxCNGot6H21MglmwULUysgfBXqsktqkX42PQL7zLqM1M
OhtvFxV/byxLBOVt1bg11dGrCDUzA9PiVw8q0Sc5tt5yla4yInNF4f526cbcbhqYSRj7kmtF1MyO
SQ/9FIbDAJjAM5I1vULNarYzyiq1prPH800JcZ0k4b6h6WI4t8IMLoR6tM7KhE8EjnClOfouboVN
uQcwOBsAkCRwWx7GYYaFxvyZbNGPElqKX9gcEusL5u6tQ0oOcI3leAyphVwLCEemVWISEQoa5JTa
IpYXhksciYPQtrwlSgTpOD1JTq86iJU3FnNmwLnMnkHBKZR6WmKJLGZSonFtE1tyTYg0qgI0JrKQ
pMaKGmtrWhyIl9BcCaBMJHXhObJngIpwKHK6UcExJLwpHjWxb1N3ClKSNycExaXTheNIIjwUETKe
B4BRVQFZBxOG4WE1nashSngy5halgKsjStkFC6JIiOH0grjLEnO1bsP+LuSKcKEhqYIozA==