Merge branch 'test'

diff --cc configure.ac
index 50fd976,703bb97..6e9f95c
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -36,14 -93,21 +93,21 @@@ AC_SYS_LARGEFIL
  
  PKG_CHECK_MODULES([X11], [x11])
  PKG_CHECK_MODULES([XEXT],[xext])
+ PKG_CHECK_MODULES([XFIXES], [xfixes])
  PKG_CHECK_MODULES([DRM], [libdrm])
- PKG_CHECK_MODULES(LIBDRM_DEPS, [libdrm])
  
 -AC_CHECK_PROG(gen4asm, [intel-gen4asm], yes, no)
 +PKG_CHECK_MODULES(GEN4ASM, [intel-gen4asm >= 1.0], [gen4asm=yes], [gen4asm=no])
  AM_CONDITIONAL(HAVE_GEN4ASM, test x$gen4asm = xyes)
  
+ # Check for libdrm >= 2.4 (needed for i965_drv_video.so)
+ if test x$enable_i965_driver = xyes && ! $PKG_CONFIG --atleast-version=2.4 libdrm; then
+     AC_MSG_WARN([libdrm < 2.4 found, disabling build of i965 video driver])
+     enable_i965_driver=no
+ fi
+ AM_CONDITIONAL(BUILD_I965_DRIVER, test x$enable_i965_driver = xyes)
+ 
  # We only need the headers, we don't link against the DRM libraries
- LIBVA_CFLAGS="$LIBDRM_DEPS_CFLAGS"
+ LIBVA_CFLAGS="$DRM_CFLAGS"
  AC_SUBST(LIBVA_CFLAGS)
  AC_SUBST(LIBVA_LIBS)