[Mesa-dev] [PATCH] use the correct variable for x11 includes

Jonathan Gray jsg at jsg.id.au
Wed Jul 17 22:01:03 PDT 2013


I'm not entirely sure if this one is right, but a change along these
lines is required to build on systems with X11 outside of the system
path in say /usr/X11R6 like on OpenBSD.

On Thu, Jul 18, 2013 at 02:57:14PM +1000, Jonathan Gray wrote:
> Signed-off-by: Jonathan Gray <jsg at jsg.id.au>
> ---
>  src/egl/drivers/glx/Makefile.am        | 2 +-
>  src/gallium/winsys/sw/xlib/Makefile.am | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git src/egl/drivers/glx/Makefile.am src/egl/drivers/glx/Makefile.am
> index 6bf67ea..220134d 100644
> --- src/egl/drivers/glx/Makefile.am
> +++ src/egl/drivers/glx/Makefile.am
> @@ -22,7 +22,7 @@
>  AM_CFLAGS = \
>  	-I$(top_srcdir)/include \
>  	-I$(top_srcdir)/src/egl/main \
> -	$(X11_CFLAGS) \
> +	$(X11_INCLUDES) \
>  	$(DEFINES)
>  
>  noinst_LTLIBRARIES = libegl_glx.la
> diff --git src/gallium/winsys/sw/xlib/Makefile.am src/gallium/winsys/sw/xlib/Makefile.am
> index 59da37d..ea6b742 100644
> --- src/gallium/winsys/sw/xlib/Makefile.am
> +++ 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
>  
> -- 
> 1.8.3.2
> 
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev


More information about the mesa-dev mailing list