Commit 106bfcae authored by Jan Djärv's avatar Jan Djärv
Browse files

Use a variable, XFT_LIBS, instead #define LIB_X11_LIB.

parent 4abaeb50
......@@ -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 */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment