diff options
| author | Glenn Morris | 2010-05-10 19:51:08 -0700 |
|---|---|---|
| committer | Glenn Morris | 2010-05-10 19:51:08 -0700 |
| commit | acddf8aec716be7810edc29e1a7eeb396fc755c3 (patch) | |
| tree | a117eb6eaa9dc16ec1e74ff4844f3e1e7944899c /src | |
| parent | 4e2af7825fa13782c5579f55b3e2d8dec23bdbf3 (diff) | |
| download | emacs-acddf8aec716be7810edc29e1a7eeb396fc755c3.tar.gz emacs-acddf8aec716be7810edc29e1a7eeb396fc755c3.zip | |
On msdos, set LIBS_SYSTEM with config.bat, not cpp.
* config.bat [HAVE_X11]: Run sed3x.inp on lib-src/Makefile.
* src/Makefile.in (LIBS_SYSTEM) [MSDOS]: Do not reset.
* src/s/msdos.h (MSDOS_LIBS_SYSTEM): Remove.
* msdos/sed1x.inp (LIBS_SYSTEM): Edit to -lxext -lsys.
* msdos/sed3x.inp: New file.
* lib-src/Makefile.in (LIBS_SYSTEM) [MSDOS]: Do not reset.
(config.h) [MSDOS]: Do not include.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/Makefile.in | 1 | ||||
| -rw-r--r-- | src/s/msdos.h | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index fab6d2034cc..8bac6573c23 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2010-05-11 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * Makefile.in (LIBS_SYSTEM) [MSDOS]: Do not reset. | ||
| 4 | * s/msdos.h (MSDOS_LIBS_SYSTEM): Remove. | ||
| 5 | |||
| 1 | 2010-05-10 Eli Zaretskii <eliz@gnu.org> | 6 | 2010-05-10 Eli Zaretskii <eliz@gnu.org> |
| 2 | 7 | ||
| 3 | * xdisp.c (init_iterator): Don't turn on bidi reordering in | 8 | * xdisp.c (init_iterator): Don't turn on bidi reordering in |
diff --git a/src/Makefile.in b/src/Makefile.in index 69e37fb236a..292429fc7b4 100644 --- a/src/Makefile.in +++ b/src/Makefile.in | |||
| @@ -322,7 +322,6 @@ LD=ld | |||
| 322 | #endif | 322 | #endif |
| 323 | 323 | ||
| 324 | #ifdef MSDOS | 324 | #ifdef MSDOS |
| 325 | LIBS_SYSTEM = MSDOS_LIBS_SYSTEM | ||
| 326 | #ifdef HAVE_X_WINDOWS | 325 | #ifdef HAVE_X_WINDOWS |
| 327 | MSDOS_OBJ = dosfns.o msdos.o | 326 | MSDOS_OBJ = dosfns.o msdos.o |
| 328 | #else | 327 | #else |
diff --git a/src/s/msdos.h b/src/s/msdos.h index a594bb850f4..4d7ca08d3c0 100644 --- a/src/s/msdos.h +++ b/src/s/msdos.h | |||
| @@ -140,9 +140,7 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */ | |||
| 140 | commentary below, in the non-X branch. The 140KB number was | 140 | commentary below, in the non-X branch. The 140KB number was |
| 141 | measured on GNU/Linux and on MS-WIndows. */ | 141 | measured on GNU/Linux and on MS-WIndows. */ |
| 142 | #define SYSTEM_PURESIZE_EXTRA (-170000+140000) | 142 | #define SYSTEM_PURESIZE_EXTRA (-170000+140000) |
| 143 | #define MSDOS_LIBS_SYSTEM -lxext -lsys | ||
| 144 | #else | 143 | #else |
| 145 | #define MSDOS_LIBS_SYSTEM | ||
| 146 | /* We need a little extra space, see ../../lisp/loadup.el. | 144 | /* We need a little extra space, see ../../lisp/loadup.el. |
| 147 | As of 20091024, DOS-specific files use up 62KB of pure space. But | 145 | As of 20091024, DOS-specific files use up 62KB of pure space. But |
| 148 | overall, we end up wasting 130KB of pure space, because | 146 | overall, we end up wasting 130KB of pure space, because |