From 106bfcaeab770b989ada669e6534548242238791 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20Dj=C3=A4rv?= Date: Mon, 29 Jan 2007 07:59:50 +0000 Subject: [PATCH] Use a variable, XFT_LIBS, instead #define LIB_X11_LIB. --- src/Makefile.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Makefile.in b/src/Makefile.in index 8dd211c0fa2..cd2c15a636d 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -403,8 +403,8 @@ LIBXT=$(LIBW) #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 @@ LIBXT=$(LIBW) /* 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 */ -- 2.39.2