From d0bea6d37dba799a4ef232da844a58a736a56a92 Mon Sep 17 00:00:00 2001
From: Joakim Tjernlund <joakim.tjernlund@infinera.com>
Date: Thu, 7 Mar 2019 17:04:43 +0100
Subject: [PATCH] Add LOGIND support

Reuses HAVE_SYSTEMD #define to reduce #ifdef mess.
---
 configure.ac             | 28 ++++++++++++++++++++++++++++
 mate-session/Makefile.am |  2 ++
 2 files changed, 30 insertions(+)

diff --git a/configure.ac b/configure.ac
index 207ad97..66faffb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -107,7 +107,34 @@ if test "x$with_systemd" != "xno" ; then
     fi
 fi
 AM_CONDITIONAL(HAVE_SYSTEMD, test "x$use_systemd" = "xyes")
+
+dnl ====================================================================
+dnl Check for elogind
+dnl ====================================================================
+
+AC_ARG_WITH(elogind,
+	    AS_HELP_STRING([--with-elogind],
+	    [Use libelogind instead of libsystemd-login]),,
+	    with_elogind=auto)
+
+use_elogind=no
+ELOGIND_REQUIRED=239
+if test "x$with_elogind" != "xno"; then
+    PKG_CHECK_MODULES(LIBELOGIND,[libelogind], [use_elogind=yes],
+                        [PKG_CHECK_MODULES([LIBELOGIND],[libelogind >= $LIBELOGIND_REQUIRED],
+			[use_elogind=yes], [use_elogind=no])])
+
+    if test "x$use_elogind" = "xyes"; then
+        AC_DEFINE([HAVE_LOGIND], 1, [Define to 1 if libelogind is available])
+        AC_DEFINE([HAVE_SYSTEMD], 1, [Define to 1 to reduce ifdefs])
+        AC_SUBST(LIBELOGIND_CFLAGS)
+        AC_SUBST(LIBELOGIND_LIBS)
+    fi
+fi
+AM_CONDITIONAL(HAVE_LOGIND, [test "x$use_elogind" = "xyes"])
+
 AC_SUBST(HAVE_SYSTEMD)
+AC_SUBST(HAVE_LOGIND)
 
 dnl ====================================================================
 dnl Check for XSync extension
@@ -333,6 +360,7 @@ echo "
 
         Default WM:               ${with_default_wm}
         Systemd support:          ${use_systemd}
+        Elogind support:          ${use_elogind}
         IPv6 support:             ${have_full_ipv6}
         Backtrace support:        ${have_backtrace}
         XRender support:          ${have_xrender}
diff --git a/mate-session/Makefile.am b/mate-session/Makefile.am
index 093c908..ea0dc95 100644
--- a/mate-session/Makefile.am
+++ b/mate-session/Makefile.am
@@ -7,6 +7,7 @@ noinst_PROGRAMS = 		\
 AM_CPPFLAGS =					\
 	$(MATE_SESSION_CFLAGS)		\
 	$(SYSTEMD_CFLAGS)			\
+	$(LIBELOGIND_CFLAGS)			\
 	$(DISABLE_DEPRECATED_CFLAGS)
 
 AM_CFLAGS = $(WARN_CFLAGS)
@@ -80,6 +81,7 @@ mate_session_LDADD =				\
 	$(XEXT_LIBS)				\
 	$(MATE_SESSION_LIBS)			\
 	$(SYSTEMD_LIBS)				\
+	$(LIBELOGIND_LIBS)			\
 	$(EXECINFO_LIBS)
 
 libgsmutil_la_SOURCES =				\
-- 
2.19.2