aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/Makefile.in2
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 @@
12007-03-03 Glenn Morris <rgm@gnu.org>
2
3 * Makefile.in: Don't clear out LIB_X11_LIB, since XFT_LIBS does
4 not include -lX11 on Solaris.
5
12007-03-02 Stuart D. Herring <herring@lanl.gov> 62007-03-02 Stuart D. Herring <herring@lanl.gov>
2 7
3 * keymap.c (Fkey_binding): Don't consider two-element lists as 8 * 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)
403#endif /* not USE_X_TOOLKIT */ 403#endif /* not USE_X_TOOLKIT */
404 404
405#if HAVE_XFT 405#if HAVE_XFT
406#undef LIB_X11_LIB /* XFT_LIBS includes -lX11 */
407#define LIB_X11_LIB
408XFT_LIBS=@XFT_LIBS@ 406XFT_LIBS=@XFT_LIBS@
409#endif /* HAVE_XFT */ 407#endif /* HAVE_XFT */
410 408