[PATCH 1/2] Don't use -lws2_32 on Cygwin

Yaakov (Cygwin/X) yselkowitz at users.sourceforge.net
Thu Oct 15 13:25:57 PDT 2009


From: Yaakov Selkowitz <yselkowitz at users.sourceforge.net>

On Cygwin, both the (builtin) *NIX socket API and WinSock (via w32api) are
available, but they cannot be mixed.  We use *NIX APIs for everything else,
so we do not want to mix in WinSock here.

Signed-off-by: Yaakov Selkowitz <yselkowitz at users.sourceforge.net>
---
 xtrans.m4 |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/xtrans.m4 b/xtrans.m4
index f6bc2ea..b58081c 100644
--- a/xtrans.m4
+++ b/xtrans.m4
@@ -32,7 +32,9 @@ AC_DEFUN([XTRANS_TCP_FLAGS],[
  # SVR4 hides these in libraries other than libc
  AC_SEARCH_LIBS(socket, [socket])
  AC_SEARCH_LIBS(gethostbyname, [nsl])
- AC_HAVE_LIBRARY([ws2_32])
+ if test "$ac_cv_search_socket$ac_cv_search_gethostbyname" = "nono"; then
+   AC_HAVE_LIBRARY([ws2_32])
+ fi
 
  # Needs to come after above checks for libsocket & libnsl for SVR4 systems
  AC_ARG_ENABLE(ipv6, 
-- 
1.6.4.2



More information about the xorg-devel mailing list