summaryrefslogtreecommitdiffstats
path: root/win/tcl.m4
diff options
context:
space:
mode:
authorandreas_kupries <akupries@shaw.ca>2010-08-31 20:47:32 (GMT)
committerandreas_kupries <akupries@shaw.ca>2010-08-31 20:47:32 (GMT)
commitb84640d55124b4ed822ec8fdcb35b4c3d45eec9f (patch)
tree609c044100685b4b46196851c3a9b99e163f7be4 /win/tcl.m4
parent21cfeef11470f8dddcaa9436870975b7960d259e (diff)
downloadtk-b84640d55124b4ed822ec8fdcb35b4c3d45eec9f.zip
tk-b84640d55124b4ed822ec8fdcb35b4c3d45eec9f.tar.gz
tk-b84640d55124b4ed822ec8fdcb35b4c3d45eec9f.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)"