dlan        14/09/09 03:21:13

  Added:                megatools-1.9.92-fuse.patch
  Log:
  fix bug 522258, 522260, thanks @hasufell
  
  (Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key 
0xAABEFD55)

Revision  Changes    Path
1.1                  net-misc/megatools/files/megatools-1.9.92-fuse.patch

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/megatools/files/megatools-1.9.92-fuse.patch?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/megatools/files/megatools-1.9.92-fuse.patch?rev=1.1&content-type=text/plain

Index: megatools-1.9.92-fuse.patch
===================================================================
diff --git a/configure.ac b/configure.ac
index cc8ff46..15ca668 100644
--- a/configure.ac
+++ b/configure.ac
@@ -41,17 +41,32 @@ AC_SUBST(MEGA_REQUIRES)
 AC_SUBST(MEGA_CFLAGS)
 AC_SUBST(MEGA_LIBS)
 
-PKG_CHECK_MODULES(FUSE, [$FUSE_REQUIRES], [ENABLE_FUSE=yes], [ENABLE_FUSE=no])
-AC_SUBST(FUSE_CFLAGS)
-AC_SUBST(FUSE_LIBS)
-AM_CONDITIONAL([ENABLE_FUSE], [test x$ENABLE_FUSE = xyes])
-
 GLIB_MAKEFILE='$(top_srcdir)/Makefile.glib'
 AC_SUBST(GLIB_MAKEFILE)
 
 PKG_CHECK_MODULES(GLIBTESTS, [glib-2.0 >= 2.34.0], [ENABLE_TESTS=yes], 
[ENABLE_TESTS=no])
 AM_CONDITIONAL([ENABLE_TESTS], [test x$ENABLE_TESTS = xyes])
 
+# check fuse
+AC_ARG_WITH([fuse],
+  AS_HELP_STRING([--without-fuse], [Ignore presence of fuse and disable it]))
+
+AS_IF([test "x$with_fuse" != "xno"],
+  [PKG_CHECK_MODULES(FUSE, [$FUSE_REQUIRES], [ENABLE_FUSE=yes], 
[ENABLE_FUSE=no])],
+  [ENABLE_FUSE=no])
+
+AS_IF([test "x$ENABLE_FUSE" = "xyes"],
+  [
+    AC_SUBST(FUSE_CFLAGS)
+    AC_SUBST(FUSE_LIBS)
+  ],
+    [AS_IF([test "x$with_fuse" = "xyes"],
+      [AC_MSG_ERROR([fuse support requested but not found])
+    ])
+])
+
+AM_CONDITIONAL([ENABLE_FUSE], [test "x$ENABLE_FUSE" = "xyes"])
+
 # enable dev compiler warnings
 AC_ARG_ENABLE([warnings], AC_HELP_STRING([--enable-warnings], [Build with 
compiler warnings enabled.]))
 AS_IF([test "x$enable_warnings" = "xyes"], [




Reply via email to