From b2662d9ddb3320fb3ac295c4858efe285fc4168f Mon Sep 17 00:00:00 2001 From: Diego Nieto Cid Date: Tue, 12 Apr 2011 21:08:04 -0300 Subject: Use locale's compose file by default. * console-client/Makefile [HAVE_X11=yes](compose-CFLAGS): Define DATADIR. * console-client/pc-kbd.c (pc_kbd_init): Load compose file unconditionally. * console-client/xkb/compose.c: Include fcntl.h, unistd.h and locale.h (struct map_entry, enum callback_result, map_callback): New types. (map_iterate): New function. (struct matcher_context): New type. (match_left_set_right, match_right_set_left): New functions. (get_compose_file_for_locale): Likewise. (read_composefile): Use get_compose_file_for_locale result when argument composefn is NULL. --- console-client/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'console-client/Makefile') diff --git a/console-client/Makefile b/console-client/Makefile index 7629e06a..c84eb7eb 100644 --- a/console-client/Makefile +++ b/console-client/Makefile @@ -118,6 +118,7 @@ XKB_UNITS = $(basename $(notdir $(XKB_SRCS))) pc_kbd.so.$(hurd-version): $(addsuffix _pic.o,$(XKB_UNITS)) pc-kbd-CFLAGS = -DXKB_SUPPORT -DXKB_DATA_DIR=\"$(XKB_BASE)\" $(X11_CFLAGS) $(foreach XKB_UNIT, $(XKB_UNITS), $(eval $(XKB_UNIT)-CFLAGS = $(X11_CFLAGS))) +compose-CFLAGS += -DDATADIR=\"$(datadir)\" pc_kbd-LDLIBS = $(X11_LIBS) install: $(XKB_BASE) $(addprefix $(XKB_BASE)/, $(XKB_DATA_FILES)) -- cgit v1.2.3