summaryrefslogtreecommitdiffstats
path: root/win/configure.in
diff options
context:
space:
mode:
authorhobbs <hobbs>2010-08-27 00:57:50 (GMT)
committerhobbs <hobbs>2010-08-27 00:57:50 (GMT)
commitab4327494c1d007210ecb9fb27f6ed0a30e3b89b (patch)
treeca32af0f965ab0293e6fe039141a2ae983a8a6b9 /win/configure.in
parent6569ef8ed20b5e054726506b892bf2aafcc00e6d (diff)
downloadtk-ab4327494c1d007210ecb9fb27f6ed0a30e3b89b.zip
tk-ab4327494c1d007210ecb9fb27f6ed0a30e3b89b.tar.gz
tk-ab4327494c1d007210ecb9fb27f6ed0a30e3b89b.tar.bz2
* win/Makefile.in (VC_MANIFEST_EMBED_DLL VC_MANIFEST_EMBED_EXE):
* win/configure, win/configure.in, win/tcl.m4: SC_EMBED_MANIFEST macro and --enable-embedded-manifest configure arg added to support manifest embedding where we know the magic. Help prevents DLL hell with MSVC8+.
Diffstat (limited to 'win/configure.in')
-rw-r--r--win/configure.in8
1 files changed, 7 insertions, 1 deletions
diff --git a/win/configure.in b/win/configure.in
index 31e4743..6e2a630 100644
--- a/win/configure.in
+++ b/win/configure.in
@@ -3,7 +3,7 @@
# generate the file "configure", which is run during Tk installation
# to configure the system for the local environment.
#
-# RCS: @(#) $Id: configure.in,v 1.89 2010/05/03 16:30:15 dgp Exp $
+# RCS: @(#) $Id: configure.in,v 1.90 2010/08/27 00:57:50 hobbs Exp $
AC_INIT(../generic/tk.h)
AC_PREREQ(2.59)
@@ -144,6 +144,12 @@ SC_ENABLE_SYMBOLS
TK_DBGX=${DBGX}
#--------------------------------------------------------------------
+# Embed the manifest if we can determine how
+#--------------------------------------------------------------------
+
+SC_EMBED_MANIFEST(wish.exe.manifest)
+
+#--------------------------------------------------------------------
# Locate and source the tclConfig.sh file.
#--------------------------------------------------------------------