From 7af9b96ae8af965228ce6e968abc3291e2486de2 Mon Sep 17 00:00:00 2001
From: nijtmans <nijtmans>
Date: Mon, 11 Oct 2010 12:27:32 +0000
Subject: Add netapi32 to the windows link line

---
 ChangeLog       | 6 ++++++
 win/configure   | 4 ++--
 win/makefile.vc | 4 ++--
 win/tcl.m4      | 4 ++--
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 11149d7..58d8625 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-10-11  Jan Nijtmans  <nijtmans@users.sf.net>
+
+	* win/tcl.m4          Add netapi32 to the link line, so we no longer
+	* win/makefile.vc     have to use LoadLibrary to access those functions.
+	* win/configure
+
 2010-10-06  Jan Nijtmans  <nijtmans@users.sf.net>
 
 	* win/tkWinClipboard.c: [FRQ 2965056]: Windows build with
diff --git a/win/configure b/win/configure
index dbef146..5ef96d9 100755
--- a/win/configure
+++ b/win/configure
@@ -3287,7 +3287,7 @@ echo "$as_me: WARNING: 64bit mode not supported with GCC on Windows" >&2;}
 	fi
 	SHLIB_LD=""
 	SHLIB_LD_LIBS='${LIBS}'
-	LIBS="-lkernel32 -luser32 -ladvapi32 -lws2_32"
+	LIBS="-lnetapi32 -lkernel32 -luser32 -ladvapi32 -lws2_32"
 	# mingw needs to link ole32 and oleaut32 for [send], but MSVC doesn't
 	LIBS_GUI="-lgdi32 -lcomdlg32 -limm32 -lcomctl32 -lshell32 -luuid -lole32 -loleaut32"
 	STLIB_LD='${AR} cr'
@@ -3449,7 +3449,7 @@ echo "${ECHO_T}   Using 64-bit $MACHINE mode" >&6
 	    fi
 	fi
 
-	LIBS="kernel32.lib user32.lib advapi32.lib ws2_32.lib"
+	LIBS="netapi32.lib kernel32.lib user32.lib advapi32.lib ws2_32.lib"
 	if test "$do64bit" != "no" ; then
 	    # The space-based-path will work for the Makefile, but will
 	    # not work if AC_TRY_COMPILE is called.  TEA has the
diff --git a/win/makefile.vc b/win/makefile.vc
index 5f90d96..7cc2423 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -13,7 +13,7 @@
 # Copyright (c) 2003-2008 Pat Thoyts.
 #
 #------------------------------------------------------------------------------
-# RCS: @(#) $Id: makefile.vc,v 1.131 2010/09/09 14:59:24 nijtmans Exp $
+# RCS: @(#) $Id: makefile.vc,v 1.132 2010/10/11 12:27:32 nijtmans Exp $
 #------------------------------------------------------------------------------
 
 # Check to see we are configured to build with MSVC (MSDEVDIR or MSVCDIR)
@@ -521,7 +521,7 @@ tcllibs    = $(TCLIMPLIB)
 tcllibs    = $(TCLSTUBLIB) $(tcllibs)
 !endif
 
-baselibs   = kernel32.lib user32.lib advapi32.lib ws2_32.lib
+baselibs   = netapi32.lib kernel32.lib user32.lib advapi32.lib ws2_32.lib
 # Avoid 'unresolved external symbol __security_cookie' errors.
 # c.f. http://support.microsoft.com/?id=894573
 !if "$(MACHINE)" == "IA64" || "$(MACHINE)" == "AMD64"
diff --git a/win/tcl.m4 b/win/tcl.m4
index 20845c0..ff07c34 100644
--- a/win/tcl.m4
+++ b/win/tcl.m4
@@ -463,7 +463,7 @@ file for information about building with Mingw.])
 	fi
 	SHLIB_LD=""
 	SHLIB_LD_LIBS='${LIBS}'
-	LIBS="-lkernel32 -luser32 -ladvapi32 -lws2_32"
+	LIBS="-lnetapi32 -lkernel32 -luser32 -ladvapi32 -lws2_32"
 	# mingw needs to link ole32 and oleaut32 for [send], but MSVC doesn't
 	LIBS_GUI="-lgdi32 -lcomdlg32 -limm32 -lcomctl32 -lshell32 -luuid -lole32 -loleaut32"
 	STLIB_LD='${AR} cr'
@@ -615,7 +615,7 @@ file for information about building with Mingw.])
 	    fi
 	fi
 
-	LIBS="kernel32.lib user32.lib advapi32.lib ws2_32.lib"
+	LIBS="netapi32.lib kernel32.lib user32.lib advapi32.lib ws2_32.lib"
 	if test "$do64bit" != "no" ; then
 	    # The space-based-path will work for the Makefile, but will
 	    # not work if AC_TRY_COMPILE is called.  TEA has the
-- 
cgit v0.12