shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-22 13:33:56 +03:00
Code

meson: libxkbcommon support

Browse Source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2017-04-13 19:37:14 -04:00
parent 005a29f234
commit 1eeb43f5af
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
meson.build
View File

@ -856,6 +856,18 @@ else
libgio = [] libgio = []
endif endif
want_xkbcommon = get_option('xkbcommon')
if want_xkbcommon != 'no'
libxkbcommon = dependency('xkbcommon',
version : '>= 0.3.0',
required : want_xkbcommon == 'yes')
if libxkbcommon.found()
conf.set('HAVE_XKBCOMMON', 1)
endif
else
libxkbcommon = []
endif
want_dbus = get_option('dbus') want_dbus = get_option('dbus')
if want_dbus != 'no' if want_dbus != 'no'
libdbus = dependency('dbus-1', libdbus = dependency('dbus-1',
@ -1493,12 +1505,19 @@ if conf.get('ENABLE_HOSTNAMED', 0) == 1
endif endif
if conf.get('ENABLE_LOCALED', 0) == 1 if conf.get('ENABLE_LOCALED', 0) == 1
if conf.get('HAVE_XKBCOMMON', 0) == 1
# logind will load libxkbcommon.so dynamically on its own
deps = [libdl]
else
deps = []
endif
executable('systemd-localed', executable('systemd-localed',
systemd_localed_sources, systemd_localed_sources,
include_directories : includes, include_directories : includes,
link_with : [libshared, link_with : [libshared,
libsystemd_internal], libsystemd_internal],
dependencies : [libdl], dependencies : deps,
install_rpath : rootlibexecdir, install_rpath : rootlibexecdir,
install : true, install : true,
install_dir : rootlibexecdir) install_dir : rootlibexecdir)

2
meson_options.txt
View File

@ -200,6 +200,8 @@ option('xz', type : 'combo', choices : ['auto', 'yes', 'no'],
description : 'xz compression support') description : 'xz compression support')
option('lz4', type : 'combo', choices : ['auto', 'yes', 'no'], option('lz4', type : 'combo', choices : ['auto', 'yes', 'no'],
description : 'lz4 compression support') description : 'lz4 compression support')
option('xkbcommon', type : 'combo', choices : ['auto', 'yes', 'no'],
description : 'xkbcommon keymap support')
option('glib', type : 'combo', choices : ['auto', 'yes', 'no'], option('glib', type : 'combo', choices : ['auto', 'yes', 'no'],
description : 'libglib support (for tests only)') description : 'libglib support (for tests only)')
option('dbus', type : 'combo', choices : ['auto', 'yes', 'no'], option('dbus', type : 'combo', choices : ['auto', 'yes', 'no'],