From 71d9f3d45bfed728872c961473b24022a77af63d Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@novell.com>
Date: Sun, 3 Aug 2008 23:47:10 +0000
Subject: [PATCH] Set LIB_EXE_MACHINE_FLAG to either X86 or X64 on Windows.
 AC_SUBST it.

2008-08-04  Tor Lillqvist  <tml@novell.com>

	* configure.in: Set LIB_EXE_MACHINE_FLAG to either X86 or X64 on
	Windows. AC_SUBST it.

	* gdk/Makefile.am
	* gtk/Makefile.am: Pass appropriate -machine flag to lib.exe.


svn path=/trunk/; revision=20957
---
 ChangeLog       | 8 ++++++++
 configure.in    | 9 +++++++++
 gdk/Makefile.am | 2 +-
 gtk/Makefile.am | 4 ++--
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 230d84b776..c75a68b4d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-08-04  Tor Lillqvist  <tml@novell.com>
+
+	* configure.in: Set LIB_EXE_MACHINE_FLAG to either X86 or X64 on
+	Windows. AC_SUBST it.
+
+	* gdk/Makefile.am
+	* gtk/Makefile.am: Pass appropriate -machine flag to lib.exe.
+
 2008-08-04  Tor Lillqvist  <tml@novell.com>
 
 	Bug 544684 - Win64 issue, window handles are assumed to be 32-bit
diff --git a/configure.in b/configure.in
index f17a9d41ae..2acde5e95f 100644
--- a/configure.in
+++ b/configure.in
@@ -123,11 +123,17 @@ AC_CANONICAL_HOST
 
 MATH_LIB=-lm
 AC_MSG_CHECKING([for native Win32])
+LIB_EXE_MACHINE_FLAG=X86
 case "$host" in
   *-*-mingw*)
     os_win32=yes
     gio_can_sniff=no
     MATH_LIB=
+    case "$host" in
+    x86_64-*-*)
+      LIB_EXE_MACHINE_FLAG=X64
+      ;;
+    esac
     ;;
   *)
     os_win32=no
@@ -135,11 +141,14 @@ case "$host" in
 esac
 AC_MSG_RESULT([$os_win32])
 
+AC_SUBST(LIB_EXE_MACHINE_FLAG)
+
 case $host in
   *-*-linux*)
     os_linux=yes
     ;;
 esac
+
 dnl Initialize libtool
 AC_PROG_CC
 AM_DISABLE_STATIC
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index e319e3bd13..e4940cf495 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -194,7 +194,7 @@ if MS_LIB_AVAILABLE
 noinst_DATA = gdk-win32-$(GTK_API_VERSION).lib
 
 gdk-win32-$(GTK_API_VERSION).lib: libgdk-win32-$(GTK_API_VERSION).la gdk.def
-	lib -name:libgdk-win32-$(GTK_API_VERSION)-@LT_CURRENT_MINUS_AGE@.dll -def:gdk.def -out:$@
+	lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgdk-win32-$(GTK_API_VERSION)-@LT_CURRENT_MINUS_AGE@.dll -def:gdk.def -out:$@
 
 install-ms-lib:
 	$(INSTALL) gdk-win32-$(GTK_API_VERSION).lib $(DESTDIR)$(libdir)
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 8c8bcc633e..96380f121b 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -71,7 +71,7 @@ if MS_LIB_AVAILABLE
 noinst_DATA = gtk-win32-$(GTK_API_VERSION).lib
 
 gtk-win32-$(GTK_API_VERSION).lib: libgtk-win32-$(GTK_API_VERSION).la gtk.def
-	lib -name:libgtk-win32-$(GTK_API_VERSION)-@LT_CURRENT_MINUS_AGE@.dll -def:gtk.def -out:$@
+	lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgtk-win32-$(GTK_API_VERSION)-@LT_CURRENT_MINUS_AGE@.dll -def:gtk.def -out:$@
 
 install-ms-lib:
 	$(INSTALL) gtk-win32-$(GTK_API_VERSION).lib $(DESTDIR)$(libdir)
@@ -271,7 +271,7 @@ gtk_public_h_sources =          \
 	gtkseparator.h		\
 	gtkseparatormenuitem.h	\
 	gtkseparatortoolitem.h	\
- 	gtkshow.h		\
+	gtkshow.h		\
 	gtksettings.h		\
 	gtksizegroup.h		\
 	gtksocket.h		\