Mercurial > emacs
comparison src/Makefile.in @ 90780:ec58e5c426ef
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 653-661)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 203-206)
- Merge from emacs--devo--0
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-180
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Sun, 04 Mar 2007 06:19:40 +0000 |
| parents | dd7c098af727 bb157af2087d |
| children | 2f8e5c845704 |
comparison
equal
deleted
inserted
replaced
| 90779:6ea6d3d1508d | 90780:ec58e5c426ef |
|---|---|
| 402 LIBXT=$(LIBW) | 402 LIBXT=$(LIBW) |
| 403 #endif | 403 #endif |
| 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 /* XFT_LIBS includes -lX11 */ | |
| 408 #define LIB_X11_LIB | |
| 409 XFT_LIBS=@XFT_LIBS@ | 407 XFT_LIBS=@XFT_LIBS@ |
| 410 #endif /* HAVE_XFT */ | 408 #endif /* HAVE_XFT */ |
| 411 | 409 |
| 412 #if HAVE_XPM | 410 #if HAVE_XPM |
| 413 #ifndef LIBXPM | 411 #ifndef LIBXPM |