--- libxklavier-3.9/configure.in.orig	2009-03-19 01:15:26 +0300

+++ libxklavier-3.9/configure.in	2009-03-19 01:18:49 +0300

@@ -153,6 +153,10 @@

 AC_SUBST(XINPUT_LIBS)

 AC_SUBST(XINPUT_CFLAGS)

+PKG_CHECK_MODULES(X, \

+	x11)

+AC_SUBST(X_LIBS)

+

 AC_SUBST(CFLAGS)

 AC_SUBST(LDFLAGS)

--- libxklavier-3.9/libxklavier/Makefile.am.orig	2009-02-22 01:20:43 +0300

+++ libxklavier-3.9/libxklavier/Makefile.am	2009-03-19 01:21:59 +0300

@@ -1,6 +1,6 @@

 if LIBXKBFILE_PRESENT

   LIBXKBFILE_PRESENT_CFLAG = -DLIBXKBFILE_PRESENT=1

-  LIBXKBFILE_PRESENT_LDFLAGS = -lxkbfile

+  LIBXKBFILE_PRESENT_LIBADD = -lxkbfile

 endif

 if ENABLE_XKB_SUPPORT

@@ -45,10 +45,10 @@

 	xklavier_xmm.c xklavier_xmm_opts.c xklavier_evt_xmm.c xklavier_config_xmm.c \

 	xklavier_util.c xklavier_props.c xklavier_dump.c xkl_engine_marshal.c \

 	$(noinst_HEADERS) $(xklavierinc_HEADERS)

-libxklavier_la_LDFLAGS = -version-info @VERSION_INFO@ -no-undefined

-libxklavier_la_LIBADD = \

- $(XML_LIBS) $(GLIB_LIBS) $(XINPUT_LIBS) \

- $(LIBXKBFILE_PRESENT_LDFLAGS) \

- $(X_LIBS) $(LIBICONV) 

+libxklavier_la_LDFLAGS = -version-info @VERSION_INFO@ -Wl,-z,defs 

+libxklavier_la_LIBADD = \

+  $(XML_LIBS) $(GLIB_LIBS) $(XINPUT_LIBS) \

+  $(X_LIBS) $(LIBICONV) \

+  $(LIBXKBFILE_PRESENT_LIBADD)