Imported Upstream version 2.21.2upstream/2.21.2upstream

1 files changed, 217 insertions, 79 deletions

diff --git a/configure b/configure
index cd430d053..96a698d92 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for xf86-video-intel 2.20.10.
+# Generated by GNU Autoconf 2.69 for xf86-video-intel 2.21.2.
 #
 # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
 #
@@ -591,8 +591,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='xf86-video-intel'
 PACKAGE_TARNAME='xf86-video-intel'
-PACKAGE_VERSION='2.20.10'
-PACKAGE_STRING='xf86-video-intel 2.20.10'
+PACKAGE_VERSION='2.21.2'
+PACKAGE_STRING='xf86-video-intel 2.21.2'
 PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
 PACKAGE_URL=''
 
@@ -651,6 +651,8 @@ KMS_ONLY_FALSE
 KMS_ONLY_TRUE
 XVMC_FALSE
 XVMC_TRUE
+XCB_LIBS
+XCB_CFLAGS
 XVMCLIB_LIBS
 XVMCLIB_CFLAGS
 DRI2_FALSE
@@ -681,10 +683,10 @@ LIBGLAMOR_LIBS
 LIBGLAMOR_CFLAGS
 GLAMOR_FALSE
 GLAMOR_TRUE
-DRMINTEL_LIBS
-DRMINTEL_CFLAGS
 UXA_FALSE
 UXA_TRUE
+DRMINTEL_LIBS
+DRMINTEL_CFLAGS
 SNA_FALSE
 SNA_TRUE
 HAVE_X11_FALSE
@@ -773,9 +775,6 @@ CPPFLAGS
 LDFLAGS
 CFLAGS
 CC
-MAINT
-MAINTAINER_MODE_FALSE
-MAINTAINER_MODE_TRUE
 am__untar
 am__tar
 AMTAR
@@ -840,7 +839,6 @@ SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
-enable_maintainer_mode
 enable_dependency_tracking
 enable_selective_werror
 enable_strict_compilation
@@ -907,6 +905,8 @@ PCIACCESS_CFLAGS
 PCIACCESS_LIBS
 XVMCLIB_CFLAGS
 XVMCLIB_LIBS
+XCB_CFLAGS
+XCB_LIBS
 VALGRIND_CFLAGS
 VALGRIND_LIBS'
 
@@ -1449,7 +1449,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures xf86-video-intel 2.20.10 to adapt to many kinds of systems.
+\`configure' configures xf86-video-intel 2.21.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1520,7 +1520,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of xf86-video-intel 2.20.10:";;
+     short | recursive ) echo "Configuration of xf86-video-intel 2.21.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1528,8 +1528,6 @@ Optional Features:
   --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-maintainer-mode  enable make rules and dependencies not useful
-			  (and sometimes confusing) to the casual installer
   --disable-dependency-tracking  speeds up one-time build
   --enable-dependency-tracking   do not reject slow dependency extractors
   --disable-selective-werror
@@ -1636,6 +1634,8 @@ Some influential environment variables:
               C compiler flags for XVMCLIB, overriding pkg-config
   XVMCLIB_LIBS
               linker flags for XVMCLIB, overriding pkg-config
+  XCB_CFLAGS  C compiler flags for XCB, overriding pkg-config
+  XCB_LIBS    linker flags for XCB, overriding pkg-config
   VALGRIND_CFLAGS
               C compiler flags for VALGRIND, overriding pkg-config
   VALGRIND_LIBS
@@ -1707,7 +1707,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-xf86-video-intel configure 2.20.10
+xf86-video-intel configure 2.21.2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2122,7 +2122,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by xf86-video-intel $as_me 2.20.10, which was
+It was created by xf86-video-intel $as_me 2.21.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2942,7 +2942,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='xf86-video-intel'
- VERSION='2.20.10'
+ VERSION='2.21.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2983,29 +2983,6 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
-$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
-    # Check whether --enable-maintainer-mode was given.
-if test "${enable_maintainer_mode+set}" = set; then :
-  enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
-else
-  USE_MAINTAINER_MODE=no
-fi
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
-$as_echo "$USE_MAINTAINER_MODE" >&6; }
-   if test $USE_MAINTAINER_MODE = yes; then
-  MAINTAINER_MODE_TRUE=
-  MAINTAINER_MODE_FALSE='#'
-else
-  MAINTAINER_MODE_TRUE='#'
-  MAINTAINER_MODE_FALSE=
-fi
-
-  MAINT=$MAINTAINER_MODE_TRUE
-
-
-
 # Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
 
 
@@ -11514,7 +11491,8 @@ else
     ;;
   *)
     lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-    if test -n "$lt_cv_sys_max_cmd_len"; then
+    if test -n "$lt_cv_sys_max_cmd_len" && \
+	test undefined != "$lt_cv_sys_max_cmd_len"; then
       lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
       lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
     else
@@ -13050,7 +13028,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
 	    LD="${LD-ld} -m elf_i386_fbsd"
 	    ;;
 	  x86_64-*linux*)
-	    LD="${LD-ld} -m elf_i386"
+	    case `/usr/bin/file conftest.o` in
+	      *x86-64*)
+		LD="${LD-ld} -m elf32_x86_64"
+		;;
+	      *)
+		LD="${LD-ld} -m elf_i386"
+		;;
+	    esac
 	    ;;
 	  ppc64-*linux*|powerpc64-*linux*)
 	    LD="${LD-ld} -m elf32ppclinux"
@@ -18261,6 +18246,72 @@ else
 fi
 
 
+# Check for atomic intrinsics
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for native atomic primitives" >&5
+$as_echo_n "checking for native atomic primitives... " >&6; }
+if ${intel_cv_atomic_primitives+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+    intel_cv_atomic_primitives="none"
+
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int atomic_add(int i) { return __sync_fetch_and_add (&i, 1); }
+int atomic_cmpxchg(int i, int j, int k) { return __sync_val_compare_and_swap (&i, j, k); }
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  intel_cv_atomic_primitives="Intel"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+    if test "x$intel_cv_atomic_primitives" = "xnone"; then
+	    ac_fn_c_check_header_mongrel "$LINENO" "atomic_ops.h" "ac_cv_header_atomic_ops_h" "$ac_includes_default"
+if test "x$ac_cv_header_atomic_ops_h" = xyes; then :
+  intel_cv_atomic_primitives="libatomic-ops"
+fi
+
+
+    fi
+
+    # atomic functions defined in <atomic.h> & libc on Solaris
+    if test "x$intel_cv_atomic_primitives" = "xnone"; then
+	    ac_fn_c_check_func "$LINENO" "atomic_cas_uint" "ac_cv_func_atomic_cas_uint"
+if test "x$ac_cv_func_atomic_cas_uint" = xyes; then :
+  intel_cv_atomic_primitives="Solaris"
+fi
+
+    fi
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $intel_cv_atomic_primitives" >&5
+$as_echo "$intel_cv_atomic_primitives" >&6; }
+if test "x$intel_cv_atomic_primitives" = xIntel; then
+
+$as_echo "#define HAVE_ATOMIC_PRIMITIVES 1" >>confdefs.h
+
+fi
+if test "x$intel_cv_atomic_primitives" = "xlibatomic-ops"; then
+
+$as_echo "#define HAVE_LIB_ATOMIC_OPS 1" >>confdefs.h
+
+fi
+
+if test "x$intel_cv_atomic_primitives" = "xnone"; then
+		as_fn_error $? "xf86-video-intel depends upon atomic operations, which were not found for your compiler/cpu. Try compiling with -march=native, or install the libatomics-op-dev package." "$LINENO" 5
+fi
+
 # Check whether --enable-udev was given.
 if test "${enable_udev+set}" = set; then :
   enableval=$enable_udev; UDEV="$enableval"
@@ -18341,7 +18392,7 @@ else
 $as_echo "yes" >&6; }
 	udev=yes
 fi
-	if test x$UDEV == xyes -a x$udev != xyes; then
+	if test x$UDEV = xyes -a x$udev != xyes; then
 		as_fn_error $? "udev support requested but not found (libudev)" "$LINENO" 5
 	fi
 	if test x$udev = xyes; then
@@ -18473,7 +18524,7 @@ fi
 
 
 required_xorg_xserver_version=1.6
-required_pixman_version=0.24
+required_pixman_version=0.16
 
 if pkg-config --exists 'pixman-1 >= 0.27.1'; then
 
@@ -18481,6 +18532,12 @@ $as_echo "#define HAS_PIXMAN_GLYPHS 1" >>confdefs.h
 
 fi
 
+if pkg-config --exists 'pixman-1 >= 0.24.0'; then
+
+$as_echo "#define HAS_PIXMAN_TRIANGLES 1" >>confdefs.h
+
+fi
+
 # Check whether --enable-sna was given.
 if test "${enable_sna+set}" = set; then :
   enableval=$enable_sna; SNA="$enableval"
@@ -18507,7 +18564,6 @@ if test "x$SNA" = "xauto" && pkg-config --exists "xorg-server >= 1.10"; then
 	SNA=yes
 fi
 if test "x$SNA" != "xno"; then
-	required_xorg_xserver_version=1.10
 
 $as_echo "#define USE_SNA 1" >>confdefs.h
 
@@ -18529,21 +18585,19 @@ $as_echo "$SNA" >&6; }
 if test "${enable_uxa+set}" = set; then :
   enableval=$enable_uxa; UXA="$enableval"
 else
-  UXA=yes
+  UXA=auto
 fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to include UXA support" >&5
 $as_echo_n "checking whether to include UXA support... " >&6; }
- if test x$UXA != xno; then
-  UXA_TRUE=
-  UXA_FALSE='#'
-else
-  UXA_TRUE='#'
-  UXA_FALSE=
+if test "x$UXA" = "xauto"; then
+	if ! pkg-config --exists 'libdrm_intel >= 2.4.29'; then
+		UXA=no
+	fi
+	if ! pkg-config --exists 'pixman-1 >= 0.24.0'; then
+		UXA=no
+	fi
 fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $UXA" >&5
-$as_echo "$UXA" >&6; }
 if test "x$UXA" != "xno"; then
 
 $as_echo "#define USE_UXA 1" >>confdefs.h
@@ -18639,8 +18693,20 @@ else
 $as_echo "yes" >&6; }
 
 fi
+	required_pixman_version=0.24
+	UXA=yes
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $UXA" >&5
+$as_echo "$UXA" >&6; }
+ if test x$UXA != xno; then
+  UXA_TRUE=
+  UXA_FALSE='#'
+else
+  UXA_TRUE='#'
+  UXA_FALSE=
 fi
 
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to include GLAMOR support" >&5
 $as_echo_n "checking whether to include GLAMOR support... " >&6; }
 # Check whether --enable-glamor was given.
@@ -19278,12 +19344,12 @@ if test -n "$DRM_CFLAGS"; then
     pkg_cv_DRM_CFLAGS="$DRM_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdrm >= 2.4.24\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libdrm >= 2.4.24") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdrm >= 2.4.20\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libdrm >= 2.4.20") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_DRM_CFLAGS=`$PKG_CONFIG --cflags "libdrm >= 2.4.24" 2>/dev/null`
+  pkg_cv_DRM_CFLAGS=`$PKG_CONFIG --cflags "libdrm >= 2.4.20" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -19295,12 +19361,12 @@ if test -n "$DRM_LIBS"; then
     pkg_cv_DRM_LIBS="$DRM_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdrm >= 2.4.24\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libdrm >= 2.4.24") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdrm >= 2.4.20\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libdrm >= 2.4.20") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_DRM_LIBS=`$PKG_CONFIG --libs "libdrm >= 2.4.24" 2>/dev/null`
+  pkg_cv_DRM_LIBS=`$PKG_CONFIG --libs "libdrm >= 2.4.20" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -19321,14 +19387,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        DRM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libdrm >= 2.4.24" 2>&1`
+	        DRM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libdrm >= 2.4.20" 2>&1`
         else
-	        DRM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libdrm >= 2.4.24" 2>&1`
+	        DRM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libdrm >= 2.4.20" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$DRM_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (libdrm >= 2.4.24) were not met:
+	as_fn_error $? "Package requirements (libdrm >= 2.4.20) were not met:
 
 $DRM_PKG_ERRORS
 
@@ -19702,12 +19768,12 @@ if test -n "$XVMCLIB_CFLAGS"; then
     pkg_cv_XVMCLIB_CFLAGS="$XVMCLIB_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xvmc xext xfixes dri2proto x11-xcb xcb-dri2 xcb-aux\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "xvmc xext xfixes dri2proto x11-xcb xcb-dri2 xcb-aux") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xvmc dri2proto\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "xvmc dri2proto") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_XVMCLIB_CFLAGS=`$PKG_CONFIG --cflags "xvmc xext xfixes dri2proto x11-xcb xcb-dri2 xcb-aux" 2>/dev/null`
+  pkg_cv_XVMCLIB_CFLAGS=`$PKG_CONFIG --cflags "xvmc dri2proto" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -19719,12 +19785,12 @@ if test -n "$XVMCLIB_LIBS"; then
     pkg_cv_XVMCLIB_LIBS="$XVMCLIB_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xvmc xext xfixes dri2proto x11-xcb xcb-dri2 xcb-aux\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "xvmc xext xfixes dri2proto x11-xcb xcb-dri2 xcb-aux") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xvmc dri2proto\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "xvmc dri2proto") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_XVMCLIB_LIBS=`$PKG_CONFIG --libs "xvmc xext xfixes dri2proto x11-xcb xcb-dri2 xcb-aux" 2>/dev/null`
+  pkg_cv_XVMCLIB_LIBS=`$PKG_CONFIG --libs "xvmc dri2proto" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -19745,9 +19811,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        XVMCLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "xvmc xext xfixes dri2proto x11-xcb xcb-dri2 xcb-aux" 2>&1`
+	        XVMCLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "xvmc dri2proto" 2>&1`
         else
-	        XVMCLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "xvmc xext xfixes dri2proto x11-xcb xcb-dri2 xcb-aux" 2>&1`
+	        XVMCLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "xvmc dri2proto" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$XVMCLIB_PKG_ERRORS" >&5
@@ -19762,7 +19828,78 @@ else
 	XVMCLIB_LIBS=$pkg_cv_XVMCLIB_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	XVMC=yes
+
+fi
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCB" >&5
+$as_echo_n "checking for XCB... " >&6; }
+
+if test -n "$XCB_CFLAGS"; then
+    pkg_cv_XCB_CFLAGS="$XCB_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11-xcb xcb-dri2 xcb-aux\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "x11-xcb xcb-dri2 xcb-aux") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_XCB_CFLAGS=`$PKG_CONFIG --cflags "x11-xcb xcb-dri2 xcb-aux" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$XCB_LIBS"; then
+    pkg_cv_XCB_LIBS="$XCB_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11-xcb xcb-dri2 xcb-aux\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "x11-xcb xcb-dri2 xcb-aux") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_XCB_LIBS=`$PKG_CONFIG --libs "x11-xcb xcb-dri2 xcb-aux" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        XCB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "x11-xcb xcb-dri2 xcb-aux" 2>&1`
+        else
+	        XCB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "x11-xcb xcb-dri2 xcb-aux" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$XCB_PKG_ERRORS" >&5
+
+	XVMC=no
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	XVMC=no
+else
+	XCB_CFLAGS=$pkg_cv_XCB_CFLAGS
+	XCB_LIBS=$pkg_cv_XCB_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
 fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to include XvMC support" >&5
@@ -19818,7 +19955,7 @@ else
   DEBUG_FALSE=
 fi
 
- if test x$FULL_DEBUG == xfull; then
+ if test x$DEBUG = xfull; then
   FULL_DEBUG_TRUE=
   FULL_DEBUG_FALSE='#'
 else
@@ -19909,6 +20046,11 @@ $as_echo "#define HAVE_VALGRIND 1" >>confdefs.h
 
 	fi
 fi
+if test "x$DEBUG" = xsync; then
+
+$as_echo "#define DEBUG_SYNC 1" >>confdefs.h
+
+fi
 if test "x$DEBUG" = xmemory; then
 
 $as_echo "#define DEBUG_MEMORY 1" >>confdefs.h
@@ -20055,10 +20197,6 @@ else
   am__EXEEXT_FALSE=
 fi
 
-if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
-  as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
   as_fn_error $? "conditional \"AMDEP\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -20532,7 +20670,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by xf86-video-intel $as_me 2.20.10, which was
+This file was extended by xf86-video-intel $as_me 2.21.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -20598,7 +20736,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-xf86-video-intel config.status 2.20.10
+xf86-video-intel config.status 2.21.2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"