Minor simplification for src/Makefile.in.

* src/Makefile.in (FONT_DRIVERS): If HAVE_X_WINDOWS is defined,
HAVE_WINDOW_SYSTEM must be too.

diff --git a/src/ChangeLog b/src/ChangeLog
index 3b47ff64b45ab640bf664c49b39170707d681e84..2ec13974f33ac74a39e23532ecdc210753039622 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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.
 

diff --git a/src/Makefile.in b/src/Makefile.in
index ceff99225d754669c2f59de6074e7f9b194f4b92..7ea2669fcfbc85a93636752898d4f2c0749b5cc8 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -353,11 +353,9 @@ ns_appresdir=@ns_appresdir@/
 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.  */