diff options
| author | andreas_kupries <akupries@shaw.ca> | 2010-08-31 20:47:32 (GMT) |
|---|---|---|
| committer | andreas_kupries <akupries@shaw.ca> | 2010-08-31 20:47:32 (GMT) |
| commit | b84640d55124b4ed822ec8fdcb35b4c3d45eec9f (patch) | |
| tree | 609c044100685b4b46196851c3a9b99e163f7be4 | |
| parent | 21cfeef11470f8dddcaa9436870975b7960d259e (diff) | |
| download | tk-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.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rwxr-xr-x | win/configure | 6 | ||||
| -rw-r--r-- | win/tcl.m4 | 6 |
3 files changed, 14 insertions, 4 deletions
@@ -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> * unix/Makefile.in: add valgrind target diff --git a/win/configure b/win/configure index 21a59af..72f0ea6 100755 --- a/win/configure +++ b/win/configure @@ -4083,8 +4083,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)" @@ -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)" |