build: Remove `systemd` option

This option is essential.

Change-Id: Idd743c76b40b958d9a1f1b962db47d544cda2ebc

diff --git a/meson.build b/meson.build
index cce09e6c7b1a94e5dd2a8b0b5cbfcf0733cbc3d8..d10803b39c031ca3f2007412b32ebc9b69d5554a 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -105,6 +105,7 @@ dep_tzsh_server = dependency('tzsh-server', required: true)
 dep_pixman = dependency('pixman-1', required: true)
 dep_egl = dependency('egl', required: true)
 dep_udev = dependency('libudev', required: true)
+dep_systemd = dependency('libsystemd', version: '>= 209', required: true)
 
 e_cflags= [
   '-D_F_ZONE_WINDOW_ROTATION_',
@@ -184,12 +185,6 @@ if dep_dlog.found()
   config_h.set('HAVE_DLOG', '1')
 endif
 
-dep_systemd = []
-if get_option('systemd')
-  dep_systemd = dependency('libsystemd', version: '>= 209', required: true)
-  config_h.set('HAVE_SYSTEMD', '1')
-endif
-
 if get_option('function-trace')
   config_h.set('ENABLE_FUNCTION_TRACE', '1')
 endif

diff --git a/meson_options.txt b/meson_options.txt
index ad645af00d65905ce4fdf55328b333841ae5237e..c52fb2fa42baeaac8a57fc05d23807ae5453bb24 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,2 +1 @@
-option('systemd', type: 'boolean', value: true, description: 'enable systemd support: (default=true)')
 option('function-trace', type: 'boolean', value: false, description: 'enable function trace: (default=false)')

diff --git a/src/bin/e_main.c b/src/bin/e_main.c
index e1ee2c6a7dcd55ec7657cf2653b10d3cfc664c53..f14d7bba32c2a8f7589d034f3f34d90d6742e8cd 100644 (file)
--- a/src/bin/e_main.c
+++ b/src/bin/e_main.c
@@ -44,9 +44,7 @@
 # include <sys/prctl.h>
 #endif
 
-#ifdef HAVE_SYSTEMD
 #include <systemd/sd-daemon.h>
-#endif
 
 #define MAX_LEVEL 80
 
@@ -793,12 +791,8 @@ main(int argc, char **argv)
 
    if (!e_input_thread_mode_get())
      {
-#ifdef HAVE_SYSTEMD
         TSM("[WM] Send start-up completion");
         sd_notify(0, "READY=1");
-#else
-        TSM("[WM] Skip sending start-up completion. (no systemd)");
-#endif
      }
 
    e_input_pointer_thread_mode_set(e_config->pointer_thread_mode);

diff --git a/src/bin/inputmgr/e_input_backend.c b/src/bin/inputmgr/e_input_backend.c
index d10703c9487b7a3e53e339c2ca85c6619c9d766d..72056b0975f8bfa1638fbc33283c3020387bce3f 100644 (file)
--- a/src/bin/inputmgr/e_input_backend.c
+++ b/src/bin/inputmgr/e_input_backend.c
@@ -22,9 +22,7 @@
 #include <libudev.h>
 #include <glib.h>
 #include <fcntl.h>
-#ifdef HAVE_SYSTEMD
-# include <systemd/sd-daemon.h>
-#endif
+#include <systemd/sd-daemon.h>
 
 #define E_INPUT_ENV_LIBINPUT_LOG_DISABLE "E_INPUT_LIBINPUT_LOG_DISABLE"
 #define E_INPUT_ENV_LIBINPUT_LOG_EINA_LOG "E_INPUT_LIBINPUT_LOG_EINA_LOG"
@@ -1321,12 +1319,8 @@ input_thread_start(void *data, Ecore_Thread *th)
    if (e_config->create_wm_ready)
      e_main_create_wm_ready();
 
-#ifdef HAVE_SYSTEMD
    TSM("[WM] Send start-up completion");
    sd_notify(0, "READY=1");
-#else
-   TSM("[WM] Skip sending start-up completion. (no systemd)");
-#endif
 
    /* enable this input */
    if (!e_input_backend_enable_input(input))