diff options
| author | Glenn Morris | 2010-05-15 14:31:19 -0700 |
|---|---|---|
| committer | Glenn Morris | 2010-05-15 14:31:19 -0700 |
| commit | 6e546d181bf5911fafac9d64c46652e34c34d62e (patch) | |
| tree | c233f078fd4168ec2ff25d5a01e7f2262e544865 /src/ChangeLog | |
| parent | 5276642588f017741f425c9c83025684feb5afdd (diff) | |
| download | emacs-6e546d181bf5911fafac9d64c46652e34c34d62e.tar.gz emacs-6e546d181bf5911fafac9d64c46652e34c34d62e.zip | |
Always define FONT_OBJ; to empty in the non-X case.
* configure.in (FONT_OBJ): Set to empty if !HAVE_X_WINDOWS.
* src/Makefile.in (FONT_DRIVERS): Remove, replace with $FONT_OBJ.
(obj, SOME_MACHINE_OBJECTS): Use $FONT_OBJ.
* msdos/sed1v2.inp (FONT_OBJ): Edit to empty for non-X case.
* msdos/sed1x.inp (FONT_OBJ): Edit to xfont.o for X case.
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 877accc913b..76b4e70c7bc 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2010-05-15 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * Makefile.in (FONT_DRIVERS): Remove, replace with $FONT_OBJ. | ||
| 4 | (obj, SOME_MACHINE_OBJECTS): Use $FONT_OBJ. | ||
| 5 | |||
| 1 | 2010-05-15 Ken Raeburn <raeburn@raeburn.org> | 6 | 2010-05-15 Ken Raeburn <raeburn@raeburn.org> |
| 2 | 7 | ||
| 3 | * lisp.h (XFLOAT_DATA): Use "0?x:x" to generate an | 8 | * lisp.h (XFLOAT_DATA): Use "0?x:x" to generate an |