diff options
| author | Glenn Morris <rgm@gnu.org> | 2010-05-17 19:30:13 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2010-05-17 19:30:13 -0700 |
| commit | be4ff9dad8bf43251f78f58a9ce86cf8bb153300 (patch) | |
| tree | b61fdf0af5566b9a1fde833b4beb05df4e4be863 /config.bat | |
| parent | 5b5262f4da935f37376c548e31e234bf2073ebef (diff) | |
| download | emacs-be4ff9dad8bf43251f78f58a9ce86cf8bb153300.tar.gz | |
Define some malloc objects with configure, not cpp.
* configure.in (GMALLOC_OBJ, VMLIMIT_OBJ): New output variables.
* config.bat (GMALLOC_OBJ, VMLIMIT_OBJ): Edit to empty if sys_malloc.
* src/Makefile.in (GMALLOC_OBJ, VMLIMIT_OBJ): New, set by configure.
(gmallocobj, vmlimitobj): Replace with previous two variables.
(otherobj): Use $GMALLOC_OBJ, $VMLIMIT_OBJ.
* msdos/sed1v2.inp (GMALLOC_OBJ): Edit to gmalloc.o.
(VMLIMIT_OBJ): Edit to vm-limit.o.
Diffstat (limited to 'config.bat')
| -rw-r--r-- | config.bat | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/config.bat b/config.bat index 953c5d64b12..35fef44b582 100644 --- a/config.bat +++ b/config.bat @@ -201,6 +201,12 @@ sed -f ../msdos/sed1x.inp <makefile.tmp >Makefile rm -f makefile.tmp
:src5
+if "%sys_malloc%" == "" goto src5a
+sed -e "/^GMALLOC_OBJ *=/s/gmalloc.o//" <Makefile >makefile.tmp
+sed -e "/^VMLIMIT_OBJ *=/s/vm-limit.o//" <makefile.tmp >Makefile
+rm -f makefile.tmp
+:src5a
+
if "%nodebug%" == "" goto src6
sed -e "/^CFLAGS *=/s/ *-gcoff//" <Makefile >makefile.tmp
sed -e "/^LDFLAGS *=/s/=/=-s/" <makefile.tmp >Makefile
|