Mercurial > emacs

changeset 108536:fcc84f208070

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Minor simplification for src/Makefile.in. * src/Makefile.in (FONT_DRIVERS): If HAVE_X_WINDOWS is defined, HAVE_WINDOW_SYSTEM must be too.
author Glenn Morris <rgm@gnu.org>
date Thu, 13 May 2010 00:41:37 -0700
parents 7ed2fb419f40
children f9f040b85798
files src/ChangeLog src/Makefile.in
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Thu May 13 00:26:50 2010 -0700
+++ b/src/ChangeLog	Thu May 13 00:41:37 2010 -0700
@@ -1,5 +1,8 @@
 2010-05-13  Glenn Morris  <rgm@gnu.org>
 
+	* Makefile.in (FONT_DRIVERS): If HAVE_X_WINDOWS is defined,
+	HAVE_WINDOW_SYSTEM must be too.
+
 	* Makefile.in (WINNT_SUPPORT): Remove, nt build does not use this file.
 	(lisp): Remove WINNT_SUPPORT.
 
--- a/src/Makefile.in	Thu May 13 00:26:50 2010 -0700
+++ b/src/Makefile.in	Thu May 13 00:41:37 2010 -0700
@@ -353,11 +353,9 @@
 ns_appsrc=@ns_appsrc@
 #endif  /* HAVE_NS */
 
-#ifdef HAVE_WINDOW_SYSTEM
 #ifdef HAVE_X_WINDOWS
 FONT_DRIVERS=$(FONT_OBJ)
 #endif /* HAVE_X_WINDOWS */
-#endif /* HAVE_WINDOW_SYSTEM */
 
 /* lastfile must follow all files
    whose initialized data areas should be dumped as pure by dump-emacs.  */