<html>
<head>
<meta content="text/html; charset=ISO-8859-1"
http-equiv="Content-Type">
</head>
<body text="#000000" bgcolor="#FFFFFF">
<div class="moz-cite-prefix">On 13-09-18 09:41 PM, Kenneth Graunke
wrote:<br>
</div>
<blockquote cite="mid:523A5662.70609@whitecape.org" type="cite">
<pre wrap="">On 09/17/2013 12:46 PM, Gaetan Nadon wrote:
</pre>
<blockquote type="cite">
<pre wrap="">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 <a class="moz-txt-link-rfc2396E" href="mailto:memsize@videotron.ca"><memsize@videotron.ca></a>
---
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
</pre>
</blockquote>
<pre wrap="">
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?</pre>
</blockquote>
<br>
These did not break the build for me. I don't know if X11_INCLUDES
would be needed,<br>
or if X11_CFLAGS is just dead code. Perhaps the C code that needed
it was ifdef out.<br>
<blockquote><tt>./src/gallium/targets/libgl-xlib/Makefile.am:AM_CFLAGS
= $(X11_CFLAGS)</tt><tt><br>
</tt><tt>./src/gallium/state_trackers/egl/Makefile.am:
$(X11_CFLAGS) \</tt><tt><br>
</tt><tt>./src/gallium/state_trackers/glx/Makefile.am:
$(X11_CFLAGS)</tt><tt><br>
</tt><tt>./src/glx/tests/Makefile.am: $(X11_CFLAGS)</tt><tt><br>
</tt><tt>./src/mesa/main/tests/Makefile.am: $(X11_CFLAGS) \</tt><tt><br>
</tt></blockquote>
<br>
My first post on mesa. What's the next step? Repost with your review
tag for the committer?<br>
I commit on X.Org modules, but don't think I can on mesa.<br>
<br>
Have you also looked at the same patch for gallium/winsys/sw/xlib,
or would this be someone else?<br>
<br>
Thanks a lot for the review.<br>
<br>
<blockquote cite="mid:523A5662.70609@whitecape.org" type="cite">
<pre wrap="">
Both patches are:
Reviewed-by: Kenneth Graunke <a class="moz-txt-link-rfc2396E" href="mailto:kenneth@whitecape.org"><kenneth@whitecape.org></a>
</pre>
</blockquote>
<br>
</body>
</html>