diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | configure.in | 14 | ||||
| -rw-r--r-- | libxklavier/Makefile.am | 10 | ||||
| -rw-r--r-- | libxklavier/xklavier_config_xkb.c | 16 | ||||
| -rw-r--r-- | libxklavier/xklavier_dump.c | 2 | ||||
| -rw-r--r-- | libxklavier/xklavier_evt_xkb.c | 4 | ||||
| -rw-r--r-- | libxklavier/xklavier_private_xkb.h | 2 | ||||
| -rw-r--r-- | libxklavier/xklavier_xkb.c | 6 |
8 files changed, 40 insertions, 26 deletions
@@ -1,3 +1,15 @@ +2006-05-20 svu + + * configure.in, + libxklavier/Makefile.am, + libxklavier/xklavier_config_xkb.c, + libxklavier/xklavier_dump.c, + libxklavier/xklavier_evt_xkb.c, + libxklavier/xklavier_private_xkb.h, + libxklavier/xklavier_xkb.c: xkb_headers -> libxkbfile, + linking to xkbfile is also optional. + Thanks to Thomas Vander Stichele + 2006-04-30 svu * autogen.sh: fail on autoconf/automake errors, diff --git a/configure.in b/configure.in index 5bf0630..9b5641d 100644 --- a/configure.in +++ b/configure.in @@ -94,11 +94,11 @@ ac_xkblib_include="\ #include <X11/XKBlib.h>" AC_CHECK_HEADER([X11/extensions/XKBrules.h], - [xkb_headers_present=yes],[],$ac_xkblib_include) + [libxkbfile_present=yes],[],$ac_xkblib_include) -AM_CONDITIONAL(XKB_HEADERS_PRESENT, test "$xkb_headers_present" = "yes") +AM_CONDITIONAL(LIBXKBFILE_PRESENT, test "$libxkbfile_present" = "yes") -AC_SUBST(xkbheaders_present) +AC_SUBST(libxkbfile_present) CFLAGS="$save_CFLAGS" @@ -116,7 +116,7 @@ AM_CONDITIONAL(ENABLE_XMM_SUPPORT, test "$enable_xmm_support" = "yes") AC_MSG_CHECKING(whether at least one libxklavier backend is enabled) if test \( "$enable_xkb_support" == "yes" -a \ - "$xkb_headers_present" == "yes" \) -o \ + "$libxkbfile_present" == "yes" \) -o \ "$enable_xmm_support" == "yes" ; then AC_MSG_RESULT(yes) else @@ -151,10 +151,10 @@ libxklavier.pc echo '**********************************************************' echo ' Libxklavier is configured with the following backends:' if test "$enable_xkb_support" == "yes" ; then - if test "$xkb_headers_present" == "yes" ; then - echo ' XKB (libxkbfile headers are present)' + if test "$libxkbfile_present" == "yes" ; then + echo ' XKB (libxkbfile is present)' else - echo ' XKB (but libxkbfile headers are NOT present)' + echo ' XKB (but libxkbfile is NOT present)' fi fi if test "$enable_xmm_support" == "yes" ; then diff --git a/libxklavier/Makefile.am b/libxklavier/Makefile.am index 3eea793..7b38f51 100644 --- a/libxklavier/Makefile.am +++ b/libxklavier/Makefile.am @@ -1,5 +1,6 @@ -if XKB_HEADERS_PRESENT - XKB_HEADERS_PRESENT_CFLAG = -DXKB_HEADERS_PRESENT=1 +if LIBXKBFILE_PRESENT + LIBXKBFILE_PRESENT_CFLAG = -DLIBXKBFILE_PRESENT=1 + LIBXKBFILE_PRESENT_LDFLAGS = -lxkbfile endif if ENABLE_XKB_SUPPORT @@ -27,7 +28,7 @@ xkl_engine_marshal.c: xkl_engine_marshal.h AM_CFLAGS=-Wall -Werror -DDATA_DIR=\"$(datadir)/$(PACKAGE)\" \ -I. -I$(includedir) -I$(x_includes) -I$(top_srcdir) \ $(XML_CFLAGS) $(GLIB_CFLAGS) \ - $(XKB_HEADERS_PRESENT_CFLAG) \ + $(LIBXKBFILE_PRESENT_CFLAG) \ $(ENABLE_XKB_SUPPORT_CFLAG) \ $(ENABLE_XMM_SUPPORT_CFLAG) @@ -45,6 +46,7 @@ libxklavier_la_SOURCES = xklavier.c xklavier_evt.c xklavier_config.c \ $(noinst_HEADERS) $(xklavierinc_HEADERS) libxklavier_la_LDFLAGS = -version-info @VERSION_INFO@ \ $(XML_LIBS) $(GLIB_LIBS) \ - -lxkbfile -L$(x_libraries) $(LIBICONV) + $(LIBXKBFILE_PRESENT_LDFLAGS) \ + -L$(x_libraries) $(LIBICONV) diff --git a/libxklavier/xklavier_config_xkb.c b/libxklavier/xklavier_config_xkb.c index d574e69..e5fcc11 100644 --- a/libxklavier/xklavier_config_xkb.c +++ b/libxklavier/xklavier_config_xkb.c @@ -16,7 +16,7 @@ #include "xklavier_private.h" #include "xklavier_private_xkb.h" -#ifdef XKB_HEADERS_PRESENT +#ifdef LIBXKBFILE_PRESENT #include <X11/extensions/XKBfile.h> #include <X11/extensions/XKM.h> #endif @@ -29,7 +29,7 @@ #define XK_XKB_KEYS #include <X11/keysymdef.h> -#ifdef XKB_HEADERS_PRESENT +#ifdef LIBXKBFILE_PRESENT static XkbRF_RulesPtr xkl_rules; static XkbRF_RulesPtr @@ -73,7 +73,7 @@ xkl_rules_set_free(void) void xkl_xkb_init_config_registry(XklConfigRegistry * config) { -#ifdef XKB_HEADERS_PRESENT +#ifdef LIBXKBFILE_PRESENT XkbInitAtoms(NULL); #endif } @@ -102,7 +102,7 @@ xkl_xkb_load_config_registry(XklConfigRegistry * config) return xkl_config_registry_load_from_file(config, file_name); } -#ifdef XKB_HEADERS_PRESENT +#ifdef LIBXKBFILE_PRESENT gboolean xkl_xkb_config_native_prepare(XklEngine * engine, const XklConfigRec * data, @@ -407,7 +407,7 @@ xkl_xkb_multiple_layouts_supported(XklEngine * engine) if (support_state == UNCHECKED) { XklConfigRec *data = xkl_config_rec_new(); -#ifdef XKB_HEADERS_PRESENT +#ifdef LIBXKBFILE_PRESENT XkbComponentNamesRec component_names; memset(&component_names, 0, sizeof(component_names)); #endif @@ -419,7 +419,7 @@ xkl_xkb_multiple_layouts_supported(XklEngine * engine) xkl_debug(100, "!!! Checking multiple layouts support\n"); support_state = NON_SUPPORTED; -#ifdef XKB_HEADERS_PRESENT +#ifdef LIBXKBFILE_PRESENT if (xkl_xkb_config_native_prepare (engine, data, &component_names)) { xkl_debug(100, @@ -460,7 +460,7 @@ xkl_xkb_activate_config_rec(XklEngine * engine, const XklConfigRec * data) } #endif -#ifdef XKB_HEADERS_PRESENT +#ifdef LIBXKBFILE_PRESENT XkbComponentNamesRec component_names; memset(&component_names, 0, sizeof(component_names)); @@ -500,7 +500,7 @@ xkl_xkb_write_config_rec_to_file(XklEngine * engine, const char *file_name, { gboolean rv = FALSE; -#ifdef XKB_HEADERS_PRESENT +#ifdef LIBXKBFILE_PRESENT XkbComponentNamesRec component_names; FILE *output = fopen(file_name, "w"); XkbFileInfo dump_info; diff --git a/libxklavier/xklavier_dump.c b/libxklavier/xklavier_dump.c index 1681151..faca19f 100644 --- a/libxklavier/xklavier_dump.c +++ b/libxklavier/xklavier_dump.c @@ -19,7 +19,7 @@ #include "xklavier_private.h" #include "xklavier_private_xkb.h" -#ifdef XKB_HEADERS_PRESENT +#ifdef LIBXKBFILE_PRESENT #if 0 static void _XkbModsRecDump(FILE * fs, XkbModsRec * mods) diff --git a/libxklavier/xklavier_evt_xkb.c b/libxklavier/xklavier_evt_xkb.c index 19da8e3..036312e 100644 --- a/libxklavier/xklavier_evt_xkb.c +++ b/libxklavier/xklavier_evt_xkb.c @@ -13,7 +13,7 @@ gint xkl_xkb_process_x_event(XklEngine * engine, XEvent * xev) { -#ifdef XKB_HEADERS_PRESENT +#ifdef LIBXKBFILE_PRESENT gint i; guint bit; guint inds; @@ -122,7 +122,7 @@ xkl_xkb_process_x_event(XklEngine * engine, XEvent * xev) void xkl_xkb_set_indicators(XklEngine * engine, const XklState * window_state) { -#ifdef XKB_HEADERS_PRESENT +#ifdef LIBXKBFILE_PRESENT int i; unsigned bit; diff --git a/libxklavier/xklavier_private_xkb.h b/libxklavier/xklavier_private_xkb.h index 0fa7d15..fd21320 100644 --- a/libxklavier/xklavier_private_xkb.h +++ b/libxklavier/xklavier_private_xkb.h @@ -1,7 +1,7 @@ #ifndef __XKLAVIER_PRIVATE_XKB_H__ #define __XKLAVIER_PRIVATE_XKB_H__ -#ifdef XKB_HEADERS_PRESENT +#ifdef LIBXKBFILE_PRESENT #include <X11/XKBlib.h> #include <X11/extensions/XKBrules.h> diff --git a/libxklavier/xklavier_xkb.c b/libxklavier/xklavier_xkb.c index 8c1dfe9..8971d2f 100644 --- a/libxklavier/xklavier_xkb.c +++ b/libxklavier/xklavier_xkb.c @@ -8,7 +8,7 @@ #include "xklavier_private.h" #include "xklavier_private_xkb.h" -#ifdef XKB_HEADERS_PRESENT +#ifdef LIBXKBFILE_PRESENT const gchar ** xkl_xkb_get_groups_names(XklEngine * engine) @@ -482,7 +482,7 @@ xkl_xkb_init(XklEngine * engine) { Display *display = xkl_engine_get_display(engine); -#ifdef XKB_HEADERS_PRESENT +#ifdef LIBXKBFILE_PRESENT gint opcode; gboolean xkl_xkb_ext_present; @@ -573,7 +573,7 @@ xkl_xkb_term(XklEngine * engine) { } -#ifdef XKB_HEADERS_PRESENT +#ifdef LIBXKBFILE_PRESENT const gchar * xkl_xkb_event_get_name(gint xkb_type) { |