diff options
| author | Lennart Poettering <lennart@poettering.net> | 2016-04-06 18:23:37 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2016-04-12 13:43:31 +0200 |
| commit | 5de344704df64d8f31448f1222432bc87ddcfbef (patch) | |
| tree | f191f23c2009ef222eecdfe5255a4bbbd900f689 /Makefile.am | |
| parent | 198402d3c9d9b92d6a5e9bca70693011108914e0 (diff) | |
localed: downgrade libxkbcommon to an optional runtime dependency
Previously, libxkbcommon was a compile-time option. When enabled the localed
binary would strictly depend on it, thus pulling in libxkbcommon and its
dependencies, which are non-trivial in size.
With this change we dlopen() libxkbcommon when it is available instead. If the
library is available behaviour is as before. However, if it isn't the system is
considered "headless", i.e. without local hardware and all attempts to set the
local keyboard configuration will be refused.
This is useful for general-purpose distributions which want to support
"headless" (such as container systems) and "full" systems with the same build.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 5c25178aec..0c2de6f2d3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4729,8 +4729,7 @@ systemd_localed_SOURCES = \ src/locale/localed.c systemd_localed_LDADD = \ - libshared.la \ - $(XKBCOMMON_LIBS) + libshared.la systemd_localed_CFLAGS = \ $(AM_CFLAGS) \ |