meson: libxkbcommon support

diff --git a/meson.build b/meson.build
index 15808e6447bed0e92826af451dbc4620e30e9f2e..ec1ab117002bde36d4a5cc2cad522d2e88398a3e 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -856,6 +856,18 @@ else
   libgio = []
 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')
 if want_dbus != 'no'
   libdbus = dependency('dbus-1',
@@ -1493,12 +1505,19 @@ if conf.get('ENABLE_HOSTNAMED', 0) == 1
 endif
 
 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',
              systemd_localed_sources,
              include_directories : includes,
              link_with : [libshared,
                           libsystemd_internal],
-             dependencies : [libdl],
+             dependencies : deps,
              install_rpath : rootlibexecdir,
              install : true,
              install_dir : rootlibexecdir)

diff --git a/meson_options.txt b/meson_options.txt
index d5ce9d9f93bf5ac247ece6aa985b823b483308de..59e38515da126a4f14a68ee46dd25c1d161e4672 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -200,6 +200,8 @@ option('xz', type : 'combo', choices : ['auto', 'yes', 'no'],
        description : 'xz compression support')
 option('lz4', type : 'combo', choices : ['auto', 'yes', 'no'],
        description : 'lz4 compression support')
+option('xkbcommon', type : 'combo', choices : ['auto', 'yes', 'no'],
+       description : 'xkbcommon keymap support')
 option('glib', type : 'combo', choices : ['auto', 'yes', 'no'],
        description : 'libglib support (for tests only)')
 option('dbus', type : 'combo', choices : ['auto', 'yes', 'no'],