[patch] glx//Makefile.am

[Brian Paul]

Pat Kane wrote:
> Attached is a patch to add  $MESA_SOURCE/include to the list of glx includes.
> MESA_SOURCE  is set in the xorg-server/configure file with the argument
> "--with-mesa-source=MESA_SOURCE", but was not being used.
> 
> Pat
> ---
> 
> 
> ------------------------------------------------------------------------
> 
> diff -acr a/glx/Makefile.am b/glx/Makefile.am
> *** a/glx/Makefile.am	2008-12-11 17:08:29.000000000 -0600
> --- b/glx/Makefile.am	2008-12-11 17:08:29.000000000 -0600
> ***************
> *** 23,29 ****
>   	-I$(top_srcdir)/hw/xfree86/common \
>   	-I$(top_srcdir)/hw/xfree86/dri \
>   	-I$(top_srcdir)/hw/xfree86/dri2 \
> ! 	-I$(top_srcdir)/mi
>   
>   glapi_sources =					\
>   	indirect_dispatch.c			\
> --- 23,29 ----
>   	-I$(top_srcdir)/hw/xfree86/common \
>   	-I$(top_srcdir)/hw/xfree86/dri \
>   	-I$(top_srcdir)/hw/xfree86/dri2 \
> ! 	-I$(top_srcdir)/mi -I$(MESA_SOURCE)/include
>   
>   glapi_sources =					\
>   	indirect_dispatch.c			\
> 
> 

I had asked Dan Nicholson about this myself recently.  With the latest 
changes in Xorg git, the --with-mesa-source option is no longer used. 
Instead, pkg-config is used to determine where to find the Mesa headers. 
  This means you should install Mesa before building the X server.

-Brian