* kern/emu/getroot.c (find_mount_point_from_dir): Compile only if

	[HAVE_LIBZFS && HAVE_LIBNVPAIR]

diff --git a/ChangeLog b/ChangeLog
index 9729f71d80b311828d51293c858825cfe27dd6c9..2e8c0daa5e46ff85ad515866f96b70d74d208d37 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-01  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * kern/emu/getroot.c (find_mount_point_from_dir): Compile only if
+       [HAVE_LIBZFS && HAVE_LIBNVPAIR]
+
 2010-08-01  Colin Watson  <cjwatson@ubuntu.com>
 
        * util/grub-mkrescue.in: Remove ${efi_dir} after building efi.img.
@@ -41,7 +46,7 @@
 2010-08-01  Robert Millan  <rmh@gnu.org>
 
        * kern/emu/getroot.c: Include `<grub/util/misc.h>'.
-       
+
 2010-07-31  Robert Millan  <rmh@gnu.org>
 
        * util/grub.d/10_kfreebsd.in: Make module handling more generic.

diff --git a/kern/emu/getroot.c b/kern/emu/getroot.c
index f8eda22946b19c3ebda565aa947f73cc76d12455..032608d1bc983176a732f0e5a918125f545af644 100644 (file)
--- a/kern/emu/getroot.c
+++ b/kern/emu/getroot.c
@@ -98,6 +98,8 @@ xgetcwd (void)
   return path;
 }
 
+#if defined(HAVE_LIBZFS) && defined(HAVE_LIBNVPAIR)
+
 static char *
 find_mount_point_from_dir (const char *dir)
 {
@@ -154,6 +156,8 @@ find_mount_point_from_dir (const char *dir)
     }
 }
 
+#endif
+
 #ifdef __linux__
 
 /* Statting something on a btrfs filesystem always returns a virtual device