Mesa (master): gallium/state_trackers/egl: use X11_INCLUDES rather than X11_CFLAGS

Gaetan Nadon gnadon at kemper.freedesktop.org
Wed Oct 9 14:44:33 UTC 2013


Module: Mesa
Branch: master
Commit: d901d7e08e355183c44a6cce54f823a26252acf3
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d901d7e08e355183c44a6cce54f823a26252acf3

Author: Gaetan Nadon <memsize at videotron.ca>
Date:   Thu Sep 19 14:55:20 2013 -0400

gallium/state_trackers/egl: use X11_INCLUDES rather than X11_CFLAGS

The X11_CFLAGS variable is undefined (not defined in config.status).
It appears the intent was to use X11_INCLUDES defined in configure.ac.
It is used for building the code in the x11 subdir.

The build does not fail on this one as LIBDRM_CFLAGS happens to have
the inludedir value as the one for X11. It will not always be the case.
The option --enable-gallium-egl is required durimg configuration.

Acked-by: Brian Paul <brianp at vmware.com>
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>

---

 src/gallium/state_trackers/egl/Makefile.am |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/gallium/state_trackers/egl/Makefile.am b/src/gallium/state_trackers/egl/Makefile.am
index 1d84d61..da360bb 100644
--- a/src/gallium/state_trackers/egl/Makefile.am
+++ b/src/gallium/state_trackers/egl/Makefile.am
@@ -37,7 +37,7 @@ libegl_la_SOURCES = $(common_SOURCES)
 if HAVE_EGL_PLATFORM_X11
 libegl_la_SOURCES += $(x11_SOURCES) $(x11_drm_SOURCES)
 AM_CFLAGS += \
-	$(X11_CFLAGS) \
+	$(X11_INCLUDES) \
 	$(LIBDRM_CFLAGS) \
 	$(DRI2PROTO_CFLAGS)
 AM_CPPFLAGS += \




More information about the mesa-commit mailing list