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.

2 files changed, 3 insertions, 0 deletions

diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index 4ce549cfd8b..1034b0a3d23 100644
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -1,5 +1,7 @@
 2010-05-18  Glenn Morris  <rgm@gnu.org>
 
+        * sed1v2.inp (RALLOC_OBJ): Edit to ralloc.o.
+
         * sed1v2.inp (GMALLOC_OBJ): Edit to gmalloc.o.
         (VMLIMIT_OBJ): Edit to vm-limit.o.
 
diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp
index 906d558ed75..574910d2beb 100644
--- a/msdos/sed1v2.inp
+++ b/msdos/sed1v2.inp
@@ -118,6 +118,7 @@ s/\.h\.in/.h-in/
 /^LIBX_OTHER *=/s/@LIBX_OTHER@//
 /^GMALLOC_OBJ *=/s/@GMALLOC_OBJ@/gmalloc.o/
 /^VMLIMIT_OBJ *=/s/@VMLIMIT_OBJ@/vm-limit.o/
+/^RALLOC_OBJ *=/s/@RALLOC_OBJ@/ralloc.o/
 /^PRE_ALLOC_OBJ *=/s/@PRE_ALLOC_OBJ@/lastfile.o/
 /^POST_ALLOC_OBJ *=/s/@POST_ALLOC_OBJ@/$(vmlimitobj)/
 /^UNEXEC_OBJ *=/s/@unexec@/unexec.o/