xserver: Branch 'master'

[Adam Jackson]

 hw/xquartz/mach-startup/Makefile.am |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 059879b3edb104014959426f953e1faf103d99ff
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Feb 26 13:58:26 2018 -0500

    xquartz: Fix linking with glxvnd
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>

diff --git a/hw/xquartz/mach-startup/Makefile.am b/hw/xquartz/mach-startup/Makefile.am
index 77962b14d..a0f9e9fe4 100644
--- a/hw/xquartz/mach-startup/Makefile.am
+++ b/hw/xquartz/mach-startup/Makefile.am
@@ -47,6 +47,7 @@ X11_bin_LDFLAGS =  \
 if GLX
 X11_bin_DEPENDENCIES += \
 	$(top_builddir)/hw/xquartz/GL/libCGLCore.la \
+	$(top_builddir)/glx/libglxvnd.la \
 	$(top_builddir)/glx/libglx.la
 
 X11_bin_LDFLAGS += \