Mesa (master): gallium/osmesa: link against static libglapi library too to get the gl exports

[Maarten Lankhorst]

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

Author: Maarten Lankhorst <maarten.lankhorst at canonical.com>
Date:   Tue Aug 20 10:44:53 2013 +0200

gallium/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.

I could swear I've done this before, maybe there was a glitch in the matrix.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=47824
Cc: "9.2" <mesa-stable at lists.freedesktop.org>
Signed-off-by: Maarten Lankhorst <maarten.lankhorst at canonical.com>

---

 src/gallium/targets/osmesa/Makefile.am |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/gallium/targets/osmesa/Makefile.am b/src/gallium/targets/osmesa/Makefile.am
index e187a47..38dbeb8 100644
--- a/src/gallium/targets/osmesa/Makefile.am
+++ b/src/gallium/targets/osmesa/Makefile.am
@@ -40,10 +40,9 @@ lib at OSMESA_LIB@_la_SOURCES = target.c
 
 lib at 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 at OSMESA_LIB@_la_LIBADD = \