[Mesa-dev] [PATCH 1/9] automake: require shared glapi when using DRI based libGL

[Emil Velikov]

From: Emil Velikov <emil.velikov at collabora.com>

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

Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
---
 configure.ac        | 2 ++
 src/glx/Makefile.am | 5 +----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 8a9172690a8..401a5f21d01 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1635,6 +1635,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 5233257fb40..8f9d80c9f41 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 = \
-- 
2.16.0