From 8587bbd85adaa92a429257a7b6f75e60f56cd603 Mon Sep 17 00:00:00 2001 From: Olivier Fourdan Date: Wed, 31 Jul 2019 09:25:09 +0200 Subject: [PATCH] xwayland: Fix build without glamor When building Xwayland without glamor support enabled using automake, the build would fail at link time trying to find `glamor_block_handler`: /usr/bin/ld: xwayland-glx.o: in function `egl_drawable_wait_x': hw/xwayland/xwayland-glx.c:102: undefined reference to `glamor_block_handler' Make sure we don't try to build `xwayland-glx.c` without glamor in the Xwayland Makefile. Note: Meson build is fine because it's already build only with glamor enabled. Fixes: commit 8469241 - "xwayland: Add EGL-backed GLX provider" Signed-off-by: Olivier Fourdan --- hw/xwayland/Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hw/xwayland/Makefile.am b/hw/xwayland/Makefile.am index 282da58f9..7b7680738 100644 --- a/hw/xwayland/Makefile.am +++ b/hw/xwayland/Makefile.am @@ -21,13 +21,15 @@ Xwayland_SOURCES = \ $(top_srcdir)/Xi/stubs.c \ $(top_srcdir)/mi/miinitext.c +if GLAMOR if GLX Xwayland_SOURCES += \ xwayland-glx.c Xwayland_CFLAGS += \ -I$(top_srcdir)/glx GLXVND_LIB = $(top_builddir)/glx/libglxvnd.la -endif +endif #GLX +endif # GLAMOR Xwayland_LDADD = \ $(glamor_lib) \