summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
-rw-r--r--configure.ac2
2 files changed, 2 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 406076812..0b9a3d67c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
xine-lib (1.1.2)
* Czech translation update
+ * Disable the XXMC plugin if Xv support isn't there
xine-lib (1.1.1)
* Improve sound quality when using alsa 1.0.9 or above.
diff --git a/configure.ac b/configure.ac
index 264fad845..20bf71820 100644
--- a/configure.ac
+++ b/configure.ac
@@ -637,7 +637,7 @@ XXMC_LIB="-L$xxmc_path -l$xxmc_stub"
AC_MSG_CHECKING(whether to enable the xxmc plugin with vld extensions)
AC_MSG_RESULT()
dnl Check if vld "extended" XvMC is available
-if test x$xxmc_stub == "xXvMCW"; then
+if test x$xxmc_stub == "xXvMCW" && test x$ac_have_xv == "xyes"; then
AC_CHECK_LIB($xxmc_stub, XvMCPutSlice,
ac_have_xxmc="yes",
[ac_have_xxmc="no"