Attachment 3250 Details for Bug 4444 – Add --with-xkb-bindir option, and change default.

[patch] Add --with-xkb-bindir option, and change default.

xserver-modular-xkb-bindir.patch (text/plain), 1.86 KB, created by Bill Crawford on 2005-09-13 09:57:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bill Crawford

Created: 2005-09-13 09:57:18 UTC

Size: 1.86 KB

patch

obsolete

>
>2005-09-13  Bill Crawford  <billcrawford1970@gmail.com>
>
>	* configure.ac
>	Add --with-xkb-bindir option.
>	Change default XKB_BIN_DIRECTORY from XKB_BASE_DIRECTORY to /usr/bin.
>
>	* xkb-config.h.in:
>	Add XKB_BIN_DIRECTORY.
>
>Index: xserver/xorg/configure.ac
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/configure.ac,v
>retrieving revision 1.77
>diff -u -u -r1.77 configure.ac
>--- xserver/xorg/configure.ac	13 Sep 2005 05:44:46 -0000	1.77
>+++ xserver/xorg/configure.ac	13 Sep 2005 16:49:59 -0000
>@@ -214,6 +214,9 @@
> AC_ARG_WITH(xkb-path,        [  --with-xkb-path=PATH ],
> 				[ XKBPATH="$withval" ],
> 				[ XKBPATH="${datadir}/X11/xkb" ])
>+AC_ARG_WITH(xkb-bindir,      [  --with-xkb-bindir=PATH ],
>+				[ XKBBINDIR="$withval" ],
>+				[ XKBBINDIR="${bindir}" ])
> AC_ARG_WITH(rgb-path,        [  --with-rgb-path=PATH ],
> 				[ RGBPATH="$withval" ],
> 				[ RGBPATH="${datadir}/X11/rgb" ])
>@@ -842,6 +845,7 @@
> dnl these only go in xkb-config.h (which is shared by the Xorg and Xnest servers)
> AC_DEFINE(__XKBDEFRULES__, "xorg", [Default XKB rules])
> AC_DEFINE_DIR(XKB_BASE_DIRECTORY, XKBPATH, [Path to XKB data])
>+AC_DEFINE_DIR(XKB_BIN_DIRECTORY, XKBBINDIR, [Path for XKB to find xkbcomp])
> 
> dnl and the rest of these are generic, so they're in config.h
> AC_DEFINE(XFree86XDGA, 1, [Build XDGA support])
>Index: xserver/xorg/include/xkb-config.h.in
>===================================================================
>RCS file: /cvs/xorg/xserver/xorg/include/xkb-config.h.in,v
>retrieving revision 1.2
>diff -u -u -r1.2 xkb-config.h.in
>--- xserver/xorg/include/xkb-config.h.in	15 Jul 2005 22:51:05 -0000	1.2
>+++ xserver/xorg/include/xkb-config.h.in	13 Sep 2005 16:49:59 -0000
>@@ -11,4 +11,7 @@
> /* Path to XKB definitions. */
> #undef XKB_BASE_DIRECTORY
> 
>+/* Path to XKB bin directory (for xkbcomp) */
>+#undef XKB_BIN_DIRECTORY
>+
> #endif /* _XKB_CONFIG_H_ */

Actions: View | Splinter Review

Attachments on bug 4444: 3250 | 3262

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.