diff options
| author | Emil Velikov <emil.velikov@collabora.com> | 2018-02-23 19:32:00 +0000 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2018-08-08 13:37:09 +0100 |
| commit | a7ea7511ba76c0a83eec84dfc9c14c82b5c82dc4 (patch) | |
| tree | 19088a1786072c90072306349a4df00f4591ea29 | |
| parent | 834036500c1b4fcc5550ff5d4ccabc872e5a868c (diff) | |
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>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/glx/Makefile.am | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 0d67a3499a5..e859ae37237 100644 --- 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 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 = \ |