diff options
| author | David Zeuthen <davidz@redhat.com> | 2012-04-21 12:28:09 -0400 |
|---|---|---|
| committer | David Zeuthen <davidz@redhat.com> | 2012-04-21 12:33:30 -0400 |
| commit | 5c9ffd7bf5d08c3fe57e235d8001e0b9c23a2730 (patch) | |
| tree | cbbd07132aa98ba014ffcde5e33b0097c89b45cd /configure.ac | |
| parent | b51b55b8a7e66cabecec972c96513edce6237193 (diff) | |
| download | gvfs-5c9ffd7bf5d08c3fe57e235d8001e0b9c23a2730.tar.gz | |
Don't set should_automount to TRUE for devices on other seats
This change uses the libsystemd-login library to obtain the seat we're
on and compares it against the Seat property on the D-Bus interface
org.freedesktop.UDisks2.Drive. This property is available in udisks
1.95.0, see
http://cgit.freedesktop.org/udisks/commit/?id=91106cdc7622d9674f6083dcb524407f026a36c7
Also, since we're still on the stable branch and not everyone may be
using systemd, make this work without hard-requiring either
libsystemd-login or udisks 1.95.0.
Signed-off-by: David Zeuthen <davidz@redhat.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 3b77b649..361b0d43 100644 --- a/configure.ac +++ b/configure.ac @@ -239,6 +239,27 @@ fi AM_CONDITIONAL(USE_UDISKS2, [test "$msg_udisks2" = "yes"]) +dnl ********************************** +dnl *** Check for libsystemd-login *** +dnl ********************************** + +AC_ARG_ENABLE(libsystemd_login, AS_HELP_STRING([--disable-libsystemd-login],[build without liblibsystemd-login])) +msg_libsystemd_login=no +LIBSYSTEMD_LOGIN_LIBS= +LIBSYSTEMD_LOGIN_CFLAGS= +LIBSYSTEMD_LOGIN_REQUIRED=44 + +if test "x$enable_libsystemd_login" != "xno"; then + PKG_CHECK_EXISTS([libsystemd-login >= $LIBSYSTEMD_LOGIN_REQUIRED], msg_libsystemd_login=yes) + + if test "x$msg_libsystemd_login" = "xyes"; then + PKG_CHECK_MODULES([LIBSYSTEMD_LOGIN],[libsystemd-login >= $LIBSYSTEMD_LOGIN_REQUIRED]) + AC_DEFINE(HAVE_LIBSYSTEMD_LOGIN, 1, [Define to 1 if liblibsystemd_login is available]) + fi +fi + +AM_CONDITIONAL(USE_LIBSYSTEMD_LOGIN, [test "$msg_libsystemd_login" = "yes"]) + dnl ********************** dnl *** Check for HAL *** dnl ********************** @@ -783,6 +804,7 @@ echo " Build HAL volume monitor: $msg_hal (with fast init path: $have_hal_fast_init) Build GDU volume monitor: $msg_gdu Build udisks2 volume monitor: $msg_udisks2 + Use libsystem-login: $msg_libsystemd_login GNOME Keyring support: $msg_keyring Bash-completion support: $msg_bash_completion " |