Update to xserver 21.1.14. tested by tb@

The xkb security fix was committed earlier. This is the rest of the
21.1.14 update.

1 files changed, 312 insertions, 312 deletions

diff --git a/xserver/configure b/xserver/configure
index cd632a467..462ccc629 100644
--- a/xserver/configure
+++ b/xserver/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for xorg-server 21.1.13.
+# Generated by GNU Autoconf 2.71 for xorg-server 21.1.14.
 #
 # Report bugs to <https://gitlab.freedesktop.org/xorg/xserver/issues>.
 #
@@ -682,8 +682,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='xorg-server'
 PACKAGE_TARNAME='xorg-server'
-PACKAGE_VERSION='21.1.13'
-PACKAGE_STRING='xorg-server 21.1.13'
+PACKAGE_VERSION='21.1.14'
+PACKAGE_STRING='xorg-server 21.1.14'
 PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/xserver/issues'
 PACKAGE_URL=''
 
@@ -2015,7 +2015,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 xorg-server 21.1.13 to adapt to many kinds of systems.
+\`configure' configures xorg-server 21.1.14 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -2086,7 +2086,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of xorg-server 21.1.13:";;
+     short | recursive ) echo "Configuration of xorg-server 21.1.14:";;
    esac
   cat <<\_ACEOF
 
@@ -2275,10 +2275,10 @@ Optional Packages:
                           org.x)
   --with-bundle-version=VERSION
                           Version to use for X11.app's CFBundleVersion
-                          (default: 21.1.13)
+                          (default: 21.1.14)
   --with-bundle-version-string=VERSION
                           Version to use for X11.app's
-                          CFBundleShortVersionString (default: 21.1.13)
+                          CFBundleShortVersionString (default: 21.1.14)
   --with-sparkle-feed-url=URL
                           URL for the Sparkle feed (default:
                           https://www.xquartz.org/releases/sparkle/release.xml)
@@ -2493,7 +2493,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-xorg-server configure 21.1.13
+xorg-server configure 21.1.14
 generated by GNU Autoconf 2.71
 
 Copyright (C) 2021 Free Software Foundation, Inc.
@@ -3150,7 +3150,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 xorg-server $as_me 21.1.13, which was
+It was created by xorg-server $as_me 21.1.14, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   $ $0$ac_configure_args_raw
@@ -3907,7 +3907,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-RELEASE_DATE="2024-04-12"
+RELEASE_DATE="2024-10-29"
 RELEASE_NAME="Caramel Ice Cream"
 
 
@@ -4388,7 +4388,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='xorg-server'
- VERSION='21.1.13'
+ VERSION='21.1.14'
 
 
 printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -22199,11 +22199,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 Does cpp preserve   "whitespace"?
 _ACEOF
-if test `${RAWCPP} < conftest.$ac_ext | grep -c 'preserve   \"'` -eq 1 ; then
+if test `${RAWCPP} < conftest.$ac_ext | grep -c 'preserve   "'` -eq 1 ; then
 	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
 else
-	if test `${RAWCPP} -traditional < conftest.$ac_ext | grep -c 'preserve   \"'` -eq 1 ; then
+	if test `${RAWCPP} -traditional < conftest.$ac_ext | grep -c 'preserve   "'` -eq 1 ; then
 		TRADITIONALCPPFLAGS="-traditional"
 		RAWCPPFLAGS="${RAWCPPFLAGS} -traditional"
 		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -23482,21 +23482,21 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        LIBBSD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libbsd-overlay" 2>&1`
+                LIBBSD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libbsd-overlay" 2>&1`
         else
-	        LIBBSD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libbsd-overlay" 2>&1`
+                LIBBSD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libbsd-overlay" 2>&1`
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$LIBBSD_PKG_ERRORS" >&5
+        # Put the nasty error message in config.log where it belongs
+        echo "$LIBBSD_PKG_ERRORS" >&5
 
-	:
+        :
 elif test $pkg_failed = untried; then
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-	:
+        :
 else
-	LIBBSD_CFLAGS=$pkg_cv_LIBBSD_CFLAGS
-	LIBBSD_LIBS=$pkg_cv_LIBBSD_LIBS
+        LIBBSD_CFLAGS=$pkg_cv_LIBBSD_CFLAGS
+        LIBBSD_LIBS=$pkg_cv_LIBBSD_LIBS
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
 
@@ -24439,7 +24439,7 @@ if test ${with_bundle_version+y}
 then :
   withval=$with_bundle_version;  BUNDLE_VERSION="${withval}"
 else $as_nop
-   BUNDLE_VERSION="21.1.13"
+   BUNDLE_VERSION="21.1.14"
 fi
 
 
@@ -25633,14 +25633,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        PIXMAN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$LIBPIXMAN" 2>&1`
+                PIXMAN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$LIBPIXMAN" 2>&1`
         else
-	        PIXMAN_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$LIBPIXMAN" 2>&1`
+                PIXMAN_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$LIBPIXMAN" 2>&1`
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$PIXMAN_PKG_ERRORS" >&5
+        # Put the nasty error message in config.log where it belongs
+        echo "$PIXMAN_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements ($LIBPIXMAN) were not met:
+        as_fn_error $? "Package requirements ($LIBPIXMAN) were not met:
 
 $PIXMAN_PKG_ERRORS
 
@@ -25653,7 +25653,7 @@ See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+        { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
@@ -25666,15 +25666,15 @@ See the pkg-config man page for more details.
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 See \`config.log' for more details" "$LINENO" 5; }
 else
-	PIXMAN_CFLAGS=$pkg_cv_PIXMAN_CFLAGS
-	PIXMAN_LIBS=$pkg_cv_PIXMAN_LIBS
+        PIXMAN_CFLAGS=$pkg_cv_PIXMAN_CFLAGS
+        PIXMAN_LIBS=$pkg_cv_PIXMAN_LIBS
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
 
 fi
 REQUIRED_LIBS="$REQUIRED_LIBS $LIBPIXMAN $LIBXFONT xau"
 
-SDK_REQUIRED_MODULES="$XPROTO $RANDRPROTO $RENDERPROTO $XEXTPROTO $INPUTPROTO $KBPROTO $FONTSPROTO $LIBPIXMAN $LIBXCVT"
+SDK_REQUIRED_MODULES="$XPROTO $RANDRPROTO $RENDERPROTO $XEXTPROTO $INPUTPROTO $KBPROTO $FONTSPROTO $LIBPIXMAN"
 # Make SDK_REQUIRED_MODULES available for inclusion in xorg-server.pc
 
 
@@ -26296,12 +26296,12 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        SYSTEMD_DAEMON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$LIBSYSTEMD" 2>&1`
+                SYSTEMD_DAEMON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$LIBSYSTEMD" 2>&1`
         else
-	        SYSTEMD_DAEMON_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$LIBSYSTEMD" 2>&1`
+                SYSTEMD_DAEMON_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$LIBSYSTEMD" 2>&1`
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$SYSTEMD_DAEMON_PKG_ERRORS" >&5
+        # Put the nasty error message in config.log where it belongs
+        echo "$SYSTEMD_DAEMON_PKG_ERRORS" >&5
 
 
 pkg_failed=no
@@ -26355,24 +26355,24 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        SYSTEMD_DAEMON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd-daemon" 2>&1`
+                SYSTEMD_DAEMON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd-daemon" 2>&1`
         else
-	        SYSTEMD_DAEMON_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd-daemon" 2>&1`
+                SYSTEMD_DAEMON_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd-daemon" 2>&1`
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$SYSTEMD_DAEMON_PKG_ERRORS" >&5
+        # Put the nasty error message in config.log where it belongs
+        echo "$SYSTEMD_DAEMON_PKG_ERRORS" >&5
 
-	HAVE_SYSTEMD_DAEMON=no
+        HAVE_SYSTEMD_DAEMON=no
 elif test $pkg_failed = untried; then
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-	HAVE_SYSTEMD_DAEMON=no
+        HAVE_SYSTEMD_DAEMON=no
 else
-	SYSTEMD_DAEMON_CFLAGS=$pkg_cv_SYSTEMD_DAEMON_CFLAGS
-	SYSTEMD_DAEMON_LIBS=$pkg_cv_SYSTEMD_DAEMON_LIBS
+        SYSTEMD_DAEMON_CFLAGS=$pkg_cv_SYSTEMD_DAEMON_CFLAGS
+        SYSTEMD_DAEMON_LIBS=$pkg_cv_SYSTEMD_DAEMON_LIBS
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
-	HAVE_SYSTEMD_DAEMON=yes;
+        HAVE_SYSTEMD_DAEMON=yes;
 					      LIBSYSTEMD_DAEMON=libsystemd-daemon
 fi
 elif test $pkg_failed = untried; then
@@ -26430,32 +26430,32 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        SYSTEMD_DAEMON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd-daemon" 2>&1`
+                SYSTEMD_DAEMON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd-daemon" 2>&1`
         else
-	        SYSTEMD_DAEMON_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd-daemon" 2>&1`
+                SYSTEMD_DAEMON_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd-daemon" 2>&1`
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$SYSTEMD_DAEMON_PKG_ERRORS" >&5
+        # Put the nasty error message in config.log where it belongs
+        echo "$SYSTEMD_DAEMON_PKG_ERRORS" >&5
 
-	HAVE_SYSTEMD_DAEMON=no
+        HAVE_SYSTEMD_DAEMON=no
 elif test $pkg_failed = untried; then
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-	HAVE_SYSTEMD_DAEMON=no
+        HAVE_SYSTEMD_DAEMON=no
 else
-	SYSTEMD_DAEMON_CFLAGS=$pkg_cv_SYSTEMD_DAEMON_CFLAGS
-	SYSTEMD_DAEMON_LIBS=$pkg_cv_SYSTEMD_DAEMON_LIBS
+        SYSTEMD_DAEMON_CFLAGS=$pkg_cv_SYSTEMD_DAEMON_CFLAGS
+        SYSTEMD_DAEMON_LIBS=$pkg_cv_SYSTEMD_DAEMON_LIBS
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
-	HAVE_SYSTEMD_DAEMON=yes;
+        HAVE_SYSTEMD_DAEMON=yes;
 					      LIBSYSTEMD_DAEMON=libsystemd-daemon
 fi
 else
-	SYSTEMD_DAEMON_CFLAGS=$pkg_cv_SYSTEMD_DAEMON_CFLAGS
-	SYSTEMD_DAEMON_LIBS=$pkg_cv_SYSTEMD_DAEMON_LIBS
+        SYSTEMD_DAEMON_CFLAGS=$pkg_cv_SYSTEMD_DAEMON_CFLAGS
+        SYSTEMD_DAEMON_LIBS=$pkg_cv_SYSTEMD_DAEMON_LIBS
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
-	HAVE_SYSTEMD_DAEMON=yes;
+        HAVE_SYSTEMD_DAEMON=yes;
 			   LIBSYSTEMD_DAEMON="$LIBSYSTEMD"
 fi
 	if test "x$HAVE_SYSTEMD_DAEMON" = xyes; then
@@ -26543,24 +26543,24 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        UDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$LIBUDEV" 2>&1`
+                UDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$LIBUDEV" 2>&1`
         else
-	        UDEV_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$LIBUDEV" 2>&1`
+                UDEV_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$LIBUDEV" 2>&1`
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$UDEV_PKG_ERRORS" >&5
+        # Put the nasty error message in config.log where it belongs
+        echo "$UDEV_PKG_ERRORS" >&5
 
-	HAVE_LIBUDEV=no
+        HAVE_LIBUDEV=no
 elif test $pkg_failed = untried; then
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-	HAVE_LIBUDEV=no
+        HAVE_LIBUDEV=no
 else
-	UDEV_CFLAGS=$pkg_cv_UDEV_CFLAGS
-	UDEV_LIBS=$pkg_cv_UDEV_LIBS
+        UDEV_CFLAGS=$pkg_cv_UDEV_CFLAGS
+        UDEV_LIBS=$pkg_cv_UDEV_LIBS
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
-	HAVE_LIBUDEV=yes
+        HAVE_LIBUDEV=yes
 fi
 if test "x$CONFIG_UDEV" = xauto; then
 	CONFIG_UDEV="$HAVE_LIBUDEV"
@@ -26671,24 +26671,24 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$LIBDBUS" 2>&1`
+                DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$LIBDBUS" 2>&1`
         else
-	        DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$LIBDBUS" 2>&1`
+                DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$LIBDBUS" 2>&1`
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$DBUS_PKG_ERRORS" >&5
+        # Put the nasty error message in config.log where it belongs
+        echo "$DBUS_PKG_ERRORS" >&5
 
-	HAVE_DBUS=no
+        HAVE_DBUS=no
 elif test $pkg_failed = untried; then
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-	HAVE_DBUS=no
+        HAVE_DBUS=no
 else
-	DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS
-	DBUS_LIBS=$pkg_cv_DBUS_LIBS
+        DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS
+        DBUS_LIBS=$pkg_cv_DBUS_LIBS
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
-	HAVE_DBUS=yes
+        HAVE_DBUS=yes
 fi
 if test "x$HAVE_DBUS" = xyes; then
 
@@ -26756,24 +26756,24 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        HAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "hal" 2>&1`
+                HAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "hal" 2>&1`
         else
-	        HAL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "hal" 2>&1`
+                HAL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "hal" 2>&1`
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$HAL_PKG_ERRORS" >&5
+        # Put the nasty error message in config.log where it belongs
+        echo "$HAL_PKG_ERRORS" >&5
 
-	HAVE_HAL=no
+        HAVE_HAL=no
 elif test $pkg_failed = untried; then
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-	HAVE_HAL=no
+        HAVE_HAL=no
 else
-	HAL_CFLAGS=$pkg_cv_HAL_CFLAGS
-	HAL_LIBS=$pkg_cv_HAL_LIBS
+        HAL_CFLAGS=$pkg_cv_HAL_CFLAGS
+        HAL_LIBS=$pkg_cv_HAL_LIBS
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
-	HAVE_HAL=yes
+        HAVE_HAL=yes
 fi
 if test "x$CONFIG_HAL" = xauto; then
 	CONFIG_HAL="$HAVE_HAL"
@@ -27282,24 +27282,24 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        DRI2PROTO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$DRI2PROTO" 2>&1`
+                DRI2PROTO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$DRI2PROTO" 2>&1`
         else
-	        DRI2PROTO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$DRI2PROTO" 2>&1`
+                DRI2PROTO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$DRI2PROTO" 2>&1`
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$DRI2PROTO_PKG_ERRORS" >&5
+        # Put the nasty error message in config.log where it belongs
+        echo "$DRI2PROTO_PKG_ERRORS" >&5
 
-	HAVE_DRI2PROTO=no
+        HAVE_DRI2PROTO=no
 elif test $pkg_failed = untried; then
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-	HAVE_DRI2PROTO=no
+        HAVE_DRI2PROTO=no
 else
-	DRI2PROTO_CFLAGS=$pkg_cv_DRI2PROTO_CFLAGS
-	DRI2PROTO_LIBS=$pkg_cv_DRI2PROTO_LIBS
+        DRI2PROTO_CFLAGS=$pkg_cv_DRI2PROTO_CFLAGS
+        DRI2PROTO_LIBS=$pkg_cv_DRI2PROTO_LIBS
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
-	HAVE_DRI2PROTO=yes
+        HAVE_DRI2PROTO=yes
 fi
 case "$DRI2,$HAVE_DRI2PROTO" in
 	yes,no)
@@ -27420,24 +27420,24 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        DRI3PROTO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$DRI3PROTO" 2>&1`
+                DRI3PROTO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$DRI3PROTO" 2>&1`
         else
-	        DRI3PROTO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$DRI3PROTO" 2>&1`
+                DRI3PROTO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$DRI3PROTO" 2>&1`
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$DRI3PROTO_PKG_ERRORS" >&5
+        # Put the nasty error message in config.log where it belongs
+        echo "$DRI3PROTO_PKG_ERRORS" >&5
 
-	HAVE_DRI3PROTO=no
+        HAVE_DRI3PROTO=no
 elif test $pkg_failed = untried; then
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-	HAVE_DRI3PROTO=no
+        HAVE_DRI3PROTO=no
 else
-	DRI3PROTO_CFLAGS=$pkg_cv_DRI3PROTO_CFLAGS
-	DRI3PROTO_LIBS=$pkg_cv_DRI3PROTO_LIBS
+        DRI3PROTO_CFLAGS=$pkg_cv_DRI3PROTO_CFLAGS
+        DRI3PROTO_LIBS=$pkg_cv_DRI3PROTO_LIBS
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
-	HAVE_DRI3PROTO=yes
+        HAVE_DRI3PROTO=yes
 fi
 
 case "$DRI3,$HAVE_DRI3PROTO" in
@@ -27546,24 +27546,24 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        XSHMFENCE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$LIBXSHMFENCE" 2>&1`
+                XSHMFENCE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$LIBXSHMFENCE" 2>&1`
         else
-	        XSHMFENCE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$LIBXSHMFENCE" 2>&1`
+                XSHMFENCE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$LIBXSHMFENCE" 2>&1`
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$XSHMFENCE_PKG_ERRORS" >&5
+        # Put the nasty error message in config.log where it belongs
+        echo "$XSHMFENCE_PKG_ERRORS" >&5
 
-	HAVE_XSHMFENCE=no
+        HAVE_XSHMFENCE=no
 elif test $pkg_failed = untried; then
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-	HAVE_XSHMFENCE=no
+        HAVE_XSHMFENCE=no
 else
-	XSHMFENCE_CFLAGS=$pkg_cv_XSHMFENCE_CFLAGS
-	XSHMFENCE_LIBS=$pkg_cv_XSHMFENCE_LIBS
+        XSHMFENCE_CFLAGS=$pkg_cv_XSHMFENCE_CFLAGS
+        XSHMFENCE_LIBS=$pkg_cv_XSHMFENCE_LIBS
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
-	HAVE_XSHMFENCE=yes
+        HAVE_XSHMFENCE=yes
 fi
 if test "x$XSHMFENCE" = "xauto"; then
     XSHMFENCE="$HAVE_XSHMFENCE"
@@ -27683,14 +27683,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        LIBDRM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$LIBDRM" 2>&1`
+                LIBDRM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$LIBDRM" 2>&1`
         else
-	        LIBDRM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$LIBDRM" 2>&1`
+                LIBDRM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$LIBDRM" 2>&1`
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$LIBDRM_PKG_ERRORS" >&5
+        # Put the nasty error message in config.log where it belongs
+        echo "$LIBDRM_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements ($LIBDRM) were not met:
+        as_fn_error $? "Package requirements ($LIBDRM) were not met:
 
 $LIBDRM_PKG_ERRORS
 
@@ -27703,7 +27703,7 @@ See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+        { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
@@ -27716,8 +27716,8 @@ See the pkg-config man page for more details.
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 See \`config.log' for more details" "$LINENO" 5; }
 else
-	LIBDRM_CFLAGS=$pkg_cv_LIBDRM_CFLAGS
-	LIBDRM_LIBS=$pkg_cv_LIBDRM_LIBS
+        LIBDRM_CFLAGS=$pkg_cv_LIBDRM_CFLAGS
+        LIBDRM_LIBS=$pkg_cv_LIBDRM_LIBS
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
 
@@ -27778,14 +27778,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        XLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "x11" 2>&1`
+                XLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "x11" 2>&1`
         else
-	        XLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "x11" 2>&1`
+                XLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "x11" 2>&1`
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$XLIB_PKG_ERRORS" >&5
+        # Put the nasty error message in config.log where it belongs
+        echo "$XLIB_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (x11) were not met:
+        as_fn_error $? "Package requirements (x11) were not met:
 
 $XLIB_PKG_ERRORS
 
@@ -27798,7 +27798,7 @@ See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+        { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
@@ -27811,8 +27811,8 @@ See the pkg-config man page for more details.
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 See \`config.log' for more details" "$LINENO" 5; }
 else
-	XLIB_CFLAGS=$pkg_cv_XLIB_CFLAGS
-	XLIB_LIBS=$pkg_cv_XLIB_LIBS
+        XLIB_CFLAGS=$pkg_cv_XLIB_CFLAGS
+        XLIB_LIBS=$pkg_cv_XLIB_LIBS
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
 
@@ -27869,14 +27869,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        GL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$GLPROTO $LIBGL" 2>&1`
+                GL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$GLPROTO $LIBGL" 2>&1`
         else
-	        GL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$GLPROTO $LIBGL" 2>&1`
+                GL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$GLPROTO $LIBGL" 2>&1`
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$GL_PKG_ERRORS" >&5
+        # Put the nasty error message in config.log where it belongs
+        echo "$GL_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements ($GLPROTO $LIBGL) were not met:
+        as_fn_error $? "Package requirements ($GLPROTO $LIBGL) were not met:
 
 $GL_PKG_ERRORS
 
@@ -27889,7 +27889,7 @@ See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+        { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
@@ -27902,8 +27902,8 @@ See the pkg-config man page for more details.
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 See \`config.log' for more details" "$LINENO" 5; }
 else
-	GL_CFLAGS=$pkg_cv_GL_CFLAGS
-	GL_LIBS=$pkg_cv_GL_LIBS
+        GL_CFLAGS=$pkg_cv_GL_CFLAGS
+        GL_LIBS=$pkg_cv_GL_LIBS
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
 
@@ -28120,14 +28120,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        SELINUX_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$LIBSELINUX" 2>&1`
+                SELINUX_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$LIBSELINUX" 2>&1`
         else
-	        SELINUX_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$LIBSELINUX" 2>&1`
+                SELINUX_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$LIBSELINUX" 2>&1`
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$SELINUX_PKG_ERRORS" >&5
+        # Put the nasty error message in config.log where it belongs
+        echo "$SELINUX_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements ($LIBSELINUX) were not met:
+        as_fn_error $? "Package requirements ($LIBSELINUX) were not met:
 
 $SELINUX_PKG_ERRORS
 
@@ -28140,7 +28140,7 @@ See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+        { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
@@ -28153,8 +28153,8 @@ See the pkg-config man page for more details.
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 See \`config.log' for more details" "$LINENO" 5; }
 else
-	SELINUX_CFLAGS=$pkg_cv_SELINUX_CFLAGS
-	SELINUX_LIBS=$pkg_cv_SELINUX_LIBS
+        SELINUX_CFLAGS=$pkg_cv_SELINUX_CFLAGS
+        SELINUX_LIBS=$pkg_cv_SELINUX_LIBS
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
 
@@ -28454,24 +28454,24 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        XDMCP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "xdmcp" 2>&1`
+                XDMCP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "xdmcp" 2>&1`
         else
-	        XDMCP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "xdmcp" 2>&1`
+                XDMCP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "xdmcp" 2>&1`
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$XDMCP_PKG_ERRORS" >&5
+        # Put the nasty error message in config.log where it belongs
+        echo "$XDMCP_PKG_ERRORS" >&5
 
-	have_libxdmcp="no"
+        have_libxdmcp="no"
 elif test $pkg_failed = untried; then
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-	have_libxdmcp="no"
+        have_libxdmcp="no"
 else
-	XDMCP_CFLAGS=$pkg_cv_XDMCP_CFLAGS
-	XDMCP_LIBS=$pkg_cv_XDMCP_LIBS
+        XDMCP_CFLAGS=$pkg_cv_XDMCP_CFLAGS
+        XDMCP_LIBS=$pkg_cv_XDMCP_LIBS
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
-	have_libxdmcp="yes"
+        have_libxdmcp="yes"
 fi
 if test "x$XDMCP" = xauto; then
 	if test "x$have_libxdmcp" = xyes; then
@@ -28858,24 +28858,24 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        LIBSHA1_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsha1" 2>&1`
+                LIBSHA1_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsha1" 2>&1`
         else
-	        LIBSHA1_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsha1" 2>&1`
+                LIBSHA1_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsha1" 2>&1`
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$LIBSHA1_PKG_ERRORS" >&5
+        # Put the nasty error message in config.log where it belongs
+        echo "$LIBSHA1_PKG_ERRORS" >&5
 
-	HAVE_LIBSHA1=no
+        HAVE_LIBSHA1=no
 elif test $pkg_failed = untried; then
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-	HAVE_LIBSHA1=no
+        HAVE_LIBSHA1=no
 else
-	LIBSHA1_CFLAGS=$pkg_cv_LIBSHA1_CFLAGS
-	LIBSHA1_LIBS=$pkg_cv_LIBSHA1_LIBS
+        LIBSHA1_CFLAGS=$pkg_cv_LIBSHA1_CFLAGS
+        LIBSHA1_LIBS=$pkg_cv_LIBSHA1_LIBS
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
-	HAVE_LIBSHA1=yes
+        HAVE_LIBSHA1=yes
 fi
 if test "x$with_sha1" = x && test "x$HAVE_LIBSHA1" = xyes; then
    with_sha1=libsha1
@@ -29086,24 +29086,24 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        OPENSSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "openssl" 2>&1`
+                OPENSSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "openssl" 2>&1`
         else
-	        OPENSSL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "openssl" 2>&1`
+                OPENSSL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "openssl" 2>&1`
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$OPENSSL_PKG_ERRORS" >&5
+        # Put the nasty error message in config.log where it belongs
+        echo "$OPENSSL_PKG_ERRORS" >&5
 
-	HAVE_OPENSSL_PKC=no
+        HAVE_OPENSSL_PKC=no
 elif test $pkg_failed = untried; then
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-	HAVE_OPENSSL_PKC=no
+        HAVE_OPENSSL_PKC=no
 else
-	OPENSSL_CFLAGS=$pkg_cv_OPENSSL_CFLAGS
-	OPENSSL_LIBS=$pkg_cv_OPENSSL_LIBS
+        OPENSSL_CFLAGS=$pkg_cv_OPENSSL_CFLAGS
+        OPENSSL_LIBS=$pkg_cv_OPENSSL_LIBS
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
-	HAVE_OPENSSL_PKC=yes
+        HAVE_OPENSSL_PKC=yes
 fi
 if test "x$HAVE_LIBCRYPTO" = xyes || test "x$HAVE_OPENSSL_PKC" = xyes; then
 	if test "x$with_sha1" = x; then
@@ -29184,14 +29184,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        XSERVERCFLAGS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$REQUIRED_MODULES $REQUIRED_LIBS" 2>&1`
+                XSERVERCFLAGS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$REQUIRED_MODULES $REQUIRED_LIBS" 2>&1`
         else
-	        XSERVERCFLAGS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$REQUIRED_MODULES $REQUIRED_LIBS" 2>&1`
+                XSERVERCFLAGS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$REQUIRED_MODULES $REQUIRED_LIBS" 2>&1`
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$XSERVERCFLAGS_PKG_ERRORS" >&5
+        # Put the nasty error message in config.log where it belongs
+        echo "$XSERVERCFLAGS_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements ($REQUIRED_MODULES $REQUIRED_LIBS) were not met:
+        as_fn_error $? "Package requirements ($REQUIRED_MODULES $REQUIRED_LIBS) were not met:
 
 $XSERVERCFLAGS_PKG_ERRORS
 
@@ -29204,7 +29204,7 @@ See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+        { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
@@ -29217,8 +29217,8 @@ See the pkg-config man page for more details.
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 See \`config.log' for more details" "$LINENO" 5; }
 else
-	XSERVERCFLAGS_CFLAGS=$pkg_cv_XSERVERCFLAGS_CFLAGS
-	XSERVERCFLAGS_LIBS=$pkg_cv_XSERVERCFLAGS_LIBS
+        XSERVERCFLAGS_CFLAGS=$pkg_cv_XSERVERCFLAGS_CFLAGS
+        XSERVERCFLAGS_LIBS=$pkg_cv_XSERVERCFLAGS_LIBS
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
 
@@ -29275,14 +29275,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        XSERVERLIBS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$REQUIRED_LIBS" 2>&1`
+                XSERVERLIBS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$REQUIRED_LIBS" 2>&1`
         else
-	        XSERVERLIBS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$REQUIRED_LIBS" 2>&1`
+                XSERVERLIBS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$REQUIRED_LIBS" 2>&1`
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$XSERVERLIBS_PKG_ERRORS" >&5
+        # Put the nasty error message in config.log where it belongs
+        echo "$XSERVERLIBS_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements ($REQUIRED_LIBS) were not met:
+        as_fn_error $? "Package requirements ($REQUIRED_LIBS) were not met:
 
 $XSERVERLIBS_PKG_ERRORS
 
@@ -29295,7 +29295,7 @@ See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+        { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
@@ -29308,8 +29308,8 @@ See the pkg-config man page for more details.
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 See \`config.log' for more details" "$LINENO" 5; }
 else
-	XSERVERLIBS_CFLAGS=$pkg_cv_XSERVERLIBS_CFLAGS
-	XSERVERLIBS_LIBS=$pkg_cv_XSERVERLIBS_LIBS
+        XSERVERLIBS_CFLAGS=$pkg_cv_XSERVERLIBS_CFLAGS
+        XSERVERLIBS_LIBS=$pkg_cv_XSERVERLIBS_LIBS
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
 
@@ -29367,24 +29367,24 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        LIBUNWIND_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libunwind" 2>&1`
+                LIBUNWIND_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libunwind" 2>&1`
         else
-	        LIBUNWIND_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libunwind" 2>&1`
+                LIBUNWIND_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libunwind" 2>&1`
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$LIBUNWIND_PKG_ERRORS" >&5
+        # Put the nasty error message in config.log where it belongs
+        echo "$LIBUNWIND_PKG_ERRORS" >&5
 
-	HAVE_LIBUNWIND=no
+        HAVE_LIBUNWIND=no
 elif test $pkg_failed = untried; then
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-	HAVE_LIBUNWIND=no
+        HAVE_LIBUNWIND=no
 else
-	LIBUNWIND_CFLAGS=$pkg_cv_LIBUNWIND_CFLAGS
-	LIBUNWIND_LIBS=$pkg_cv_LIBUNWIND_LIBS
+        LIBUNWIND_CFLAGS=$pkg_cv_LIBUNWIND_CFLAGS
+        LIBUNWIND_LIBS=$pkg_cv_LIBUNWIND_LIBS
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
-	HAVE_LIBUNWIND=yes
+        HAVE_LIBUNWIND=yes
 fi
 if test "x$LIBUNWIND" = "xauto"; then
     LIBUNWIND="$HAVE_LIBUNWIND"
@@ -29639,24 +29639,24 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        XNESTMODULES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$LIBXEXT x11 xau $XDMCP_MODULES" 2>&1`
+                XNESTMODULES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$LIBXEXT x11 xau $XDMCP_MODULES" 2>&1`
         else
-	        XNESTMODULES_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$LIBXEXT x11 xau $XDMCP_MODULES" 2>&1`
+                XNESTMODULES_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$LIBXEXT x11 xau $XDMCP_MODULES" 2>&1`
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$XNESTMODULES_PKG_ERRORS" >&5
+        # Put the nasty error message in config.log where it belongs
+        echo "$XNESTMODULES_PKG_ERRORS" >&5
 
-	have_xnest=no
+        have_xnest=no
 elif test $pkg_failed = untried; then
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-	have_xnest=no
+        have_xnest=no
 else
-	XNESTMODULES_CFLAGS=$pkg_cv_XNESTMODULES_CFLAGS
-	XNESTMODULES_LIBS=$pkg_cv_XNESTMODULES_LIBS
+        XNESTMODULES_CFLAGS=$pkg_cv_XNESTMODULES_CFLAGS
+        XNESTMODULES_LIBS=$pkg_cv_XNESTMODULES_LIBS
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
-	have_xnest=yes
+        have_xnest=yes
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build Xnest DDX" >&5
 printf %s "checking whether to build Xnest DDX... " >&6; }
@@ -29752,14 +29752,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        LIBXCVT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$LIBXCVT" 2>&1`
+                LIBXCVT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$LIBXCVT" 2>&1`
         else
-	        LIBXCVT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$LIBXCVT" 2>&1`
+                LIBXCVT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$LIBXCVT" 2>&1`
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$LIBXCVT_PKG_ERRORS" >&5
+        # Put the nasty error message in config.log where it belongs
+        echo "$LIBXCVT_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements ($LIBXCVT) were not met:
+        as_fn_error $? "Package requirements ($LIBXCVT) were not met:
 
 $LIBXCVT_PKG_ERRORS
 
@@ -29772,7 +29772,7 @@ See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+        { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
@@ -29785,8 +29785,8 @@ See the pkg-config man page for more details.
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 See \`config.log' for more details" "$LINENO" 5; }
 else
-	LIBXCVT_CFLAGS=$pkg_cv_LIBXCVT_CFLAGS
-	LIBXCVT_LIBS=$pkg_cv_LIBXCVT_LIBS
+        LIBXCVT_CFLAGS=$pkg_cv_LIBXCVT_CFLAGS
+        LIBXCVT_LIBS=$pkg_cv_LIBXCVT_LIBS
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
 
@@ -29910,14 +29910,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        PCIACCESS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$LIBPCIACCESS" 2>&1`
+                PCIACCESS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$LIBPCIACCESS" 2>&1`
         else
-	        PCIACCESS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$LIBPCIACCESS" 2>&1`
+                PCIACCESS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$LIBPCIACCESS" 2>&1`
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$PCIACCESS_PKG_ERRORS" >&5
+        # Put the nasty error message in config.log where it belongs
+        echo "$PCIACCESS_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements ($LIBPCIACCESS) were not met:
+        as_fn_error $? "Package requirements ($LIBPCIACCESS) were not met:
 
 $PCIACCESS_PKG_ERRORS
 
@@ -29930,7 +29930,7 @@ See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+        { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
@@ -29943,8 +29943,8 @@ See the pkg-config man page for more details.
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 See \`config.log' for more details" "$LINENO" 5; }
 else
-	PCIACCESS_CFLAGS=$pkg_cv_PCIACCESS_CFLAGS
-	PCIACCESS_LIBS=$pkg_cv_PCIACCESS_LIBS
+        PCIACCESS_CFLAGS=$pkg_cv_PCIACCESS_CFLAGS
+        PCIACCESS_LIBS=$pkg_cv_PCIACCESS_LIBS
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
 
@@ -30168,24 +30168,24 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        DGA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$DGAPROTO" 2>&1`
+                DGA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$DGAPROTO" 2>&1`
         else
-	        DGA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$DGAPROTO" 2>&1`
+                DGA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$DGAPROTO" 2>&1`
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$DGA_PKG_ERRORS" >&5
+        # Put the nasty error message in config.log where it belongs
+        echo "$DGA_PKG_ERRORS" >&5
 
-	DGA=no
+        DGA=no
 elif test $pkg_failed = untried; then
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-	DGA=no
+        DGA=no
 else
-	DGA_CFLAGS=$pkg_cv_DGA_CFLAGS
-	DGA_LIBS=$pkg_cv_DGA_LIBS
+        DGA_CFLAGS=$pkg_cv_DGA_CFLAGS
+        DGA_LIBS=$pkg_cv_DGA_LIBS
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
-	DGA=yes
+        DGA=yes
 fi
 	fi
 	if test "x$DGA" = xyes; then
@@ -30242,14 +30242,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        DGA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$DGAPROTO" 2>&1`
+                DGA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$DGAPROTO" 2>&1`
         else
-	        DGA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$DGAPROTO" 2>&1`
+                DGA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$DGAPROTO" 2>&1`
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$DGA_PKG_ERRORS" >&5
+        # Put the nasty error message in config.log where it belongs
+        echo "$DGA_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements ($DGAPROTO) were not met:
+        as_fn_error $? "Package requirements ($DGAPROTO) were not met:
 
 $DGA_PKG_ERRORS
 
@@ -30262,7 +30262,7 @@ See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+        { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
@@ -30275,8 +30275,8 @@ See the pkg-config man page for more details.
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 See \`config.log' for more details" "$LINENO" 5; }
 else
-	DGA_CFLAGS=$pkg_cv_DGA_CFLAGS
-	DGA_LIBS=$pkg_cv_DGA_LIBS
+        DGA_CFLAGS=$pkg_cv_DGA_CFLAGS
+        DGA_LIBS=$pkg_cv_DGA_LIBS
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
 
@@ -30346,14 +30346,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        XORG_MODULES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$XORG_MODULES" 2>&1`
+                XORG_MODULES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$XORG_MODULES" 2>&1`
         else
-	        XORG_MODULES_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$XORG_MODULES" 2>&1`
+                XORG_MODULES_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$XORG_MODULES" 2>&1`
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$XORG_MODULES_PKG_ERRORS" >&5
+        # Put the nasty error message in config.log where it belongs
+        echo "$XORG_MODULES_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements ($XORG_MODULES) were not met:
+        as_fn_error $? "Package requirements ($XORG_MODULES) were not met:
 
 $XORG_MODULES_PKG_ERRORS
 
@@ -30366,7 +30366,7 @@ See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+        { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
@@ -30379,8 +30379,8 @@ See the pkg-config man page for more details.
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 See \`config.log' for more details" "$LINENO" 5; }
 else
-	XORG_MODULES_CFLAGS=$pkg_cv_XORG_MODULES_CFLAGS
-	XORG_MODULES_LIBS=$pkg_cv_XORG_MODULES_LIBS
+        XORG_MODULES_CFLAGS=$pkg_cv_XORG_MODULES_CFLAGS
+        XORG_MODULES_LIBS=$pkg_cv_XORG_MODULES_LIBS
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
 
@@ -30754,14 +30754,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        GLAMOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "epoxy" 2>&1`
+                GLAMOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "epoxy" 2>&1`
         else
-	        GLAMOR_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "epoxy" 2>&1`
+                GLAMOR_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "epoxy" 2>&1`
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$GLAMOR_PKG_ERRORS" >&5
+        # Put the nasty error message in config.log where it belongs
+        echo "$GLAMOR_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (epoxy) were not met:
+        as_fn_error $? "Package requirements (epoxy) were not met:
 
 $GLAMOR_PKG_ERRORS
 
@@ -30774,7 +30774,7 @@ See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+        { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
@@ -30787,8 +30787,8 @@ See the pkg-config man page for more details.
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 See \`config.log' for more details" "$LINENO" 5; }
 else
-	GLAMOR_CFLAGS=$pkg_cv_GLAMOR_CFLAGS
-	GLAMOR_LIBS=$pkg_cv_GLAMOR_LIBS
+        GLAMOR_CFLAGS=$pkg_cv_GLAMOR_CFLAGS
+        GLAMOR_LIBS=$pkg_cv_GLAMOR_LIBS
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
 
@@ -30868,24 +30868,24 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        GBM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs ""$LIBGBM"" 2>&1`
+                GBM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs ""$LIBGBM"" 2>&1`
         else
-	        GBM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs ""$LIBGBM"" 2>&1`
+                GBM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs ""$LIBGBM"" 2>&1`
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$GBM_PKG_ERRORS" >&5
+        # Put the nasty error message in config.log where it belongs
+        echo "$GBM_PKG_ERRORS" >&5
 
-	GBM=no
+        GBM=no
 elif test $pkg_failed = untried; then
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-	GBM=no
+        GBM=no
 else
-	GBM_CFLAGS=$pkg_cv_GBM_CFLAGS
-	GBM_LIBS=$pkg_cv_GBM_LIBS
+        GBM_CFLAGS=$pkg_cv_GBM_CFLAGS
+        GBM_LIBS=$pkg_cv_GBM_LIBS
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
-	GBM=yes
+        GBM=yes
 fi
 	if test "x$GBM" = xyes; then
 
@@ -31115,14 +31115,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        XWINMODULES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "xcb-aux xcb-composite xcb-image xcb-ewmh xcb-icccm xcb-xfixes" 2>&1`
+                XWINMODULES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "xcb-aux xcb-composite xcb-image xcb-ewmh xcb-icccm xcb-xfixes" 2>&1`
         else
-	        XWINMODULES_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "xcb-aux xcb-composite xcb-image xcb-ewmh xcb-icccm xcb-xfixes" 2>&1`
+                XWINMODULES_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "xcb-aux xcb-composite xcb-image xcb-ewmh xcb-icccm xcb-xfixes" 2>&1`
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$XWINMODULES_PKG_ERRORS" >&5
+        # Put the nasty error message in config.log where it belongs
+        echo "$XWINMODULES_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (xcb-aux xcb-composite xcb-image xcb-ewmh xcb-icccm xcb-xfixes) were not met:
+        as_fn_error $? "Package requirements (xcb-aux xcb-composite xcb-image xcb-ewmh xcb-icccm xcb-xfixes) were not met:
 
 $XWINMODULES_PKG_ERRORS
 
@@ -31135,7 +31135,7 @@ See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+        { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
@@ -31148,8 +31148,8 @@ See the pkg-config man page for more details.
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 See \`config.log' for more details" "$LINENO" 5; }
 else
-	XWINMODULES_CFLAGS=$pkg_cv_XWINMODULES_CFLAGS
-	XWINMODULES_LIBS=$pkg_cv_XWINMODULES_LIBS
+        XWINMODULES_CFLAGS=$pkg_cv_XWINMODULES_CFLAGS
+        XWINMODULES_LIBS=$pkg_cv_XWINMODULES_LIBS
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
 
@@ -31220,14 +31220,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        WINDOWSDRI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "windowsdriproto" 2>&1`
+                WINDOWSDRI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "windowsdriproto" 2>&1`
         else
-	        WINDOWSDRI_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "windowsdriproto" 2>&1`
+                WINDOWSDRI_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "windowsdriproto" 2>&1`
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$WINDOWSDRI_PKG_ERRORS" >&5
+        # Put the nasty error message in config.log where it belongs
+        echo "$WINDOWSDRI_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (windowsdriproto) were not met:
+        as_fn_error $? "Package requirements (windowsdriproto) were not met:
 
 $WINDOWSDRI_PKG_ERRORS
 
@@ -31240,7 +31240,7 @@ See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+        { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
@@ -31253,8 +31253,8 @@ See the pkg-config man page for more details.
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 See \`config.log' for more details" "$LINENO" 5; }
 else
-	WINDOWSDRI_CFLAGS=$pkg_cv_WINDOWSDRI_CFLAGS
-	WINDOWSDRI_LIBS=$pkg_cv_WINDOWSDRI_LIBS
+        WINDOWSDRI_CFLAGS=$pkg_cv_WINDOWSDRI_CFLAGS
+        WINDOWSDRI_LIBS=$pkg_cv_WINDOWSDRI_LIBS
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
 
@@ -31412,14 +31412,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        KHRONOS_OPENGL_REGISTRY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "khronos-opengl-registry" 2>&1`
+                KHRONOS_OPENGL_REGISTRY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "khronos-opengl-registry" 2>&1`
         else
-	        KHRONOS_OPENGL_REGISTRY_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "khronos-opengl-registry" 2>&1`
+                KHRONOS_OPENGL_REGISTRY_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "khronos-opengl-registry" 2>&1`
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$KHRONOS_OPENGL_REGISTRY_PKG_ERRORS" >&5
+        # Put the nasty error message in config.log where it belongs
+        echo "$KHRONOS_OPENGL_REGISTRY_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (khronos-opengl-registry) were not met:
+        as_fn_error $? "Package requirements (khronos-opengl-registry) were not met:
 
 $KHRONOS_OPENGL_REGISTRY_PKG_ERRORS
 
@@ -31432,7 +31432,7 @@ See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+        { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
@@ -31445,8 +31445,8 @@ See the pkg-config man page for more details.
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 See \`config.log' for more details" "$LINENO" 5; }
 else
-	KHRONOS_OPENGL_REGISTRY_CFLAGS=$pkg_cv_KHRONOS_OPENGL_REGISTRY_CFLAGS
-	KHRONOS_OPENGL_REGISTRY_LIBS=$pkg_cv_KHRONOS_OPENGL_REGISTRY_LIBS
+        KHRONOS_OPENGL_REGISTRY_CFLAGS=$pkg_cv_KHRONOS_OPENGL_REGISTRY_CFLAGS
+        KHRONOS_OPENGL_REGISTRY_LIBS=$pkg_cv_KHRONOS_OPENGL_REGISTRY_LIBS
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
 
@@ -31588,14 +31588,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        XPBPROXY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$APPLEWMPROTO $LIBAPPLEWM xfixes x11" 2>&1`
+                XPBPROXY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$APPLEWMPROTO $LIBAPPLEWM xfixes x11" 2>&1`
         else
-	        XPBPROXY_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$APPLEWMPROTO $LIBAPPLEWM xfixes x11" 2>&1`
+                XPBPROXY_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$APPLEWMPROTO $LIBAPPLEWM xfixes x11" 2>&1`
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$XPBPROXY_PKG_ERRORS" >&5
+        # Put the nasty error message in config.log where it belongs
+        echo "$XPBPROXY_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements ($APPLEWMPROTO $LIBAPPLEWM xfixes x11) were not met:
+        as_fn_error $? "Package requirements ($APPLEWMPROTO $LIBAPPLEWM xfixes x11) were not met:
 
 $XPBPROXY_PKG_ERRORS
 
@@ -31608,7 +31608,7 @@ See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+        { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
@@ -31621,8 +31621,8 @@ See the pkg-config man page for more details.
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 See \`config.log' for more details" "$LINENO" 5; }
 else
-	XPBPROXY_CFLAGS=$pkg_cv_XPBPROXY_CFLAGS
-	XPBPROXY_LIBS=$pkg_cv_XPBPROXY_LIBS
+        XPBPROXY_CFLAGS=$pkg_cv_XPBPROXY_CFLAGS
+        XPBPROXY_LIBS=$pkg_cv_XPBPROXY_LIBS
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
 
@@ -31891,24 +31891,24 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        XEPHYR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$XEPHYR_REQUIRED_LIBS" 2>&1`
+                XEPHYR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$XEPHYR_REQUIRED_LIBS" 2>&1`
         else
-	        XEPHYR_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$XEPHYR_REQUIRED_LIBS" 2>&1`
+                XEPHYR_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$XEPHYR_REQUIRED_LIBS" 2>&1`
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$XEPHYR_PKG_ERRORS" >&5
+        # Put the nasty error message in config.log where it belongs
+        echo "$XEPHYR_PKG_ERRORS" >&5
 
-	XEPHYR="no"
+        XEPHYR="no"
 elif test $pkg_failed = untried; then
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-	XEPHYR="no"
+        XEPHYR="no"
 else
-	XEPHYR_CFLAGS=$pkg_cv_XEPHYR_CFLAGS
-	XEPHYR_LIBS=$pkg_cv_XEPHYR_LIBS
+        XEPHYR_CFLAGS=$pkg_cv_XEPHYR_CFLAGS
+        XEPHYR_LIBS=$pkg_cv_XEPHYR_LIBS
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
-	XEPHYR="yes"
+        XEPHYR="yes"
 fi
     elif test "x$XEPHYR" = xyes ; then
 
@@ -31963,14 +31963,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        XEPHYR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$XEPHYR_REQUIRED_LIBS" 2>&1`
+                XEPHYR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$XEPHYR_REQUIRED_LIBS" 2>&1`
         else
-	        XEPHYR_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$XEPHYR_REQUIRED_LIBS" 2>&1`
+                XEPHYR_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$XEPHYR_REQUIRED_LIBS" 2>&1`
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$XEPHYR_PKG_ERRORS" >&5
+        # Put the nasty error message in config.log where it belongs
+        echo "$XEPHYR_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements ($XEPHYR_REQUIRED_LIBS) were not met:
+        as_fn_error $? "Package requirements ($XEPHYR_REQUIRED_LIBS) were not met:
 
 $XEPHYR_PKG_ERRORS
 
@@ -31983,7 +31983,7 @@ See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+        { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
@@ -31996,8 +31996,8 @@ See the pkg-config man page for more details.
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 See \`config.log' for more details" "$LINENO" 5; }
 else
-	XEPHYR_CFLAGS=$pkg_cv_XEPHYR_CFLAGS
-	XEPHYR_LIBS=$pkg_cv_XEPHYR_LIBS
+        XEPHYR_CFLAGS=$pkg_cv_XEPHYR_CFLAGS
+        XEPHYR_LIBS=$pkg_cv_XEPHYR_LIBS
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
 
@@ -33105,7 +33105,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 xorg-server $as_me 21.1.13, which was
+This file was extended by xorg-server $as_me 21.1.14, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -33173,7 +33173,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
-xorg-server config.status 21.1.13
+xorg-server config.status 21.1.14
 configured by $0, generated by GNU Autoconf 2.71,
   with options \\"\$ac_cs_config\\"