gimp r26411 - in trunk: . app

[tml svn gnome org]

Author: tml
Date: Thu Aug  7 00:36:47 2008
New Revision: 26411
URL: http://svn.gnome.org/viewvc/gimp?rev=26411&view=rev

Log:
2008-08-07  Tor Lillqvist  <tml novell com>

	* configure.in: Define WIN32_LARGE_ADDRESS_AWARE as
	-Wl,--large-address-aware on 32-bit Windows, empty
	otherwise. AC_SUBST() it.

	* app/Makefile.am (win32_ldflags): Use WIN32_LARGE_ADDRESS_AWARE
	instead of hardcoding the switch, as it isn't valid, and would be
	pointless, when building a 64-bit GIMP.



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

Modified: trunk/app/Makefile.am
==============================================================================
--- trunk/app/Makefile.am	(original)
+++ trunk/app/Makefile.am	Thu Aug  7 00:36:47 2008
@@ -69,7 +69,7 @@
 	wilber.ico
 
 if OS_WIN32
-win32_ldflags = -mwindows -Wl,--large-address-aware
+win32_ldflags = -mwindows $(WIN32_LARGE_ADDRESS_AWARE)
 endif
 
 if USE_BINRELOC

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Thu Aug  7 00:36:47 2008
@@ -220,6 +220,13 @@
 case "$target_or_host" in
   *-*-mingw*)
     os_win32=yes
+    case "$host" in
+      x86_64-*-*)
+	;;
+      *)
+	WIN32_LARGE_ADDRESS_AWARE='-Wl,--large-address-aware'
+	;;
+    esac
     PATHSEP=';'
     ;;
   *)
@@ -228,6 +235,7 @@
     ;;
 esac
 AC_MSG_RESULT([$os_win32])
+AC_SUBST(WIN32_LARGE_ADDRESS_AWARE)
 AC_SUBST(PATHSEP)
 AM_CONDITIONAL(OS_WIN32, test "$os_win32" = "yes")
 AM_CONDITIONAL(OS_UNIX, test "$os_win32" != "yes")