From: Iain Lane <iain.lane@canonical.com>
Date: Tue, 16 Apr 2013 16:27:50 +0000 (+0100)
Subject: Define LOGIND_RUNNING from the configure script
X-Git-Url: https://rtime.felk.cvut.cz/gitweb/sojka/lightdm.git/commitdiff_plain/1a2e759dff3f6709647979e8e5c7ec7d0d207899

Define LOGIND_RUNNING from the configure script
---

1a2e759dff3f6709647979e8e5c7ec7d0d207899
diff --cc configure.ac
index bbc25b67,224b1bdf..1a6dc963
--- a/configure.ac
+++ b/configure.ac
@@@ -171,30 -171,6 +171,34 @@@ AC_ARG_WITH(greeter-user
  AC_SUBST(GREETER_USER)
  AC_DEFINE_UNQUOTED(GREETER_USER, "$GREETER_USER", User to run greeter as)
  
 +AC_ARG_ENABLE(consolekit,
 +              AS_HELP_STRING([--enable-consolekit],
 +                                [Build with ConsoleKit support @<:@default=yes@:>@]),,
 +                 enable_consolekit=yes)
 +AM_CONDITIONAL(ENABLE_CONSOLEKIT, test x$enable_consolekit = xyes)
 +
 +if test x$enable_consolekit = xyes; then
 +  AC_DEFINE(WITH_CONSOLEKIT, 1, [Define if ConsoleKit support is enabled])
++  AC_DEFINE(LOGIND_RUNNING(), 0,
++		      [Define to a check for whether the system is running logind])
 +fi
 +
 +AC_ARG_ENABLE(logind,
 +              AS_HELP_STRING([--enable-logind],
 +                                [Build with systemd logind support @<:@default=no@:>@]),,
 +                 enable_logind=no)
 +AM_CONDITIONAL(ENABLE_LOGIND, test x$enable_logind = xyes)
 +
 +if test x$enable_logind = xyes; then
 +  AC_DEFINE(WITH_LOGIND, 1, [Define if systemd logind support is enabled])
++  AC_DEFINE(LOGIND_RUNNING(), (access("/run/systemd/seats/", F_OK) >= 0),
++		      [Define to a check for whether the system is running logind])
 +fi
 +
 +if test x$enable_consolekit = xno -a x$enable_logind = xno; then
 +   AC_MSG_ERROR(one of --enable-consolekit or --enable-logind must be supplied)
 +fi
 +
  dnl ###########################################################################
  dnl Documentation
  dnl ###########################################################################