diff options
| author | Sergey Udaltsov <svu@gnome.org> | 2005-12-26 18:55:32 +0000 |
|---|---|---|
| committer | Sergey Udaltsov <svu@gnome.org> | 2005-12-26 18:55:32 +0000 |
| commit | 195125bf5a0d363885914154b06bb06f3806f7e6 (patch) | |
| tree | c429b8cfbcf5f74eef0355e1b1058090f7401793 | |
| parent | 78484214299566ff4e9438e678b589c37001cf58 (diff) | |
| download | libxklavier-195125bf5a0d363885914154b06bb06f3806f7e6.tar.gz | |
XKB_BIN_BASE, b.rh.com#174361
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.in | 9 | ||||
| -rw-r--r-- | libxklavier/xklavier_config_xkb.c | 2 |
3 files changed, 14 insertions, 2 deletions
@@ -1,3 +1,8 @@ +2005-12-26 svu + + * configure.in, libxklavier/xklavier_config_xkb.c: adding XKB_BIN_BASE, + closing https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=174361 + 2005-12-10 svu * NEWS: update for 2.1 diff --git a/configure.in b/configure.in index f9bb2c9..f7b650e 100644 --- a/configure.in +++ b/configure.in @@ -57,9 +57,16 @@ AC_ARG_WITH( xkb_base, [ --with-xkb-base=DIR XKB base path (by default it is /usr/X11R6/lib/X11/xkb)], xkb_base="$withval", xkb_base="$x_libraries/X11/xkb" ) - + AC_DEFINE_UNQUOTED(XKB_BASE,"${xkb_base}",Base for XKB configuration) +AC_ARG_WITH( xkb_bin_base, + [ --with-xkb-bin-base=DIR XKB executables base path], + xkb_bin_base="$withval", + xkb_bin_base="$xkb_base" ) + +AC_DEFINE_UNQUOTED(XKB_BIN_BASE,"${xkb_bin_base}",Base for XKB executables) + AC_ARG_WITH( xkb_default_ruleset, [ --with-xkb-default-ruleset=RULES XKB default set of rules (by default it is base)], xkb_default_ruleset="$withval", diff --git a/libxklavier/xklavier_config_xkb.c b/libxklavier/xklavier_config_xkb.c index d19106b..05843fe 100644 --- a/libxklavier/xklavier_config_xkb.c +++ b/libxklavier/xklavier_config_xkb.c @@ -24,7 +24,7 @@ /* For "bad" X servers we hold our own copy */ #define XML_CFG_FALLBACK_PATH ( DATA_DIR "/xfree86.xml" ) -#define XKBCOMP ( XKB_BASE "/xkbcomp" ) +#define XKBCOMP ( XKB_BIN_BASE "/xkbcomp" ) #define XK_XKB_KEYS #include <X11/keysymdef.h> |