fix for [Bug 3280043]: win2k: unresolved DLL imports

4 files changed, 90 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 6c5a31c..a44ee50 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-04-08  Jan Nijtmans  <nijtmans@users.sf.net>
+
+	* win/tclWinPort.h: fix for [Bug 3280043]: win2k: unresolved DLL imports
+	* win/configure.in
+	* win/configure
+
 2011-04-06  Miguel Sofer  <msofer@users.sf.net>
 
 	* generic/tclExecute.c (TclCompileObj): earlier return if Tip280
diff --git a/win/configure b/win/configure
index d1d50e2..c3969fa 100755
--- a/win/configure
+++ b/win/configure
@@ -3700,6 +3700,72 @@ _ACEOF
 
 fi
 
+# See if the <wspiapi.h> header file is present
+
+echo "$as_me:$LINENO: checking for wspiapi.h" >&5
+echo $ECHO_N "checking for wspiapi.h... $ECHO_C" >&6
+if test "${tcl_have_wspiapi_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#include <wspiapi.h>
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  tcl_have_wspiapi_h=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+tcl_have_wspiapi_h=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+echo "$as_me:$LINENO: result: $tcl_have_wspiapi_h" >&5
+echo "${ECHO_T}$tcl_have_wspiapi_h" >&6
+if test "tcl_have_wspiapi_h" = "yes"; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_WSPIAPI_H 1
+_ACEOF
+
+fi
+
 #--------------------------------------------------------------------
 # Determines the correct binary file extension (.o, .obj, .exe etc.)
 #--------------------------------------------------------------------
diff --git a/win/configure.in b/win/configure.in
index 4e9f2db..b286537 100644
--- a/win/configure.in
+++ b/win/configure.in
@@ -291,6 +291,21 @@ if test "$tcl_cv_intrinsics" = "yes"; then
             [Defined when the compilers supports intrinsics])
 fi
 
+# See if the <wspiapi.h> header file is present    
+
+AC_CACHE_CHECK(for wspiapi.h,
+    tcl_have_wspiapi_h,
+AC_TRY_COMPILE([
+#include <wspiapi.h>
+], [],
+        tcl_have_wspiapi_h=yes,
+        tcl_have_wspiapi_h=no)
+)
+if test "tcl_have_wspiapi_h" = "yes"; then
+    AC_DEFINE(HAVE_WSPIAPI_H, 1,
+            [Defined when wspiapi.h exists])
+fi
+
 #--------------------------------------------------------------------
 # Determines the correct binary file extension (.o, .obj, .exe etc.)
 #--------------------------------------------------------------------
diff --git a/win/tclWinPort.h b/win/tclWinPort.h
index e60ff2c..f7e16a2 100644
--- a/win/tclWinPort.h
+++ b/win/tclWinPort.h
@@ -37,6 +37,9 @@
 #define INCL_WINSOCK_API_TYPEDEFS   1
 #include <winsock2.h>
 #include <ws2tcpip.h>
+#ifdef HAVE_WSPIAPI_H
+#   include <wspiapi.h>
+#endif
 
 #ifdef CHECK_UNICODE_CALLS
 #   define _UNICODE