Accept --with-xkb-output argument to specify output dir for compiled xkb
keymaps. Define XKM_OUTPUT_DIR and XKB_BIN_DIRECTORY. Add XKM_OUTPUT_DIR and XKB_BIN_DIRECTORY. Add XKB_CFLAGS.
This commit is contained in:
parent
361a9eb953
commit
32497ff479
10
ChangeLog
10
ChangeLog
|
@ -1,3 +1,13 @@
|
|||
2005-09-21 Kristian Høgsberg <krh@redhat.com>
|
||||
|
||||
* configure.ac: Accept --with-xkb-output argument to specify
|
||||
output dir for compiled xkb keymaps. Define XKM_OUTPUT_DIR and
|
||||
XKB_BIN_DIRECTORY.
|
||||
|
||||
* include/xkb-config.h.in: Add XKM_OUTPUT_DIR and XKB_BIN_DIRECTORY.
|
||||
|
||||
* xkb/Makefile.am (AM_CFLAGS): Add XKB_CFLAGS.
|
||||
|
||||
2005-09-20 Adam Jackson <ajax@freedesktop.org>
|
||||
|
||||
* hw/xfree86/os-support/Makefile.am:
|
||||
|
|
|
@ -308,6 +308,9 @@ AC_ARG_WITH(default-font-path, [ --with-default-font-path=PATH ],
|
|||
AC_ARG_WITH(xkb-path, [ --with-xkb-path=PATH ],
|
||||
[ XKBPATH="$withval" ],
|
||||
[ XKBPATH="${datadir}/X11/xkb" ])
|
||||
AC_ARG_WITH(xkb-output, [ --with-xkb-output=PATH ],
|
||||
[ XKBOUTPUT="$withval" ],
|
||||
[ XKBOUTPUT="compiled/" ])
|
||||
AC_ARG_WITH(rgb-path, [ --with-rgb-path=PATH ],
|
||||
[ RGBPATH="$withval" ],
|
||||
[ RGBPATH="${datadir}/X11/rgb" ])
|
||||
|
@ -968,6 +971,8 @@ AM_CONDITIONAL(XWIN_XV, [test "x$XWIN" = xyes && test "x$XV" = xyes])
|
|||
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, bindir, [Path to XKB bin dir])
|
||||
AC_DEFINE_DIR(XKM_OUTPUT_DIR, XKBOUTPUT, [Path to XKB output dir])
|
||||
|
||||
dnl and the rest of these are generic, so they're in config.h
|
||||
AC_DEFINE(XFree86XDGA, 1, [Build XDGA support])
|
||||
|
|
|
@ -11,4 +11,10 @@
|
|||
/* Path to XKB definitions. */
|
||||
#undef XKB_BASE_DIRECTORY
|
||||
|
||||
/* Path to xkbcomp. */
|
||||
#undef XKB_BIN_DIRECTORY
|
||||
|
||||
/* XKB output dir for compiled keymaps. */
|
||||
#undef XKM_OUTPUT_DIR
|
||||
|
||||
#endif /* _XKB_CONFIG_H_ */
|
||||
|
|
Loading…
Reference in New Issue
Block a user