diff --git a/packages/x11/xserver/xorg-server/xorg-server-crosscompiling.diff b/packages/x11/xserver/xorg-server/xorg-server-crosscompiling.diff
deleted file mode 100644
index 6734f59bc1..0000000000
--- a/packages/x11/xserver/xorg-server/xorg-server-crosscompiling.diff
+++ /dev/null
@@ -1,2224 +0,0 @@
-diff -Naur xorg-server-1.7.99.2/autom4te.cache/output.0 xorg-server-1.7.99.2.patch/autom4te.cache/output.0
-diff -Naur xorg-server-1.7.99.2/autom4te.cache/requests xorg-server-1.7.99.2.patch/autom4te.cache/requests
-diff -Naur xorg-server-1.7.99.2/autom4te.cache/traces.0 xorg-server-1.7.99.2.patch/autom4te.cache/traces.0
-diff -Naur xorg-server-1.7.99.2/configure xorg-server-1.7.99.2.patch/configure
---- xorg-server-1.7.99.2/configure	2009-12-20 14:25:52.292986199 +0100
-+++ xorg-server-1.7.99.2.patch/configure	2009-12-20 14:29:33.424861429 +0100
-@@ -2132,7 +2132,7 @@
-                           (default: auto)
-   --enable-unix-transport Enable UNIX domain socket transport
-   --enable-tcp-transport  Enable TCP socket transport
--  --enable-IPv6           Enable IPv6 support
-+  --enable-ipv6           Enable IPv6 support
-   --enable-local-transport
-                           Enable os-specific local transport
-   --enable-secure-rpc     Enable Secure RPC
-@@ -16129,35 +16129,6 @@
- $as_echo "${FONT100DPIDIR}" >&6; }
- 
- 
--as_ac_File=`$as_echo "ac_cv_file_${sysconfdir}/X11/fontpath.d" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${sysconfdir}/X11/fontpath.d" >&5
--$as_echo_n "checking for ${sysconfdir}/X11/fontpath.d... " >&6; }
--if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then :
--  $as_echo_n "(cached) " >&6
--else
--  test "$cross_compiling" = yes &&
--  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
--if test -r "${sysconfdir}/X11/fontpath.d"; then
--  eval "$as_ac_File=yes"
--else
--  eval "$as_ac_File=no"
--fi
--fi
--eval ac_res=\$$as_ac_File
--	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--eval as_val=\$$as_ac_File
--   if test "x$as_val" = x""yes; then :
--  DEFAULT_FONT_PATH='catalogue:${sysconfdir}/X11/fontpath.d'
--else
--
--		DEFAULT_FONT_PATH="${FONTMISCDIR}/,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/"
--		case $host_os in
--			darwin*)    DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;;
--		esac
--
--fi
--
- 
- # Check whether --with-default-font-path was given.
- if test "${with_default_font_path+set}" = set; then :
-@@ -16862,6 +16833,46 @@
- 
- fi
- 
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lws2_32" >&5
-+$as_echo_n "checking for main in -lws2_32... " >&6; }
-+if test "${ac_cv_lib_ws2_32_main+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lws2_32  $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+
-+int
-+main ()
-+{
-+return main ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_ws2_32_main=yes
-+else
-+  ac_cv_lib_ws2_32_main=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ws2_32_main" >&5
-+$as_echo "$ac_cv_lib_ws2_32_main" >&6; }
-+if test "x$ac_cv_lib_ws2_32_main" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBWS2_32 1
-+_ACEOF
-+
-+  LIBS="-lws2_32 $LIBS"
-+
-+fi
-+ac_cv_lib_ws2_32=ac_cv_lib_ws2_32_main
-+
- 
-  # Needs to come after above checks for libsocket & libnsl for SVR4 systems
-  # Check whether --enable-ipv6 was given.
-@@ -17372,10 +17383,11 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for UDEV" >&5
- $as_echo_n "checking for UDEV... " >&6; }
- 
--if test -n "$UDEV_CFLAGS"; then
--    pkg_cv_UDEV_CFLAGS="$UDEV_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$UDEV_CFLAGS"; then
-+        pkg_cv_UDEV_CFLAGS="$UDEV_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBUDEV\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$LIBUDEV") 2>&5
-   ac_status=$?
-@@ -17385,13 +17397,15 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$UDEV_LIBS"; then
--    pkg_cv_UDEV_LIBS="$UDEV_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$UDEV_LIBS"; then
-+        pkg_cv_UDEV_LIBS="$UDEV_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBUDEV\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$LIBUDEV") 2>&5
-   ac_status=$?
-@@ -17401,8 +17415,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -17415,9 +17430,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        UDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$LIBUDEV" 2>&1`
-+	        UDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$LIBUDEV"`
-         else
--	        UDEV_PKG_ERRORS=`$PKG_CONFIG --print-errors "$LIBUDEV" 2>&1`
-+	        UDEV_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$LIBUDEV"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$UDEV_PKG_ERRORS" >&5
-@@ -17461,10 +17476,11 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUS" >&5
- $as_echo_n "checking for DBUS... " >&6; }
- 
--if test -n "$DBUS_CFLAGS"; then
--    pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$DBUS_CFLAGS"; then
-+        pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "dbus-1") 2>&5
-   ac_status=$?
-@@ -17474,13 +17490,15 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$DBUS_LIBS"; then
--    pkg_cv_DBUS_LIBS="$DBUS_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$DBUS_LIBS"; then
-+        pkg_cv_DBUS_LIBS="$DBUS_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "dbus-1") 2>&5
-   ac_status=$?
-@@ -17490,8 +17508,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -17504,9 +17523,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-1" 2>&1`
-+	        DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "dbus-1"`
-         else
--	        DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-1" 2>&1`
-+	        DBUS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbus-1"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$DBUS_PKG_ERRORS" >&5
-@@ -17564,10 +17583,11 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for HAL" >&5
- $as_echo_n "checking for HAL... " >&6; }
- 
--if test -n "$HAL_CFLAGS"; then
--    pkg_cv_HAL_CFLAGS="$HAL_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$HAL_CFLAGS"; then
-+        pkg_cv_HAL_CFLAGS="$HAL_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"hal\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "hal") 2>&5
-   ac_status=$?
-@@ -17577,13 +17597,15 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$HAL_LIBS"; then
--    pkg_cv_HAL_LIBS="$HAL_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$HAL_LIBS"; then
-+        pkg_cv_HAL_LIBS="$HAL_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"hal\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "hal") 2>&5
-   ac_status=$?
-@@ -17593,8 +17615,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -17607,9 +17630,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        HAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "hal" 2>&1`
-+	        HAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "hal"`
-         else
--	        HAL_PKG_ERRORS=`$PKG_CONFIG --print-errors "hal" 2>&1`
-+	        HAL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "hal"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$HAL_PKG_ERRORS" >&5
-@@ -17945,10 +17968,11 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XLIB" >&5
- $as_echo_n "checking for XLIB... " >&6; }
- 
--if test -n "$XLIB_CFLAGS"; then
--    pkg_cv_XLIB_CFLAGS="$XLIB_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$XLIB_CFLAGS"; then
-+        pkg_cv_XLIB_CFLAGS="$XLIB_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "x11") 2>&5
-   ac_status=$?
-@@ -17958,13 +17982,15 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$XLIB_LIBS"; then
--    pkg_cv_XLIB_LIBS="$XLIB_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$XLIB_LIBS"; then
-+        pkg_cv_XLIB_LIBS="$XLIB_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "x11") 2>&5
-   ac_status=$?
-@@ -17974,8 +18000,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -17988,9 +18015,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        XLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x11" 2>&1`
-+	        XLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "x11"`
-         else
--	        XLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "x11" 2>&1`
-+	        XLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x11"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$XLIB_PKG_ERRORS" >&5
-@@ -18031,10 +18058,11 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GL" >&5
- $as_echo_n "checking for GL... " >&6; }
- 
--if test -n "$GL_CFLAGS"; then
--    pkg_cv_GL_CFLAGS="$GL_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$GL_CFLAGS"; then
-+        pkg_cv_GL_CFLAGS="$GL_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$GLPROTO \$LIBGL\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$GLPROTO $LIBGL") 2>&5
-   ac_status=$?
-@@ -18044,13 +18072,15 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$GL_LIBS"; then
--    pkg_cv_GL_LIBS="$GL_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$GL_LIBS"; then
-+        pkg_cv_GL_LIBS="$GL_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$GLPROTO \$LIBGL\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$GLPROTO $LIBGL") 2>&5
-   ac_status=$?
-@@ -18060,8 +18090,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -18074,9 +18105,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        GL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$GLPROTO $LIBGL" 2>&1`
-+	        GL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$GLPROTO $LIBGL"`
-         else
--	        GL_PKG_ERRORS=`$PKG_CONFIG --print-errors "$GLPROTO $LIBGL" 2>&1`
-+	        GL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$GLPROTO $LIBGL"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$GL_PKG_ERRORS" >&5
-@@ -18169,10 +18200,11 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DRIPROTO" >&5
- $as_echo_n "checking for DRIPROTO... " >&6; }
- 
--if test -n "$DRIPROTO_CFLAGS"; then
--    pkg_cv_DRIPROTO_CFLAGS="$DRIPROTO_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$DRIPROTO_CFLAGS"; then
-+        pkg_cv_DRIPROTO_CFLAGS="$DRIPROTO_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$DRIPROTO\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$DRIPROTO") 2>&5
-   ac_status=$?
-@@ -18182,13 +18214,15 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$DRIPROTO_LIBS"; then
--    pkg_cv_DRIPROTO_LIBS="$DRIPROTO_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$DRIPROTO_LIBS"; then
-+        pkg_cv_DRIPROTO_LIBS="$DRIPROTO_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$DRIPROTO\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$DRIPROTO") 2>&5
-   ac_status=$?
-@@ -18198,8 +18232,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -18212,9 +18247,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        DRIPROTO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$DRIPROTO" 2>&1`
-+	        DRIPROTO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$DRIPROTO"`
-         else
--	        DRIPROTO_PKG_ERRORS=`$PKG_CONFIG --print-errors "$DRIPROTO" 2>&1`
-+	        DRIPROTO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$DRIPROTO"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$DRIPROTO_PKG_ERRORS" >&5
-@@ -18255,10 +18290,11 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DRI" >&5
- $as_echo_n "checking for DRI... " >&6; }
- 
--if test -n "$DRI_CFLAGS"; then
--    pkg_cv_DRI_CFLAGS="$DRI_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$DRI_CFLAGS"; then
-+        pkg_cv_DRI_CFLAGS="$DRI_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$GLPROTO \$LIBDRI\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$GLPROTO $LIBDRI") 2>&5
-   ac_status=$?
-@@ -18268,13 +18304,15 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$DRI_LIBS"; then
--    pkg_cv_DRI_LIBS="$DRI_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$DRI_LIBS"; then
-+        pkg_cv_DRI_LIBS="$DRI_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$GLPROTO \$LIBDRI\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$GLPROTO $LIBDRI") 2>&5
-   ac_status=$?
-@@ -18284,8 +18322,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -18298,9 +18337,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        DRI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$GLPROTO $LIBDRI" 2>&1`
-+	        DRI_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$GLPROTO $LIBDRI"`
-         else
--	        DRI_PKG_ERRORS=`$PKG_CONFIG --print-errors "$GLPROTO $LIBDRI" 2>&1`
-+	        DRI_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$GLPROTO $LIBDRI"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$DRI_PKG_ERRORS" >&5
-@@ -18344,10 +18383,11 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DRI2PROTO" >&5
- $as_echo_n "checking for DRI2PROTO... " >&6; }
- 
--if test -n "$DRI2PROTO_CFLAGS"; then
--    pkg_cv_DRI2PROTO_CFLAGS="$DRI2PROTO_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$DRI2PROTO_CFLAGS"; then
-+        pkg_cv_DRI2PROTO_CFLAGS="$DRI2PROTO_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$DRI2PROTO\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$DRI2PROTO") 2>&5
-   ac_status=$?
-@@ -18357,13 +18397,15 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$DRI2PROTO_LIBS"; then
--    pkg_cv_DRI2PROTO_LIBS="$DRI2PROTO_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$DRI2PROTO_LIBS"; then
-+        pkg_cv_DRI2PROTO_LIBS="$DRI2PROTO_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$DRI2PROTO\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$DRI2PROTO") 2>&5
-   ac_status=$?
-@@ -18373,8 +18415,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -18387,9 +18430,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        DRI2PROTO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$DRI2PROTO" 2>&1`
-+	        DRI2PROTO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$DRI2PROTO"`
-         else
--	        DRI2PROTO_PKG_ERRORS=`$PKG_CONFIG --print-errors "$DRI2PROTO" 2>&1`
-+	        DRI2PROTO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$DRI2PROTO"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$DRI2PROTO_PKG_ERRORS" >&5
-@@ -18432,10 +18475,11 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBDRM" >&5
- $as_echo_n "checking for LIBDRM... " >&6; }
- 
--if test -n "$LIBDRM_CFLAGS"; then
--    pkg_cv_LIBDRM_CFLAGS="$LIBDRM_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$LIBDRM_CFLAGS"; then
-+        pkg_cv_LIBDRM_CFLAGS="$LIBDRM_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBDRM\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$LIBDRM") 2>&5
-   ac_status=$?
-@@ -18445,13 +18489,15 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$LIBDRM_LIBS"; then
--    pkg_cv_LIBDRM_LIBS="$LIBDRM_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$LIBDRM_LIBS"; then
-+        pkg_cv_LIBDRM_LIBS="$LIBDRM_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBDRM\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$LIBDRM") 2>&5
-   ac_status=$?
-@@ -18461,8 +18507,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -18475,9 +18522,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        LIBDRM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$LIBDRM" 2>&1`
-+	        LIBDRM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$LIBDRM"`
-         else
--	        LIBDRM_PKG_ERRORS=`$PKG_CONFIG --print-errors "$LIBDRM" 2>&1`
-+	        LIBDRM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$LIBDRM"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$LIBDRM_PKG_ERRORS" >&5
-@@ -19060,10 +19107,11 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XDMCP" >&5
- $as_echo_n "checking for XDMCP... " >&6; }
- 
--if test -n "$XDMCP_CFLAGS"; then
--    pkg_cv_XDMCP_CFLAGS="$XDMCP_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$XDMCP_CFLAGS"; then
-+        pkg_cv_XDMCP_CFLAGS="$XDMCP_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xdmcp\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "xdmcp") 2>&5
-   ac_status=$?
-@@ -19073,13 +19121,15 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$XDMCP_LIBS"; then
--    pkg_cv_XDMCP_LIBS="$XDMCP_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$XDMCP_LIBS"; then
-+        pkg_cv_XDMCP_LIBS="$XDMCP_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xdmcp\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "xdmcp") 2>&5
-   ac_status=$?
-@@ -19089,8 +19139,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -19103,9 +19154,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        XDMCP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xdmcp" 2>&1`
-+	        XDMCP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xdmcp"`
-         else
--	        XDMCP_PKG_ERRORS=`$PKG_CONFIG --print-errors "xdmcp" 2>&1`
-+	        XDMCP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xdmcp"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$XDMCP_PKG_ERRORS" >&5
-@@ -19393,10 +19444,11 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB" >&5
- $as_echo_n "checking for GLIB... " >&6; }
- 
--if test -n "$GLIB_CFLAGS"; then
--    pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$GLIB_CFLAGS"; then
-+        pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBGLIB\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$LIBGLIB") 2>&5
-   ac_status=$?
-@@ -19406,13 +19458,15 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$GLIB_LIBS"; then
--    pkg_cv_GLIB_LIBS="$GLIB_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$GLIB_LIBS"; then
-+        pkg_cv_GLIB_LIBS="$GLIB_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBGLIB\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$LIBGLIB") 2>&5
-   ac_status=$?
-@@ -19422,8 +19476,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -19436,9 +19491,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$LIBGLIB" 2>&1`
-+	        GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$LIBGLIB"`
-         else
--	        GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "$LIBGLIB" 2>&1`
-+	        GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$LIBGLIB"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$GLIB_PKG_ERRORS" >&5
-@@ -19796,10 +19851,11 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OPENSSL" >&5
- $as_echo_n "checking for OPENSSL... " >&6; }
- 
--if test -n "$OPENSSL_CFLAGS"; then
--    pkg_cv_OPENSSL_CFLAGS="$OPENSSL_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$OPENSSL_CFLAGS"; then
-+        pkg_cv_OPENSSL_CFLAGS="$OPENSSL_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "openssl") 2>&5
-   ac_status=$?
-@@ -19809,13 +19865,15 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$OPENSSL_LIBS"; then
--    pkg_cv_OPENSSL_LIBS="$OPENSSL_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$OPENSSL_LIBS"; then
-+        pkg_cv_OPENSSL_LIBS="$OPENSSL_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "openssl") 2>&5
-   ac_status=$?
-@@ -19825,8 +19883,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -19839,9 +19898,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        OPENSSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "openssl" 2>&1`
-+	        OPENSSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "openssl"`
-         else
--	        OPENSSL_PKG_ERRORS=`$PKG_CONFIG --print-errors "openssl" 2>&1`
-+	        OPENSSL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "openssl"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$OPENSSL_PKG_ERRORS" >&5
-@@ -19890,10 +19949,11 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XSERVERCFLAGS" >&5
- $as_echo_n "checking for XSERVERCFLAGS... " >&6; }
- 
--if test -n "$XSERVERCFLAGS_CFLAGS"; then
--    pkg_cv_XSERVERCFLAGS_CFLAGS="$XSERVERCFLAGS_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$XSERVERCFLAGS_CFLAGS"; then
-+        pkg_cv_XSERVERCFLAGS_CFLAGS="$XSERVERCFLAGS_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$REQUIRED_MODULES \$REQUIRED_LIBS\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$REQUIRED_MODULES $REQUIRED_LIBS") 2>&5
-   ac_status=$?
-@@ -19903,13 +19963,15 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$XSERVERCFLAGS_LIBS"; then
--    pkg_cv_XSERVERCFLAGS_LIBS="$XSERVERCFLAGS_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$XSERVERCFLAGS_LIBS"; then
-+        pkg_cv_XSERVERCFLAGS_LIBS="$XSERVERCFLAGS_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$REQUIRED_MODULES \$REQUIRED_LIBS\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$REQUIRED_MODULES $REQUIRED_LIBS") 2>&5
-   ac_status=$?
-@@ -19919,8 +19981,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -19933,9 +19996,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        XSERVERCFLAGS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$REQUIRED_MODULES $REQUIRED_LIBS" 2>&1`
-+	        XSERVERCFLAGS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$REQUIRED_MODULES $REQUIRED_LIBS"`
-         else
--	        XSERVERCFLAGS_PKG_ERRORS=`$PKG_CONFIG --print-errors "$REQUIRED_MODULES $REQUIRED_LIBS" 2>&1`
-+	        XSERVERCFLAGS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$REQUIRED_MODULES $REQUIRED_LIBS"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$XSERVERCFLAGS_PKG_ERRORS" >&5
-@@ -19976,10 +20039,11 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XSERVERLIBS" >&5
- $as_echo_n "checking for XSERVERLIBS... " >&6; }
- 
--if test -n "$XSERVERLIBS_CFLAGS"; then
--    pkg_cv_XSERVERLIBS_CFLAGS="$XSERVERLIBS_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$XSERVERLIBS_CFLAGS"; then
-+        pkg_cv_XSERVERLIBS_CFLAGS="$XSERVERLIBS_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$REQUIRED_LIBS\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$REQUIRED_LIBS") 2>&5
-   ac_status=$?
-@@ -19989,13 +20053,15 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$XSERVERLIBS_LIBS"; then
--    pkg_cv_XSERVERLIBS_LIBS="$XSERVERLIBS_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$XSERVERLIBS_LIBS"; then
-+        pkg_cv_XSERVERLIBS_LIBS="$XSERVERLIBS_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$REQUIRED_LIBS\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$REQUIRED_LIBS") 2>&5
-   ac_status=$?
-@@ -20005,8 +20071,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -20019,9 +20086,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        XSERVERLIBS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$REQUIRED_LIBS" 2>&1`
-+	        XSERVERLIBS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$REQUIRED_LIBS"`
-         else
--	        XSERVERLIBS_PKG_ERRORS=`$PKG_CONFIG --print-errors "$REQUIRED_LIBS" 2>&1`
-+	        XSERVERLIBS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$REQUIRED_LIBS"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$XSERVERLIBS_PKG_ERRORS" >&5
-@@ -20152,10 +20219,11 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XNESTMODULES" >&5
- $as_echo_n "checking for XNESTMODULES... " >&6; }
- 
--if test -n "$XNESTMODULES_CFLAGS"; then
--    pkg_cv_XNESTMODULES_CFLAGS="$XNESTMODULES_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$XNESTMODULES_CFLAGS"; then
-+        pkg_cv_XNESTMODULES_CFLAGS="$XNESTMODULES_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xfont \$LIBXEXT x11 xau \$XDMCP_MODULES\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "xfont $LIBXEXT x11 xau $XDMCP_MODULES") 2>&5
-   ac_status=$?
-@@ -20165,13 +20233,15 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$XNESTMODULES_LIBS"; then
--    pkg_cv_XNESTMODULES_LIBS="$XNESTMODULES_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$XNESTMODULES_LIBS"; then
-+        pkg_cv_XNESTMODULES_LIBS="$XNESTMODULES_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xfont \$LIBXEXT x11 xau \$XDMCP_MODULES\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "xfont $LIBXEXT x11 xau $XDMCP_MODULES") 2>&5
-   ac_status=$?
-@@ -20181,8 +20251,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -20195,9 +20266,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        XNESTMODULES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xfont $LIBXEXT x11 xau $XDMCP_MODULES" 2>&1`
-+	        XNESTMODULES_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xfont $LIBXEXT x11 xau $XDMCP_MODULES"`
-         else
--	        XNESTMODULES_PKG_ERRORS=`$PKG_CONFIG --print-errors "xfont $LIBXEXT x11 xau $XDMCP_MODULES" 2>&1`
-+	        XNESTMODULES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xfont $LIBXEXT x11 xau $XDMCP_MODULES"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$XNESTMODULES_PKG_ERRORS" >&5
-@@ -20327,10 +20398,11 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PCIACCESS" >&5
- $as_echo_n "checking for PCIACCESS... " >&6; }
- 
--if test -n "$PCIACCESS_CFLAGS"; then
--    pkg_cv_PCIACCESS_CFLAGS="$PCIACCESS_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$PCIACCESS_CFLAGS"; then
-+        pkg_cv_PCIACCESS_CFLAGS="$PCIACCESS_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBPCIACCESS\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$LIBPCIACCESS") 2>&5
-   ac_status=$?
-@@ -20340,13 +20412,15 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$PCIACCESS_LIBS"; then
--    pkg_cv_PCIACCESS_LIBS="$PCIACCESS_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$PCIACCESS_LIBS"; then
-+        pkg_cv_PCIACCESS_LIBS="$PCIACCESS_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBPCIACCESS\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$LIBPCIACCESS") 2>&5
-   ac_status=$?
-@@ -20356,8 +20430,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -20370,9 +20445,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        PCIACCESS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$LIBPCIACCESS" 2>&1`
-+	        PCIACCESS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$LIBPCIACCESS"`
-         else
--	        PCIACCESS_PKG_ERRORS=`$PKG_CONFIG --print-errors "$LIBPCIACCESS" 2>&1`
-+	        PCIACCESS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$LIBPCIACCESS"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$PCIACCESS_PKG_ERRORS" >&5
-@@ -20640,10 +20715,11 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DGA" >&5
- $as_echo_n "checking for DGA... " >&6; }
- 
--if test -n "$DGA_CFLAGS"; then
--    pkg_cv_DGA_CFLAGS="$DGA_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$DGA_CFLAGS"; then
-+        pkg_cv_DGA_CFLAGS="$DGA_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$DGAPROTO\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$DGAPROTO") 2>&5
-   ac_status=$?
-@@ -20653,13 +20729,15 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$DGA_LIBS"; then
--    pkg_cv_DGA_LIBS="$DGA_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$DGA_LIBS"; then
-+        pkg_cv_DGA_LIBS="$DGA_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$DGAPROTO\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$DGAPROTO") 2>&5
-   ac_status=$?
-@@ -20669,8 +20747,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -20683,9 +20762,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        DGA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$DGAPROTO" 2>&1`
-+	        DGA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$DGAPROTO"`
-         else
--	        DGA_PKG_ERRORS=`$PKG_CONFIG --print-errors "$DGAPROTO" 2>&1`
-+	        DGA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$DGAPROTO"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$DGA_PKG_ERRORS" >&5
-@@ -20710,10 +20789,11 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DGA" >&5
- $as_echo_n "checking for DGA... " >&6; }
- 
--if test -n "$DGA_CFLAGS"; then
--    pkg_cv_DGA_CFLAGS="$DGA_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$DGA_CFLAGS"; then
-+        pkg_cv_DGA_CFLAGS="$DGA_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$DGAPROTO\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$DGAPROTO") 2>&5
-   ac_status=$?
-@@ -20723,13 +20803,15 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$DGA_LIBS"; then
--    pkg_cv_DGA_LIBS="$DGA_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$DGA_LIBS"; then
-+        pkg_cv_DGA_LIBS="$DGA_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$DGAPROTO\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$DGAPROTO") 2>&5
-   ac_status=$?
-@@ -20739,8 +20821,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -20753,9 +20836,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        DGA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$DGAPROTO" 2>&1`
-+	        DGA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$DGAPROTO"`
-         else
--	        DGA_PKG_ERRORS=`$PKG_CONFIG --print-errors "$DGAPROTO" 2>&1`
-+	        DGA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$DGAPROTO"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$DGA_PKG_ERRORS" >&5
-@@ -20805,10 +20888,11 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XF86VIDMODE" >&5
- $as_echo_n "checking for XF86VIDMODE... " >&6; }
- 
--if test -n "$XF86VIDMODE_CFLAGS"; then
--    pkg_cv_XF86VIDMODE_CFLAGS="$XF86VIDMODE_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$XF86VIDMODE_CFLAGS"; then
-+        pkg_cv_XF86VIDMODE_CFLAGS="$XF86VIDMODE_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$VIDMODEPROTO\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$VIDMODEPROTO") 2>&5
-   ac_status=$?
-@@ -20818,13 +20902,15 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$XF86VIDMODE_LIBS"; then
--    pkg_cv_XF86VIDMODE_LIBS="$XF86VIDMODE_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$XF86VIDMODE_LIBS"; then
-+        pkg_cv_XF86VIDMODE_LIBS="$XF86VIDMODE_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$VIDMODEPROTO\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$VIDMODEPROTO") 2>&5
-   ac_status=$?
-@@ -20834,8 +20920,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -20848,9 +20935,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        XF86VIDMODE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$VIDMODEPROTO" 2>&1`
-+	        XF86VIDMODE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$VIDMODEPROTO"`
-         else
--	        XF86VIDMODE_PKG_ERRORS=`$PKG_CONFIG --print-errors "$VIDMODEPROTO" 2>&1`
-+	        XF86VIDMODE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$VIDMODEPROTO"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$XF86VIDMODE_PKG_ERRORS" >&5
-@@ -20875,10 +20962,11 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XF86VIDMODE" >&5
- $as_echo_n "checking for XF86VIDMODE... " >&6; }
- 
--if test -n "$XF86VIDMODE_CFLAGS"; then
--    pkg_cv_XF86VIDMODE_CFLAGS="$XF86VIDMODE_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$XF86VIDMODE_CFLAGS"; then
-+        pkg_cv_XF86VIDMODE_CFLAGS="$XF86VIDMODE_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$VIDMODEPROTO\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$VIDMODEPROTO") 2>&5
-   ac_status=$?
-@@ -20888,13 +20976,15 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$XF86VIDMODE_LIBS"; then
--    pkg_cv_XF86VIDMODE_LIBS="$XF86VIDMODE_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$XF86VIDMODE_LIBS"; then
-+        pkg_cv_XF86VIDMODE_LIBS="$XF86VIDMODE_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$VIDMODEPROTO\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$VIDMODEPROTO") 2>&5
-   ac_status=$?
-@@ -20904,8 +20994,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -20918,9 +21009,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        XF86VIDMODE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$VIDMODEPROTO" 2>&1`
-+	        XF86VIDMODE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$VIDMODEPROTO"`
-         else
--	        XF86VIDMODE_PKG_ERRORS=`$PKG_CONFIG --print-errors "$VIDMODEPROTO" 2>&1`
-+	        XF86VIDMODE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$VIDMODEPROTO"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$XF86VIDMODE_PKG_ERRORS" >&5
-@@ -20967,10 +21058,11 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XORG_MODULES" >&5
- $as_echo_n "checking for XORG_MODULES... " >&6; }
- 
--if test -n "$XORG_MODULES_CFLAGS"; then
--    pkg_cv_XORG_MODULES_CFLAGS="$XORG_MODULES_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$XORG_MODULES_CFLAGS"; then
-+        pkg_cv_XORG_MODULES_CFLAGS="$XORG_MODULES_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$XORG_MODULES\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$XORG_MODULES") 2>&5
-   ac_status=$?
-@@ -20980,13 +21072,15 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$XORG_MODULES_LIBS"; then
--    pkg_cv_XORG_MODULES_LIBS="$XORG_MODULES_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$XORG_MODULES_LIBS"; then
-+        pkg_cv_XORG_MODULES_LIBS="$XORG_MODULES_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$XORG_MODULES\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$XORG_MODULES") 2>&5
-   ac_status=$?
-@@ -20996,8 +21090,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -21010,9 +21105,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        XORG_MODULES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$XORG_MODULES" 2>&1`
-+	        XORG_MODULES_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$XORG_MODULES"`
-         else
--	        XORG_MODULES_PKG_ERRORS=`$PKG_CONFIG --print-errors "$XORG_MODULES" 2>&1`
-+	        XORG_MODULES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$XORG_MODULES"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$XORG_MODULES_PKG_ERRORS" >&5
-@@ -21474,10 +21569,11 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XWINMODULES" >&5
- $as_echo_n "checking for XWINMODULES... " >&6; }
- 
--if test -n "$XWINMODULES_CFLAGS"; then
--    pkg_cv_XWINMODULES_CFLAGS="$XWINMODULES_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$XWINMODULES_CFLAGS"; then
-+        pkg_cv_XWINMODULES_CFLAGS="$XWINMODULES_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11 xdmcp xau xfont\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "x11 xdmcp xau xfont") 2>&5
-   ac_status=$?
-@@ -21487,13 +21583,15 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$XWINMODULES_LIBS"; then
--    pkg_cv_XWINMODULES_LIBS="$XWINMODULES_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$XWINMODULES_LIBS"; then
-+        pkg_cv_XWINMODULES_LIBS="$XWINMODULES_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11 xdmcp xau xfont\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "x11 xdmcp xau xfont") 2>&5
-   ac_status=$?
-@@ -21503,8 +21601,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -21517,9 +21616,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        XWINMODULES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x11 xdmcp xau xfont" 2>&1`
-+	        XWINMODULES_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "x11 xdmcp xau xfont"`
-         else
--	        XWINMODULES_PKG_ERRORS=`$PKG_CONFIG --print-errors "x11 xdmcp xau xfont" 2>&1`
-+	        XWINMODULES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x11 xdmcp xau xfont"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$XWINMODULES_PKG_ERRORS" >&5
-@@ -21575,10 +21674,11 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XWINMODULES" >&5
- $as_echo_n "checking for XWINMODULES... " >&6; }
- 
--if test -n "$XWINMODULES_CFLAGS"; then
--    pkg_cv_XWINMODULES_CFLAGS="$XWINMODULES_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$XWINMODULES_CFLAGS"; then
-+        pkg_cv_XWINMODULES_CFLAGS="$XWINMODULES_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11 xdmcp xau xfont\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "x11 xdmcp xau xfont") 2>&5
-   ac_status=$?
-@@ -21588,13 +21688,15 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$XWINMODULES_LIBS"; then
--    pkg_cv_XWINMODULES_LIBS="$XWINMODULES_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$XWINMODULES_LIBS"; then
-+        pkg_cv_XWINMODULES_LIBS="$XWINMODULES_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11 xdmcp xau xfont\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "x11 xdmcp xau xfont") 2>&5
-   ac_status=$?
-@@ -21604,8 +21706,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -21618,9 +21721,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        XWINMODULES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x11 xdmcp xau xfont" 2>&1`
-+	        XWINMODULES_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "x11 xdmcp xau xfont"`
-         else
--	        XWINMODULES_PKG_ERRORS=`$PKG_CONFIG --print-errors "x11 xdmcp xau xfont" 2>&1`
-+	        XWINMODULES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x11 xdmcp xau xfont"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$XWINMODULES_PKG_ERRORS" >&5
-@@ -21827,10 +21930,11 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XPBPROXY" >&5
- $as_echo_n "checking for XPBPROXY... " >&6; }
- 
--if test -n "$XPBPROXY_CFLAGS"; then
--    pkg_cv_XPBPROXY_CFLAGS="$XPBPROXY_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$XPBPROXY_CFLAGS"; then
-+        pkg_cv_XPBPROXY_CFLAGS="$XPBPROXY_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$APPLEWMPROTO \$LIBAPPLEWM xfixes x11\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$APPLEWMPROTO $LIBAPPLEWM xfixes x11") 2>&5
-   ac_status=$?
-@@ -21840,13 +21944,15 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$XPBPROXY_LIBS"; then
--    pkg_cv_XPBPROXY_LIBS="$XPBPROXY_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$XPBPROXY_LIBS"; then
-+        pkg_cv_XPBPROXY_LIBS="$XPBPROXY_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$APPLEWMPROTO \$LIBAPPLEWM xfixes x11\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$APPLEWMPROTO $LIBAPPLEWM xfixes x11") 2>&5
-   ac_status=$?
-@@ -21856,8 +21962,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -21870,9 +21977,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        XPBPROXY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$APPLEWMPROTO $LIBAPPLEWM xfixes x11" 2>&1`
-+	        XPBPROXY_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$APPLEWMPROTO $LIBAPPLEWM xfixes x11"`
-         else
--	        XPBPROXY_PKG_ERRORS=`$PKG_CONFIG --print-errors "$APPLEWMPROTO $LIBAPPLEWM xfixes x11" 2>&1`
-+	        XPBPROXY_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$APPLEWMPROTO $LIBAPPLEWM xfixes x11"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$XPBPROXY_PKG_ERRORS" >&5
-@@ -22088,10 +22195,11 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DMXMODULES" >&5
- $as_echo_n "checking for DMXMODULES... " >&6; }
- 
--if test -n "$DMXMODULES_CFLAGS"; then
--    pkg_cv_DMXMODULES_CFLAGS="$DMXMODULES_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$DMXMODULES_CFLAGS"; then
-+        pkg_cv_DMXMODULES_CFLAGS="$DMXMODULES_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xmuu \$LIBXEXT x11 xrender xfixes xfont \$LIBXI \$DMXPROTO xau \$XDMCP_MODULES\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "xmuu $LIBXEXT x11 xrender xfixes xfont $LIBXI $DMXPROTO xau $XDMCP_MODULES") 2>&5
-   ac_status=$?
-@@ -22101,13 +22209,15 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$DMXMODULES_LIBS"; then
--    pkg_cv_DMXMODULES_LIBS="$DMXMODULES_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$DMXMODULES_LIBS"; then
-+        pkg_cv_DMXMODULES_LIBS="$DMXMODULES_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xmuu \$LIBXEXT x11 xrender xfixes xfont \$LIBXI \$DMXPROTO xau \$XDMCP_MODULES\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "xmuu $LIBXEXT x11 xrender xfixes xfont $LIBXI $DMXPROTO xau $XDMCP_MODULES") 2>&5
-   ac_status=$?
-@@ -22117,8 +22227,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -22131,9 +22242,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        DMXMODULES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xmuu $LIBXEXT x11 xrender xfixes xfont $LIBXI $DMXPROTO xau $XDMCP_MODULES" 2>&1`
-+	        DMXMODULES_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xmuu $LIBXEXT x11 xrender xfixes xfont $LIBXI $DMXPROTO xau $XDMCP_MODULES"`
-         else
--	        DMXMODULES_PKG_ERRORS=`$PKG_CONFIG --print-errors "xmuu $LIBXEXT x11 xrender xfixes xfont $LIBXI $DMXPROTO xau $XDMCP_MODULES" 2>&1`
-+	        DMXMODULES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xmuu $LIBXEXT x11 xrender xfixes xfont $LIBXI $DMXPROTO xau $XDMCP_MODULES"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$DMXMODULES_PKG_ERRORS" >&5
-@@ -22153,10 +22264,11 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XDMXCONFIG_DEP" >&5
- $as_echo_n "checking for XDMXCONFIG_DEP... " >&6; }
- 
--if test -n "$XDMXCONFIG_DEP_CFLAGS"; then
--    pkg_cv_XDMXCONFIG_DEP_CFLAGS="$XDMXCONFIG_DEP_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$XDMXCONFIG_DEP_CFLAGS"; then
-+        pkg_cv_XDMXCONFIG_DEP_CFLAGS="$XDMXCONFIG_DEP_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xaw7 xmu xt xpm x11\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "xaw7 xmu xt xpm x11") 2>&5
-   ac_status=$?
-@@ -22166,13 +22278,15 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$XDMXCONFIG_DEP_LIBS"; then
--    pkg_cv_XDMXCONFIG_DEP_LIBS="$XDMXCONFIG_DEP_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$XDMXCONFIG_DEP_LIBS"; then
-+        pkg_cv_XDMXCONFIG_DEP_LIBS="$XDMXCONFIG_DEP_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xaw7 xmu xt xpm x11\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "xaw7 xmu xt xpm x11") 2>&5
-   ac_status=$?
-@@ -22182,8 +22296,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -22196,9 +22311,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        XDMXCONFIG_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xaw7 xmu xt xpm x11" 2>&1`
-+	        XDMXCONFIG_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xaw7 xmu xt xpm x11"`
-         else
--	        XDMXCONFIG_DEP_PKG_ERRORS=`$PKG_CONFIG --print-errors "xaw7 xmu xt xpm x11" 2>&1`
-+	        XDMXCONFIG_DEP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xaw7 xmu xt xpm x11"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$XDMXCONFIG_DEP_PKG_ERRORS" >&5
-@@ -22274,10 +22389,11 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DMXEXAMPLES_DEP" >&5
- $as_echo_n "checking for DMXEXAMPLES_DEP... " >&6; }
- 
--if test -n "$DMXEXAMPLES_DEP_CFLAGS"; then
--    pkg_cv_DMXEXAMPLES_DEP_CFLAGS="$DMXEXAMPLES_DEP_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$DMXEXAMPLES_DEP_CFLAGS"; then
-+        pkg_cv_DMXEXAMPLES_DEP_CFLAGS="$DMXEXAMPLES_DEP_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBDMX \$LIBXEXT x11\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$LIBDMX $LIBXEXT x11") 2>&5
-   ac_status=$?
-@@ -22287,13 +22403,15 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$DMXEXAMPLES_DEP_LIBS"; then
--    pkg_cv_DMXEXAMPLES_DEP_LIBS="$DMXEXAMPLES_DEP_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$DMXEXAMPLES_DEP_LIBS"; then
-+        pkg_cv_DMXEXAMPLES_DEP_LIBS="$DMXEXAMPLES_DEP_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBDMX \$LIBXEXT x11\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$LIBDMX $LIBXEXT x11") 2>&5
-   ac_status=$?
-@@ -22303,8 +22421,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -22317,9 +22436,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        DMXEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$LIBDMX $LIBXEXT x11" 2>&1`
-+	        DMXEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$LIBDMX $LIBXEXT x11"`
-         else
--	        DMXEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --print-errors "$LIBDMX $LIBXEXT x11" 2>&1`
-+	        DMXEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$LIBDMX $LIBXEXT x11"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$DMXEXAMPLES_DEP_PKG_ERRORS" >&5
-@@ -22361,10 +22480,11 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DMXXMUEXAMPLES_DEP" >&5
- $as_echo_n "checking for DMXXMUEXAMPLES_DEP... " >&6; }
- 
--if test -n "$DMXXMUEXAMPLES_DEP_CFLAGS"; then
--    pkg_cv_DMXXMUEXAMPLES_DEP_CFLAGS="$DMXXMUEXAMPLES_DEP_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$DMXXMUEXAMPLES_DEP_CFLAGS"; then
-+        pkg_cv_DMXXMUEXAMPLES_DEP_CFLAGS="$DMXXMUEXAMPLES_DEP_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBDMX xmu \$LIBXEXT x11\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$LIBDMX xmu $LIBXEXT x11") 2>&5
-   ac_status=$?
-@@ -22374,13 +22494,15 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$DMXXMUEXAMPLES_DEP_LIBS"; then
--    pkg_cv_DMXXMUEXAMPLES_DEP_LIBS="$DMXXMUEXAMPLES_DEP_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$DMXXMUEXAMPLES_DEP_LIBS"; then
-+        pkg_cv_DMXXMUEXAMPLES_DEP_LIBS="$DMXXMUEXAMPLES_DEP_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBDMX xmu \$LIBXEXT x11\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$LIBDMX xmu $LIBXEXT x11") 2>&5
-   ac_status=$?
-@@ -22390,8 +22512,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -22404,9 +22527,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        DMXXMUEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$LIBDMX xmu $LIBXEXT x11" 2>&1`
-+	        DMXXMUEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$LIBDMX xmu $LIBXEXT x11"`
-         else
--	        DMXXMUEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --print-errors "$LIBDMX xmu $LIBXEXT x11" 2>&1`
-+	        DMXXMUEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$LIBDMX xmu $LIBXEXT x11"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$DMXXMUEXAMPLES_DEP_PKG_ERRORS" >&5
-@@ -22448,10 +22571,11 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DMXXIEXAMPLES_DEP" >&5
- $as_echo_n "checking for DMXXIEXAMPLES_DEP... " >&6; }
- 
--if test -n "$DMXXIEXAMPLES_DEP_CFLAGS"; then
--    pkg_cv_DMXXIEXAMPLES_DEP_CFLAGS="$DMXXIEXAMPLES_DEP_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$DMXXIEXAMPLES_DEP_CFLAGS"; then
-+        pkg_cv_DMXXIEXAMPLES_DEP_CFLAGS="$DMXXIEXAMPLES_DEP_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBDMX \$LIBXI \$LIBXEXT x11\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$LIBDMX $LIBXI $LIBXEXT x11") 2>&5
-   ac_status=$?
-@@ -22461,13 +22585,15 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$DMXXIEXAMPLES_DEP_LIBS"; then
--    pkg_cv_DMXXIEXAMPLES_DEP_LIBS="$DMXXIEXAMPLES_DEP_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$DMXXIEXAMPLES_DEP_LIBS"; then
-+        pkg_cv_DMXXIEXAMPLES_DEP_LIBS="$DMXXIEXAMPLES_DEP_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBDMX \$LIBXI \$LIBXEXT x11\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$LIBDMX $LIBXI $LIBXEXT x11") 2>&5
-   ac_status=$?
-@@ -22477,8 +22603,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -22491,9 +22618,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        DMXXIEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$LIBDMX $LIBXI $LIBXEXT x11" 2>&1`
-+	        DMXXIEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$LIBDMX $LIBXI $LIBXEXT x11"`
-         else
--	        DMXXIEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --print-errors "$LIBDMX $LIBXI $LIBXEXT x11" 2>&1`
-+	        DMXXIEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$LIBDMX $LIBXI $LIBXEXT x11"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$DMXXIEXAMPLES_DEP_PKG_ERRORS" >&5
-@@ -22535,10 +22662,11 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XTSTEXAMPLES_DEP" >&5
- $as_echo_n "checking for XTSTEXAMPLES_DEP... " >&6; }
- 
--if test -n "$XTSTEXAMPLES_DEP_CFLAGS"; then
--    pkg_cv_XTSTEXAMPLES_DEP_CFLAGS="$XTSTEXAMPLES_DEP_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$XTSTEXAMPLES_DEP_CFLAGS"; then
-+        pkg_cv_XTSTEXAMPLES_DEP_CFLAGS="$XTSTEXAMPLES_DEP_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBXTST \$LIBXEXT x11\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$LIBXTST $LIBXEXT x11") 2>&5
-   ac_status=$?
-@@ -22548,13 +22676,15 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$XTSTEXAMPLES_DEP_LIBS"; then
--    pkg_cv_XTSTEXAMPLES_DEP_LIBS="$XTSTEXAMPLES_DEP_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$XTSTEXAMPLES_DEP_LIBS"; then
-+        pkg_cv_XTSTEXAMPLES_DEP_LIBS="$XTSTEXAMPLES_DEP_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBXTST \$LIBXEXT x11\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$LIBXTST $LIBXEXT x11") 2>&5
-   ac_status=$?
-@@ -22564,8 +22694,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -22578,9 +22709,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        XTSTEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$LIBXTST $LIBXEXT x11" 2>&1`
-+	        XTSTEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$LIBXTST $LIBXEXT x11"`
-         else
--	        XTSTEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --print-errors "$LIBXTST $LIBXEXT x11" 2>&1`
-+	        XTSTEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$LIBXTST $LIBXEXT x11"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$XTSTEXAMPLES_DEP_PKG_ERRORS" >&5
-@@ -22622,10 +22753,11 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XRESEXAMPLES_DEP" >&5
- $as_echo_n "checking for XRESEXAMPLES_DEP... " >&6; }
- 
--if test -n "$XRESEXAMPLES_DEP_CFLAGS"; then
--    pkg_cv_XRESEXAMPLES_DEP_CFLAGS="$XRESEXAMPLES_DEP_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$XRESEXAMPLES_DEP_CFLAGS"; then
-+        pkg_cv_XRESEXAMPLES_DEP_CFLAGS="$XRESEXAMPLES_DEP_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xres \$LIBXEXT x11\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "xres $LIBXEXT x11") 2>&5
-   ac_status=$?
-@@ -22635,13 +22767,15 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$XRESEXAMPLES_DEP_LIBS"; then
--    pkg_cv_XRESEXAMPLES_DEP_LIBS="$XRESEXAMPLES_DEP_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$XRESEXAMPLES_DEP_LIBS"; then
-+        pkg_cv_XRESEXAMPLES_DEP_LIBS="$XRESEXAMPLES_DEP_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xres \$LIBXEXT x11\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "xres $LIBXEXT x11") 2>&5
-   ac_status=$?
-@@ -22651,8 +22785,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -22665,9 +22800,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        XRESEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xres $LIBXEXT x11" 2>&1`
-+	        XRESEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xres $LIBXEXT x11"`
-         else
--	        XRESEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --print-errors "xres $LIBXEXT x11" 2>&1`
-+	        XRESEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xres $LIBXEXT x11"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$XRESEXAMPLES_DEP_PKG_ERRORS" >&5
-@@ -22709,10 +22844,11 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X11EXAMPLES_DEP" >&5
- $as_echo_n "checking for X11EXAMPLES_DEP... " >&6; }
- 
--if test -n "$X11EXAMPLES_DEP_CFLAGS"; then
--    pkg_cv_X11EXAMPLES_DEP_CFLAGS="$X11EXAMPLES_DEP_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$X11EXAMPLES_DEP_CFLAGS"; then
-+        pkg_cv_X11EXAMPLES_DEP_CFLAGS="$X11EXAMPLES_DEP_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBXEXT x11\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$LIBXEXT x11") 2>&5
-   ac_status=$?
-@@ -22722,13 +22858,15 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$X11EXAMPLES_DEP_LIBS"; then
--    pkg_cv_X11EXAMPLES_DEP_LIBS="$X11EXAMPLES_DEP_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$X11EXAMPLES_DEP_LIBS"; then
-+        pkg_cv_X11EXAMPLES_DEP_LIBS="$X11EXAMPLES_DEP_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$LIBXEXT x11\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$LIBXEXT x11") 2>&5
-   ac_status=$?
-@@ -22738,8 +22876,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -22752,9 +22891,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        X11EXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$LIBXEXT x11" 2>&1`
-+	        X11EXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$LIBXEXT x11"`
-         else
--	        X11EXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --print-errors "$LIBXEXT x11" 2>&1`
-+	        X11EXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$LIBXEXT x11"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$X11EXAMPLES_DEP_PKG_ERRORS" >&5
-@@ -22913,10 +23052,11 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TSLIB" >&5
- $as_echo_n "checking for TSLIB... " >&6; }
- 
--if test -n "$TSLIB_CFLAGS"; then
--    pkg_cv_TSLIB_CFLAGS="$TSLIB_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$TSLIB_CFLAGS"; then
-+        pkg_cv_TSLIB_CFLAGS="$TSLIB_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tslib-0.0\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "tslib-0.0") 2>&5
-   ac_status=$?
-@@ -22926,13 +23066,15 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$TSLIB_LIBS"; then
--    pkg_cv_TSLIB_LIBS="$TSLIB_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$TSLIB_LIBS"; then
-+        pkg_cv_TSLIB_LIBS="$TSLIB_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tslib-0.0\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "tslib-0.0") 2>&5
-   ac_status=$?
-@@ -22942,8 +23084,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -22956,9 +23099,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        TSLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "tslib-0.0" 2>&1`
-+	        TSLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "tslib-0.0"`
-         else
--	        TSLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "tslib-0.0" 2>&1`
-+	        TSLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "tslib-0.0"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$TSLIB_PKG_ERRORS" >&5
-@@ -23045,10 +23188,11 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XEPHYR" >&5
- $as_echo_n "checking for XEPHYR... " >&6; }
- 
--if test -n "$XEPHYR_CFLAGS"; then
--    pkg_cv_XEPHYR_CFLAGS="$XEPHYR_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$XEPHYR_CFLAGS"; then
-+        pkg_cv_XEPHYR_CFLAGS="$XEPHYR_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$XEPHYR_REQUIRED_LIBS\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$XEPHYR_REQUIRED_LIBS") 2>&5
-   ac_status=$?
-@@ -23058,13 +23202,15 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$XEPHYR_LIBS"; then
--    pkg_cv_XEPHYR_LIBS="$XEPHYR_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$XEPHYR_LIBS"; then
-+        pkg_cv_XEPHYR_LIBS="$XEPHYR_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$XEPHYR_REQUIRED_LIBS\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "$XEPHYR_REQUIRED_LIBS") 2>&5
-   ac_status=$?
-@@ -23074,8 +23220,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -23088,9 +23235,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        XEPHYR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$XEPHYR_REQUIRED_LIBS" 2>&1`
-+	        XEPHYR_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$XEPHYR_REQUIRED_LIBS"`
-         else
--	        XEPHYR_PKG_ERRORS=`$PKG_CONFIG --print-errors "$XEPHYR_REQUIRED_LIBS" 2>&1`
-+	        XEPHYR_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$XEPHYR_REQUIRED_LIBS"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$XEPHYR_PKG_ERRORS" >&5
-diff -Naur xorg-server-1.7.99.2/configure.ac xorg-server-1.7.99.2.patch/configure.ac
---- xorg-server-1.7.99.2/configure.ac	2009-12-20 14:25:52.294986508 +0100
-+++ xorg-server-1.7.99.2.patch/configure.ac	2009-12-20 14:29:22.349862339 +0100
-@@ -504,14 +504,6 @@
- 
- dnl Uses --default-font-path if set, otherwise checks for /etc/X11/fontpath.d,
- dnl otherwise uses standard subdirectories of FONTROOTDIR
--AC_CHECK_FILE([${sysconfdir}/X11/fontpath.d],
--	[DEFAULT_FONT_PATH='catalogue:${sysconfdir}/X11/fontpath.d'],
--	[
--		DEFAULT_FONT_PATH="${FONTMISCDIR}/,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/"
--		case $host_os in
--			darwin*)    DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;;
--		esac
--	])
- AC_ARG_WITH(default-font-path, AS_HELP_STRING([--with-default-font-path=PATH], [Comma separated list of font dirs]),
- 				[ FONTPATH="$withval" ],
- 				[ FONTPATH="${DEFAULT_FONT_PATH}" ])