From 3186d33ae975c967ad7ec31cc763e9c47d5c4e22 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Thu, 13 Apr 2017 16:37:44 +0100 Subject: [PATCH] mesa/dri: remove unneeded HAVE_SHARED_GLAPI guard MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Nicolai Hähnle --- src/mesa/drivers/dri/Makefile.am | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) 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) \ $() -- 2.30.2