# HG changeset patch # User Chong Yidong # Date 1172958654 0 # Node ID bb157af2087def9f345df2fb6fd46f72669ffb30 # Parent 6f86cadf3faa3b63ae70dd6a9c51cf6761c968c4 Don't clear out LIB_X11_LIB, since XFT_LIBS does not include -lX11 on Solaris. diff -r 6f86cadf3faa -r bb157af2087d src/ChangeLog --- a/src/ChangeLog Sat Mar 03 12:33:00 2007 +0000 +++ b/src/ChangeLog Sat Mar 03 21:50:54 2007 +0000 @@ -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 -r 6f86cadf3faa -r bb157af2087d src/Makefile.in --- a/src/Makefile.in Sat Mar 03 12:33:00 2007 +0000 +++ b/src/Makefile.in Sat Mar 03 21:50:54 2007 +0000 @@ -403,8 +403,6 @@ #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 */