Makefile.am  |    4 +++-
 configure.ac |   20 +-------------------
 2 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 59f9547..dafffaf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,7 +25,9 @@ DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
 AM_CPPFLAGS = -I. -I$(srcdir) @GTK_CFLAGS@
 
 # Link time dependencies.
-LDADD = @LIBINTL@ @GTK_LIBS@ @EMFLIBS@
+LDADD = @LIBINTL@ @GTK_LIBS@ @EMFLIBS@ -lX11
+
+AM_CFLAGS = -DGTK2
 
 # Additional files to be distributed.
 EXTRA_DIST = autogen.sh autoclean.sh
diff --git a/configure.ac b/configure.ac
index 29e3344..6fd754f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,25 +34,7 @@ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
 
 AC_MSG_CHECKING([for GTK version and compile options ])
 
-if test x$PKG_CONFIG = xno -o x$enable_gtk1 = xyes ; then
-AM_PATH_GTK(1.0.2, , exit 1)
-else
-if $PKG_CONFIG gtk+-2.0 --cflags ; then
-       GTK_CFLAGS="-DGTK2 `$PKG_CONFIG gtk+-2.0 --cflags` "
-       GTK_LIBS=`$PKG_CONFIG gtk+-2.0 --libs`
-dnl    use_gtk2=yes
-       AC_DEFINE([GTK2], [1], [the GTK2 library])
-       enable_stockgtk=yes
-else
-if $PKG_CONFIG --cflags gtk+ ; then
-	GTK_CFLAGS=`$PKG_CONFIG gtk+ --cflags`       
-	GTK_LIBS=`$PKG_CONFIG gtk+ --libs`
-dnl    use_gtk2=no
-fi
-fi
-fi
-
-dnl AC_MSG_RESULT using GTK2 : $use_gtk2
+PKG_CHECK_MODULES([GTK],[gtk+-2.0])
 
 dnl Checks for header files.
 AC_PATH_X