imake cleanup: Drop all references to BuildFontServer.

7 files changed, 1 insertions, 40 deletions

diff --git a/nx-X11/config/cf/README b/nx-X11/config/cf/README
index e1b65a378..a31490377 100644
--- a/nx-X11/config/cf/README
+++ b/nx-X11/config/cf/README
@@ -178,7 +178,6 @@ X11.tmpl provides defaults for the following variables:
 	BuildDBE		build DOUBLE-BUFFER extension
 	BuildDmx		build Distributed Multihead X server and extension
 	BuildDPMS		build Display Power Management Signaling extension
-	BuildFontServer		build font server
 	BuildFonts		build pcf fonts
 	BuildIncRoot		relative path to location of headers in build
 	BuildIncTop		path from build includes directory to top
diff --git a/nx-X11/config/cf/X11.tmpl b/nx-X11/config/cf/X11.tmpl
index 71a5d26e7..b6ff72e1f 100644
--- a/nx-X11/config/cf/X11.tmpl
+++ b/nx-X11/config/cf/X11.tmpl
@@ -144,9 +144,6 @@ XORGRELSTRING = XorgManVersionString
 #ifndef BuildLibrariesForXServers
 #define BuildLibrariesForXServers	BuildServer
 #endif
-#ifndef BuildFontServer
-#define BuildFontServer		YES
-#endif
 #ifndef XserverStaticFontLib
 #define XserverStaticFontLib	YES
 #endif
@@ -166,7 +163,7 @@ XORGRELSTRING = XorgManVersionString
 #define BuildBuiltinFonts	NO
 #endif
 #ifndef BuildFonts
-#define BuildFonts		(BuildServer | BuildFontServer)
+#define BuildFonts		BuildServer
 #endif
 #ifndef Build75DpiFonts
 #define Build75DpiFonts		YES
@@ -1688,7 +1685,6 @@ XCOMM X Window System make variables; these need to be coordinated with rules
            RGBSRC = $(XTOP)/programs/rgb
       BDFTOPCFSRC = $(PROGRAMSRC)/bdftopcf
      MKFONTDIRSRC = $(PROGRAMSRC)/mkfontdir
-    FONTSERVERSRC = $(PROGRAMSRC)/xfs
        FONTINCSRC = $(XTOP)/include/fonts
         EXTINCSRC = $(XTOP)/include/extensions
       FTSOURCEDIR = FreeTypeSrcDir
diff --git a/nx-X11/config/cf/host.def b/nx-X11/config/cf/host.def
index cae87f153..1bd3289ab 100644
--- a/nx-X11/config/cf/host.def
+++ b/nx-X11/config/cf/host.def
@@ -250,13 +250,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
  */
 
 /*
- * To disable building the font server, uncomment this.
- *
-#define BuildFontServer		NO
- */
-#define BuildFontServer		NO
-
-/*
  * Speedo fonts have been disabled by default in this release.
  * To re-enable support for Speedo fonts, uncomment this.
  *
@@ -934,7 +927,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
 #define BuildServersOnly            YES
 #define DefaultFontPath             /usr/NX/share/fonts/misc/,/usr/NX/share/fonts/TTF/
 #define DefaultRGBDatabase          /usr/NX/share/rgb
-#define BuildFontServer             NO
 #define BuildFreeType               NO
 #define BuildXTrueType              NO
 #define FontLibSharedFreeType       YES
diff --git a/nx-X11/config/cf/xf86site.def b/nx-X11/config/cf/xf86site.def
index db89ffe4c..39d8980b6 100644
--- a/nx-X11/config/cf/xf86site.def
+++ b/nx-X11/config/cf/xf86site.def
@@ -139,12 +139,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
  */
 
 /*
- * To disable building the font server, uncomment this.
- *
-#define BuildFontServer		NO
- */
-
-/*
  * To disable support for Speedo fonts, uncomment this.
  *
 #define BuildSpeedo		NO
diff --git a/nx-X11/config/cf/xfree86.cf b/nx-X11/config/cf/xfree86.cf
index 5832096ec..0348c0302 100644
--- a/nx-X11/config/cf/xfree86.cf
+++ b/nx-X11/config/cf/xfree86.cf
@@ -1684,13 +1684,6 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8
 #endif
 
 /*
- * Build the font server
- */
-#ifndef BuildFontServer
-# define BuildFontServer	YES
-#endif
-
-/*
  * Include fonts support
  */
 #ifndef BuildSpeedo
diff --git a/nx-X11/config/cf/xorg.cf b/nx-X11/config/cf/xorg.cf
index 6b482420b..3f922359e 100644
--- a/nx-X11/config/cf/xorg.cf
+++ b/nx-X11/config/cf/xorg.cf
@@ -1248,13 +1248,6 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8
 #endif
 
 /*
- * Build the font server
- */
-#ifndef BuildFontServer
-# define BuildFontServer	YES
-#endif
-
-/*
  * Include fonts support
  */
 #ifndef BuildSpeedo
diff --git a/nx-X11/config/cf/xorgsite.def b/nx-X11/config/cf/xorgsite.def
index 6083ce5b3..eeaffa496 100644
--- a/nx-X11/config/cf/xorgsite.def
+++ b/nx-X11/config/cf/xorgsite.def
@@ -153,12 +153,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
  */
 
 /*
- * To disable building the font server, uncomment this.
- *
-#define BuildFontServer		NO
- */
-
-/*
  * Speedo fonts have been disabled by default in this release.
  * To re-enable support for Speedo fonts, uncomment this.
  *