diff options
| author | Julien Cristau <jcristau@debian.org> | 2008-03-24 13:29:24 +0800 |
|---|---|---|
| committer | Zhenyu Wang <zhenyu.z.wang@intel.com> | 2008-03-24 13:29:24 +0800 |
| commit | c1a2bc357fc122d3718eca771530367ba2915815 (patch) | |
| tree | cc7c90381edff0e64f6ecc2c5bcda65dcfd430e0 /configure.ac | |
| parent | 5fcc002f77ebb66c1dc0f901a377ccf9bbc1d0bd (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.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 5b677f01..9965e0b9 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 |