[Mesa-dev] [PATCH] glx: fix compile error in egl_glx.c.

[Gaetan Nadon]

On 13-09-18 09:41 PM, Kenneth Graunke wrote:
> On 09/17/2013 12:46 PM, Gaetan Nadon wrote:
>> egl_glx.c:40: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 <memsize at videotron.ca>
>> ---
>>  src/egl/drivers/glx/Makefile.am |    2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/src/egl/drivers/glx/Makefile.am b/src/egl/drivers/glx/Makefile.am
>> index 6db95b4..5dd5228 100644
>> --- a/src/egl/drivers/glx/Makefile.am
>> +++ b/src/egl/drivers/glx/Makefile.am
>> @@ -23,7 +23,7 @@ AM_CFLAGS = \
>>  	-I$(top_srcdir)/include \
>>  	-I$(top_srcdir)/src/egl/main \
>>  	$(VISIBILITY_CFLAGS) \
>> -	$(X11_CFLAGS) \
>> +	$(X11_INCLUDES) \
>>  	$(DEFINES)
>>  
>>  noinst_LTLIBRARIES = libegl_glx.la
>>
> This looks good to me.  There are a couple of other instances of
> X11_CFLAGS in the codebase as well.  Presumably those need to be changed
> as well?

These did not break the build for me. I don't know if X11_INCLUDES would
be needed,
or if X11_CFLAGS is just dead code. Perhaps the C code that needed it
was ifdef out.

    ./src/gallium/targets/libgl-xlib/Makefile.am:AM_CFLAGS = $(X11_CFLAGS)
    ./src/gallium/state_trackers/egl/Makefile.am:    $(X11_CFLAGS) \
    ./src/gallium/state_trackers/glx/Makefile.am:    $(X11_CFLAGS)
    ./src/glx/tests/Makefile.am:    $(X11_CFLAGS)
    ./src/mesa/main/tests/Makefile.am:    $(X11_CFLAGS) \


My first post on mesa. What's the next step? Repost with your review tag
for the committer?
I commit on X.Org modules, but don't think I can on mesa.

Have you also looked at the same patch for gallium/winsys/sw/xlib, or
would this be someone else?

Thanks a lot for the review.

>
> Both patches are:
> Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
>

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/mesa-dev/attachments/20130919/05e8666b/attachment.html>