]> git.ipfire.org Git - thirdparty/grub.git/commitdiff
fix grub-mount buildability on GNU/kFreeBSD
authorRobert Millan <rmh@gnu.org>
Sat, 11 Jun 2011 14:57:19 +0000 (16:57 +0200)
committerRobert Millan <rmh@gnu.org>
Sat, 11 Jun 2011 14:57:19 +0000 (16:57 +0200)
Makefile.util.def
configure.ac

index cd37d0d65f2faaead25f6705baa2cb76e15c0401..313339adc28e79d51f051968749fe8ba7509a2fa 100644 (file)
@@ -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;
 };
 
index d1eaa0c8458fbb6e2586dfbac4534bba980c4b6c..26af7e7c31406fd835c3b199e685b3f0e9ec7a1d 100644 (file)
@@ -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"