Mesa (master): gallium: Respect user's CFLAGS for including X headers

[Dan Nicholson]

Module: Mesa
Branch: master
Commit: 4f8bf353bd7e896268e0eb445c61270a8823892a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4f8bf353bd7e896268e0eb445c61270a8823892a

Author: Dan Nicholson <dbn.lists at gmail.com>
Date:   Fri Apr  2 06:33:48 2010 -0700

gallium: Respect user's CFLAGS for including X headers

This can break on systems that don't have a system X installation.

Signed-off-by: Dan Nicholson <dbn.lists at gmail.com>
(cherry picked from commit de4ee20578a79e024b0de83c40648112f42c994e)

Conflicts:

	src/gallium/winsys/xlib/Makefile

---

 src/gallium/state_trackers/glx/xlib/Makefile |    3 ++-
 src/gallium/winsys/xlib/Makefile             |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/gallium/state_trackers/glx/xlib/Makefile b/src/gallium/state_trackers/glx/xlib/Makefile
index 7b2adc6..8c7cc52 100644
--- a/src/gallium/state_trackers/glx/xlib/Makefile
+++ b/src/gallium/state_trackers/glx/xlib/Makefile
@@ -5,7 +5,8 @@ LIBNAME = xlib
 
 LIBRARY_INCLUDES = \
 	-I$(TOP)/include \
-	-I$(TOP)/src/mesa
+	-I$(TOP)/src/mesa \
+	$(X_CFLAGS)
 
 C_SOURCES = \
 	glx_api.c \
diff --git a/src/gallium/winsys/xlib/Makefile b/src/gallium/winsys/xlib/Makefile
index 824c666..76f073e 100644
--- a/src/gallium/winsys/xlib/Makefile
+++ b/src/gallium/winsys/xlib/Makefile
@@ -20,7 +20,8 @@ INCLUDE_DIRS = \
 	-I$(TOP)/src/gallium/include \
 	-I$(TOP)/src/gallium/drivers \
 	-I$(TOP)/src/gallium/state_trackers/glx/xlib \
-	-I$(TOP)/src/gallium/auxiliary
+	-I$(TOP)/src/gallium/auxiliary \
+	$(X_CFLAGS)
 
 DEFINES += \
 	-DGALLIUM_SOFTPIPE