atk r1263 - in trunk: . atk

[tml svn gnome org]

Author: tml
Date: Wed Aug  6 14:24:53 2008
New Revision: 1263
URL: http://svn.gnome.org/viewvc/atk?rev=1263&view=rev

Log:
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.



Modified:
   trunk/ChangeLog
   trunk/atk/Makefile.am
   trunk/configure.in

Modified: trunk/atk/Makefile.am
==============================================================================
--- trunk/atk/Makefile.am	(original)
+++ trunk/atk/Makefile.am	Wed Aug  6 14:24:53 2008
@@ -169,7 +169,7 @@
 	(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

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Wed Aug  6 14:24:53 2008
@@ -103,6 +103,14 @@
 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 @@
 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