summaryrefslogtreecommitdiff
path: root/glx
diff options
context:
space:
mode:
authorOlivier Fourdan <ofourdan@redhat.com>2020-10-27 16:33:55 +0100
committerOlivier Fourdan <fourdan@gmail.com>2020-11-09 09:38:46 +0000
commit899cebb76ab7754fea49f7babcd64a7e94052cc8 (patch)
tree081e1bf02048f2f169d57ac3311b1e3dfdbcb3f0 /glx
parent606ba7fc51e5420646f75c4e672fbe61eb7c7e6e (diff)
configure: Build hashtable for Xres and glvnd
With autoconf, hashtable support is built along with Xres support. Yet, glvnd also use it, so when disabling Xres from configure, the build will fail at link time because hashtable functions are not available. Untie the build of hashtable from Xres support, just like meson build does. Signed-off-by: Olivier Fourdan <ofourdan@redhat.com> Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1091
Diffstat (limited to 'glx')
-rw-r--r--glx/Makefile.am4
1 files changed, 3 insertions, 1 deletions
diff --git a/glx/Makefile.am b/glx/Makefile.am
index 0f652356d..8f19e9dc7 100644
--- a/glx/Makefile.am
+++ b/glx/Makefile.am
@@ -81,7 +81,7 @@ libglx_la_SOURCES = \
unpack.h \
xfont.c
-libglx_la_LIBADD = $(DLOPEN_LIBS)
+libglx_la_LIBADD = $(DLOPEN_LIBS) $(top_builddir)/Xext/libhashtable.la
libglxvnd_la_SOURCES = \
vndcmds.c \
@@ -90,4 +90,6 @@ libglxvnd_la_SOURCES = \
vndservervendor.h \
vndservervendor.c
+libglxvnd_la_LIBADD = $(top_builddir)/Xext/libhashtable.la
+
EXTRA_DIST = vnd_dispatch_stubs.c