---------------------
PatchSet 5556 
Date: 2002/12/14 22:04:46
Author: serassio
Branch: nt-2_5
Tag: (none) 
Log:
A better winsock check in configure

Members: 
	configure.in:1.42.2.5.4.32->1.42.2.5.4.33 

Index: squid/configure.in
===================================================================
RCS file: /cvsroot/squid-sf//squid/configure.in,v
retrieving revision 1.42.2.5.4.32
retrieving revision 1.42.2.5.4.33
diff -u -r1.42.2.5.4.32 -r1.42.2.5.4.33
--- squid/configure.in	23 Nov 2002 14:52:46 -0000	1.42.2.5.4.32
+++ squid/configure.in	14 Dec 2002 22:04:46 -0000	1.42.2.5.4.33
@@ -3,7 +3,7 @@
 dnl
 dnl  Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.9)
 dnl
-dnl  $Id: configure.in,v 1.42.2.5.4.32 2002/11/23 14:52:46 serassio Exp $
+dnl  $Id: configure.in,v 1.42.2.5.4.33 2002/12/14 22:04:46 serassio Exp $
 dnl
 dnl
 dnl
@@ -11,7 +11,7 @@
 AC_CONFIG_AUX_DIR(cfgaux)
 AM_INIT_AUTOMAKE(squid, 2.5.STABLE1.NT-CVS)
 AM_CONFIG_HEADER(include/autoconf.h)
-AC_REVISION($Revision: 1.42.2.5.4.32 $)dnl
+AC_REVISION($Revision: 1.42.2.5.4.33 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AM_MAINTAINER_MODE
 
@@ -1313,6 +1313,7 @@
 case "$host_os" in
   mingw|mingw32)
     AC_DEFINE(HAVE_STRUCT_RUSAGE)
+    ac_cv_func_getrusage='yes'
     echo "Using own rusage."
     ;;
   *)      
@@ -1464,11 +1465,36 @@
 dnl Check for needed libraries
 AC_CHECK_LIB(nsl, main)
 AC_CHECK_LIB(socket, main)
-AC_CHECK_LIB(ws2_32, WSAGetLastError)
+AC_MSG_CHECKING(for winsock)
+save_LIBS="$LIBS"
+for curlib in ws2_32 wsock32; do
+	LIBS="$LIBS -l$curlib"
+	AC_TRY_LINK([
+			char __attribute__((stdcall)) socket(int,int,int);
+			char __attribute__((stdcall)) select(int,int,int,int,int);
+			char __attribute__((stdcall)) closesocket(int);
+			char __attribute__((stdcall)) gethostname(int,int);
+			],
+			[
+			socket(1,2,3);
+			select(1,2,3,4,5);
+			closesocket(1);
+			gethostname(1,2);
+			],
+			have_winsock=yes, have_winsock=no)
+
+	if test $have_winsock = yes; then
+		ac_cv_func_select='yes'
+		if test $curlib = ws2_32; then
+			have_winsock=winsock2
+		fi
+		break
+	fi
+	LIBS="$save_LIBS"
+done
+AC_MSG_RESULT($have_winsock)
 case "$host_os" in
   mingw|mingw32)
-    echo "Using WIN32 Winsock 2 library."
-    LIBS="$LIBS -lws2_32"
     echo "Using own getopt."
     AC_LIBOBJ(getopt)
     ;;
@@ -1700,8 +1726,6 @@
 case "$host_os" in
 mingw|mingw32)
 	ac_cv_func_crypt='yes'
-	ac_cv_func_getrusage='yes'
-	ac_cv_func_select='yes'
 	ac_cv_func_statfs='yes'
 	;;
 esac