From: Gaetan Nadon Date: Tue, 17 Sep 2013 19:46:10 +0000 (-0400) Subject: winsys/sw/xlib: fix compile error in xlib_sw_winsys.c. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=79930c60278d26911c7e7500ef6e1c788dd74c3e;p=mesa.git winsys/sw/xlib: fix compile error in xlib_sw_winsys.c. xlib_sw_winsys.h:5:22: fatal error: X11/Xlib.h: No such file or directory The compiler cannot find the Xlib.h in the installed system headers. All supplied include directives point to inside the mesa module. The X11_CFLAGS variable is undefined (not defined in config.status). It appears the intent was to use X11_INCLUDES defined in configure.ac. The Xlib.h file is not installed on my workstation. It is supplied in the libx11-dev package. This allows an X developer control over which version of this file is used for X development. Signed-off-by: Gaetan Nadon Reviewed-by: Kenneth Graunke --- diff --git a/src/gallium/winsys/sw/xlib/Makefile.am b/src/gallium/winsys/sw/xlib/Makefile.am index 59da37dbb47..ea6b7429d86 100644 --- a/src/gallium/winsys/sw/xlib/Makefile.am +++ b/src/gallium/winsys/sw/xlib/Makefile.am @@ -24,7 +24,7 @@ include $(top_srcdir)/src/gallium/Automake.inc AM_CPPFLAGS = \ $(GALLIUM_CFLAGS) \ - $(X11_CFLAGS) + $(X11_INCLUDES) noinst_LTLIBRARIES = libws_xlib.la