logind will always be built

diff --git a/configure.ac b/configure.ac
index e5c3b305f9cf047e372250bc501e65957ab6c6b7..a283f50dd8587a523217f0da915c636d1e568dd2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -485,15 +485,6 @@ fi
 
 AM_CONDITIONAL([HAVE_SMACK], [test "x$have_smack" = "xyes"])
 
 
 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]))
 # ------------------------------------------------------------------------------
 have_machined=no
 AC_ARG_ENABLE(machined, AS_HELP_STRING([--disable-machined], [disable machine daemon]))


@@ -956,7 +947,6 @@ AC_MSG_RESULT([
         SECCOMP:                 ${have_seccomp}
         SMACK:                   ${have_smack}
         ACL:                     ${have_acl}
         SECCOMP:                 ${have_seccomp}
         SMACK:                   ${have_smack}
         ACL:                     ${have_acl}

-        logind:                  ${have_logind}

         machined:                ${have_machined}
         importd:                 ${have_importd}
         hostnamed:               ${have_hostnamed}
         machined:                ${have_machined}
         importd:                 ${have_importd}
         hostnamed:               ${have_hostnamed}

diff --git a/man/loginctl.xml b/man/loginctl.xml
index 9dda14d4548df1da386bde21a8317281da380000..b93ba80de5d44768423db0262af8d6956f5e831f 100644 (file)
--- a/man/loginctl.xml
+++ b/man/loginctl.xml
@@ -21,8 +21,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
 
   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>
 
   <refentryinfo>
     <title>loginctl</title>

diff --git a/man/logind.conf.xml b/man/logind.conf.xml
index 2b79547275caf7f2b470d1113d807f0a7d552e5c..2e22e5cc95367109079565045497d85f85114bde 100644 (file)
--- 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/>.
 -->
 
   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>
   <refentryinfo>
     <title>logind.conf</title>
     <productname>systemd</productname>

diff --git a/man/logind.xml b/man/logind.xml
index 5733e42cd1afd5f2a15368f88703460cc8038f99..da0bd7a0c50e5a61fd416f6d346d2f4202c6cabe 100644 (file)
--- a/man/logind.xml
+++ b/man/logind.xml
@@ -21,7 +21,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
 
   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>
 
   <refentryinfo>
     <title>systemd-logind.service</title>