osmesa: link against static libglapi library too to get the gl exports

This should fix missing symbols in a osmesa built against shared glapi
osmesa build. All opengl exports were missing that are defined in the
static glapi, so link against both to fix this.

This is a candidate for the stable series.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=47824
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>

diff --git a/src/mesa/drivers/osmesa/Makefile.am b/src/mesa/drivers/osmesa/Makefile.am
index 082c294a3ef45987a58e28dab641474248268d66..a1c0bb5b3e350e08f1c998620ffc799bc2f8a785 100644 (file)
--- a/src/mesa/drivers/osmesa/Makefile.am
+++ b/src/mesa/drivers/osmesa/Makefile.am
@@ -39,11 +39,11 @@ lib@OSMESA_LIB@_la_SOURCES = osmesa.c
 
 lib@OSMESA_LIB@_la_LDFLAGS = -module -version-number @OSMESA_VERSION@ -no-undefined
 
-if HAVE_SHARED_GLAPI
-GLAPI_LIB = $(top_builddir)/src/mapi/shared-glapi/libglapi.la
-else
 GLAPI_LIB = $(top_builddir)/src/mapi/glapi/libglapi.la
+if HAVE_SHARED_GLAPI
+GLAPI_LIB += $(top_builddir)/src/mapi/shared-glapi/libglapi.la
 endif
+
 lib@OSMESA_LIB@_la_LIBADD = \
        $(top_builddir)/src/mesa/libmesa.la \
        $(GLAPI_LIB) \