From d97f29be22e22e6f5bc23229ffa5ef087f992c8c Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 16 Feb 2006 21:35:32 +0000 Subject: [PATCH] =?UTF-8?q?Bug=20#5453:=20Don't=20forget=20to=20still=20do?= =?UTF-8?q?=20AM=5FCONDITIONAL=20for=20XVMC=20even=20if=20XV=20is=20=20=20?= =?UTF-8?q?=20=20disabled,=20and=20also=20force=20XVMC=20disabled=20if=20X?= =?UTF-8?q?V=20is=20disabled.=20(Dag-Erling=20=20=20=20=20Sm=EF=BF=BDrgrav?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ChangeLog | 7 +++++++ configure.ac | 11 +++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index c1320d705..aadfc9b04 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-02-16 Eric Anholt + + * configure.ac: + Bug #5453: Don't forget to still do AM_CONDITIONAL for XVMC even if XV + is disabled, and also force XVMC disabled if XV is disabled. + (Dag-Erling Sm�rgrav) + 2006-02-16 Keith Packard * miext/shadow/shrotpackYX.h: diff --git a/configure.ac b/configure.ac index 7318cd788..2a5b79289 100644 --- a/configure.ac +++ b/configure.ac @@ -483,10 +483,13 @@ if test "x$XV" = xyes; then AC_DEFINE(XV, 1, [Support Xv extension]) AC_DEFINE(XvExtension, 1, [Build Xv extension]) REQUIRED_MODULES="$REQUIRED_MODULES videoproto" - AM_CONDITIONAL(XVMC, [test "x$XVMC" = xyes]) - if test "x$XVMC" = xyes; then - AC_DEFINE(XvMCExtension, 1, [Build XvMC extension]) - fi +else + XVMC=no +fi + +AM_CONDITIONAL(XVMC, [test "x$XVMC" = xyes]) +if test "x$XVMC" = xyes; then + AC_DEFINE(XvMCExtension, 1, [Build XvMC extension]) fi AM_CONDITIONAL(DGA, [test "x$DGA" = xyes])