diff options
| author | Sergey Udaltsov <svu@gnome.org> | 2004-04-09 20:11:12 +0000 |
|---|---|---|
| committer | Sergey Udaltsov <svu@gnome.org> | 2004-04-09 20:11:12 +0000 |
| commit | f840228b9b700f0522fcde4026487d49f13c7d9b (patch) | |
| tree | 01278ffd447f6fefe4ff70b1d35ce5c7ec2d64c7 | |
| parent | 21f3298356db3340a69c2caedd9e401ef52cdc5d (diff) | |
| download | libxklavier-f840228b9b700f0522fcde4026487d49f13c7d9b.tar.gz | |
I suppose now libxklavier should be able to live in xorg world - the name of the rules files is customizable at build-time
| -rw-r--r-- | configure.in | 9 | ||||
| -rw-r--r-- | libxklavier/xklavier_config_xkb.c | 4 |
2 files changed, 10 insertions, 3 deletions
diff --git a/configure.in b/configure.in index d8be24d..045ffcc 100644 --- a/configure.in +++ b/configure.in @@ -2,7 +2,7 @@ AC_INIT(libxklavier/xklavier.c) PACKAGE=libxklavier MAJOR_VERSION=1 -MINOR_VERSION=00 +MINOR_VERSION=01 VERSION=$MAJOR_VERSION.$MINOR_VERSION VERSION_INFO=8:0:0 @@ -64,6 +64,13 @@ fi AC_DEFINE_UNQUOTED(XKB_BASE,"${xkb_base}",Base for XKB configuration) +AC_ARG_WITH( xkb_rules_set, + [ --with-xkb-rules-set=DIR Set of XKB rules (by default it is xfree86)], + xkb_rules_set="$withval", + xkb_rules_set="xfree86" ) + +AC_DEFINE_UNQUOTED(XKB_RULES_SET,"${xkb_rules_set}",Set of XKB rules) + ac_xkblib_include="\ #include <stdio.h> #include <X11/Xlib.h> diff --git a/libxklavier/xklavier_config_xkb.c b/libxklavier/xklavier_config_xkb.c index 7685bf9..29e732d 100644 --- a/libxklavier/xklavier_config_xkb.c +++ b/libxklavier/xklavier_config_xkb.c @@ -16,11 +16,11 @@ #include <X11/extensions/XKM.h> #endif -#define RULES_FILE "xfree86" +#define RULES_FILE XKB_RULES_SET #define RULES_PATH ( XKB_BASE "/rules/" RULES_FILE ) -#define XML_CFG_PATH ( XKB_BASE "/rules/xfree86.xml" ) +#define XML_CFG_PATH ( XKB_BASE "/rules/" RULES_FILE ".xml" ) // For "bad" X servers we hold our own copy #define XML_CFG_FALLBACK_PATH ( DATA_DIR "/xfree86.xml" ) |