Mesa (9.0): build: Link OSMesa with glapi, libdl, libstdc++

[Matt Turner]

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

Author: Matt Turner <mattst88 at gmail.com>
Date:   Thu Sep 27 13:56:27 2012 -0700

build: Link OSMesa with glapi, libdl, libstdc++
(cherry picked from commit 1762ec28db4bfb85eeb6e61377839a3889f77216)

Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=399813
          https://bugs.freedesktop.org/show_bug.cgi?id=53179

---

 src/mesa/drivers/osmesa/Makefile.am |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/mesa/drivers/osmesa/Makefile.am b/src/mesa/drivers/osmesa/Makefile.am
index 6d087f2..21b8dfb 100644
--- a/src/mesa/drivers/osmesa/Makefile.am
+++ b/src/mesa/drivers/osmesa/Makefile.am
@@ -21,24 +21,31 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
 
-# Hack to make some of the non-automake variables work.
-TOP=$(top_builddir)
-
-AM_CFLAGS = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir)/include \
 	-I$(top_srcdir)/src/mapi \
 	-I$(top_srcdir)/src/mesa/ \
 	$(DEFINES) \
 	$(API_DEFINES)
+AM_CFLAGS = $(PTHREAD_CFLAGS)
+AM_CXXFLAGS = $(PTHREAD_CFLAGS)
 
 lib_LTLIBRARIES = lib at OSMESA_LIB@.la
 
+nodist_EXTRA_lib at OSMESA_LIB@_la_SOURCES = dummy.cpp
 lib at OSMESA_LIB@_la_SOURCES = osmesa.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
+endif
 lib at OSMESA_LIB@_la_LIBADD = \
 	$(top_builddir)/src/mesa/libmesa.la \
-	$(top_builddir)/src/mapi/glapi/libglapi.la
+	$(GLAPI_LIB) \
+	$(OSMESA_LIB_DEPS)
 
 if BUILD_SHARED
 # Provide compatibility with scripts for the old Mesa build system for