Attachment #474904 for bug #599492

Lines 144-149 Link Here

(-)a/config.h.in (+3 lines)
144	/* Version number of package */	144	/* Version number of package */
145	#undef VERSION	145	#undef VERSION
146		146
		147	/* Define to enable elogind support */
		148	#undef WITH_ELOGIND
		149
147	/* Define to enable systemd support */	150	/* Define to enable systemd support */
148	#undef WITH_SYSTEMD	151	#undef WITH_SYSTEMD
149		152




dnl ---------------------------------------------------------------------------
AC_PATH_PROG([XSLTPROC], [xsltproc])

# elogind

have_elogind=no

AC_MSG_CHECKING([whether to use elogind])

AC_ARG_ENABLE([elogind],
              AS_HELP_STRING([--enable-elogind], [Use elogind]),
              [enable_elogind=$enableval])

AC_MSG_RESULT($enable_elogind)

if test "x$enable_elogind" != "xno"; then
        PKG_CHECK_MODULES(ELOGIND, [libelogind >= 219],
                                   [have_elogind=yes],
                                   [have_elogind=no])
fi

if test "x$enable_elogind" != "xno"; then
        if test "x$have_elogind" != "xyes"; then
                AC_MSG_ERROR([elogind support explicitly required, but libelogind not found])
        else
                AC_SUBST(ELOGIND_CFLAGS)
                AC_SUBST(ELOGIND_LIBS)

                LIBACCOUNTSSERVICE_LIBS="$LIBACCOUNTSSERVICE_LIBS $ELOGIND_LIBS"
                LIBACCOUNTSSERVICE_CFLAGS="$LIBACCOUNTSSERVICE_CFLAGS $ELOGIND_CFLAGS"

                AC_DEFINE(WITH_ELOGIND, 1, [Define to enable elogind support])
        fi
fi


# systemd

AC_ARG_ENABLE([systemd],

              [enable_systemd=auto])

if test x$enable_systemd != xno; then
   if test "x$enable_elogind" != "xno"; then
           AC_MSG_NOTICE([Systemd support requested, but elogind found])
           have_systemd=no
           enable_systemd=no
   else
        PKG_CHECK_MODULES(SYSTEMD, [libsystemd >= 186],
                                   [have_systemd=yes],
                                   [have_systemd=no])
   fi
else
   have_systemd=no
fi

Lines 43-50 Link Here

(-)a/src/libaccountsservice/act-user-manager.c (+8 lines)
43		43
44	#ifdef WITH_SYSTEMD	44	#ifdef WITH_SYSTEMD
45	#include <systemd/sd-login.h>	45	#include <systemd/sd-login.h>
		46	#endif
		47
		48	#ifdef WITH_ELOGIND
		49	#include <elogind/sd-login.h>
		50	/* Re-Use WITH_SYSTEMD as elogind substitutes systemd-login */
		51	#define WITH_SYSTEMD 1
		52	#endif
46		53
47	/* check if logind is running */	54	/* check if logind is running */
		55	#ifdef WITH_SYSTEMD
48	#define LOGIND_RUNNING() (access("/run/systemd/seats/", F_OK) >= 0)	56	#define LOGIND_RUNNING() (access("/run/systemd/seats/", F_OK) >= 0)
49	#endif	57	#endif
50		58

Return to bug 599492

Lines 264-269 Link Here

(-)a/configure.ac (-2 / +42 lines)
264	dnl ---------------------------------------------------------------------------	264	dnl ---------------------------------------------------------------------------
265	AC_PATH_PROG([XSLTPROC], [xsltproc])	265	AC_PATH_PROG([XSLTPROC], [xsltproc])
266		266
		267	# elogind
		268
		269	have_elogind=no
		270
		271	AC_MSG_CHECKING([whether to use elogind])
		272
		273	AC_ARG_ENABLE([elogind],
		274	AS_HELP_STRING([--enable-elogind], [Use elogind]),
		275	[enable_elogind=$enableval])
		276
		277	AC_MSG_RESULT($enable_elogind)
		278
		279	if test "x$enable_elogind" != "xno"; then
		280	PKG_CHECK_MODULES(ELOGIND, [libelogind >= 219],
		281	[have_elogind=yes],
		282	[have_elogind=no])
		283	fi
		284
		285	if test "x$enable_elogind" != "xno"; then
		286	if test "x$have_elogind" != "xyes"; then
		287	AC_MSG_ERROR([elogind support explicitly required, but libelogind not found])
		288	else
		289	AC_SUBST(ELOGIND_CFLAGS)
		290	AC_SUBST(ELOGIND_LIBS)
		291
		292	LIBACCOUNTSSERVICE_LIBS="$LIBACCOUNTSSERVICE_LIBS $ELOGIND_LIBS"
		293	LIBACCOUNTSSERVICE_CFLAGS="$LIBACCOUNTSSERVICE_CFLAGS $ELOGIND_CFLAGS"
		294
		295	AC_DEFINE(WITH_ELOGIND, 1, [Define to enable elogind support])
		296	fi
		297	fi
		298
		299
267	# systemd	300	# systemd
268		301
269	AC_ARG_ENABLE([systemd],	302	AC_ARG_ENABLE([systemd],
Lines 272-279 Link Here
272	[enable_systemd=auto])	305	[enable_systemd=auto])
273		306
274	if test x$enable_systemd != xno; then	307	if test x$enable_systemd != xno; then
275	PKG_CHECK_MODULES(SYSTEMD, [libsystemd >= 186],	308	if test "x$enable_elogind" != "xno"; then
276	[have_systemd=yes], [have_systemd=no])	309	AC_MSG_NOTICE([Systemd support requested, but elogind found])
		310	have_systemd=no
		311	enable_systemd=no
		312	else
		313	PKG_CHECK_MODULES(SYSTEMD, [libsystemd >= 186],
		314	[have_systemd=yes],
		315	[have_systemd=no])
		316	fi
277	else	317	else
278	have_systemd=no	318	have_systemd=no
279	fi	319	fi