diff -ur libxklavier-3.6/configure.in libxklavier-3.6.new/configure.in

--- libxklavier-3.6/configure.in	2008-04-22 02:30:42 +0400

+++ libxklavier-3.6.new/configure.in	2008-06-02 16:00:40 +0400

@@ -155,6 +155,10 @@

 AC_SUBST(GLIB_LIBS)

 AC_SUBST(GLIB_CFLAGS)

+PKG_CHECK_MODULES(X, \

+	x11)

+AC_SUBST(X_LIBS)

+

 AC_SUBST(CFLAGS)

 AC_SUBST(LDFLAGS)

diff -ur libxklavier-3.6/libxklavier/Makefile.am libxklavier-3.6.new/libxklavier/Makefile.am

--- libxklavier-3.6/libxklavier/Makefile.am	2008-04-22 00:11:58 +0400

+++ libxklavier-3.6.new/libxklavier/Makefile.am	2008-06-02 16:04:02 +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

@@ -44,9 +44,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@ \

- $(XML_LIBS) $(GLIB_LIBS) \

- $(LIBXKBFILE_PRESENT_LDFLAGS) \

- $(X_LIBS) $(LIBICONV) 

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

+libxklavier_la_LIBADD = \

+ $(XML_LIBS) $(GLIB_LIBS) \

+ $(X_LIBS) $(LIBICONV) \

+ $(LIBXKBFILE_PRESENT_LIBADD)