[Freeciv-Dev] (PR#14397) SDL client removal

["Mateusz Stefek" <mstefek@xxxxxxxxx>]

<URL: http://bugs.freeciv.org/Ticket/Display.html?id=14397 >

The attached patch removes the sdl client.

Files to be removed:
client/gui-sdl
m4/sdl-client,m4
data/freeciv.rc

Have I missed something?
--
mateusz

Index: configure.ac
===================================================================
--- configure.ac        (wersja 11161)
+++ configure.ac        (kopia robocza)
@@ -59,7 +59,7 @@
 
 dnl  no=do not compile client,  yes=guess it,  *=use this client or error
 AC_ARG_ENABLE(client,
-[  --enable-client[=no/yes/xaw3d/xaw/gtk/win32/sdl/ftwl]
+[  --enable-client[=no/yes/xaw3d/xaw/gtk/win32/ftwl]
                           compile a client [default=yes] (if yes, guess type)],
 [case "${enableval}" in
   yes)   client=yes ;;
@@ -379,9 +379,6 @@
   dnl Gtk-2.0-specific overrides
   FC_GTK2_CLIENT
 
-  dnl SDL-specific overrides
-  FC_SDL_CLIENT
-
   dnl Xaw-specific overrides
   FC_XAW_CLIENT
 
@@ -442,7 +439,6 @@
 AC_SUBST(VERSION_WITHOUT_LABEL)
 AC_SUBST(VERSION_LABEL)
 AM_CONDITIONAL(SDL, test "x$SDL_mixer" = "xyes")
-AM_CONDITIONAL(CLIENT_GUI_SDL, test "$gui_sources" = "gui-sdl")
 AM_CONDITIONAL(CLIENT_GUI_GTK_2_0, test "$gui_sources" = "gui-gtk-2.0")
 AM_CONDITIONAL(CLIENT_GUI_XAW, test "$gui_sources" = "gui-xaw")
 AM_CONDITIONAL(CLIENT_GUI_BEOS, test "$gui_sources" = "gui-beos")
@@ -690,7 +686,6 @@
          client/Makefile 
          client/agents/Makefile
          client/include/Makefile 
-         client/gui-sdl/Makefile 
          client/gui-gtk-2.0/Makefile
          client/gui-xaw/Makefile 
          client/gui-win32/Makefile 
Index: data/Makefile.am
===================================================================
--- data/Makefile.am    (wersja 11161)
+++ data/Makefile.am    (kopia robocza)
@@ -31,11 +31,9 @@
 
 pkgdata_DATA = $(SERVER_FILES) $(CLIENT_FILES)
 
-# Freeciv.rc was originally for gui-gtk but is also used by gui-sdl
 EXTRA_DIST = \
        Freeciv \
        freeciv-client.png \
-       freeciv.rc      \
        freeciv.rc-2.0  \
        amplio.tilespec \
        isophex.tilespec        \
Index: Makefile.am
===================================================================
--- Makefile.am (wersja 11161)
+++ Makefile.am (kopia robocza)
@@ -79,7 +79,6 @@
                m4/no-client.m4                 \
                m4/progtest.m4                  \
                m4/readline.m4                  \
-               m4/sdl-client.m4                \
                m4/sdl.m4                       \
                m4/sound.m4                     \
                m4/version.m4                   \
Index: client/Makefile.am
===================================================================
--- client/Makefile.am  (wersja 11161)
+++ client/Makefile.am  (kopia robocza)
@@ -3,10 +3,6 @@
 ## Below used to be just 
 ##    SUBDIRS = @gui_sources@
 ## but that doesn't work properly for "make dist"
-
-if CLIENT_GUI_SDL
-GUI_SUBDIR = gui-sdl
-endif
 if CLIENT_GUI_GTK_2_0
 GUI_SUBDIR = gui-gtk-2.0
 endif