summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2015-10-06 15:04:42 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2015-10-06 15:04:42 (GMT)
commitc7881f1311665010dcf5da4bab4d7a5f3b0ca631 (patch)
treeb7d2fe003ea8c9f3e2e11a1cead2d37800e737b3
parent47a8d3de4e7b782b904446dcfe4897a631764254 (diff)
downloadtk-c7881f1311665010dcf5da4bab4d7a5f3b0ca631.zip
tk-c7881f1311665010dcf5da4bab4d7a5f3b0ca631.tar.gz
tk-c7881f1311665010dcf5da4bab4d7a5f3b0ca631.tar.bz2
Link with userenv.lib, because it is now needed by Tcl.
-rwxr-xr-xwin/configure4
-rw-r--r--win/makefile.vc2
-rw-r--r--win/tcl.m44
3 files changed, 5 insertions, 5 deletions
diff --git a/win/configure b/win/configure
index 8671721..64aea44 100755
--- a/win/configure
+++ b/win/configure
@@ -3736,7 +3736,7 @@ echo $ECHO_N "checking compiler flags... $ECHO_C" >&6
if test "${GCC}" = "yes" ; then
SHLIB_LD=""
SHLIB_LD_LIBS='${LIBS}'
- LIBS="-lnetapi32 -lkernel32 -luser32 -ladvapi32 -lws2_32"
+ LIBS="-lnetapi32 -lkernel32 -luser32 -ladvapi32 -luserenv -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'
@@ -3952,7 +3952,7 @@ echo "${ECHO_T} Using 64-bit $MACHINE mode" >&6
fi
fi
- LIBS="netapi32.lib kernel32.lib user32.lib advapi32.lib ws2_32.lib"
+ LIBS="netapi32.lib kernel32.lib user32.lib advapi32.lib userenv.lib ws2_32.lib"
case "x`echo \${VisualStudioVersion}`" in
x1[4-9]*)
diff --git a/win/makefile.vc b/win/makefile.vc
index 1b55cdf..ae43eb6 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -523,7 +523,7 @@ guilflags = $(lflags) -subsystem:windows
tcllibs = $(TCLSTUBLIB) $(TCLIMPLIB)
-baselibs = netapi32.lib kernel32.lib user32.lib advapi32.lib ws2_32.lib
+baselibs = netapi32.lib kernel32.lib user32.lib advapi32.lib userenv.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 80a5086..db86f6c 100644
--- a/win/tcl.m4
+++ b/win/tcl.m4
@@ -673,7 +673,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
if test "${GCC}" = "yes" ; then
SHLIB_LD=""
SHLIB_LD_LIBS='${LIBS}'
- LIBS="-lnetapi32 -lkernel32 -luser32 -ladvapi32 -lws2_32"
+ LIBS="-lnetapi32 -lkernel32 -luser32 -ladvapi32 -luserenv -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'
@@ -834,7 +834,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
fi
fi
- LIBS="netapi32.lib kernel32.lib user32.lib advapi32.lib ws2_32.lib"
+ LIBS="netapi32.lib kernel32.lib user32.lib advapi32.lib userenv.lib ws2_32.lib"
case "x`echo \${VisualStudioVersion}`" in
x1[[4-9]]*)