[Emacs-diffs] /srv/bzr/emacs/trunk r100257: Minor simplification for src/Makefile.in.

[Glenn Morris]

------------------------------------------------------------
revno: 100257
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2010-05-13 00:41:37 -0700
message:
  Minor simplification for src/Makefile.in.
  
  * src/Makefile.in (FONT_DRIVERS): If HAVE_X_WINDOWS is defined,
  HAVE_WINDOW_SYSTEM must be too.
modified:
  src/ChangeLog
  src/Makefile.in

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-05-13 04:23:06 +0000
+++ b/src/ChangeLog     2010-05-13 07:41:37 +0000
@@ -1,5 +1,8 @@
 2010-05-13  Glenn Morris  <address@hidden>
 
+       * 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.
 

=== modified file 'src/Makefile.in'
--- a/src/Makefile.in   2010-05-13 04:15:12 +0000
+++ b/src/Makefile.in   2010-05-13 07:41:37 +0000
@@ -353,11 +353,9 @@
 address@hidden@
 #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.  */