Fixes for compiling XSDL on host

autogen.sh

@@ -11,7 +11,3 @@ cd "$ORIGDIR" || exit $?
 
 git config --local --get format.subjectPrefix ||
     git config --local format.subjectPrefix "PATCH xserver"
-
-if test -z "$NOCONFIGURE"; then
-    exec "$srcdir"/configure "$@"
-fi

dri3/dri3.c

@@ -26,7 +26,7 @@
 
 #include "dri3_priv.h"
 
-#include <drm/drm_fourcc.h>
+#include <libdrm/drm_fourcc.h>
 
 static int dri3_request;
 DevPrivateKeyRec dri3_screen_private_key;

dri3/dri3_request.c

@@ -30,7 +30,7 @@
 #include <xace.h>
 #include "../Xext/syncsdk.h"
 #include <protocol-versions.h>
-#include <drm/drm_fourcc.h>
+#include <libdrm/drm_fourcc.h>
 
 static Bool
 dri3_screen_can_one_point_two(ScreenPtr screen)

dri3/dri3_screen.c

@@ -29,7 +29,7 @@
 #include <misync.h>
 #include <misyncshm.h>
 #include <randrstr.h>
-#include <drm/drm_fourcc.h>
+#include <libdrm/drm_fourcc.h>
 #include <unistd.h>
 
 int

host-build/configure-xsdl.sh

@@ -1,10 +1,13 @@
 #!/bin/sh
+
 env SDL=yes CFLAGS="-O0 -g -DDEBUG" \
-./configure --prefix=`pwd`/data/usr \
+../configure --prefix=`pwd`/data/usr \
 --enable-debug \
 --disable-xorg --disable-dmx --disable-xvfb --disable-xnest --disable-xquartz --disable-xwin \
 --disable-xephyr --disable-xfake --disable-xfbdev --disable-unit-tests \
 --disable-shm --disable-mitshm --disable-dri --disable-dri2 --disable-glx --disable-xf86vidmode \
 --enable-xsdl --enable-kdrive --enable-kdrive-kbd --enable-kdrive-mouse --enable-kdrive-evdev \
+--disable-libdrm \
+|| exit 1
 
 nice -n19 make -j8