dri3: Include dix-config.h instead of xorg-config.h

This is DIX code.

dri3/Makefile.am

@@ -1,7 +1,6 @@
 noinst_LTLIBRARIES = libdri3.la
 AM_CFLAGS = \
-	-DHAVE_XORG_CONFIG_H \
-	@DIX_CFLAGS@ @XORG_CFLAGS@
+	@DIX_CFLAGS@
 
 libdri3_la_SOURCES = \
 	dri3.h \

dri3/dri3.c

@@ -20,10 +20,6 @@
  * OF THIS SOFTWARE.
  */
 
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
 #include "dri3_priv.h"
 
 #include <drm_fourcc.h>

dri3/dri3_priv.h

@@ -23,6 +23,7 @@
 #ifndef _DRI3PRIV_H_
 #define _DRI3PRIV_H_
 
+#include "dix-config.h"
 #include <X11/X.h>
 #include "scrnintstr.h"
 #include "misc.h"

dri3/dri3_request.c

@@ -20,10 +20,6 @@
  * OF THIS SOFTWARE.
  */
 
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
 #include "dri3_priv.h"
 #include <syncsrv.h>
 #include <unistd.h>

dri3/dri3_screen.c

@@ -20,10 +20,6 @@
  * OF THIS SOFTWARE.
  */
 
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
 #include "dri3_priv.h"
 #include <syncsdk.h>
 #include <misync.h>

dri3/meson.build

@@ -14,7 +14,6 @@ if build_dri3
         srcs_dri3,
         include_directories: inc,
         dependencies: [ common_dep, libdrm_dep ],
-        c_args: '-DHAVE_XORG_CONFIG_H'
         )
 endif