[gtk+/gtk-2-18] Use correct processorArchitecture for x86_64 in manifest file

[Tor Lillqvist <tml src gnome org>]

commit 8b2c243af6908afc4680c3635467e276afd6d7a7
Author: Tor Lillqvist <tml iki fi>
Date:   Mon Feb 8 10:41:51 2010 +0200

    Use correct processorArchitecture for x86_64 in manifest file

 configure.in    |    3 +++
 gtk/Makefile.am |    2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/configure.in b/configure.in
index 93b4aee..8845023 100644
--- a/configure.in
+++ b/configure.in
@@ -129,6 +129,7 @@ AC_CANONICAL_HOST
 MATH_LIB=-lm
 AC_MSG_CHECKING([for native Win32])
 LIB_EXE_MACHINE_FLAG=X86
+EXE_MANIFEST_ARCHITECTURE=X86
 case "$host" in
   *-*-mingw*)
     os_win32=yes
@@ -137,6 +138,7 @@ case "$host" in
     case "$host" in
     x86_64-*-*)
       LIB_EXE_MACHINE_FLAG=X64
+      EXE_MANIFEST_ARCHITECTURE=AMD64
       ;;
     esac
     ;;
@@ -147,6 +149,7 @@ esac
 AC_MSG_RESULT([$os_win32])
 
 AC_SUBST(LIB_EXE_MACHINE_FLAG)
+AC_SUBST(EXE_MANIFEST_ARCHITECTURE)
 
 case $host in
   *-*-linux*)
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index be8944e..267c499 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -967,7 +967,7 @@ gtk-update-icon-cache.exe.manifest:
 	(echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>' ; \
 	 echo '<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">' ; \
 	 echo '  <assemblyIdentity version="1.0.0.0"' ; \
-	 echo '     processorArchitecture="'$(LIB_EXE_MACHINE_FLAG)'"' ; \
+	 echo '     processorArchitecture="'$(EXE_MANIFEST_ARCHITECTURE)'"' ; \
 	 echo '     name="gtk-update-icon-cache.exe"' ; \
 	 echo '     type="win32"/>' ; \
 	 echo '  <!-- Identify the application security requirements. -->' ; \