Keep only on Xservers file.

The Xservers.fs file makes no sense in xenodm.

app/xenodm/config/Makefile.am

@@ -25,16 +25,13 @@ pixmapdir = $(XENODM_PIXMAPDIR)
 dist_pixmap_DATA = OpenBSD_15bpp.xpm OpenBSD_1bpp.xpm \
 		OpenBSD_4bpp.xpm OpenBSD_8bpp.xpm
 
-BUILT_SOURCES = Xservers.ws xenodm-config Xreset Xresources Xsession Xstartup
+BUILT_SOURCES = Xservers xenodm-config Xreset Xresources Xsession Xstartup
 
 CLEANFILES = $(BUILT_SOURCES) Xservers
 
-EXTRA_DIST = Xservers.ws.cpp Xservers.fs \
+EXTRA_DIST = Xservers.cpp \
 	xenodm-config.cpp Xreset.cpp Xresources.cpp Xsession.cpp Xstartup.cpp
 
-Xservers: Xservers.$(SERVERSTYPE)
-	ln -s Xservers.$(SERVERSTYPE) Xservers
-
 # Defines used when cpp'ing config files to replace settings in the files
 
 #if USE_XPM
@@ -54,5 +51,5 @@ CPP_FILES_FLAGS = -DBINDIR="$(bindir)" -DDEFAULTVT="$(DEFAULTVT)" \
     -DXENODMSCRIPTDIR="$(XENODMSCRIPTDIR)" -DSU="$(SU)" \
     $(XPMDEFINES) -DSHELL_CMD="$(SHELL_CMD)" $(MKTEMP_DEFINES)
 
-Xservers.ws: $(srcdir)/Xservers.ws.cpp
-	$(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $(srcdir)/Xservers.ws.cpp | $(CPP_SED_MAGIC) > $@
+Xservers: $(srcdir)/Xservers.cpp
+	$(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $(srcdir)/Xservers.cpp | $(CPP_SED_MAGIC) > $@

app/xenodm/config/Xservers.fs

@@ -1,10 +0,0 @@
-#
-# Xservers file, fileserver prototype (any machine without a display)
-#
-# Put X terminals which don't support XDMCP in this file; you will
-# want to leave those terminals on and connected to the network, else
-# xdm will have a tougher time managing them.
-#
-# Each line should look like:
-#
-#	XterminalName:0 foreign

app/xenodm/configure.ac

@@ -124,12 +124,6 @@ AC_ARG_WITH(default-vt,
 	[DEFAULTVT="$withval"], [[DEFAULTVT=""]])
 AC_SUBST(DEFAULTVT)
 
-AC_ARG_WITH(config-type,
-	AS_HELP_STRING([--with-config-type={ws|fs}],
-	 [default config file type to use - workstation (ws) or fileserver (fs) (default=ws)]),
-	[SERVERSTYPE="$withval"], [SERVERSTYPE="ws"])
-AC_SUBST(SERVERSTYPE)
-
 # Ideally we'd just pull out UTMP_FILE & WTMP_FILE from <utmp.h>
 # but that's not easy to do in autoconf
 AC_ARG_WITH(utmp_file,