]> git.eshelyaron.com Git - emacs.git/commitdiff
Don't clear out LIB_X11_LIB, since XFT_LIBS does not include -lX11 on
authorChong Yidong <cyd@stupidchicken.com>
Sat, 3 Mar 2007 21:50:54 +0000 (21:50 +0000)
committerChong Yidong <cyd@stupidchicken.com>
Sat, 3 Mar 2007 21:50:54 +0000 (21:50 +0000)
Solaris.

src/ChangeLog
src/Makefile.in

index d9633301be20aa8c1fe9038220e61481a68311cf..10d0fa9d82831d7d7e1a8d3df3c9e4459d122dd7 100644 (file)
@@ -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
index 9ddfdc7bfe22641ad152f9a868a1dbef319fe4e7..b6b61399a05bf908ec66d6928383eca969d207f1 100644 (file)
@@ -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 */