From 40dc6bf44ec6e258dabd6aa3c674f8e65ded64bb Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Mon, 17 May 2010 19:44:07 -0700 Subject: Set rallocobj with configure, not cpp. * configure.in (REL_ALLOC): Unset on gnu, gnu-linux if DOUG_LEA_MALLOC. (RALLOC_OBJ): New output variable. * config.bat (RALLOC_OBJ): Edit to empty if sys_malloc. * src/Makefile.in (RALLOC_OBJ): New, set by configure. (rallocobj): Replace with the previous variable. (otherobj): Use $RALLOC_OBJ. * src/s/gnu.h (REL_ALLOC) [DOUG_LEA_MALLOC]: * src/s/gnu-linux.h (REL_ALLOC) [DOUG_LEA_MALLOC]: Move undef to configure. * msdos/sed1v2.inp (RALLOC_OBJ): Edit to ralloc.o. --- config.bat | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'config.bat') diff --git a/config.bat b/config.bat index 35fef44b582..20b8b285e59 100644 --- a/config.bat +++ b/config.bat @@ -203,8 +203,9 @@ rm -f makefile.tmp if "%sys_malloc%" == "" goto src5a sed -e "/^GMALLOC_OBJ *=/s/gmalloc.o//" makefile.tmp -sed -e "/^VMLIMIT_OBJ *=/s/vm-limit.o//" Makefile -rm -f makefile.tmp +sed -e "/^VMLIMIT_OBJ *=/s/vm-limit.o//" makefile.tmp2 +sed -e "/^RALLOC_OBJ *=/s/ralloc.o//" Makefile +rm -f makefile.tmp makefile.tmp2 :src5a if "%nodebug%" == "" goto src6 -- cgit v1.2.3