diff options
| author | hobbs <hobbs> | 2010-08-27 00:21:45 (GMT) |
|---|---|---|
| committer | hobbs <hobbs> | 2010-08-27 00:21:45 (GMT) |
| commit | 77f1040bfa885893472f496ec67b4dff85cb1da4 (patch) | |
| tree | 89b762704d6b179591b4ffacbea7975c1e55f3c9 /win/configure.in | |
| parent | 5330b2a031728d95041878980cef0a82fc7d8e0c (diff) | |
| download | tk-77f1040bfa885893472f496ec67b4dff85cb1da4.zip tk-77f1040bfa885893472f496ec67b4dff85cb1da4.tar.gz tk-77f1040bfa885893472f496ec67b4dff85cb1da4.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.in | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/win/configure.in b/win/configure.in index 7bb2ffd..5fa1c7a 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.77.2.13 2010/08/04 17:06:53 dgp Exp $ +# RCS: @(#) $Id: configure.in,v 1.77.2.14 2010/08/27 00:21:45 hobbs Exp $ AC_INIT(../generic/tk.h) AC_PREREQ(2.59) @@ -158,6 +158,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. #-------------------------------------------------------------------- |