summaryrefslogtreecommitdiff
path: root/src/gallium/state_trackers/glx/xlib/Makefile
diff options
context:
space:
mode:
authorDan Nicholson <dbn.lists@gmail.com>2010-03-15 20:53:56 -0700
committerDan Nicholson <dbn.lists@gmail.com>2010-04-19 20:21:57 -0700
commit4e7a4bed372a6da4dde8926f3bc30c56e3fbe07b (patch)
treef887a07a43cfda435e8bf51caacae30624627510 /src/gallium/state_trackers/glx/xlib/Makefile
parent4f8bf353bd7e896268e0eb445c61270a8823892a (diff)
Change libX11 variables to not conflict with AC_PATH_XTRA
The variable X_LIBS from AC_PATH_XTRA contains only the -L searchdir parameter and not the -lX11 to link to Xlib. Use X11 prefixed build vars for linking with Xlib to avoid the conflict. Signed-off-by: Dan Nicholson <dbn.lists@gmail.com> (cherry picked from commit e725ef171b5a4d5425461f237d9ccab223806913)
Diffstat (limited to 'src/gallium/state_trackers/glx/xlib/Makefile')
-rw-r--r--src/gallium/state_trackers/glx/xlib/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/state_trackers/glx/xlib/Makefile b/src/gallium/state_trackers/glx/xlib/Makefile
index 8c7cc524df..b64dcbcd10 100644
--- a/src/gallium/state_trackers/glx/xlib/Makefile
+++ b/src/gallium/state_trackers/glx/xlib/Makefile
@@ -6,7 +6,7 @@ LIBNAME = xlib
LIBRARY_INCLUDES = \
-I$(TOP)/include \
-I$(TOP)/src/mesa \
- $(X_CFLAGS)
+ $(X11_CFLAGS)
C_SOURCES = \
glx_api.c \