# HG changeset patch
# User Miles Bader <miles@gnu.org>
# Date 1170203219 0
# Node ID 1b883722b73c45bec0351d9889d542cc5ce92daf
# Parent  f1196eda45a0916f5abd54f5935323a92e4866a7
src/Makefile.in: Remove redundant HAVE_XFT clause

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-168

diff -r f1196eda45a0 -r 1b883722b73c src/ChangeLog.unicode
--- a/src/ChangeLog.unicode	Tue Jan 30 23:18:01 2007 +0000
+++ b/src/ChangeLog.unicode	Wed Jan 31 00:26:59 2007 +0000
@@ -1,3 +1,7 @@
+2007-01-30  Miles Bader  <miles@gnu.org>
+
+	* Makefile.in: Remove redundant HAVE_XFT clause.
+
 2006-12-20  Kenichi Handa  <handa@m17n.org>
 
 	* xrdb.c (x_load_resources): Setup the default fontSet X reource.
diff -r f1196eda45a0 -r 1b883722b73c src/Makefile.in
--- a/src/Makefile.in	Tue Jan 30 23:18:01 2007 +0000
+++ b/src/Makefile.in	Wed Jan 31 00:26:59 2007 +0000
@@ -404,11 +404,6 @@
 #endif /* not USE_X_TOOLKIT */
 
 #if HAVE_XFT
-#undef LIB_X11_LIB
-#define LIB_X11_LIB @XFT_LIBS@
-#endif /* HAVE_XFT */
-
-#if HAVE_XFT
 #undef LIB_X11_LIB /* XFT_LIBS includes -lX11 */
 #define LIB_X11_LIB
 XFT_LIBS=@XFT_LIBS@