From: Emil Velikov <emil.velikov@collabora.com>
Date: Thu, 13 Apr 2017 15:37:44 +0000 (+0100)
Subject: mesa/dri: remove unneeded HAVE_SHARED_GLAPI guard
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3186d33ae975c967ad7ec31cc763e9c47d5c4e22;p=mesa.git

mesa/dri: remove unneeded HAVE_SHARED_GLAPI guard

Always true, since the dri modules required shared glapi.

With earlier commit (da410e6afad "configure: explicitly require shared
glapi for enable-dri") we even made that explicit during the configure
stage.

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
---

diff --git a/src/mesa/drivers/dri/Makefile.am b/src/mesa/drivers/dri/Makefile.am
index fb0fc3258bf..381c6a20b72 100644
--- a/src/mesa/drivers/dri/Makefile.am
+++ b/src/mesa/drivers/dri/Makefile.am
@@ -6,10 +6,6 @@ MEGADRIVERS_DEPS =
 
 SUBDIRS+=common
 
-if HAVE_SHARED_GLAPI
-SHARED_GLAPI_LIB = $(top_builddir)/src/mapi/shared-glapi/libglapi.la
-endif
-
 if HAVE_I915_DRI
 SUBDIRS += i915
 MEGADRIVERS_DEPS += i915/libi915_dri.la
@@ -70,7 +66,7 @@ mesa_dri_drivers_la_LIBADD = \
         common/libmegadriver_stub.la \
         common/libdricommon.la \
         common/libxmlconfig.la \
-        $(SHARED_GLAPI_LIB) \
+        $(top_builddir)/src/mapi/shared-glapi/libglapi.la \
         $(MEGADRIVERS_DEPS) \
         $(DRI_LIB_DEPS) \
         $()