diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2014-06-13 09:14:47 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2014-06-13 09:19:31 +0100 |
| commit | bccfb768ee14348b6db5b140fdd6df5fdbfcad0c (patch) | |
| tree | 1f5a3f9c3b34ee4b43702d615c13a4642e9cf963 | |
| parent | 5a0cb1049c2fa0586708719210a2d2cffa7a4491 (diff) | |
xvmc: Sanitize compile and library flags
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | xvmc/Makefile.am | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index bd654f3a..09dd8305 100644 --- a/configure.ac +++ b/configure.ac @@ -622,8 +622,7 @@ AM_CONDITIONAL(SNA, test "x$SNA" != "xno") AC_MSG_RESULT([$SNA]) if test "$XVMC" = "yes"; then - PKG_CHECK_MODULES(XVMCLIB, [xvmc dri2proto x11], [], [XVMC="no"]) - PKG_CHECK_MODULES(XCB, [x11-xcb xcb-dri2 xcb-aux], [], [XVMC="no"]) + PKG_CHECK_MODULES(XVMCLIB, [xvmc dri2proto x11 x11-xcb xcb-dri2 xcb-aux libdrm_intel], [], [XVMC="no"]) fi AC_MSG_CHECKING([whether to include XvMC support]) AC_MSG_RESULT([$XVMC]) diff --git a/xvmc/Makefile.am b/xvmc/Makefile.am index eaa88eac..a91b138d 100644 --- a/xvmc/Makefile.am +++ b/xvmc/Makefile.am @@ -24,9 +24,7 @@ libIntelXvMC_la_SOURCES = \ intel_batchbuffer.h \ $(NULL) -AM_CFLAGS = @XORG_CFLAGS@ @DRM_CFLAGS@ @DRI2_CFLAGS@ \ - @XVMCLIB_CFLAGS@ @XCB_CFLAGS@ \ - -I$(top_srcdir)/src -DTRUE=1 -DFALSE=0 +AM_CFLAGS = $(XVMCLIB_CFLAGS) $(XORG_CFLAGS) -I$(top_srcdir)/src -DTRUE=1 -DFALSE=0 libIntelXvMC_la_LDFLAGS = -version-number 1:0:0 -libIntelXvMC_la_LIBADD = @DRI2_LIBS@ @DRM_LIBS@ @XVMCLIB_LIBS@ @XCB_LIBS@ @DRMINTEL_LIBS@ -lpthread +libIntelXvMC_la_LIBADD = $(XVMCLIB_LIBS) -lpthread |