Attachment #471960 for bug #599502




AC_SUBST(LIBSYSTEMD_LOGIN_CFLAGS)
AC_SUBST(LIBSYSTEMD_LOGIN_LIBS)

PKG_CHECK_MODULES(LIBELOGIND, [libelogind >= 219],
                  [have_libelogind=yes],
                  [have_libelogins=no])
AM_CONDITIONAL(HAVE_LIBELOGIND, test x$have_libelogind = xyes)
if test "x$have_libelogind" = "xyes"; then
  AC_DEFINE([HAVE_LIBELOGIND], 1, [Define to 1 if libelogind is available])
fi
AC_SUBST(HAVE_LIBELOGIND)
AC_SUBST(LIBELOGIND_CFLAGS)
AC_SUBST(LIBELOGIND_LIBS)

# udevdir
AC_ARG_WITH([udevdir],
            AS_HELP_STRING([--with-udevdir=DIR], [Directory for udev]),

        udevdir:                    ${udevdir}
        systemdsystemunitdir:       ${systemdsystemunitdir}
        using libsystemd-login:     ${have_libsystemd_login}
        using libelogind:           ${have_libelogind}
        use /media for mounting:    ${fhs_media}
        acl support:                ${have_acl}
        libblockdev_part support:   ${have_libblockdev_part}

Lines 100-105 Link Here

(-)a/src/Makefile.am (+2 lines)
100	$(POLKIT_GOBJECT_1_CFLAGS) \	100	$(POLKIT_GOBJECT_1_CFLAGS) \
101	$(ACL_CFLAGS) \	101	$(ACL_CFLAGS) \
102	$(LIBSYSTEMD_LOGIN_CFLAGS) \	102	$(LIBSYSTEMD_LOGIN_CFLAGS) \
		103	$(LIBELOGIND_CFLAGS) \
103	$(PART_CFLAGS) \	104	$(PART_CFLAGS) \
104	$(NULL)	105	$(NULL)
105		106
Lines 112-117 Link Here
112	$(POLKIT_GOBJECT_1_LIBS) \	113	$(POLKIT_GOBJECT_1_LIBS) \
113	$(ACL_LIBS) \	114	$(ACL_LIBS) \
114	$(LIBSYSTEMD_LOGIN_LIBS) \	115	$(LIBSYSTEMD_LOGIN_LIBS) \
		116	$(LIBELOGIND_LIBS) \
115	$(PART_LDFLAGS) \	117	$(PART_LDFLAGS) \
116	$(top_builddir)/udisks/libudisks2.la \	118	$(top_builddir)/udisks/libudisks2.la \
117	$(NULL)	119	$(NULL)

Lines 44-50 Link Here

(-)a/src/udisksdaemonutil.c (+8 lines)
44	#if defined(HAVE_LIBSYSTEMD_LOGIN)	44	#if defined(HAVE_LIBSYSTEMD_LOGIN)
45	#include <systemd/sd-daemon.h>	45	#include <systemd/sd-daemon.h>
46	#include <systemd/sd-login.h>	46	#include <systemd/sd-login.h>
		47	#endif
		48
		49	#if defined(HAVE_ELOGIND) && !defined(HAVE_LIBSYSTEMD_LOGIN)
		50	#include <elogind/sd-login.h>
		51	/* re-use HAVE_LIBSYSTEMD_LOGIN to not clutter the source file */
		52	#define HAVE_LIBSYSTEMD_LOGIN 1
		53	#endif
47		54
		55	#if defined(HAVE_LIBSYSTEMD_LOGIN)
48	#define LOGIND_AVAILABLE() (access("/run/systemd/seats/", F_OK) >= 0)	56	#define LOGIND_AVAILABLE() (access("/run/systemd/seats/", F_OK) >= 0)
49	#endif	57	#endif
50		58

Return to bug 599502

Lines 170-175 Link Here

(-)a/configure.ac (+12 lines)
170	AC_SUBST(LIBSYSTEMD_LOGIN_CFLAGS)	170	AC_SUBST(LIBSYSTEMD_LOGIN_CFLAGS)
171	AC_SUBST(LIBSYSTEMD_LOGIN_LIBS)	171	AC_SUBST(LIBSYSTEMD_LOGIN_LIBS)
172		172
		173	PKG_CHECK_MODULES(LIBELOGIND, [libelogind >= 219],
		174	[have_libelogind=yes],
		175	[have_libelogins=no])
		176	AM_CONDITIONAL(HAVE_LIBELOGIND, test x$have_libelogind = xyes)
		177	if test "x$have_libelogind" = "xyes"; then
		178	AC_DEFINE([HAVE_LIBELOGIND], 1, [Define to 1 if libelogind is available])
		179	fi
		180	AC_SUBST(HAVE_LIBELOGIND)
		181	AC_SUBST(LIBELOGIND_CFLAGS)
		182	AC_SUBST(LIBELOGIND_LIBS)
		183
173	# udevdir	184	# udevdir
174	AC_ARG_WITH([udevdir],	185	AC_ARG_WITH([udevdir],
175	AS_HELP_STRING([--with-udevdir=DIR], [Directory for udev]),	186	AS_HELP_STRING([--with-udevdir=DIR], [Directory for udev]),
Lines 600-605 Link Here
600	udevdir: ${udevdir}	611	udevdir: ${udevdir}
601	systemdsystemunitdir: ${systemdsystemunitdir}	612	systemdsystemunitdir: ${systemdsystemunitdir}
602	using libsystemd-login: ${have_libsystemd_login}	613	using libsystemd-login: ${have_libsystemd_login}
		614	using libelogind: ${have_libelogind}
603	use /media for mounting: ${fhs_media}	615	use /media for mounting: ${fhs_media}
604	acl support: ${have_acl}	616	acl support: ${have_acl}
605	libblockdev_part support: ${have_libblockdev_part}	617	libblockdev_part support: ${have_libblockdev_part}