summaryrefslogtreecommitdiffstats
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
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.
-rw-r--r--ChangeLog6
-rwxr-xr-xwin/configure6
-rw-r--r--win/tcl.m46
3 files changed, 14 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 8205243..c3b1b79 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-08-31 Andreas Kupries <andreask@activestate.com>
+
+ * win/tcl.m4: Applied patch by Jeff fixing issues with the
+ manifest handling on Win64.
+ * win/configure: Regenerated.
+
2010-08-30 Miguel Sofer <msofer@users.sf.net>
* generic/tclBasic.c: New implementation for [tailcall]:
* generic/tclCmdAH.c: it now schedules the command and returns
diff --git a/win/configure b/win/configure
index f64d1ec..5d4614e 100755
--- a/win/configure
+++ b/win/configure
@@ -4478,8 +4478,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 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)"