From 57ae8d6e0e518151e5e4b87cc8703ce60f46f1e5 Mon Sep 17 00:00:00 2001
From: Mike Gorse <mgorse@linux-e5s4.suse>
Date: Thu, 28 Sep 2017 14:32:00 -0500
Subject: [PATCH] Remove dependency on libxkbcommon

Currently, no functions in libxkbcommon are used, so the dependency is
spurious. Instead, check for XkbGetMap in -lX11.

https://bugzilla.gnome.org/show_bug.cgi?id=787756
---
 configure.ac | 4 +---
 meson.build  | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index 8c4fca2..850f808 100644
--- a/configure.ac
+++ b/configure.ac
@@ -107,10 +107,8 @@ AS_IF([test "x$enable_x11" = xno], [
     X11_LIBS="$X11_LIBS $XINPUT_LIBS"
 
     # XKB (optional)
-    PKG_CHECK_MODULES(XKB, [xkbcommon-x11], [
+    AC_CHECK_LIB(X11, XkbGetMap, [
       AC_DEFINE(HAVE_XKB, 1, [Define to use XKB])
-      X11_CFLAGS="$X11_CFLAGS $XKB_CFLAGS"
-      X11_LIBS="$X11_LIBS $XKB_LIBS"
     ], [:])
   ])
 
diff --git a/meson.build b/meson.build
index abd4c7c..e746e14 100644
--- a/meson.build
+++ b/meson.build
@@ -62,9 +62,7 @@ if x11_dep.found()
   xtest_dep = dependency('xtst')
   x11_deps += xtest_dep
 
-  xkb_dep = dependency('xkbcommon-x11', required: false)
-  if xkb_dep.found()
-    x11_deps += xkb_dep
+  if cc.has_function('XkbGetMap', dependencies: x11_deps)
     at_spi_conf.set('HAVE_XKB', 1)
   endif
 
-- 
2.7.4