diff options
| author | Rob Bradford <rob@linux.intel.com> | 2013-06-24 16:52:45 +0100 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2013-06-28 19:56:41 -0400 |
| commit | 382ff46ffb9f7d824335bc50d2b53f6e280a2441 (patch) | |
| tree | 0f60b8af8ae41da5a6205b2fc36ebcf00ac984a5 /configure.ac | |
| parent | 01a9273bd2c2e80f1a9efeeadd6a6484b8b7e57c (diff) | |
| download | weston-382ff46ffb9f7d824335bc50d2b53f6e280a2441.tar.gz weston-382ff46ffb9f7d824335bc50d2b53f6e280a2441.tar.bz2 weston-382ff46ffb9f7d824335bc50d2b53f6e280a2441.zip | |
build: Make libxkbcommon build-time optional in the compositor
v2: Incorporate review feedback from Daniel Stone - improved configure
message about the purpose of this option and reorganisation of #ifdefs.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index b6252218..726eb4ff 100644 --- a/configure.ac +++ b/configure.ac @@ -54,7 +54,7 @@ AC_CHECK_HEADERS([execinfo.h]) AC_CHECK_FUNCS([mkostemp strchrnul]) -COMPOSITOR_MODULES="wayland-server >= 1.1.90 xkbcommon pixman-1" +COMPOSITOR_MODULES="wayland-server >= 1.1.90 pixman-1" AC_ARG_ENABLE(egl, [ --disable-egl],, enable_egl=yes) @@ -64,6 +64,19 @@ if test x$enable_egl = xyes; then COMPOSITOR_MODULES="$COMPOSITOR_MODULES egl >= 7.10 glesv2" fi +AC_ARG_ENABLE(xkbcommon, + AS_HELP_STRING([--disable-xkbcommon], [Disable libxkbcommon + support: This is only useful in environments + where you do not have a hardware keyboard. If + libxkbcommon support is disabled clients will not + be sent a keymap and and must know how to + interpret the keycode sent for any key event.]),, + enable_xkbcommon=yes) +if test x$enable_xkbcommon = xyes; then + AC_DEFINE(ENABLE_XKBCOMMON, [1], [Build Weston with libxkbcommon support]) + COMPOSITOR_MODULES="$COMPOSITOR_MODULES xkbcommon" +fi + PKG_CHECK_MODULES(COMPOSITOR, [$COMPOSITOR_MODULES]) AC_ARG_ENABLE(setuid-install, [ --enable-setuid-install],, |