Blob Blame Raw
Index: configure.in
===================================================================
RCS file: /cvs/xklavier/libxklavier/configure.in,v
retrieving revision 1.26
retrieving revision 1.27
diff -d -u -p -r1.26 -r1.27
--- configure.in	11 Dec 2005 02:51:19 -0000	1.26
+++ configure.in	26 Dec 2005 18:55:32 -0000	1.27
@@ -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", 
Index: libxklavier/xklavier_config_xkb.c
===================================================================
RCS file: /cvs/xklavier/libxklavier/libxklavier/xklavier_config_xkb.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -d -u -p -r1.30 -r1.31
--- libxklavier/xklavier_config_xkb.c	3 Dec 2005 13:31:58 -0000	1.30
+++ libxklavier/xklavier_config_xkb.c	26 Dec 2005 18:55:32 -0000	1.31
@@ -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>
Index: ChangeLog
===================================================================
RCS file: /cvs/xklavier/libxklavier/ChangeLog,v
retrieving revision 1.31
retrieving revision 1.32
diff -d -u -p -r1.31 -r1.32
--- ChangeLog	11 Dec 2005 02:51:19 -0000	1.31
+++ ChangeLog	26 Dec 2005 18:55:32 -0000	1.32
@@ -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