--- a/configure.ac~	2016-05-30 17:09:04.000000000 +0200
+++ b/configure.ac	2016-06-25 17:26:08.614205626 +0200
@@ -580,9 +580,15 @@
 dnl logind support
 dnl ---------------------------------------------------------------------------
 
-PKG_CHECK_MODULES(LOGIND, [libsystemd-login], [have_logind=yes], [
-	PKG_CHECK_MODULES(LOGIND, [libsystemd], [have_logind=yes], [have_logind=no])
-])
+AC_ARG_ENABLE([logind],
+  AS_HELP_STRING([--disable-logind], [Do not check for logind]),
+  [enable_logind=$enableval],
+  [enable_logind=auto])
+
+have_logind=no
+if test x$enable_logind != xno ; then
+  PKG_CHECK_MODULES(LOGIND, [libsystemd], [have_logind=yes], [have_logind=no])
+fi
 
 if test x$have_logind = xyes ; then
         AC_DEFINE(HAVE_LOGIND, 1, [logind support])