From 2511a00cdd576512f5d7f45707a4a725df2f4618 Mon Sep 17 00:00:00 2001
From: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Thu, 5 Jan 2012 14:26:01 +0800
Subject: [PATCH] Fixed a configure bug.

Should check the enable-glamor-gles2 before use the variable.
And should include the config.h as the GLAMOR_GLES2 macro is
defined there.

Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
---
 glamor/glamor_egl.c  | 4 ++++
 glamor/glamor_priv.h | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/glamor/glamor_egl.c b/glamor/glamor_egl.c
index 7eca5ad42..28a48ca78 100644
--- a/glamor/glamor_egl.c
+++ b/glamor/glamor_egl.c
@@ -27,6 +27,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
diff --git a/glamor/glamor_priv.h b/glamor/glamor_priv.h
index 4bd169b30..08db6316f 100644
--- a/glamor/glamor_priv.h
+++ b/glamor/glamor_priv.h
@@ -27,6 +27,10 @@
 #ifndef GLAMOR_PRIV_H
 #define GLAMOR_PRIV_H
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #include <xorg-config.h>