From 84df1745ae92896716e3ebf906e22505ddf640eb Mon Sep 17 00:00:00 2001
From: Thomas Vander Stichele <thomas@apestaart.org>
Date: Mon, 5 Sep 2005 11:52:32 +0000
Subject: fix --disable-x build bug

Original commit message from CVS:
fix --disable-x build bug
---
 ChangeLog    | 5 +++++
 configure.ac | 7 ++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9e373b4aa..d897380d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-05  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* configure.ac:
+	  build fix for configure --disable-x
+
 2005-09-05  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* ext/flac/gstflacdec.c: (flac_caps_factory), (raw_caps_factory):
diff --git a/configure.ac b/configure.ac
index cf90ade37..f95475a96 100644
--- a/configure.ac
+++ b/configure.ac
@@ -634,8 +634,6 @@ GST_CHECK_FEATURE(X, [X libraries and plugins],
     AC_SUBST(XFIXES_LIBS)
     AC_SUBST(XFIXES_CFLAGS)
     
-    AM_CONDITIONAL(HAVE_XFIXES, test "x$HAVE_XFIXES" = "xyes")
-
     dnl check for Xdamage
     PKG_CHECK_MODULES(XDAMAGE, xdamage, HAVE_XDAMAGE="yes", HAVE_XDAMAGE="no")
     if test "x$HAVE_XDAMAGE" = "xyes"
@@ -644,12 +642,11 @@ GST_CHECK_FEATURE(X, [X libraries and plugins],
     fi
     AC_SUBST(XDAMAGE_LIBS)
     AC_SUBST(XDAMAGE_CFLAGS)
-    
-    AM_CONDITIONAL(HAVE_XDAMAGE, test "x$HAVE_XDAMAGE" = "xyes")
-
   fi
   AC_SUBST(HAVE_X)
 ])
+AM_CONDITIONAL(HAVE_XFIXES, test "x$HAVE_XFIXES" = "xyes")
+AM_CONDITIONAL(HAVE_XDAMAGE, test "x$HAVE_XDAMAGE" = "xyes")
     
 dnl *** XVideo ***
 dnl Look for the PIC library first, Debian requires it.
-- 
cgit v1.2.1