Mesa (7.9): st/egl: Fix build for include files in nonstandard places

[Thomas Hellstrom]

Module: Mesa
Branch: 7.9
Commit: 8ae23176d65cf6b8bf9ed5fcabe58338c1f817eb
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8ae23176d65cf6b8bf9ed5fcabe58338c1f817eb

Author: Thomas Hellstrom <thellstrom at vmware.com>
Date:   Mon Nov  1 17:12:39 2010 +0100

st/egl: Fix build for include files in nonstandard places

Signed-off-by: Thomas Hellstrom <thellstrom at vmware.com>

---

 src/gallium/state_trackers/egl/Makefile         |    2 +-
 src/gallium/state_trackers/egl/x11/native_x11.h |    1 +
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/gallium/state_trackers/egl/Makefile b/src/gallium/state_trackers/egl/Makefile
index 8dbfc5b..8cfcef9 100644
--- a/src/gallium/state_trackers/egl/Makefile
+++ b/src/gallium/state_trackers/egl/Makefile
@@ -17,7 +17,7 @@ x11_INCLUDES = \
 	-I$(TOP)/src/mapi \
 	-I$(TOP)/src/mesa \
 	$(X11_CFLAGS) \
-	$(shell pkg-config --cflags-only-I libdrm)
+	$(shell pkg-config --cflags-only-I libdrm dri2proto)
 
 x11_SOURCES = $(wildcard x11/*.c) \
 	      $(TOP)/src/glx/dri2.c
diff --git a/src/gallium/state_trackers/egl/x11/native_x11.h b/src/gallium/state_trackers/egl/x11/native_x11.h
index 0b47837..8945117 100644
--- a/src/gallium/state_trackers/egl/x11/native_x11.h
+++ b/src/gallium/state_trackers/egl/x11/native_x11.h
@@ -27,6 +27,7 @@
 #define _NATIVE_X11_H_
 
 #include "common/native.h"
+#include <X11/Xlib.h>
 
 struct native_display *
 x11_create_ximage_display(Display *dpy,