summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authorandreas_kupries <akupries@shaw.ca>2010-08-31 20:46:41 (GMT)
committerandreas_kupries <akupries@shaw.ca>2010-08-31 20:46:41 (GMT)
commit3a715c060e723e5cfd9d6e9d5a263533a16bc0c0 (patch)
tree22169aa832c36671af89fbbb5f529014d517b161 /win
parent225338c9eea5fdc1c3dfe89aadd957ade48e8c3c (diff)
downloadtcl-3a715c060e723e5cfd9d6e9d5a263533a16bc0c0.zip
tcl-3a715c060e723e5cfd9d6e9d5a263533a16bc0c0.tar.gz
tcl-3a715c060e723e5cfd9d6e9d5a263533a16bc0c0.tar.bz2
* win/tcl.m4: Applied patch by Jeff fixing issues with the
manifest handling on Win64. * win/configure: Regenerated.
Diffstat (limited to 'win')
-rwxr-xr-xwin/configure6
-rw-r--r--win/tcl.m46
2 files changed, 8 insertions, 4 deletions
diff --git a/win/configure b/win/configure
index aa0c5c0..f58e61d 100755
--- a/win/configure
+++ b/win/configure
@@ -4449,8 +4449,10 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
# 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 -outputresource:\$@\;2"
- VC_MANIFEST_EMBED_EXE="mt.exe -nologo -manifest \$@.manifest -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 -outputresource:\$@\;2 ; fi"
+ VC_MANIFEST_EMBED_EXE="if test -f \$@.manifest ; then mt.exe -nologo -manifest \$@.manifest -outputresource:\$@\;1 ; fi"
result=yes
if test "x" != x ; then
result="yes ()"
diff --git a/win/tcl.m4 b/win/tcl.m4
index cd9a36e..8877181 100644
--- a/win/tcl.m4
+++ b/win/tcl.m4
@@ -960,8 +960,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)"