summaryrefslogtreecommitdiffstats
path: root/win/tcl.m4
diff options
context:
space:
mode:
authorandreas_kupries <akupries@shaw.ca>2010-08-31 20:46:55 (GMT)
committerandreas_kupries <akupries@shaw.ca>2010-08-31 20:46:55 (GMT)
commitf97a6571a6db13315c2b0767b1d178cd3330c4c3 (patch)
tree3ab828fc4d4963bcc7d51bc0e8290a3b065e5cd0 /win/tcl.m4
parent2af0652a1208ff8714ab22a714c0b7e78eb15569 (diff)
downloadtcl-f97a6571a6db13315c2b0767b1d178cd3330c4c3.zip
tcl-f97a6571a6db13315c2b0767b1d178cd3330c4c3.tar.gz
tcl-f97a6571a6db13315c2b0767b1d178cd3330c4c3.tar.bz2
* win/tcl.m4: Applied patch by Jeff fixing issues with the
manifest handling on Win64. * win/configure: Regenerated.
Diffstat (limited to 'win/tcl.m4')
-rw-r--r--win/tcl.m46
1 files changed, 4 insertions, 2 deletions
diff --git a/win/tcl.m4 b/win/tcl.m4
index f673921..33762cf 100644
--- a/win/tcl.m4
+++ b/win/tcl.m4
@@ -962,8 +962,10 @@ print("manifest needed")
# Could add 'if test -f' check, but manifest should be created
# in this compiler case
# Add in a manifest argument that may be specified
- VC_MANIFEST_EMBED_DLL="mt.exe -nologo -manifest \[$]@.manifest $1 -outputresource:\[$]@\;2"
- VC_MANIFEST_EMBED_EXE="mt.exe -nologo -manifest \[$]@.manifest $1 -outputresource:\[$]@\;1"
+ # XXX Needs improvement so that the test for existence accounts
+ # XXX for a provided (known) manifest
+ VC_MANIFEST_EMBED_DLL="if test -f \[$]@.manifest ; then mt.exe -nologo -manifest \[$]@.manifest $1 -outputresource:\[$]@\;2 ; fi"
+ VC_MANIFEST_EMBED_EXE="if test -f \[$]@.manifest ; then mt.exe -nologo -manifest \[$]@.manifest $1 -outputresource:\[$]@\;1 ; fi"
result=yes
if test "x$1" != x ; then
result="yes ($1)"