diff options
| author | Andy Wingo <wingo@pobox.com> | 2015-04-19 15:58:17 +0200 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2015-04-19 15:58:17 +0200 |
| commit | 24ae905d8eb4af9bfbb40f04c7e9730250e3ca0d (patch) | |
| tree | a60806719108940d761048252e7d9e6d7a716a60 | |
| parent | 7ccbdfc48fc925d3c74a867c8996ceff866c7fd3 (diff) | |
logind will always be built
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | man/loginctl.xml | 3 | ||||
| -rw-r--r-- | man/logind.conf.xml | 3 | ||||
| -rw-r--r-- | man/logind.xml | 2 |
4 files changed, 3 insertions, 15 deletions
diff --git a/configure.ac b/configure.ac index e5c3b305f9..a283f50dd8 100644 --- a/configure.ac +++ b/configure.ac @@ -486,15 +486,6 @@ fi AM_CONDITIONAL([HAVE_SMACK], [test "x$have_smack" = "xyes"]) # ------------------------------------------------------------------------------ -have_logind=no -AC_ARG_ENABLE(logind, AS_HELP_STRING([--disable-logind], [disable login daemon])) -if test "x$enable_logind" != "xno"; then - have_logind=yes -fi -AM_CONDITIONAL(ENABLE_LOGIND, [test "$have_logind" = "yes"]) -AS_IF([test "$have_logind" = "yes"], [ AC_DEFINE(HAVE_LOGIND, [1], [Logind support available]) ]) - -# ------------------------------------------------------------------------------ have_machined=no AC_ARG_ENABLE(machined, AS_HELP_STRING([--disable-machined], [disable machine daemon])) if test "x$enable_machined" != "xno"; then @@ -956,7 +947,6 @@ AC_MSG_RESULT([ SECCOMP: ${have_seccomp} SMACK: ${have_smack} ACL: ${have_acl} - logind: ${have_logind} machined: ${have_machined} importd: ${have_importd} hostnamed: ${have_hostnamed} diff --git a/man/loginctl.xml b/man/loginctl.xml index 9dda14d454..b93ba80de5 100644 --- a/man/loginctl.xml +++ b/man/loginctl.xml @@ -21,8 +21,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. --> -<refentry id="loginctl" conditional='ENABLE_LOGIND' - xmlns:xi="http://www.w3.org/2001/XInclude"> +<refentry id="loginctl" xmlns:xi="http://www.w3.org/2001/XInclude"> <refentryinfo> <title>loginctl</title> diff --git a/man/logind.conf.xml b/man/logind.conf.xml index 2b79547275..2e22e5cc95 100644 --- a/man/logind.conf.xml +++ b/man/logind.conf.xml @@ -21,8 +21,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. --> -<refentry id="logind.conf" conditional='ENABLE_LOGIND' - xmlns:xi="http://www.w3.org/2001/XInclude"> +<refentry id="logind.conf" xmlns:xi="http://www.w3.org/2001/XInclude"> <refentryinfo> <title>logind.conf</title> <productname>systemd</productname> diff --git a/man/logind.xml b/man/logind.xml index 5733e42cd1..da0bd7a0c5 100644 --- a/man/logind.xml +++ b/man/logind.xml @@ -21,7 +21,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. --> -<refentry id="systemd-logind.service" conditional='ENABLE_LOGIND'> +<refentry id="systemd-logind.service"> <refentryinfo> <title>systemd-logind.service</title> |