Mesa (staging/18.2): automake: require shared glapi when using DRI based libGL

[GitLab Mirror]

Module: Mesa
Branch: staging/18.2
Commit: f0ae95492ad4def099acd16c712192d61f597fea
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f0ae95492ad4def099acd16c712192d61f597fea

Author: Emil Velikov <emil.velikov at collabora.com>
Date:   Fri Feb 23 19:32:00 2018 +0000

automake: require shared glapi when using DRI based libGL

This has been a requirement for ages, yet it seems like we never
explicitly errored out during configure.

CC: <mesa-stable at lists.freedesktop.org>
Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
Reviewed-by: Adam Jackson <ajax at redhat.com>
(cherry picked from commit a7ea7511ba76c0a83eec84dfc9c14c82b5c82dc4)

---

 configure.ac        | 2 ++
 src/glx/Makefile.am | 5 +----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index ffb8424a07..8937d23823 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1658,6 +1658,8 @@ xxlib | xgallium-xlib)
 xdri)
     # DRI-based GLX
 
+    require_dri_shared_libs_and_glapi "GLX"
+
     # find the DRI deps for libGL
     dri_modules="x11 xext xdamage >= $XDAMAGE_REQUIRED xfixes x11-xcb xcb xcb-glx >= $XCBGLX_REQUIRED"
 
diff --git a/src/glx/Makefile.am b/src/glx/Makefile.am
index 5233257fb4..8f9d80c9f4 100644
--- a/src/glx/Makefile.am
+++ b/src/glx/Makefile.am
@@ -19,9 +19,6 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
 
-if HAVE_SHARED_GLAPI
-SHARED_GLAPI_LIB = $(top_builddir)/src/mapi/shared-glapi/libglapi.la
-endif
 
 SUBDIRS =
 
@@ -181,7 +178,7 @@ GL_LIBS = \
 	$(LIBDRM_LIBS) \
 	libglx.la \
 	$(top_builddir)/src/mapi/glapi/libglapi.la \
-	$(SHARED_GLAPI_LIB) \
+	$(top_builddir)/src/mapi/shared-glapi/libglapi.la \
 	$(GL_LIB_DEPS)
 
 GL_LDFLAGS = \