# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: address@hidden
# target_branch: file:///home/floppym/src/grub/trunk/
# testament_sha1: 1074def3743856c383bbbdc33396b8f3701a587c
# timestamp: 2012-02-25 13:38:55 -0500
# base_revision_id: address@hidden
# 
# Begin patch
=== modified file 'ChangeLog'
--- ChangeLog	2012-02-25 00:15:29 +0000
+++ ChangeLog	2012-02-25 18:36:53 +0000
@@ -1,3 +1,9 @@
+2012-02-25  Mike Gilbert  <address@hidden>
+
+	Add configure flag to control libzfs integration.
+
+	* configure.ac: Add AC_ARG_ENABLE(libzfs ...) and associated logic.
+
 2012-02-25  Vladimir Serbinenko  <address@hidden>
 
 	Convert grub-emu to argp.

=== modified file 'configure.ac'
--- configure.ac	2012-02-24 11:30:32 +0000
+++ configure.ac	2012-02-25 18:36:53 +0000
@@ -302,7 +302,7 @@
 
 # Check for functions and headers.
 AC_CHECK_FUNCS(posix_memalign memalign asprintf vasprintf getextmntent)
-AC_CHECK_HEADERS(libzfs.h libnvpair.h sys/param.h sys/mount.h sys/mnttab.h sys/mkdev.h limits.h)
+AC_CHECK_HEADERS(sys/param.h sys/mount.h sys/mnttab.h sys/mkdev.h limits.h)
 
 AC_CHECK_MEMBERS([struct statfs.f_fstypename],,,[$ac_includes_default
 #include <sys/param.h>
@@ -1006,16 +1006,41 @@
                         [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([libzfs],
+              [AS_HELP_STRING([--enable-libzfs],
+                              [enable libzfs integration (default=guessed)])])
+if test x"$enable_libzfs" = xno ; then
+  libzfs_excuse="explicitly disabled"
+fi
+
+if test x"$libzfs_excuse" = x ; then
+  # Only check for system headers if libzfs support has not been disabled.
+  AC_CHECK_HEADERS(libzfs.h libnvpair.h)
+fi
+
+if test x"$libzfs_excuse" = x ; then
+  AC_CHECK_LIB([zfs], [libzfs_init],
+               [],
+               [libzfs_excuse="need zfs library"])
+fi
+
+if test x"$libzfs_excuse" = x ; then
+  AC_CHECK_LIB([nvpair], [nvlist_print],
+               [],
+               [libzfs_excuse="need nvpair library"])
+fi
+
+if test x"$libzfs_excuse" = x ; then
+  # We need both libzfs and libnvpair for a successful build.
+  LIBZFS="-lzfs"
+  AC_DEFINE([HAVE_LIBZFS], [1],
+            [Define to 1 if you have the ZFS library.])
+  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=""
@@ -1169,5 +1194,10 @@
 else
 echo starfield theme: No "($starfield_excuse)"
 fi
+if [ x"$libzfs_excuse" = x ]; then
+echo With libzfs support: Yes
+else
+echo With libzfs support: No "($libzfs_excuse)"
+fi
 echo "*******************************************************"
 ]

# Begin bundle
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