[gvfs] Disable udisks2 volume monitor if gudev is not available
- From: Ondrej Holy <oholy src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gvfs] Disable udisks2 volume monitor if gudev is not available
- Date: Wed, 19 Oct 2016 11:16:47 +0000 (UTC)
commit 4c4740f605edac7b55a417e244b7c1a7253ef6a2
Author: Michael Biebl <biebl debian org>
Date: Wed Aug 31 21:22:08 2016 +0200
Disable udisks2 volume monitor if gudev is not available
The udisks2 volume monitor requires gudev, so disable it if gudev
support is not available.
https://bugzilla.gnome.org/show_bug.cgi?id=770670
configure.ac | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 0e778f1..68ba662 100644
--- a/configure.ac
+++ b/configure.ac
@@ -202,6 +202,23 @@ if test "x$enable_udev" != "xno"; then
fi
dnl **********************
+dnl *** Check for gudev ***
+dnl **********************
+AC_ARG_ENABLE([gudev], [AS_HELP_STRING([--disable-gudev],[build without gudev support])])
+msg_gudev=no
+GUDEV_REQUIRED=147
+
+if test "x$enable_gudev" != "xno"; then
+ PKG_CHECK_EXISTS([gudev-1.0 >= $GUDEV_REQUIRED], [msg_gudev=yes])
+
+ if test "x$msg_gudev" = "xyes"; then
+ PKG_CHECK_MODULES([GUDEV], [gudev-1.0 >= $GUDEV_REQUIRED])
+ AC_DEFINE([HAVE_GUDEV], 1, [Define to 1 if gudev is available])
+ fi
+fi
+AM_CONDITIONAL([USE_GUDEV], [test "$msg_gudev" = "yes"])
+
+dnl **********************
dnl *** Check for FUSE ***
dnl **********************
AC_ARG_ENABLE([fuse], [AS_HELP_STRING([--disable-fuse],[build without FUSE support])])
@@ -245,7 +262,7 @@ AC_ARG_ENABLE([udisks2], [AS_HELP_STRING([--disable-udisks2],[build without libu
msg_udisks2=no
UDISKS2_REQUIRED=1.97
-if test "x$enable_udisks2" != "xno"; then
+if test "x$enable_udisks2" != "xno" -a "x$msg_gudev" = "xyes"; then
PKG_CHECK_EXISTS([udisks2 >= $UDISKS2_REQUIRED], [msg_udisks2=yes])
if test "x$msg_udisks2" = "xyes"; then
@@ -295,23 +312,6 @@ fi
AM_CONDITIONAL(USE_LIBSYSTEMD_LOGIN, [test "$msg_libsystemd_login" = "yes"])
-dnl **********************
-dnl *** Check for gudev ***
-dnl **********************
-AC_ARG_ENABLE([gudev], [AS_HELP_STRING([--disable-gudev],[build without gudev support])])
-msg_gudev=no
-GUDEV_REQUIRED=147
-
-if test "x$enable_gudev" != "xno"; then
- PKG_CHECK_EXISTS([gudev-1.0 >= $GUDEV_REQUIRED], [msg_gudev=yes])
-
- if test "x$msg_gudev" = "xyes"; then
- PKG_CHECK_MODULES([GUDEV], [gudev-1.0 >= $GUDEV_REQUIRED])
- AC_DEFINE([HAVE_GUDEV], 1, [Define to 1 if gudev is available])
- fi
-fi
-AM_CONDITIONAL([USE_GUDEV], [test "$msg_gudev" = "yes"])
-
dnl **************************************************
dnl *** Check if we should build with CDDA backend ***
dnl **************************************************
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]