Mesa (master): drivers/x11: fix the build against shared_glapi

[Emil Velikov]

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

Author: Emil Velikov <emil.l.velikov at gmail.com>
Date:   Fri Jun 19 17:28:25 2015 +0100

drivers/x11: fix the build against shared_glapi

Cc: Brian Paul <brianp at vmware.com>
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
Reviewed-by: Eric Anholt <eric at anholt.net>
Acked-by: Jose Fonseca <jfonseca at vmware.com>

---

 src/mesa/drivers/x11/Makefile.am |    7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/mesa/drivers/x11/Makefile.am b/src/mesa/drivers/x11/Makefile.am
index c0596f8..a8847e8 100644
--- a/src/mesa/drivers/x11/Makefile.am
+++ b/src/mesa/drivers/x11/Makefile.am
@@ -25,6 +25,11 @@
 
 EXTRA_DIST = SConscript
 
+if HAVE_SHARED_GLAPI
+SHARED_GLAPI_CFLAGS = -DGLX_SHARED_GLAPI
+SHARED_GLAPI_LIB = $(top_builddir)/src/mapi/shared-glapi/libglapi.la
+endif
+
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/include \
 	-I$(top_srcdir)/src/mapi \
@@ -34,6 +39,7 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/gallium/auxiliary \
 	-I$(top_srcdir)/src/mesa/main \
 	$(X11_INCLUDES) \
+	$(SHARED_GLAPI_CFLAGS) \
 	$(DEFINES)
 
 if HAVE_X11_DRIVER
@@ -66,6 +72,7 @@ GL_PATCH = 0
 lib at GL_LIB@_la_LIBADD = \
 	$(top_builddir)/src/mesa/libmesa.la \
 	$(top_builddir)/src/mapi/glapi/libglapi.la \
+	$(SHARED_GLAPI_LIB) \
 	$(GL_LIB_DEPS)
 
 lib at GL_LIB@_la_LDFLAGS = \