From: Gaetan Nadon <memsize@videotron.ca>
Date: Sat, 11 Dec 2010 23:56:21 +0000 (-0500)
Subject: config: set the default xkb config root based on xkeyboard-config module
X-Git-Tag: xkbcommon-0.2.0~806
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1b6e022c97df129b7106a54a366faee64062cfb3;p=platform%2Fupstream%2Flibxkbcommon.git

config: set the default xkb config root based on xkeyboard-config module

The default value ${dataroot}/X11/xkb only works if xkeyboard-config
has created the keymaps in that directory. Let's obtain the true final
value of where the keymaps are and use that as a default. In a production
environment this is the only value that can work.

This new default value also has the merit of making the 'check' target
to work in distcheck which does not have a copy of the xkeyboard-config
keymaps in its sandbox based on ${dataroot}/X11/xkb. The test data
cannot find the "include" keymaps it needs.
.../libxkbcommon-0.1.0/_inst/share/X11/xkb

Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
---

diff --git a/configure.ac b/configure.ac
index f8175ba..0026441 100644
--- a/configure.ac
+++ b/configure.ac
@@ -88,11 +88,12 @@ AC_MSG_RESULT([$XF86KEYSYM_H])
 AC_SUBST([XF86KEYSYM_H])
 
 # Define a configuration option for the XKB config root
+xkb_base=`$PKG_CONFIG --variable=xkb_base xkeyboard-config`
 AC_ARG_WITH([xkb_config_root],
     [AS_HELP_STRING([--with-xkb-config-root=<paths>],
         [Set default XKB config root (default: ${datadir}/X11/xkb)])],
     [XKBCONFIGROOT="$withval"],
-    [XKBCONFIGROOT='${datadir}/X11/xkb'])
+    [XKBCONFIGROOT="$xkb_base"])
 AC_SUBST([XKBCONFIGROOT])
 
 AC_CONFIG_FILES([