diff -urN coriander-2.0.0/configure.in coriander-2.0.0.dso/configure.in
--- coriander-2.0.0/configure.in	2008-06-21 15:57:56.000000000 +0200
+++ coriander-2.0.0.dso/configure.in	2010-02-26 11:49:04.000000000 +0100
@@ -16,6 +16,10 @@
 AC_SUBST(PACKAGE_CFLAGS)
 AC_SUBST(PACKAGE_LIBS)
 
+PKG_CHECK_MODULES(X11, ["x11"])
+AC_SUBST(X11_CFLAGS)
+AC_SUBST(X11_LIBS)
+
 GETTEXT_PACKAGE=coriander
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.])
diff -urN coriander-2.0.0/src/Makefile.am coriander-2.0.0.dso/src/Makefile.am
--- coriander-2.0.0/src/Makefile.am	2006-09-26 05:10:33.000000000 +0200
+++ coriander-2.0.0.dso/src/Makefile.am	2010-02-26 11:49:29.000000000 +0100
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-INCLUDES = -Wall -DPACKAGE_DATA_DIR=\""$(datadir)"\" -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" @PACKAGE_CFLAGS@ $(SDLLIB_CFLAGS) $(LIBRAW_CFLAGS) $(LIBDC_CFLAGS) $(COR_LFS_CFLAGS) $(FFMPEG_CFLAGS)
+INCLUDES = -Wall -DPACKAGE_DATA_DIR=\""$(datadir)"\" -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" @PACKAGE_CFLAGS@ $(SDLLIB_CFLAGS) $(LIBRAW_CFLAGS) $(LIBDC_CFLAGS) $(COR_LFS_CFLAGS) $(FFMPEG_CFLAGS) $(X11_CFLAGS)
 
 bin_PROGRAMS = coriander
 
@@ -33,5 +33,5 @@
 	video_encode.c video_encode.h \
 	subtitles.c subtitles.h 
 
-coriander_LDADD = -L/usr/X11R6/lib/ @PACKAGE_LIBS@ $(INTLLIBS) $(FTPLIB_LIBS) $(SDLLIB_LIBS) $(LIBDC_LIBS) $(LIBRAW_LIBS) $(XV_LIBS) $(COR_LFS_LDFLAGS) -lgthread-2.0 $(FFMPEG_LIBS)
+coriander_LDADD = -L/usr/X11R6/lib/ @PACKAGE_LIBS@ $(INTLLIBS) $(FTPLIB_LIBS) $(SDLLIB_LIBS) $(LIBDC_LIBS) $(LIBRAW_LIBS) $(XV_LIBS) $(COR_LFS_LDFLAGS) -lgthread-2.0 $(FFMPEG_LIBS) $(X11_LIBS)