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@lists.freedesktop.org>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>

diff --git a/configure.ac b/configure.ac
index 0d67a3499a52faa1798927e228f4fe0b6b26f4d4..e859ae37237773e0c84286362c176bfbd70610c6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1659,6 +1659,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 5233257fb401d2bdcbf59854ecdd389982911191..8f9d80c9f415e282c739f30ab7ba9677da73d621 100644 (file)
--- 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 = \