xvmc: Sanitize compile and library flags

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2014-06-13 09:14:47 +01:00
parent 5a0cb1049c
commit bccfb768ee
2 changed files with 3 additions and 6 deletions

View File

@ -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])

View File

@ -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