summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Cristau <jcristau@debian.org>2008-03-24 13:29:24 +0800
committerZhenyu Wang <zhenyu.z.wang@intel.com>2008-03-24 15:06:18 +0800
commit996dc7fd8b5d0aaaa1cda339c2a069893d2d1a43 (patch)
tree02f6ce4cc356b8a7f3c4eb43fbc077b5139fe261
parent40744d88b477a27772c541d73311208f47ba562e (diff)
Don't try to build XvMC if DRI is disabled
Instead of failing the build, don't even try unless --enable-xvmc was used.
-rw-r--r--configure.ac10
1 files changed, 8 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 9179bb27..871cd264 100644
--- a/configure.ac
+++ b/configure.ac
@@ -67,9 +67,9 @@ AC_ARG_WITH(xserver-source,AC_HELP_STRING([--with-xserver-source=XSERVER_SOURCE]
[ XSERVER_SOURCE="" ])
AC_ARG_ENABLE(xvmc, AC_HELP_STRING([--disable-xvmc],
- [Disable XvMC support [[default=yes]]]),
+ [Disable XvMC support [[default=auto]]]),
[XVMC="$enableval"],
- [XVMC=yes])
+ [XVMC=auto])
# Checks for extensions
XORG_DRIVER_CHECK_EXT(XINERAMA, xineramaproto)
@@ -211,6 +211,12 @@ if test "$VIDEO_DEBUG" = yes; then
fi
AC_MSG_CHECKING([whether to include XvMC support])
+if test "$XVMC" = auto; then
+ XVMC="$DRI"
+fi
+if test "$XVMC" = yes && test "$DRI" = no; then
+ AC_MSG_ERROR([XvMC can't be enabled without DRI])
+fi
AC_MSG_RESULT([$XVMC])
AM_CONDITIONAL(XVMC, test x$XVMC = xyes)
if test "$XVMC" = yes; then