[OS/2] Bug 351246: Load Mozilla into Highmem on OS/2. Part 3, changes to build config. r=mkaply, sr=wtc

config/autoconf.mk.in

@@ -532,6 +532,7 @@ AIX_OBJMODEL = @AIX_OBJMODEL@
 # For OS/2 build
 MOZ_OS2_TOOLS = @MOZ_OS2_TOOLS@
 MOZ_OS2_USE_DECLSPEC = @MOZ_OS2_USE_DECLSPEC@
+MOZ_OS2_HIGH_MEMORY = @MOZ_OS2_HIGH_MEMORY@
 
 HAVE_XIE=@HAVE_XIE@
 

configure.in

@@ -1302,6 +1302,15 @@ AC_SUBST(HAVE_64BIT_OS)
 AC_LANG_RESTORE
 fi # COMPILE_ENVIRONMENT
 
+dnl ========================================================
+dnl Enable high-memory support on OS/2, disabled by default
+dnl ========================================================
+MOZ_ARG_ENABLE_BOOL(os2-high-mem,
+[  --enable-os2-high-mem Enable high-memory support on OS/2],
+    MOZ_OS2_HIGH_MEMORY=1,
+    MOZ_OS2_HIGH_MEMORY= )
+AC_SUBST(MOZ_OS2_HIGH_MEMORY)
+
 dnl ========================================================
 dnl System overrides of the defaults for host
 dnl ========================================================
@@ -2071,6 +2080,12 @@ case "$target" in
         MOZ_XPCOM_OBSOLETE_LIBS='-L$(LIBXUL_DIST)/lib $(LIBXUL_DIST)/lib/xpcomct.lib'
         DYNAMIC_XPCOM_LIBS='-L$(LIBXUL_DIST)/lib $(LIBXUL_DIST)/lib/xpcom.lib $(LIBXUL_DIST)/lib/xpcomcor.lib'
         LIBXUL_LIBS='-L$(LIBXUL_DIST)/lib $(LIBXUL_DIST)/lib/xpcom.lib $(LIBXUL_DIST)/lib/xul.lib'
+        if test -n "$MOZ_OS2_HIGH_MEMORY"; then
+          DSO_LDOPTS="$DSO_LDOPTS -Zhigh-mem"
+          LDFLAGS="$LDFLAGS -Zhigh-mem"
+          MOZ_OPTIMIZE_LDFLAGS="$MOZ_OPTIMIZE_LDFLAGS -Zhigh-mem"
+          AC_DEFINE(MOZ_OS2_HIGH_MEMORY)
+        fi
 
         # GCC for OS/2 currently predefines these, but we don't want them
         _DEFINES_CFLAGS="$_DEFINES_CFLAGS -Uunix -U__unix -U__unix__"