|
 |
0119bf1 |
This patch is generated from running autogen.sh after applying
|
|
|
0119bf1 |
the upstream patch to configure.in (see libxklaver-2.1-xkb-path.patch)
|
|
|
0119bf1 |
and then removing the portions which are not relevant. These include
|
|
|
0119bf1 |
changes to whitespace, quoting, line numbers, etc.
|
|
|
0119bf1 |
|
|
|
0119bf1 |
diff -u config.h.in.xkb-path-autogen config.h.in
|
|
|
0119bf1 |
--- config.h.in.xkb-path-autogen 2005-12-27 13:21:11.000000000 -0400
|
|
|
0119bf1 |
+++ config.h.in 2005-12-27 18:02:40.000000000 -0400
|
|
|
0119bf1 |
@@ -75,6 +75,9 @@
|
|
|
0119bf1 |
/* Base for XKB configuration */
|
|
|
0119bf1 |
#undef XKB_BASE
|
|
|
0119bf1 |
|
|
|
0119bf1 |
+/* Base for XKB executables */
|
|
|
0119bf1 |
+#undef XKB_BIN_BASE
|
|
|
0119bf1 |
+
|
|
|
0119bf1 |
/* Default XKB set of rules */
|
|
|
0119bf1 |
#undef XKB_DEFAULT_RULESET
|
|
|
0119bf1 |
|
|
|
0119bf1 |
diff -u configure.xkb-path-autogen configure
|
|
|
0119bf1 |
--- configure.xkb-path-autogen 2005-12-27 13:21:11.000000000 -0400
|
|
|
0119bf1 |
+++ configure 2005-12-27 18:02:41.000000000 -0400
|
|
|
0119bf1 |
@@ -1068,6 +1068,7 @@
|
|
|
0119bf1 |
--without-libiconv-prefix don't search for libiconv in includedir and libdir
|
|
|
0119bf1 |
--with-x use the X Window System
|
|
|
0119bf1 |
--with-xkb-base=DIR XKB base path (by default it is /usr/X11R6/lib/X11/xkb)
|
|
|
0119bf1 |
+ --with-xkb-bin-base=DIR XKB executables base path
|
|
|
0119bf1 |
--with-xkb-default-ruleset=RULES XKB default set of rules (by default it is base)
|
|
|
0119bf1 |
--with-xmodmap-base=DIR xmodmap base path (by default it is /usr/share/xmodmap)
|
|
|
0119bf1 |
|
|
|
0119bf1 |
@@ -20693,6 +20744,21 @@
|
|
|
0119bf1 |
|
|
|
0119bf1 |
|
|
|
0119bf1 |
|
|
|
0119bf1 |
+# Check whether --with-xkb_bin_base or --without-xkb_bin_base was given.
|
|
|
0119bf1 |
+if test "${with_xkb_bin_base+set}" = set; then
|
|
|
0119bf1 |
+ withval="$with_xkb_bin_base"
|
|
|
0119bf1 |
+ xkb_bin_base="$withval"
|
|
|
0119bf1 |
+else
|
|
|
0119bf1 |
+ xkb_bin_base="$xkb_base"
|
|
|
0119bf1 |
+fi;
|
|
|
0119bf1 |
+
|
|
|
0119bf1 |
+
|
|
|
0119bf1 |
+cat >>confdefs.h <<_ACEOF
|
|
|
0119bf1 |
+#define XKB_BIN_BASE "${xkb_bin_base}"
|
|
|
0119bf1 |
+_ACEOF
|
|
|
0119bf1 |
+
|
|
|
0119bf1 |
+
|
|
|
0119bf1 |
+
|
|
|
0119bf1 |
# Check whether --with-xkb_default_ruleset or --without-xkb_default_ruleset was given.
|
|
|
0119bf1 |
if test "${with_xkb_default_ruleset+set}" = set; then
|
|
|
0119bf1 |
withval="$with_xkb_default_ruleset"
|