Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 599492 | Differences between
and this patch

Collapse All | Expand All

(-)a/configure.ac (+49 lines)
Lines 264-269 Link Here
264
dnl ---------------------------------------------------------------------------
264
dnl ---------------------------------------------------------------------------
265
AC_PATH_PROG([XSLTPROC], [xsltproc])
265
AC_PATH_PROG([XSLTPROC], [xsltproc])
266
266
267
# elogind
268
269
AC_ARG_ENABLE([elogind],
270
              AS_HELP_STRING([--enable-elogind], [Use elogind]),
271
              [enable_elogind=$enableval],
272
              [enable_elogind=auto])
273
274
if test "x$enable_elogind" != "xno"; then
275
   PKG_CHECK_MODULES(ELOGIND, [libelogind >= 219],
276
                              [have_elogind=yes],
277
                              [have_elogind=no])
278
else
279
   have_elogind=no
280
fi
281
282
AC_MSG_CHECKING([whether to use elogind])
283
284
if test "x$enable_elogind" = "xauto" ; then
285
        if test "x$have_elogind" = "xno" ; then
286
                enable_elogind=no
287
        else
288
                enable_elogind=yes
289
        fi
290
fi
291
292
AC_MSG_RESULT($enable_elogind)
293
294
if test "x$enable_elogind" = "xyes"; then
295
        if test "x$have_elogind" = "xno"; then
296
                AC_MSG_ERROR([elogind support explicitly required, but libelogind not found])
297
        fi
298
fi
299
AC_SUBST(ELOGIND_CFLAGS)
300
AC_SUBST(ELOGIND_LIBS)
301
302
LIBACCOUNTSSERVICE_LIBS="$LIBACCOUNTSSERVICE_LIBS $ELOGIND_LIBS"
303
LIBACCOUNTSSERVICE_CFLAGS="$LIBACCOUNTSSERVICE_CFLAGS $ELOGIND_CFLAGS"
304
305
if test "x$have_elogind" != "xno" ; then
306
        AC_DEFINE(WITH_ELOGIND, 1, [Define to enable elogind support])
307
fi
308
309
267
# systemd
310
# systemd
268
311
269
AC_ARG_ENABLE([systemd],
312
AC_ARG_ENABLE([systemd],
Lines 272-279 Link Here
272
              [enable_systemd=auto])
315
              [enable_systemd=auto])
273
316
274
if test x$enable_systemd != xno; then
317
if test x$enable_systemd != xno; then
318
   if test "x$have_elogind" != "xno"; then
319
           AC_MSG_NOTICE([Systemd support requested, but elogind found])
320
           have_systemd=no
321
           enable_systemd=no
322
   else
275
   PKG_CHECK_MODULES(SYSTEMD, [libsystemd >= 186],
323
   PKG_CHECK_MODULES(SYSTEMD, [libsystemd >= 186],
276
			                     [have_systemd=yes], [have_systemd=no])
324
			                     [have_systemd=yes], [have_systemd=no])
325
   fi
277
else
326
else
278
   have_systemd=no
327
   have_systemd=no
279
fi
328
fi
(-)a/src/libaccountsservice/act-user-manager.c (+5 lines)
Lines 42-48 Link Here
42
#include <gio/gunixinputstream.h>
42
#include <gio/gunixinputstream.h>
43
43
44
#ifdef WITH_SYSTEMD
44
#ifdef WITH_SYSTEMD
45
#include <systemd/sd-login.h>
45
#include <systemd/sd-login.h>
46
#else
47
#ifdef WITH_ELOGIND
48
#include <elogind/sd-login.h>
49
#define WITH_SYSTEMD 1 /* Do not clutter the sources */
50
#endif /* check against elogind substitution
46
51
47
/* check if logind is running */
52
/* check if logind is running */
48
#define LOGIND_RUNNING() (access("/run/systemd/seats/", F_OK) >= 0)
53
#define LOGIND_RUNNING() (access("/run/systemd/seats/", F_OK) >= 0)

Return to bug 599492