aboutsummaryrefslogtreecommitdiff
path: root/libXdmcp
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2015-04-20 22:42:55 +0200
committermarha <marha@users.sourceforge.net>2015-04-20 22:42:55 +0200
commit934184bfecd402aae891b8740d788b486aa7269f (patch)
treec23fb0afd169dc6846ea23bda21260fcffd1e3e6 /libXdmcp
parent57dd848fb6dd7cf15820172e2abc9fb9de2b4268 (diff)
parent4ba9be2882d9f1567809edb0a31fcdf11320d41f (diff)
downloadvcxsrv-934184bfecd402aae891b8740d788b486aa7269f.tar.gz
vcxsrv-934184bfecd402aae891b8740d788b486aa7269f.tar.bz2
vcxsrv-934184bfecd402aae891b8740d788b486aa7269f.zip
Merge remote-tracking branch 'origin/released'
Conflicts: mesalib/src/mesa/main/.gitignore mesalib/src/mesa/main/dlopen.h xorg-server/hw/xwin/glx/gen_gl_wrappers.py xorg-server/hw/xwin/win.h xorg-server/hw/xwin/winengine.c xorg-server/hw/xwin/winglobals.c xorg-server/hw/xwin/winscrinit.c xorg-server/hw/xwin/winshaddd.c xorg-server/randr/rrxinerama.c
Diffstat (limited to 'libXdmcp')
-rw-r--r--libXdmcp/configure.ac8
1 files changed, 8 insertions, 0 deletions
diff --git a/libXdmcp/configure.ac b/libXdmcp/configure.ac
index 608bab99e..2288502ec 100644
--- a/libXdmcp/configure.ac
+++ b/libXdmcp/configure.ac
@@ -55,6 +55,14 @@ AC_PROG_LN_S
# Checks for libraries.
AC_SEARCH_LIBS([recvfrom],[socket])
+case $host_os in
+ *mingw*)
+ AC_CHECK_LIB([ws2_32],[main])
+ ;;
+ *)
+ ;;
+esac
+
# Checks for library functions.
AC_CHECK_LIB([bsd], [arc4random_buf])
AC_CHECK_FUNCS([srand48 lrand48 arc4random_buf])