From 1cc98f5a48924d750fbef7ea6b05a1ba49c28589 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Mon, 5 Nov 2012 07:36:16 +0100
Subject: xserver mesa xkbcomp git update 5 nov 2012

xserver: a194630f7f7b287cb4ea4a459df0745f4c0d4c1a
mesa: ccbfe3dde94cd50a4e6468cfeabf95c79c9d8072
xkbcomp: a68c5b7b29eb1433b1be73b50c4248e10eab8e64
---
 xorg-server/configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'xorg-server/configure.ac')

diff --git a/xorg-server/configure.ac b/xorg-server/configure.ac
index b6ed92cb3..86153ec81 100644
--- a/xorg-server/configure.ac
+++ b/xorg-server/configure.ac
@@ -420,7 +420,7 @@ case $host_os in
   darwin*)
 	AC_DEFINE(CSRG_BASED, 1, [System is BSD-like])
 	;;
-  cygwin*)
+  cygwin*|mingw*)
 	CFLAGS="$CFLAGS -DFD_SETSIZE=256"
 	;;
 esac
@@ -1904,7 +1904,7 @@ if test "x$XWIN" = xyes; then
 			XWIN_SERVER_NAME=Xming
 			AC_DEFINE(RELOCATE_PROJECTROOT,1,[Make PROJECT_ROOT relative to the xserver location])
 			AC_DEFINE(HAS_WINSOCK,1,[Use Windows sockets])
-			XWIN_SYS_LIBS=-lws2_32
+			XWIN_SYS_LIBS="-lpthread -lws2_32"
 			;;
 	esac
 
-- 
cgit v1.2.3