gallium/dri: remove unneeded HAVE_SHARED_GLAPI guard
authorEmil Velikov <emil.velikov@collabora.com>
Thu, 13 Apr 2017 15:12:02 +0000 (16:12 +0100)
committerEmil Velikov <emil.l.velikov@gmail.com>
Thu, 4 May 2017 17:11:40 +0000 (18:11 +0100)
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>
src/gallium/targets/dri/Makefile.am

index 8363406c5811108c0eb7b227d6b364ba936e6cda..e61df81228e4f465d21e7c8c8b26b2a752e18372 100644 (file)
@@ -1,9 +1,5 @@
 include $(top_srcdir)/src/gallium/Automake.inc
 
-if HAVE_SHARED_GLAPI
-SHARED_GLAPI_LIB = $(top_builddir)/src/mapi/shared-glapi/libglapi.la
-endif
-
 AM_CFLAGS = \
        -I$(top_srcdir)/src/mapi \
        -I$(top_srcdir)/src/mesa \
@@ -55,7 +51,7 @@ gallium_dri_la_LIBADD = \
        $(top_builddir)/src/gallium/drivers/noop/libnoop.la \
        $(top_builddir)/src/gallium/drivers/rbug/librbug.la \
        $(top_builddir)/src/gallium/drivers/trace/libtrace.la \
-       $(SHARED_GLAPI_LIB) \
+       $(top_builddir)/src/mapi/shared-glapi/libglapi.la \
        $(SELINUX_LIBS) \
        $(EXPAT_LIBS) \
        $(LIBDRM_LIBS) \