From 20751bdbd37ea868b591bb87c33dc05e6534d7b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.net>
Date: Wed, 6 Feb 2008 18:56:40 +0000
Subject: [PATCH] configure.ac: ximagesrc has moved to -good, so no need to
 check for the required X libs here any more.

Original commit message from CVS:
* configure.ac:
ximagesrc has moved to -good, so no need to check for
the required X libs here any more.
---
 ChangeLog    |  6 ++++++
 common       |  2 +-
 configure.ac | 31 -------------------------------
 3 files changed, 7 insertions(+), 32 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 38e4fd1a63..6c2421834d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-06  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* configure.ac:
+	  ximagesrc has moved to -good, so no need to check for
+	  the required X libs here any more.
+
 2008-02-06  Sebastian Dröge  <slomo@circular-chaos.org>
 
 	Patch by: Wouter Cloetens <wouter at mind dot be>
diff --git a/common b/common
index 3c5473161c..8b37d7ee83 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 3c5473161ce19a3530bad279b842d542895b1500
+Subproject commit 8b37d7ee833fab1d25b484d8574df3dae231b5f2
diff --git a/configure.ac b/configure.ac
index eced067497..f5ba905a48 100644
--- a/configure.ac
+++ b/configure.ac
@@ -320,36 +320,6 @@ AG_GST_CHECK_FEATURE(VCD, [Video CD], vcdsrc, [
   AC_CHECK_HEADER(linux/cdrom.h, HAVE_VCD="yes", HAVE_VCD="no")
 ])
 
-dnl Check for X11
-translit(dnm, m, l) AM_CONDITIONAL(USE_X, true)
-AG_GST_CHECK_FEATURE(X, [X libraries and plugins],
-                  [ximagesrc], [
-  AC_PATH_XTRA
-
-  dnl now try to find the HEADER
-  ac_cflags_save="$CFLAGS"
-  ac_cppflags_save="$CPPFLAGS"
-  CFLAGS="$CFLAGS $X_CFLAGS"
-  CPPFLAGS="$CPPFLAGS $X_CFLAGS"
-  AC_CHECK_HEADER(X11/X.h, HAVE_X="yes", HAVE_X="no")
-
-  if test "x$HAVE_X" = "xno"
-  then
-    AC_MSG_NOTICE([cannot find X11 development files])
-  else
-    dnl this is much more than we want
-    X_LIBS="$X_LIBS $X_PRE_LIBS $X_EXTRA_LIBS"
-    dnl AC_PATH_XTRA only defines the path needed to find the X libs,
-    dnl it does not add the libs; therefore we add them here
-    X_LIBS="$X_LIBS -lX11"
-    AC_SUBST(X_CFLAGS)
-    AC_SUBST(X_LIBS)
-  fi
-  AC_SUBST(HAVE_X)
-  CFLAGS="$ac_cflags_save"
-  CPPFLAGS="$ac_cppflags_save"
-])
-
 dnl *** ext plug-ins ***
 dnl keep this list sorted alphabetically !
 
@@ -993,7 +963,6 @@ dnl but we still need to set the conditionals
 AM_CONDITIONAL(USE_OPENGL, false)
 AM_CONDITIONAL(USE_QUICKTIME, false)
 AM_CONDITIONAL(USE_VCD, false)
-AM_CONDITIONAL(USE_X, false)
 AM_CONDITIONAL(USE_ALSA, false)
 AM_CONDITIONAL(USE_AMRWB, false)
 AM_CONDITIONAL(USE_BZ2, false)