[gnome-session] Revert "meson: Support elogind"



commit aa115037db0dfb8b00b8d6276049f782a2369150
Author: Ray Strode <halfline gmail com>
Date:   Wed Mar 20 18:28:12 2019 +0000

    Revert "meson: Support elogind"
    
    This reverts commit 25dde19ebb75a2a297d9ce9ee313e7b3a69dedb5

 meson.build       | 12 +++---------
 meson_options.txt |  1 -
 2 files changed, 3 insertions(+), 10 deletions(-)
---
diff --git a/meson.build b/meson.build
index 3a9c32a4..afc97457 100644
--- a/meson.build
+++ b/meson.build
@@ -121,10 +121,8 @@ session_tracking = 'null backend'
 
 enable_systemd = get_option('systemd')
 enable_systemd_journal = get_option('systemd_journal')
-enable_elogind = get_option('elogind')
 enable_consolekit = get_option('consolekit')
-assert(not (enable_systemd and enable_elogind), 'Can not support systemd and elogind at once')
-if enable_systemd or enable_elogind or enable_consolekit
+if enable_systemd or enable_consolekit
   session_bin_deps += dependency('gio-unix-2.0', version: glib_req_version)
 
   # Check for systemd
@@ -147,10 +145,6 @@ if enable_systemd or enable_elogind or enable_consolekit
     endif
 
     session_tracking = 'systemd'
-  elif enable_elogind
-    libelogind_dep = dependency('libelogind', version: '>= 239')
-    session_bin_deps += libelogind_dep
-    session_tracking = 'elogind'
   endif
 
   # Check for ConsoleKit
@@ -160,14 +154,14 @@ if enable_systemd or enable_elogind or enable_consolekit
 
     session_bin_deps += dbus_glib_dep
 
-    if enable_systemd or enable_elogind
+    if enable_systemd
       session_tracking += ' (with fallback to ConsoleKit)'
     else
       session_tracking = 'ConsoleKit'
     endif
   endif
 endif
-config_h.set('HAVE_SYSTEMD', enable_systemd or enable_elogind)
+config_h.set('HAVE_SYSTEMD', enable_systemd)
 config_h.set('ENABLE_SYSTEMD_JOURNAL', enable_systemd_journal)
 config_h.set('HAVE_CONSOLEKIT', enable_consolekit)
 
diff --git a/meson_options.txt b/meson_options.txt
index cd85eae8..05174fec 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,5 +1,4 @@
 option('deprecation_flags', type: 'boolean', value: false, description: 'use *_DISABLE_DEPRECATED flags')
-option('elogind', type: 'boolean', value: true, description: 'Use elogind')
 option('session_selector', type: 'boolean', value: false, description: 'enable building a custom session 
selector dialog')
 option('systemd', type: 'boolean', value: true, description: 'Use systemd')
 option('systemd_journal', type: 'boolean', value:'true', description: 'Send log to systemd-journal')


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]