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@gmail.com>
(cherry picked from commit de4ee20578a79e024b0de83c40648112f42c994e)

Conflicts:

	src/gallium/winsys/xlib/Makefile

diff --git a/src/gallium/state_trackers/glx/xlib/Makefile b/src/gallium/state_trackers/glx/xlib/Makefile
index 7b2adc62c34d87fcbdde1886a0f6f680a739c82b..8c7cc524dfc393e07441b1ba2059ed5bfce12da0 100644 (file)
--- 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 824c666ae30c74da903fc99ff80282f08a8994d4..76f073e38d0ba6ecacf7f39e666e24d8233b21d3 100644 (file)
--- 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