pango r2670 - in trunk: . pango

[tml svn gnome org]

Author: tml
Date: Tue Aug  5 23:12:13 2008
New Revision: 2670
URL: http://svn.gnome.org/viewvc/pango?rev=2670&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.

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



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

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Tue Aug  5 23:12:13 2008
@@ -88,12 +88,23 @@
 case "$host" in
   *-*-mingw*)
     pango_os_win32=yes
+    case "$host" in
+      x86_64-*-*)
+	LIB_EXE_MACHINE_FLAG=X64
+	;;
+      *)
+	LIB_EXE_MACHINE_FLAG=X86
+	;;
+    esac
     ;;
   *)
     pango_os_win32=no
     ;;
 esac
 AC_MSG_RESULT([$pango_os_win32])
+
+AC_SUBST(LIB_EXE_MACHINE_FLAG)
+
 AM_CONDITIONAL(OS_WIN32, test "$pango_os_win32" = "yes")
 
 AC_PROG_CC

Modified: trunk/pango/Makefile.am
==============================================================================
--- trunk/pango/Makefile.am	(original)
+++ trunk/pango/Makefile.am	Tue Aug  5 23:12:13 2008
@@ -403,16 +403,16 @@
 endif
 
 pango-$(PANGO_API_VERSION).lib: libpango-$(PANGO_API_VERSION).la $(srcdir)/pango.def
-	lib -name:libpango-$(PANGO_API_VERSION)-$(PANGO_CURRENT_MINUS_AGE).dll -def:$(srcdir)/pango.def -out:$@
+	lib -machine:$(LIB_EXE_MACHINE_FLAG) -name:libpango-$(PANGO_API_VERSION)-$(PANGO_CURRENT_MINUS_AGE).dll -def:$(srcdir)/pango.def -out:$@
 
 pangoft2-$(PANGO_API_VERSION).lib: libpangoft2-$(PANGO_API_VERSION).la $(srcdir)/pangoft2.def
-	lib -name:libpangoft2-$(PANGO_API_VERSION)-$(PANGO_CURRENT_MINUS_AGE).dll -def:$(srcdir)/pangoft2.def -out:$@
+	lib -machine:$(LIB_EXE_MACHINE_FLAG) -name:libpangoft2-$(PANGO_API_VERSION)-$(PANGO_CURRENT_MINUS_AGE).dll -def:$(srcdir)/pangoft2.def -out:$@
 
 pangowin32-$(PANGO_API_VERSION).lib: libpangowin32-$(PANGO_API_VERSION).la $(srcdir)/pangowin32.def
-	lib -name:libpangowin32-$(PANGO_API_VERSION)-$(PANGO_CURRENT_MINUS_AGE).dll -def:$(srcdir)/pangowin32.def -out:$@
+	lib -machine:$(LIB_EXE_MACHINE_FLAG) -name:libpangowin32-$(PANGO_API_VERSION)-$(PANGO_CURRENT_MINUS_AGE).dll -def:$(srcdir)/pangowin32.def -out:$@
 
 pangocairo-$(PANGO_API_VERSION).lib: libpangocairo-$(PANGO_API_VERSION).la $(srcdir)/pangocairo.def
-	lib -name:libpangocairo-$(PANGO_API_VERSION)-$(PANGO_CURRENT_MINUS_AGE).dll -def:$(srcdir)/pangocairo.def -out:$@
+	lib -machine:$(LIB_EXE_MACHINE_FLAG) -name:libpangocairo-$(PANGO_API_VERSION)-$(PANGO_CURRENT_MINUS_AGE).dll -def:$(srcdir)/pangocairo.def -out:$@
 
 
 # ------------------- pango-querymodules -------------------