summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandreas_kupries <akupries@shaw.ca>2010-08-31 20:47:18 (GMT)
committerandreas_kupries <akupries@shaw.ca>2010-08-31 20:47:18 (GMT)
commit6e5f41b1d18cd53c898dc9aafa1b2f207cdd538c (patch)
tree1c591e9453099675817bee2be8f00684447be45a
parentccda1862f4dd73523f2861c2424643f886b08b14 (diff)
downloadtk-6e5f41b1d18cd53c898dc9aafa1b2f207cdd538c.zip
tk-6e5f41b1d18cd53c898dc9aafa1b2f207cdd538c.tar.gz
tk-6e5f41b1d18cd53c898dc9aafa1b2f207cdd538c.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 81f0be0..0a84dbb 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-26 Jeff Hobbs <jeffh@ActiveState.com>
*** 8.5.9 TAGGED FOR RELEASE ***
diff --git a/win/configure b/win/configure
index d974770..ee40344 100755
--- a/win/configure
+++ b/win/configure
@@ -4043,8 +4043,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 wish.exe.manifest -outputresource:\$@\;2"
- VC_MANIFEST_EMBED_EXE="mt.exe -nologo -manifest \$@.manifest wish.exe.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 wish.exe.manifest -outputresource:\$@\;2 ; fi"
+ VC_MANIFEST_EMBED_EXE="if test -f \$@.manifest ; then mt.exe -nologo -manifest \$@.manifest wish.exe.manifest -outputresource:\$@\;1 ; fi"
result=yes
if test "xwish.exe.manifest" != x ; then
result="yes (wish.exe.manifest)"
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)"