summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Kareh <[email protected]>2019-03-08 13:37:01 -0500
committerVictor Kareh <[email protected]>2019-03-21 08:33:24 -0400
commit51f12ece0dcb77f08462ca1ae27a0a571f3b338e (patch)
tree940ecabac4ef106b2c7c545e9ca6bdebb114c255
parent254a091b31517a25bc037b31daff27fbb74ac90d (diff)
downloadmate-session-manager-51f12ece0dcb77f08462ca1ae27a0a571f3b338e.tar.bz2
mate-session-manager-51f12ece0dcb77f08462ca1ae27a0a571f3b338e.tar.xz
Add ELOGIND support
Reuses HAVE_SYSTEMD #define to reduce #ifdef mess. ELOGIND is not officially supported, but since it's a subset of systemd, it should work out of the box. Co-authored-by: Joakim Tjernlund <[email protected]> Co-authored-by: Jorge Pizarro Callejas <[email protected]>
-rw-r--r--configure.ac29
-rw-r--r--mate-session/Makefile.am2
2 files changed, 31 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index 207ad97..1390ba0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -110,6 +110,34 @@ AM_CONDITIONAL(HAVE_SYSTEMD, test "x$use_systemd" = "xyes")
AC_SUBST(HAVE_SYSTEMD)
dnl ====================================================================
+dnl Check for elogind
+dnl
+dnl elogind is not officially supported, but since it's a subset of
+dnl systemd, it should work out of the box
+dnl ====================================================================
+
+AC_ARG_WITH(elogind,
+ AS_HELP_STRING([--with-elogind],
+ [Use libelogind instead of libsystemd-login]),,
+ with_elogind=auto)
+
+use_elogind=no
+if test "x$with_elogind" != "xno"; then
+ PKG_CHECK_MODULES(LIBELOGIND,[libelogind], [use_elogind=yes],
+ [PKG_CHECK_MODULES([LIBELOGIND], [libelogind],
+ [use_elogind=yes], [use_elogind=no])])
+
+ if test "x$use_elogind" = "xyes"; then
+ AC_DEFINE([HAVE_ELOGIND], 1, [elogind support])
+ AC_DEFINE([HAVE_SYSTEMD], 1, [Define to 1 to reduce ifdefs since elogind is a drop-in replacement for systemd])
+ AC_SUBST(LIBELOGIND_CFLAGS)
+ AC_SUBST(LIBELOGIND_LIBS)
+ fi
+fi
+AM_CONDITIONAL(HAVE_ELOGIND, [test "x$use_elogind" = "xyes"])
+AC_SUBST(HAVE_ELOGIND)
+
+dnl ====================================================================
dnl Check for XSync extension
dnl ====================================================================
@@ -333,6 +361,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 = \