957N/Adiff -urp -x '*~' -x '*.orig' configure.ac configure.ac

957N/A--- configure.ac 2010-04-20 16:51:58.116747548 -0700

957N/A+++ configure.ac 2010-04-20 16:51:58.619268104 -0700

957N/A@@ -244,8 +244,7 @@ if test "$XVMC" = yes && test "$DRI" = n

957N/A AC_MSG_ERROR([XvMC can't be enabled without DRI])

957N/A fi

957N/A if test "$XVMC" = yes; then

957N/A- PKG_CHECK_MODULES(XVMCLIB, [xvmc], [XVMC=yes], [XVMC=no])

957N/A- PKG_CHECK_MODULES(XEXT, [xext])

957N/A+ PKG_CHECK_MODULES(XVMCLIB, [xvmc xext x11 xfixes dri2proto], [XVMC=yes], [XVMC=no])

957N/A fi

957N/A AC_MSG_CHECKING([whether to include XvMC support])

957N/A AC_MSG_RESULT([$XVMC])

606N/Adiff -urp -x '*~' -x '*.orig' src/Makefile.am src/Makefile.am

957N/A--- src/Makefile.am 2009-02-28 12:28:53.000000000 -0800

957N/A+++ src/Makefile.am 2010-04-20 16:51:58.619438335 -0700

957N/A@@ -38,6 +38,8 @@ intel_drv_la_LTLIBRARIES = intel_drv.la

957N/A intel_drv_la_LDFLAGS = -module -avoid-version

199N/A intel_drv_ladir = @moduledir@/drivers

705N/A intel_drv_la_LIBADD = -lm @DRM_LIBS@ -ldrm_intel

957N/A+intel_drv_la_LIBADD += -lfb -lextmod -lshadowfb -lXfont \

957N/A+ -lvbe -lvgahw -lxaa -lexa -ldri -ldri2 -lglx

705N/A if BUILD_UXA

957N/A intel_drv_la_LIBADD += ../uxa/libuxa.la

957N/A endif