diff options
| author | Dan Nicholson <dbn.lists@gmail.com> | 2010-03-15 20:53:56 -0700 |
|---|---|---|
| committer | Dan Nicholson <dbn.lists@gmail.com> | 2010-04-19 20:21:57 -0700 |
| commit | 4e7a4bed372a6da4dde8926f3bc30c56e3fbe07b (patch) | |
| tree | f887a07a43cfda435e8bf51caacae30624627510 /src/gallium/winsys/xlib/Makefile | |
| parent | 4f8bf353bd7e896268e0eb445c61270a8823892a (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/winsys/xlib/Makefile')
| -rw-r--r-- | src/gallium/winsys/xlib/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/winsys/xlib/Makefile b/src/gallium/winsys/xlib/Makefile index 76f073e38d..50b00e0add 100644 --- a/src/gallium/winsys/xlib/Makefile +++ b/src/gallium/winsys/xlib/Makefile @@ -21,7 +21,7 @@ INCLUDE_DIRS = \ -I$(TOP)/src/gallium/drivers \ -I$(TOP)/src/gallium/state_trackers/glx/xlib \ -I$(TOP)/src/gallium/auxiliary \ - $(X_CFLAGS) + $(X11_CFLAGS) DEFINES += \ -DGALLIUM_SOFTPIPE |