From: Robert Millan <rmh@gnu.org>
Date: Sat, 11 Jun 2011 14:57:19 +0000 (+0200)
Subject: fix grub-mount buildability on GNU/kFreeBSD
X-Git-Tag: 2.00~956^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=338c7fab9be66bc5aa6cf093539a0aafa4010b83;p=thirdparty%2Fgrub.git

fix grub-mount buildability on GNU/kFreeBSD
---

diff --git a/Makefile.util.def b/Makefile.util.def
index cd37d0d65..313339adc 100644
--- a/Makefile.util.def
+++ b/Makefile.util.def
@@ -223,7 +223,7 @@ program = {
   ldadd = libgrubmods.a;
   ldadd = libgrubkern.a;
   ldadd = grub-core/gnulib/libgnu.a;
-  ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR)' '-lfuse';
+  ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) -lfuse';
   condition = COND_GRUB_MOUNT;
 };
 
diff --git a/configure.ac b/configure.ac
index d1eaa0c84..26af7e7c3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -871,7 +871,7 @@ fi
 if test x"$grub_mount_excuse" = x ; then
   # Check for fuse headers.
   SAVED_CPPFLAGS="$CPPFLAGS"
-  CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=64"
+  CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=64 -DFUSE_USE_VERSION=26"
   AC_CHECK_HEADERS([fuse/fuse.h], [],
   	[grub_mount_excuse=["need FUSE headers"]])
   CPPFLAGS="$SAVED_CPPFLAGS"