blob: 97d13a30df8e82752c33b0b33710434a03d79de8 [file] [log] [blame]
Patrick Williamsc124f4f2015-09-15 14:41:29 -05001add "-disable-xkb" option
2
3Upstream-Status: Pending
4
5Rebase for 1.2.1 by: Yu Ke <ke.yu@intel.com>
6
7diff --git a/configure.ac b/configure.ac
8index 81c3ae4..26601bf 100644
9--- a/configure.ac
10+++ b/configure.ac
11@@ -52,11 +52,15 @@ PKG_CHECK_MODULES(SET_XEXT, xext,
12 AC_CHECK_HEADERS([X11/extensions/dpms.h X11/extensions/MITMisc.h],,,[#include <X11/Xlib.h>])
13 CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
14
15+AC_ARG_ENABLE(xkb, AC_HELP_STRING([--disable-xkb], [Disable XKB support]),
16+ XKB="$enableval", XKB="yes")
17+if test "x$XKB" = "xyes" ; then
18 PKG_CHECK_MODULES(SET_XKB, x11,
19 [SAVE_CPPFLAGS="$CPPFLAGS"
20 CPPFLAGS="$CPPFLAGS $SET_XKB_CFLAGS $SET_X11_CFLAGS"
21 AC_CHECK_HEADERS([X11/XKBlib.h],,,[#include <X11/Xlib.h>])
22 CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
23+fi
24
25 AC_ARG_WITH(xf86misc, AC_HELP_STRING([--without-xf86misc],[Disable xf86misc support.]),
26 [USE_XF86MISC="$withval"], [USE_XF86MISC="yes"])