diff options
| author | Julien Cristau <jcristau@debian.org> | 2009-06-11 17:15:04 +0200 |
|---|---|---|
| committer | Julien Cristau <jcristau@debian.org> | 2009-06-11 17:51:38 +0200 |
| commit | 6d062e9e9fc4ac92a5dc2941b4ed0251a1dc6e11 (patch) | |
| tree | dc2981f158d4240b89447c5c0ba7652fb4732b15 | |
| parent | 9d3c3b056c1d4da6ef7afd3f71a5994fad810632 (diff) | |
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>).
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | src/xvmc/Makefile.am | 2 | ||||
| -rw-r--r-- | src/xvmc/intel_xvmc.c | 1 |
3 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index c40818f9..0864d7c5 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 fc402bb4..6cbba6af 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 6f559028..06763aef 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; |