From 046c44135ee38f8e89cb3e318776a1ab11a5d1cd Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Sat, 3 Mar 2007 21:50:54 +0000 Subject: [PATCH] Don't clear out LIB_X11_LIB, since XFT_LIBS does not include -lX11 on Solaris. --- src/ChangeLog | 5 +++++ src/Makefile.in | 2 -- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index d9633301be2..10d0fa9d828 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2007-03-03 Glenn Morris + + * Makefile.in: Don't clear out LIB_X11_LIB, since XFT_LIBS does + not include -lX11 on Solaris. + 2007-03-02 Stuart D. Herring * keymap.c (Fkey_binding): Don't consider two-element lists as diff --git a/src/Makefile.in b/src/Makefile.in index 9ddfdc7bfe2..b6b61399a05 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -403,8 +403,6 @@ LIBXT=$(LIBW) #endif /* not USE_X_TOOLKIT */ #if HAVE_XFT -#undef LIB_X11_LIB /* XFT_LIBS includes -lX11 */ -#define LIB_X11_LIB XFT_LIBS=@XFT_LIBS@ #endif /* HAVE_XFT */ -- 2.39.5