Attachment #453002 for bug #599482

Lines 286-291 Link Here

(-)a/configure.ac (+24 lines)
286	msg_libsystemd_login=no	286	msg_libsystemd_login=no
287	LIBSYSTEMD_LOGIN_REQUIRED=44	287	LIBSYSTEMD_LOGIN_REQUIRED=44
288		288
		289	if test "x$enable_libelogind" != "xno"; then
		290	enable_libsystemd_login=no
		291	fi
		292
289	if test "x$enable_libsystemd_login" != "xno"; then	293	if test "x$enable_libsystemd_login" != "xno"; then
290	PKG_CHECK_EXISTS([libsystemd], [msg_libsystemd_login=yes],	294	PKG_CHECK_EXISTS([libsystemd], [msg_libsystemd_login=yes],
291	[PKG_CHECK_EXISTS([libsystemd-login >= $LIBSYSTEMD_LOGIN_REQUIRED], [msg_libsystemd_login=yes])])	295	[PKG_CHECK_EXISTS([libsystemd-login >= $LIBSYSTEMD_LOGIN_REQUIRED], [msg_libsystemd_login=yes])])
Lines 299-304 Link Here
299		303
300	AM_CONDITIONAL(USE_LIBSYSTEMD_LOGIN, [test "$msg_libsystemd_login" = "yes"])	304	AM_CONDITIONAL(USE_LIBSYSTEMD_LOGIN, [test "$msg_libsystemd_login" = "yes"])
301		305
		306	dnl **********************************
		307	dnl * Check for libelogind *
		308	dnl **********************************
		309
		310	AC_ARG_ENABLE([libelogind], [AS_HELP_STRING([--enable-libelogind],[build with libelogind instead of libsystemd-login])])
		311	msg_libelogind=no
		312	LIBELOGIND_REQUIRED=218
		313
		314	if test "x$enable_libelogind" != "xno"; then
		315	PKG_CHECK_EXISTS([libelogind >= $LIBELOGIND_REQUIRED], [msg_libelogind=yes])
		316
		317	if test "x$msg_libelogind" = "xyes"; then
		318	PKG_CHECK_MODULES([LIBELOGIND],[libelogind >= $LIBELOGIND_REQUIRED])
		319	AC_DEFINE([HAVE_LIBELOGIND], 1, [Define to 1 if libelogind is available])
		320	fi
		321	fi
		322
		323	AM_CONDITIONAL(USE_LIBELOGIND, [test "$msg_libelogind" = "yes"])
		324
302	dnl **********************	325	dnl **********************
303	dnl * Check for HAL *	326	dnl * Check for HAL *
304	dnl **********************	327	dnl **********************
Lines 969-974 Link Here
969	Build GOA volume monitor: $msg_goa	992	Build GOA volume monitor: $msg_goa
970	Use systemd user units: $msg_systemd_user_units	993	Use systemd user units: $msg_systemd_user_units
971	Use libsystemd-login: $msg_libsystemd_login	994	Use libsystemd-login: $msg_libsystemd_login
		995	Use libelogind: $msg_libelogind
972	Use GCR: $msg_gcr	996	Use GCR: $msg_gcr
973	GNOME Keyring support: $msg_keyring	997	GNOME Keyring support: $msg_keyring
974	GTK+ support: $msg_gtk	998	GTK+ support: $msg_gtk

Lines 20-25 Link Here

(-)a/monitor/udisks2/Makefile.am (+2 lines)
20	$(UDISKS2_CFLAGS) \	20	$(UDISKS2_CFLAGS) \
21	$(GUDEV_CFLAGS) \	21	$(GUDEV_CFLAGS) \
22	$(LIBSYSTEMD_LOGIN_CFLAGS) \	22	$(LIBSYSTEMD_LOGIN_CFLAGS) \
		23	$(LIBELOGIND_CFLAGS) \
23	$(KEYRING_CFLAGS) \	24	$(KEYRING_CFLAGS) \
24	-DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\" \	25	-DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\" \
25	-DGVFS_LOCALEDIR=\""$(localedir)"\" \	26	-DGVFS_LOCALEDIR=\""$(localedir)"\" \
Lines 35-40 Link Here
35	$(UDISKS2_LIBS) \	36	$(UDISKS2_LIBS) \
36	$(GUDEV_LIBS) \	37	$(GUDEV_LIBS) \
37	$(LIBSYSTEMD_LOGIN_LIBS) \	38	$(LIBSYSTEMD_LOGIN_LIBS) \
		39	$(LIBELOGIND_LIBS) \
38	$(KEYRING_LIBS) \	40	$(KEYRING_LIBS) \
39	$(top_builddir)/common/libgvfscommon.la \	41	$(top_builddir)/common/libgvfscommon.la \
40	$(top_builddir)/common/libgvfscommon-monitor.la \	42	$(top_builddir)/common/libgvfscommon-monitor.la \

Lines 532-538 Link Here

(-)a/monitor/udisks2/gvfsudisks2utils.c (+6 lines)
532		532
533	#if defined(HAVE_LIBSYSTEMD_LOGIN)	533	#if defined(HAVE_LIBSYSTEMD_LOGIN)
534	#include <systemd/sd-login.h>	534	#include <systemd/sd-login.h>
		535	#endif
535		536
		537	#if defined(HAVE_LIBELOGIND)
		538	#include <elogind/sd-login.h>
		539	#endif
		540
		541	#if defined(HAVE_LIBSYSTEMD_LOGIN) \|\| defined(HAVE_LIBELOGIND)
536	static const gchar *	542	static const gchar *
537	get_seat (void)	543	get_seat (void)
538	{	544	{

Return to bug 599482