diff -durN libxklavier-4.0.orig/configure.in libxklavier-4.0/configure.in

--- libxklavier-4.0.orig/configure.in	2009-06-24 01:25:12 +0400

+++ libxklavier-4.0/configure.in	2009-07-08 08:28:17 +0400

@@ -154,6 +154,10 @@

 AC_SUBST(XINPUT_LIBS)

 AC_SUBST(XINPUT_CFLAGS)

+PKG_CHECK_MODULES(X, \

+	x11)

+AC_SUBST(X_LIBS)

+

 AC_SUBST(CFLAGS)

 AC_SUBST(LDFLAGS)

diff -durN libxklavier-4.0.orig/libxklavier/Makefile.am libxklavier-4.0/libxklavier/Makefile.am

--- libxklavier-4.0.orig/libxklavier/Makefile.am	2009-06-28 17:07:27 +0400

+++ libxklavier-4.0/libxklavier/Makefile.am	2009-07-08 08:34:51 +0400

@@ -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

@@ -37,11 +37,11 @@

 	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_LDFLAGS = -version-info @VERSION_INFO@ -Wl,-z,defs

 libxklavier_la_LIBADD = \

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

- $(LIBXKBFILE_PRESENT_LDFLAGS) \

- $(X_LIBS) -lX11 $(LIBICONV) 

+ $(X_LIBS) $(LIBICONV) \

+ $(LIBXKBFILE_PRESENT_LIBADD)

 EXTRA_DIST=marshal.list