xf86-video-intel: configure.ac src/xvmc/intel_xvmc.c src/xvmc/Makefile.am

[Julien Cristau]

 configure.ac          |    3 +--
 src/xvmc/Makefile.am  |    2 +-
 src/xvmc/intel_xvmc.c |    1 +
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 6d062e9e9fc4ac92a5dc2941b4ed0251a1dc6e11
Author: Julien Cristau <jcristau at debian.org>
Date:   Thu Jun 11 17:15:04 2009 +0200

    Fix xvmc build
    
    If we don't find xext.pc, disable xvmc instead of failing configure
    Also add dependencies on xfixes and dri2proto (src/xvmc/dri2.h includes
    <X11/extensions/Xfixes.h> and <X11/extensions/dri2tokens.h>).

diff --git a/configure.ac b/configure.ac
index c40818f..0864d7c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -152,8 +152,7 @@ if test "$VIDEO_DEBUG" = yes; then
 fi
 
 if test "$XVMC" = yes; then
-	PKG_CHECK_MODULES(XVMCLIB, [xvmc], [XVMC=yes], [XVMC=no])
-	PKG_CHECK_MODULES(XEXT, [xext])
+	PKG_CHECK_MODULES(XVMCLIB, [xvmc xext xfixes dri2proto], [XVMC=yes], [XVMC=no])
 fi
 AC_MSG_CHECKING([whether to include XvMC support])
 AC_MSG_RESULT([$XVMC])
diff --git a/src/xvmc/Makefile.am b/src/xvmc/Makefile.am
index fc402bb..6cbba6a 100644
--- a/src/xvmc/Makefile.am
+++ b/src/xvmc/Makefile.am
@@ -31,4 +31,4 @@ libIntelXvMC_la_SOURCES = intel_xvmc.c \
 libIntelXvMC_la_CFLAGS = @XORG_CFLAGS@ @DRM_CFLAGS@ @DRI_CFLAGS@ \
 	@XVMCLIB_CFLAGS@ -I$(top_srcdir)/src -DTRUE=1 -DFALSE=0
 libIntelXvMC_la_LDFLAGS = -version-number 1:0:0
-libIntelXvMC_la_LIBADD = @DRI_LIBS@ @DRM_LIBS@ @XVMCLIB_LIBS@ @XEXT_LIBS@ -lpthread -ldrm_intel
+libIntelXvMC_la_LIBADD = @DRI_LIBS@ @DRM_LIBS@ @XVMCLIB_LIBS@ -lpthread -ldrm_intel
diff --git a/src/xvmc/intel_xvmc.c b/src/xvmc/intel_xvmc.c
index 6f55902..06763ae 100644
--- a/src/xvmc/intel_xvmc.c
+++ b/src/xvmc/intel_xvmc.c
@@ -25,6 +25,7 @@
  *
  */
 #include "intel_xvmc.h"
+#include "dri2.h"
 
 /* global */
 struct _intel_xvmc_driver *xvmc_driver = NULL;