xserver: Branch 'master'

[Adam Jackson]

 hw/vfb/Makefile.am |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 8ac0e05cc6c6e87b223ba7cb31d8856771c5d41a
Author: Adam Jackson <ajax at redhat.com>
Date:   Wed Mar 23 14:42:08 2016 -0400

    vfb: Re-add LD_EXPORT_SYMBOLS_FLAG to LDFLAGS
    
    Accidentally removed, breaks Xvfb on cygwin.
    
    Reviewed-by: Yaakov Selkowitz <yselkowitz at users.sourceforge.net>
    Signed-off-by: Adam Jackson <ajax at redhat.com>

diff --git a/hw/vfb/Makefile.am b/hw/vfb/Makefile.am
index c9ac35e..f0f9fee 100644
--- a/hw/vfb/Makefile.am
+++ b/hw/vfb/Makefile.am
@@ -21,6 +21,7 @@ XVFB_LIBS = \
 
 Xvfb_LDADD = $(XVFB_LIBS) $(XVFB_SYS_LIBS) $(XSERVER_SYS_LIBS)
 Xvfb_DEPENDENCIES = $(XVFB_LIBS)
+Xvfb_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
 
 relink:
 	$(AM_V_at)rm -f Xvfb$(EXEEXT) && $(MAKE) Xvfb$(EXEEXT)