]> rtime.felk.cvut.cz Git - sojka/lightdm.git/commitdiff
Define LOGIND_RUNNING from the configure script
authorIain Lane <iain.lane@canonical.com>
Tue, 16 Apr 2013 16:27:50 +0000 (17:27 +0100)
committerIain Lane <iain.lane@canonical.com>
Tue, 16 Apr 2013 16:27:50 +0000 (17:27 +0100)
1  2 
configure.ac

diff --cc configure.ac
index bbc25b67dfd29719556fadac5529c911ff1a1788,224b1bdf0273c1d6af025eddc88cd2bb20551aca..1a6dc9637e5f6f5b43ab6a90aa9965e33214bbbe
@@@ -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 ###########################################################################