summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--configure.ac7
2 files changed, 7 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 9e373b4a..d897380d 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 cf90ade3..f95475a9 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.