Mercurial > emacs

changeset 76285:bb157af2087d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Don't clear out LIB_X11_LIB, since XFT_LIBS does not include -lX11 on Solaris.
author Chong Yidong <cyd@stupidchicken.com>
date Sat, 03 Mar 2007 21:50:54 +0000
parents 6f86cadf3faa
children 2b80d4245e1d
files src/ChangeLog src/Makefile.in
diffstat 2 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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  <rgm@gnu.org>
+
+	* Makefile.in: Don't clear out LIB_X11_LIB, since XFT_LIBS does
+	not include -lX11 on Solaris.
+
 2007-03-02  Stuart D. Herring <herring@lanl.gov>
 
 	* keymap.c (Fkey_binding): Don't consider two-element lists as
--- 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 */