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>
This commit is contained in:
Maarten Lankhorst
2013-07-16 10:18:38 +02:00
parent 121ea0b38b
commit b20b2b6dc8
+3 -3
View File
@@ -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) \