From 8582683290c390d8e5f551f35886eb2453f7f8e7 Mon Sep 17 00:00:00 2001 From: Diego Nieto Cid Date: Sun, 3 Apr 2011 00:02:46 -0300 Subject: Depend on X11 for string to keysym mappings. * 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 . * console-client/xkb/compose.c: Likewise. * console-client/xkb/xkb.h: Remove XStringToKeysym prototype. Include . --- config.make.in | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'config.make.in') diff --git a/config.make.in b/config.make.in index 986ea2ae..1fbdef1b 100644 --- a/config.make.in +++ b/config.make.in @@ -66,6 +66,12 @@ PARTED_LIBS = @PARTED_LIBS@ LIBNCURSESW = @LIBNCURSESW@ NCURSESW_INCLUDE = @NCURSESW_INCLUDE@ +# How to compile and link against X11. +HAVE_X11 = @have_x11@ +X11_CFLAGS = @X11_CFLAGS@ +X11_LIBS = @X11_LIBS@ +XKB_BASE = @XKB_BASE@ + # Installation tools. INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ -- cgit v1.2.3