Commit af74d380 authored by Mart Raudsepp's avatar Mart Raudsepp Committed by Kai Lüke

build: add elogind support for seat retrieval

parent a35749b6
......@@ -3,7 +3,7 @@ project(
version: '3.32.0',
license: 'GPL2.0',
default_options: 'buildtype=debugoptimized',
meson_version: '>= 0.43.0'
meson_version: '>= 0.47.0'
)
gdu_name = 'gnome-disk-utility'
......@@ -75,13 +75,16 @@ libnotify_dep = dependency('libnotify', version: '>= 0.7')
liblzma_dep = dependency('liblzma', version: '>= 5.0.5')
m_dep = cc.find_library('m')
# *** Check for libsystemd ***
enable_libsystemd = get_option('libsystemd')
if enable_libsystemd
libsystemd_dep = dependency('libsystemd', version: '>= 209', required: false)
config_h.set('HAVE_LIBSYSTEMD', libsystemd_dep.found(),
description: 'Define to 1 if libsystemd is available')
# *** Check for logind ***
assert(not (get_option('libsystemd').enabled() and get_option('libelogind').enabled()), 'Can not support systemd and elogind at once')
if not get_option('libelogind').enabled()
logind_dep = dependency('libsystemd', version: '>= 209', required: get_option('libsystemd'))
endif
if get_option('libelogind').enabled() or not logind_dep.found()
logind_dep = dependency('libelogind', version: '>= 209', required: get_option('libelogind'))
endif
config_h.set('HAVE_LOGIND', logind_dep.found(),
description: 'Define to 1 if logind API is available')
gnome = import('gnome')
i18n = import('i18n')
......@@ -123,9 +126,9 @@ output += ' libexecdir: ' + gdu_libexecdir + '\n'
output += ' localedir: ' + gdu_localedir + '\n'
output += ' mandir: ' + gdu_mandir + '\n'
output += ' sysconfdir: ' + gdu_sysconfdir + '\n\n'
output += ' Use libsystemd: ' + enable_libsystemd.to_string() + '\n'
output += ' Use logind: ' + logind_dep.found().to_string() + '\n'
output += ' Build g-s-d plug-in: ' + enable_gsd_plugin.to_string() + '\n\n'
output += ' compiler: ' + cc.get_id() + '\n'
output += ' cflags: ' + ' '.join(compiler_flags) + '\n\n'
output += ' (Change with: meson configure BUILDDIR -D libsystemd=true|false -D gsd_plugin=true|false)\n\n'
output += ' (Change with: meson configure BUILDDIR -D libelogind=auto|enabled|disabled -D libsystemd=auto|enabled|disabled -D gsd_plugin=true|false)\n\n'
message(output)
option('libsystemd', type: 'boolean', value: true, description: 'build with libsystemd')
option('libelogind', type: 'feature', value: 'auto', description: 'build with libelogind')
option('libsystemd', type: 'feature', value: 'auto', description: 'build with libsystemd')
option('gsd_plugin', type: 'boolean', value: true, description: 'build gnome-settings-daemon plug-in')
......@@ -19,7 +19,7 @@
# include <features.h>
#endif
#if defined(HAVE_LIBSYSTEMD)
#if defined(HAVE_LOGIND)
#include <systemd/sd-login.h>
#endif
......@@ -405,7 +405,7 @@ gdu_options_update_entry_option (GtkWidget *options_entry,
g_free (opts);
}
#if defined(HAVE_LIBSYSTEMD)
#if defined(HAVE_LOGIND)
const gchar *
gdu_utils_get_seat (void)
......
......@@ -17,14 +17,11 @@ deps = [
udisk_dep,
gtk_dep,
libsecret_dep,
logind_dep,
pwquality_dep,
m_dep
]
if enable_libsystemd
deps += libsystemd_dep
endif
cflags = [
'-DPACKAGE_DATA_DIR="@0@"'.format(gdu_datadir),
'-DG_LOG_DOMAIN="libgdu"',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment