|
* config.make.in (HAVE_X11,X11_CFLAGS,X11_LIBS,XKB_BASE): New variables.
* configure.in: Check for x11 module.
* console-client/Makefile (PC_KBD_SO_SRCS): Move XKB sources...
* console-client/Makefile (XKB_SRCS): ... here. New variable.
* console-client/Makefile (SRCS): Add $(XKB_SRCS).
* console-client/Makefile (LCLHDRS): Add xkb/xkb.h.
* console-client/Makefile (XKB_DATA_DIR): Removed variable.
* console-client/Makefile (pc_kbd.so.$(hurd-version)): Use patsubst.
Depend on XKB objects when HAVE_X11 = yes.
* console-client/Makefile (install): Depend on XKB datafiles when
HAVE_X11 = yes.
* console-client/Makefile (pc-kbd-CFLAGS): Set variable when
HAVE_X11 = yes
* console-client/Makefile ($(XKB_DATA_DIR),$(XKB_DATA_DIR)/%): Replaced
by...
* console-client/Makefile[HAVE_X11=yes]($(XKB_BASE),$(XKB_BASE)/%): ...
this targets.
* console-client/Makefile[HAVE_X11=yes](pc_kbd-LDLIBS): New variable.
* console-client/xkb/keysymdef.h: Removed file.
* console-client/xkb/ks_tables.h: Likewise.
* console-client/xkb/symname.c: Likewise.
* console-client/xkb/xkb.c: Include <X11/keysymdef.h>.
* console-client/xkb/compose.c: Likewise.
* console-client/xkb/xkb.h: Remove XStringToKeysym prototype.
Include <X11/Xlib.h>.
|
