From 4f8bf353bd7e896268e0eb445c61270a8823892a Mon Sep 17 00:00:00 2001 From: Dan Nicholson Date: Fri, 2 Apr 2010 06:33:48 -0700 Subject: [PATCH] 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 (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 7b2adc62c34..8c7cc524dfc 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 824c666ae30..76f073e38d0 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 -- 2.30.2