diff options
| author | Glenn Morris <rgm@gnu.org> | 2010-06-29 19:48:54 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2010-06-29 19:48:54 -0700 |
| commit | 6259c2ec7ae4b60f59d5101c8c544d15a90540a3 (patch) | |
| tree | e0680ee34ce375d77f41226081a616a3f1f762e1 /msdos | |
| parent | a2f043d3d72cbbc0ad64fb271a9f0545791100ec (diff) | |
| download | emacs-6259c2ec7ae4b60f59d5101c8c544d15a90540a3.tar.gz | |
Remove some cpp that is internal to configure.in.
* configure.in (C_OPTIMIZE_SWITCH, CANNOT_DUMP, SYSTEM_MALLOC):
(USE_MMAP_FOR_BUFFERS, C_WARNING_SWITCH): Set with shell, not cpp.
(LIBX): Remove, just use -lX11 in the one place this was used.
(cannot_dump): Replace with CANNOT_DUMP.
* src/Makefile.in (CANNOT_DUMP): Update for configure name change.
* src/s/freebsd.h (USE_MMAP_FOR_BUFFERS):
* src/s/irix6-5.h (USE_MMAP_FOR_BUFFERS):
* src/s/darwin.h (SYSTEM_MALLOC):
* src/s/sol2-10.h (SYSTEM_MALLOC): Move to configure.
* src/m/alpha.h: Remove old comment.
* src/s/aix4-2.h: Update comment.
* src/s/template.h: Remove USE_MMAP_FOR_BUFFERS.
* msdos/sed1v2.inp (CANNOT_DUMP): Update for configure name change.
* admin/CPP-DEFINES: Remove USE_MMAP_FOR_BUFFERS, CANNOT_DUMP.
* etc/DEBUG: Update SYSTEM_MALLOC and CANNOT_DUMP references.
Some re-filling.
Diffstat (limited to 'msdos')
| -rw-r--r-- | msdos/ChangeLog | 4 | ||||
| -rw-r--r-- | msdos/sed1v2.inp | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/msdos/ChangeLog b/msdos/ChangeLog index 71d2acbc928..287f568438f 100644 --- a/msdos/ChangeLog +++ b/msdos/ChangeLog @@ -1,3 +1,7 @@ +2010-06-30 Glenn Morris <rgm@gnu.org> + + * sed1v2.inp (CANNOT_DUMP): Update for configure name change. + 2010-06-26 Eli Zaretskii <eliz@gnu.org> * mainmake.v2 (version): Use emacs_version[] in src/emacs.c diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp index 8f7c06cfd8c..eef9ea80b79 100644 --- a/msdos/sed1v2.inp +++ b/msdos/sed1v2.inp @@ -116,7 +116,7 @@ s/\.h\.in/.h-in/ /^PRE_ALLOC_OBJ *=/s/@PRE_ALLOC_OBJ@/lastfile.o/ /^POST_ALLOC_OBJ *=/s/@POST_ALLOC_OBJ@/$(vmlimitobj)/ /^UNEXEC_OBJ *=/s/@UNEXEC_OBJ@/unexec.o/ -/^CANNOT_DUMP *=/s/@cannot_dump@/no/ +/^CANNOT_DUMP *=/s/@CANNOT_DUMP@/no/ /^DEPFLAGS *=/s/@DEPFLAGS@// /^MKDEPDIR *=/s/@MKDEPDIR@// /^version *=/s/@[^@\n]*@// |