diff options
| author | Miles Bader | 2007-01-31 00:26:59 +0000 |
|---|---|---|
| committer | Miles Bader | 2007-01-31 00:26:59 +0000 |
| commit | f51a0e7f4d7fbba102c6236f37844a1f77c8c2d5 (patch) | |
| tree | 34e255e85283c8f7d97244e2554efa9d4129243d /src | |
| parent | 6dec449c9b47c081502d180de3b5faef78c75e18 (diff) | |
| download | emacs-f51a0e7f4d7fbba102c6236f37844a1f77c8c2d5.tar.gz emacs-f51a0e7f4d7fbba102c6236f37844a1f77c8c2d5.zip | |
src/Makefile.in: Remove redundant HAVE_XFT clause
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-168
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog.unicode | 4 | ||||
| -rw-r--r-- | src/Makefile.in | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/ChangeLog.unicode b/src/ChangeLog.unicode index e3dd5c4a17e..40bb22bfef1 100644 --- a/src/ChangeLog.unicode +++ b/src/ChangeLog.unicode | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2007-01-30 Miles Bader <miles@gnu.org> | ||
| 2 | |||
| 3 | * Makefile.in: Remove redundant HAVE_XFT clause. | ||
| 4 | |||
| 1 | 2006-12-20 Kenichi Handa <handa@m17n.org> | 5 | 2006-12-20 Kenichi Handa <handa@m17n.org> |
| 2 | 6 | ||
| 3 | * xrdb.c (x_load_resources): Setup the default fontSet X reource. | 7 | * xrdb.c (x_load_resources): Setup the default fontSet X reource. |
diff --git a/src/Makefile.in b/src/Makefile.in index 95de3fbd61f..3b82091cc5d 100644 --- a/src/Makefile.in +++ b/src/Makefile.in | |||
| @@ -404,11 +404,6 @@ LIBXT=$(LIBW) | |||
| 404 | #endif /* not USE_X_TOOLKIT */ | 404 | #endif /* not USE_X_TOOLKIT */ |
| 405 | 405 | ||
| 406 | #if HAVE_XFT | 406 | #if HAVE_XFT |
| 407 | #undef LIB_X11_LIB | ||
| 408 | #define LIB_X11_LIB @XFT_LIBS@ | ||
| 409 | #endif /* HAVE_XFT */ | ||
| 410 | |||
| 411 | #if HAVE_XFT | ||
| 412 | #undef LIB_X11_LIB /* XFT_LIBS includes -lX11 */ | 407 | #undef LIB_X11_LIB /* XFT_LIBS includes -lX11 */ |
| 413 | #define LIB_X11_LIB | 408 | #define LIB_X11_LIB |
| 414 | XFT_LIBS=@XFT_LIBS@ | 409 | XFT_LIBS=@XFT_LIBS@ |