From b3acb47e98023da898ffc4b6a5bac38a78bd7727 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Wed, 30 Oct 2013 11:30:23 -0400
Subject: [PATCH] glamor: Use dix-config.h not project config.h

v2: Also edit the one in glamor_egl.c (by anholt)
v3: Also edit the one in glamor_eglmodule.c (by anholt)

Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Zhigang Gong <zhigang.gong@linux.intel.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
---
 glamor/glamor_egl.c       | 4 +---
 glamor/glamor_eglmodule.c | 4 +---
 glamor/glamor_priv.h      | 4 +---
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/glamor/glamor_egl.c b/glamor/glamor_egl.c
index b30eeec..2f97a83 100644
--- a/glamor/glamor_egl.c
+++ b/glamor/glamor_egl.c
@@ -27,9 +27,7 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include "dix-config.h"
 
 #define GLAMOR_FOR_XORG
 #include <xorg-server.h>
diff --git a/glamor/glamor_eglmodule.c b/glamor/glamor_eglmodule.c
index e7c8eda..5ddd602 100644
--- a/glamor/glamor_eglmodule.c
+++ b/glamor/glamor_eglmodule.c
@@ -27,9 +27,7 @@
  *    Zhigang Gong <zhigang.gong@gmail.com>
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include "dix-config.h"
 
 #include <xorg-server.h>
 #define GLAMOR_FOR_XORG
diff --git a/glamor/glamor_priv.h b/glamor/glamor_priv.h
index c733b90..9f0c558 100644
--- a/glamor/glamor_priv.h
+++ b/glamor/glamor_priv.h
@@ -27,9 +27,7 @@
 #ifndef GLAMOR_PRIV_H
 #define GLAMOR_PRIV_H
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include "dix-config.h"
 
 #include <xorg-server.h>
 #ifndef DEBUG
-- 
2.7.4