diff options
| author | Richard M. Stallman | 1997-04-09 04:01:31 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1997-04-09 04:01:31 +0000 |
| commit | b1377d7f09878ac8b39774535c8408f77fab244f (patch) | |
| tree | 3e40fb5772bdec456ed52b0ce4a6b27fcbd72bb5 /src | |
| parent | 188b4aeaacfdd82fe6cdc5933d0612d814158703 (diff) | |
| download | emacs-b1377d7f09878ac8b39774535c8408f77fab244f.tar.gz emacs-b1377d7f09878ac8b39774535c8408f77fab244f.zip | |
(mallocobj): Don't add gmalloc if using glibc.
Drop check for `old malloc'; it isn't distributed with Emacs.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.in | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index 53857331a8b..a6e7842b55f 100644 --- a/src/Makefile.in +++ b/src/Makefile.in | |||
| @@ -536,15 +536,19 @@ termcapobj = tparam.o | |||
| 536 | 536 | ||
| 537 | #ifndef SYSTEM_MALLOC | 537 | #ifndef SYSTEM_MALLOC |
| 538 | 538 | ||
| 539 | #ifdef GNU_MALLOC /* New GNU malloc */ | 539 | #ifdef DOUG_LEA_MALLOC |
| 540 | #ifdef REL_ALLOC | ||
| 541 | mallocobj = ralloc.o vm-limit.o | ||
| 542 | #else /* ! defined (REL_ALLOC) */ | ||
| 543 | mallocobj = | ||
| 544 | #endif /* ! defined (REL_ALLOC) */ | ||
| 545 | #else /* ! defined (DOUG_LEA_MALLOC) */ | ||
| 540 | #ifdef REL_ALLOC | 546 | #ifdef REL_ALLOC |
| 541 | mallocobj = gmalloc.o ralloc.o vm-limit.o | 547 | mallocobj = gmalloc.o ralloc.o vm-limit.o |
| 542 | #else /* ! defined (REL_ALLOC) */ | 548 | #else /* ! defined (REL_ALLOC) */ |
| 543 | mallocobj = gmalloc.o vm-limit.o | 549 | mallocobj = gmalloc.o vm-limit.o |
| 544 | #endif /* ! defined (REL_ALLOC) */ | 550 | #endif /* ! defined (REL_ALLOC) */ |
| 545 | #else /* Old GNU malloc */ | 551 | #endif /* ! defined (DOUG_LEA_MALLOC) */ |
| 546 | mallocobj = malloc.o | ||
| 547 | #endif /* Old GNU malloc */ | ||
| 548 | 552 | ||
| 549 | #endif /* SYSTEM_MALLOC */ | 553 | #endif /* SYSTEM_MALLOC */ |
| 550 | 554 | ||