xserver: Branch 'master'

[Jon TURNEY]

 configure.ac        |    1 +
 hw/xwin/Makefile.am |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 2ec0ac08addb938a3d5aa5b9888ce7c79a0daada
Author: Jon TURNEY <jon.turney at dronecode.org.uk>
Date:   Wed Dec 17 19:18:38 2008 +0000

    Cygwin/X: Fix some remaining build issues
    
    Fixes for a few remaining build issues, omitted from commmit 6e85a8304b50c0bfd16a400a05d257f0168fb99b in error
    
    Provide VENDOR_RELEASE in XORG_VERSION_CURRENT for XWin
    Remove -static from linker flags for XWin
    
    Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>

diff --git a/configure.ac b/configure.ac
index c7ae5e0..9161cba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1544,6 +1544,7 @@ fi
 AC_MSG_RESULT([$XWIN])
 
 if test "x$XWIN" = xyes; then
+	AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version])
 	AC_CHECK_TOOL(WINDRES, windres)
 	case $host_os in
 		cygwin*)
diff --git a/hw/xwin/Makefile.am b/hw/xwin/Makefile.am
index 504c2a6..fd2aa77 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 -static
+XWin_LDFLAGS = -mwindows
 
 winprefsyacc.h: winprefsyacc.c
 winprefslex.c: winprefslex.l winprefsyacc.c winprefsyacc.h