regen

7 files changed, 5 insertions, 29 deletions

diff --git a/Makefile.in b/Makefile.in
index b3df168..720e6d0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -74,7 +74,7 @@ subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
 	$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL \
-	config.guess config.sub install-sh ltmain.sh missing
+	config.guess config.sub depcomp install-sh ltmain.sh missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_define_dir.m4 \
 	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
@@ -262,7 +262,6 @@ RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
 SED = @SED@
-SERVERSTYPE = @SERVERSTYPE@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SHELL_CMD = @SHELL_CMD@
diff --git a/config/Makefile.in b/config/Makefile.in
index 48174c8..9bbad0e 100644
--- a/config/Makefile.in
+++ b/config/Makefile.in
@@ -221,7 +221,6 @@ RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
 SED = sed
-SERVERSTYPE = @SERVERSTYPE@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SHELL_CMD = @SHELL_CMD@
@@ -346,9 +345,9 @@ 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
 
 
@@ -696,11 +695,8 @@ uninstall-am: uninstall-dist_pixmapDATA \
 .cpp:
 	$(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
 
-Xservers: Xservers.$(SERVERSTYPE)
-	ln -s Xservers.$(SERVERSTYPE) Xservers
-
-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) > $@
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/configure b/configure
index dce9e7a..7267157 100755
--- a/configure
+++ b/configure
@@ -671,7 +671,6 @@ XENODM_CFLAGS
 SHELL_CMD
 WTMP_FILE
 UTMP_FILE
-SERVERSTYPE
 DEFAULTVT
 XENODMLOGDIR
 XENODMSCRIPTDIR
@@ -850,7 +849,6 @@ with_xenodmconfigdir
 with_xenodmscriptdir
 with_logdir
 with_default_vt
-with_config_type
 with_utmp_file
 with_wtmp_file
 with_color_pixmap
@@ -1561,9 +1559,6 @@ Optional Packages:
                           (default=/var/log)
   --with-default-vt=<vtname>
                           specify default vt to start xenodm on (default=none)
-  --with-config-type={ws|fs}
-                          default config file type to use - workstation (ws)
-                          or fileserver (fs) (default=ws)
   --with-utmp-file=<pathname>
                           specify file to pass to sessreg -u for current
                           logins
@@ -18997,16 +18992,6 @@ fi
 
 
 
-
-# Check whether --with-config-type was given.
-if test "${with_config_type+set}" = set; then :
-  withval=$with_config_type; SERVERSTYPE="$withval"
-else
-  SERVERSTYPE="ws"
-fi
-
-
-
 # Ideally we'd just pull out UTMP_FILE & WTMP_FILE from <utmp.h>
 # but that's not easy to do in autoconf
 
diff --git a/greeter/Makefile.in b/greeter/Makefile.in
index 808b3d2..886bf86 100644
--- a/greeter/Makefile.in
+++ b/greeter/Makefile.in
@@ -218,7 +218,6 @@ RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
 SED = @SED@
-SERVERSTYPE = @SERVERSTYPE@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SHELL_CMD = @SHELL_CMD@
diff --git a/include/Makefile.in b/include/Makefile.in
index fcae2d1..f5a298f 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -184,7 +184,6 @@ RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
 SED = @SED@
-SERVERSTYPE = @SERVERSTYPE@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SHELL_CMD = @SHELL_CMD@
diff --git a/man/Makefile.in b/man/Makefile.in
index c2047ec..676d886 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -238,7 +238,6 @@ RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
 SED = @SED@
-SERVERSTYPE = @SERVERSTYPE@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SHELL_CMD = @SHELL_CMD@
diff --git a/xenodm/Makefile.in b/xenodm/Makefile.in
index c205b5d..66c464d 100644
--- a/xenodm/Makefile.in
+++ b/xenodm/Makefile.in
@@ -240,7 +240,6 @@ RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
 SED = @SED@
-SERVERSTYPE = @SERVERSTYPE@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SHELL_CMD = @SHELL_CMD@