On Windows set LIB_EXE_MACHINE_FLAG to X86 or X64 depending on host

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

	* configure.in: On Windows set LIB_EXE_MACHINE_FLAG to X86 or X64
	depending on host architecture.

	* atk/Makefile.am: Use it if/when running lib.exe.

svn path=/trunk/; revision=1263

diff --git a/ChangeLog b/ChangeLog
index 8a1dda5..47fcd1b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-08-06  Tor Lillqvist  <tml@novell.com>
+
+       * configure.in: On Windows set LIB_EXE_MACHINE_FLAG to X86 or X64
+       depending on host architecture.
+
+       * atk/Makefile.am: Use it if/when running lib.exe.
+
 2008-07-28  Tor Lillqvist  <tml@novell.com>
 
        * atk/Makefile.am (libatk_1_0_la_DEPENDENCIES): Depend on atk.def

diff --git a/atk/Makefile.am b/atk/Makefile.am
index b1c1cf0..0572324 100644 (file)
--- a/atk/Makefile.am
+++ b/atk/Makefile.am
@@ -169,7 +169,7 @@ atk.def: atk.symbols
        (echo -e EXPORTS; $(CPP) -P -DINCLUDE_VARIABLES -DG_OS_WIN32 -DALL_FILES - <$(srcdir)/atk.symbols | sed -e '/^$$/d' -e 's/^/    /' -e 's/G_GNUC_[^ ]*//g') > atk.def
 
 atk-$(ATK_API_VERSION).lib: libatk-$(ATK_API_VERSION).la atk.def
-       lib -name:libatk-$(ATK_API_VERSION)-$(LT_CURRENT_MINUS_AGE).dll -def:atk.def -out:$@
+       lib -machine:$(LIB_EXE_MACHINE_FLAG) -name:libatk-$(ATK_API_VERSION)-$(LT_CURRENT_MINUS_AGE).dll -def:atk.def -out:$@
 
 
 EXTRA_DIST = atk.symbols atk.rc.in atkmarshal.list atkintl.h

diff --git a/configure.in b/configure.in
index 955a418..3eb569c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -103,6 +103,14 @@ AC_MSG_CHECKING([for native Win32 platform])
 case "$host" in
   *-*-mingw*)
     atk_native_win32=yes
+    case "$host" in
+      x86_64-*-*)
+       LIB_EXE_MACHINE_FLAG=X64
+       ;;
+      *)
+       LIB_EXE_MACHINE_FLAG=X86
+       ;;
+    esac
     ;;
   *)
     atk_native_win32=no
@@ -111,6 +119,8 @@ esac
 AC_MSG_RESULT([$atk_native_win32])
 AM_CONDITIONAL(OS_WIN32, test "$atk_native_win32" = "yes")
 
+AC_SUBST(LIB_EXE_MACHINE_FLAG)
+
 if test "$atk_native_win32" = "yes"; then
   AC_CHECK_TOOL(WINDRES, windres, no)
   if test "$WINDRES" = no; then