From c81a4687fca80bf7367d7f0e9a00a6a09737c5bb Mon Sep 17 00:00:00 2001 From: Zhenyu Wang Date: Tue, 6 May 2008 13:52:22 +0800 Subject: [PATCH] Only check xvmc lib when xvmc is enabled. Don't check xvmc lib if user has already wanted to disable it. Fix fdo bug #15762. --- configure.ac | 8 ++++++-- src/xvmc/Makefile.am | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 00f075e8..60b95fa7 100644 --- a/configure.ac +++ b/configure.ac @@ -83,7 +83,7 @@ XORG_DRIVER_CHECK_EXT(XF86DRI, xextproto x11) XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto) # Checks for pkg-config packages -PKG_CHECK_MODULES(XORG, [xorg-server xproto xvmc fontsproto $REQUIRED_MODULES]) +PKG_CHECK_MODULES(XORG, [xorg-server xproto fontsproto $REQUIRED_MODULES]) sdkdir=$(pkg-config --variable=sdkdir xorg-server) # Checks for libraries. @@ -226,17 +226,21 @@ if test "$VIDEO_DEBUG" = yes; then AC_DEFINE(VIDEO_DEBUG,1,[Enable debug support]) 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 +if test "$XVMC" = yes; then + PKG_CHECK_MODULES(XVMCLIB, [xvmc], [XVMC=yes], [XVMC=no]) +fi +AC_MSG_CHECKING([whether to include XvMC support]) AC_MSG_RESULT([$XVMC]) AM_CONDITIONAL(XVMC, test x$XVMC = xyes) if test "$XVMC" = yes; then AC_DEFINE(ENABLE_XVMC,1,[Enable XvMC support]) + AC_SUBST([XVMCLIB_CFLAGS]) fi diff --git a/src/xvmc/Makefile.am b/src/xvmc/Makefile.am index 7ae429ab..f571743f 100644 --- a/src/xvmc/Makefile.am +++ b/src/xvmc/Makefile.am @@ -22,7 +22,7 @@ libIntelXvMC_la_SOURCES = intel_xvmc.c \ xf86dristr.h \ driDrawable.c \ driDrawable.h -libIntelXvMC_la_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ -I$(top_srcdir)/src -DTRUE=1 -DFALSE=0 +libIntelXvMC_la_CFLAGS = @XORG_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@ endif