Mercurial > emacs
changeset 75501:f63d37162a0d
Use a variable, XFT_LIBS, instead #define LIB_X11_LIB.
| author | Jan Djärv <jan.h.d@swipnet.se> |
|---|---|
| date | Mon, 29 Jan 2007 07:59:50 +0000 |
| parents | 30da76a7681a |
| children | 86d302468149 |
| files | src/Makefile.in |
| diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/Makefile.in Mon Jan 29 07:59:22 2007 +0000 +++ b/src/Makefile.in Mon Jan 29 07:59:50 2007 +0000 @@ -403,8 +403,8 @@ #endif /* not USE_X_TOOLKIT */ #if HAVE_XFT -#undef LIB_X11_LIB -#define LIB_X11_LIB @XFT_LIBS@ +#undef LIB_X11_LIB /* XFT_LIBS includes -lX11 */ +XFT_LIBS=@XFT_LIBS@" #endif /* HAVE_XFT */ #if HAVE_XPM @@ -451,7 +451,7 @@ /* LD_SWITCH_X_DEFAULT comes after everything else that specifies options for where to find X libraries, but before those libraries. */ X11_LDFLAGS = LD_SWITCH_X_SITE LD_SWITCH_X_DEFAULT -LIBX= $(LIBXMENU) $(X11_LDFLAGS) $(LIBXT) LIBTIFF LIBJPEG LIBPNG LIBGIF LIBXPM LIB_X11_LIB LIBX11_MACHINE LIBX11_SYSTEM +LIBX= $(LIBXMENU) $(X11_LDFLAGS) $(LIBXT) LIBTIFF LIBJPEG LIBPNG LIBGIF LIBXPM LIB_X11_LIB LIBX11_MACHINE LIBX11_SYSTEM $(XFT_LIBS) #else /* not HAVE_X11 */ LIBX= $(LIBXMENU) LD_SWITCH_X_SITE -lX10 LIBX10_MACHINE LIBX10_SYSTEM #endif /* not HAVE_X11 */