diff options
| -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-29 Donal K. Fellows <dkf@users.sf.net> *** 8.5.9 TAGGED FOR RELEASE *** 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 ()" @@ -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)" |