diff -Naur mjpegtools-1.9.0_orig/configure mjpegtools-1.9.0/configure
--- mjpegtools-1.9.0_orig/configure	2007-12-04 20:13:25.000000000 +0100
+++ mjpegtools-1.9.0/configure	2007-12-18 23:38:54.000000000 +0100
@@ -25073,7 +25073,7 @@
     # Martyn Johnson says this is needed for Ultrix, if the X
     # libraries were built with DECnet support.  And Karl Berry says
     # the Alpha needs dnet_stub (dnet does not exist).
-    ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
+    ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS"
     cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -26154,7 +26154,7 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lXxf86dga $X_LIBS $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS"
+LIBS="-lXxf86dga $X_LIBS $X_PRE_LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
diff -Naur mjpegtools-1.9.0_orig/configure.ac mjpegtools-1.9.0/configure.ac
--- mjpegtools-1.9.0_orig/configure.ac	2007-11-08 18:32:20.000000000 +0100
+++ mjpegtools-1.9.0/configure.ac	2007-12-18 23:39:03.000000000 +0100
@@ -261,7 +261,7 @@
 AC_CHECK_LIB(Xxf86dga, XF86DGAQueryExtension,
 	V4LCONF_LIBS="$X_LIBS -lXxf86dga" 
 	AC_DEFINE(HAVE_LIBXXF86DGA,1, [libxf86dga is present]),,
-	$X_LIBS $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS)
+	$X_LIBS $X_PRE_LIBS $X_EXTRA_LIBS)
 
 dnl ********************************************************************
 dnl Check for Gtk+/glib (for glav).  2.4.0 or greater required (should
diff -Naur mjpegtools-1.9.0_orig/lavtools/Makefile.am mjpegtools-1.9.0/lavtools/Makefile.am
--- mjpegtools-1.9.0_orig/lavtools/Makefile.am	2007-11-08 18:32:20.000000000 +0100
+++ mjpegtools-1.9.0/lavtools/Makefile.am	2007-12-18 23:39:08.000000000 +0100
@@ -60,7 +60,7 @@
 liblavplay_la_LDFLAGS = $(LAV_ALL_LIB_OPTS)
 liblavplay_la_LIBADD = liblavfile.la $(SDL_LIBS) liblavjpeg.la
 if HAVE_V4L
-   liblavplay_la_LIBADD += ${X_LIBS} -lX11
+   liblavplay_la_LIBADD += ${X_LIBS}
 endif
 liblavplay_la_DEPENDENCIES = liblavfile.la liblavjpeg.la
 
diff -Naur mjpegtools-1.9.0_orig/lavtools/Makefile.in mjpegtools-1.9.0/lavtools/Makefile.in
--- mjpegtools-1.9.0_orig/lavtools/Makefile.in	2007-12-04 20:14:05.000000000 +0100
+++ mjpegtools-1.9.0/lavtools/Makefile.in	2007-12-18 23:39:13.000000000 +0100
@@ -44,7 +44,7 @@
 @HAVE_ALTIVEC_TRUE@am__append_1 = $(top_builddir)/mpeg2enc/libmpeg2encpp.la
 @HAVE_V4L_TRUE@am__append_2 = liblavrec.la
 @HAVE_V4L_OR_SDL_TRUE@am__append_3 = liblavplay.la
-@HAVE_V4L_TRUE@am__append_4 = ${X_LIBS} -lX11
+@HAVE_V4L_TRUE@am__append_4 = ${X_LIBS}
 bin_PROGRAMS = mjpeg_simd_helper$(EXEEXT) lav2wav$(EXEEXT) \
 	lav2yuv$(EXEEXT) lavaddwav$(EXEEXT) lavtrans$(EXEEXT) \
 	ypipe$(EXEEXT) yuv2lav$(EXEEXT) transist.flt$(EXEEXT) \