From b84640d55124b4ed822ec8fdcb35b4c3d45eec9f Mon Sep 17 00:00:00 2001 From: andreas_kupries Date: Tue, 31 Aug 2010 20:47:32 +0000 Subject: * win/tcl.m4: Applied patch by Jeff fixing issues with the manifest handling on Win64. * win/configure: Regenerated. --- ChangeLog | 6 ++++++ win/configure | 6 ++++-- win/tcl.m4 | 6 ++++-- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index a5a7e85..939b46d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-08-31 Andreas Kupries + + * win/tcl.m4: Applied patch by Jeff fixing issues with the + manifest handling on Win64. + * win/configure: Regenerated. + 2010-08-26 Jeff Hobbs * 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)" 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)" -- cgit v0.12