xserver: Branch 'master'

[Jon TURNEY]

 hw/xwin/Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f6f97419bd2db651384ecaec0b296840810463a4
Author: Jon TURNEY <jon.turney at dronecode.org.uk>
Date:   Mon Jan 5 18:35:52 2009 +0000

    Cygwin/X: Add -static back to linker flags
    
    Add -static back to linker flags to avoid screwing things up for
    people who don't know that they need to avoid dynamically linking
    with libXfont, as weak symbol handling requires static linking to
    work correctly on Cygwin...

diff --git a/hw/xwin/Makefile.am b/hw/xwin/Makefile.am
index fd2aa77..504c2a6 100644
--- a/hw/xwin/Makefile.am
+++ b/hw/xwin/Makefile.am
@@ -152,7 +152,7 @@ XWin_LDADD = $(XWIN_LIBS) $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) $(XWIN_SYS_LIBS)
 .rc.o:
 	$(WINDRES) --use-temp-file -i $< --input-format=rc -o $@ -O coff -DPROJECT_NAME=\"$(VENDOR_NAME_SHORT)\"
 
-XWin_LDFLAGS = -mwindows
+XWin_LDFLAGS = -mwindows -static
 
 winprefsyacc.h: winprefsyacc.c
 winprefslex.c: winprefslex.l winprefsyacc.c winprefsyacc.h