[Freeciv-Dev] (PR#10468) S2_0: Remove ftwl and sdl clients

["Per I. Mathisen" <per@xxxxxxxxxxx>]

<URL: http://rt.freeciv.org/Ticket/Display.html?id=10468 >

This patch removes build options for ftwl and sdl clients in S2_0. Since
they don't work.

  - Per

Index: configure.ac
===================================================================
RCS file: /home/freeciv/CVS/freeciv/configure.ac,v
retrieving revision 1.80
diff -u -r1.80 configure.ac
--- configure.ac        4 Oct 2004 17:33:08 -0000       1.80
+++ configure.ac        7 Oct 2004 18:29:43 -0000
@@ -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/gtk2/win32/sdl/ftwl]
+[  --enable-client[=no/yes/xaw3d/xaw/gtk/gtk2/win32]
                           compile a client [default=yes] (if yes, guess type)],
 [case "${enableval}" in
   yes)   client=yes ;;
@@ -76,20 +76,6 @@
 esac], [client=yes])
 AM_CONDITIONAL(CLIENT, test x$client != xno)
 
-dnl You MUST build ftwl to use the ftwl client
-AC_ARG_ENABLE(ftwl,
-[  --enable-ftwl[=no/x11/sdl]
-                          compile ftwl [default=no]],
-[case "${enableval}" in
-  x11)   ftwl=x11 ;;
-  sdl)    ftwl=sdl ;;
-  *)     AC_MSG_ERROR(bad value ${enableval} for --enable-ftwl) ;;
-esac], [ftwl=no])
-AM_CONDITIONAL(FTWL, test x$ftwl != xno)
-if test "$ftwl" = no && test "$client" = ftwl ; then
-  AC_MSG_ERROR(You must use --enable-ftwl to use the ftwl client)
-fi
-
 AC_ARG_WITH(xaw,
 [  --with-xaw              use the Xaw widget set for the xaw client],
 WITH_XAW=1
@@ -316,17 +302,6 @@
   AC_MSG_ERROR([zlib found but not zlib.h.  
 You may need to install a zlib \"development\" package.]))
 
-dnl Check and compile ftwl
-if test "$ftwl" = x11 ; then
-     FTWL_CFLAGS=`freetype-config --cflags`
-     FTWL_LIBS="-L/usr/X11R6/lib -lX11 -lpng "`freetype-config --libs`
-fi
-
-if test "$ftwl" = sdl ; then
-     FTWL_CFLAGS=`sdl-config --cflags`" "`freetype-config --cflags`
-     FTWL_LIBS=`sdl-config --libs`" -lpng "`freetype-config --libs`
-fi
-
 dnl Check for libiconv (which is usually included in glibc, but may be
 dnl distributed separately).
 AM_ICONV
@@ -353,19 +328,9 @@
   dnl Gtk-specific overrides
   FC_GTK_CLIENT
 
-  dnl SDL-specific overrides
-  FC_SDL_CLIENT
-
   dnl Xaw-specific overrides
   FC_XAW_CLIENT
 
-  if test "$client" = ftwl ; then
-      AC_MSG_CHECKING([will compile gui-ftwl])
-      AC_MSG_RESULT([yes])
-      CLIENT_CFLAGS="$CLIENT_FLAGS $FTWL_FLAGS"
-      CLIENT_LIBS="$CLIENT_LIBS $FTWL_LIBS"
-  fi
-
   dnl BeOS-specific overrides
   if test "$client" = beos || test "$client" = yes ; then
     if test x`$UNAME -s` = xBeOS ; then
@@ -418,17 +383,12 @@
 AM_CONDITIONAL(SDL, test "x$SDL_mixer" = "xyes")
 AM_CONDITIONAL(ALSA, test "x$ALSA" = "xyes")
 AM_CONDITIONAL(WINMM, test "x$WINMM" = "xyes")
-AM_CONDITIONAL(CLIENT_GUI_SDL, test "$gui_sources" = "gui-sdl")
 AM_CONDITIONAL(CLIENT_GUI_GTK, test "$gui_sources" = "gui-gtk")
 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")
 AM_CONDITIONAL(CLIENT_GUI_STUB, test "$gui_sources" = "gui-stub")
 AM_CONDITIONAL(CLIENT_GUI_WIN32, test "$gui_sources" = "gui-win32")
-AM_CONDITIONAL(CLIENT_GUI_FTWL, test "$gui_sources" = "gui-ftwl")
-AM_CONDITIONAL(FTWL, test "$ftwl" != "no")
-AM_CONDITIONAL(FTWL_X11, test "$ftwl" = "x11")
-AM_CONDITIONAL(FTWL_SDL, test "$ftwl" = "sdl")
 
 dnl Checks for additional server libraries:
 if test x$server = xtrue; then
@@ -646,7 +606,6 @@
          data/nation/Makefile 
          data/history/Makefile 
          utility/Makefile
-         utility/ftwl/Makefile
          common/Makefile 
          common/aicore/Makefile 
          ai/Makefile 
@@ -654,12 +613,10 @@
          client/Makefile 
          client/agents/Makefile
          client/include/Makefile 
-         client/gui-sdl/Makefile 
          client/gui-gtk/Makefile 
          client/gui-gtk-2.0/Makefile
          client/gui-xaw/Makefile 
          client/gui-win32/Makefile 
-         client/gui-ftwl/Makefile
          client/gui-stub/Makefile 
          server/Makefile 
          server/generator/Makefile
Index: client/Makefile.am
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/Makefile.am,v
retrieving revision 1.61
diff -u -r1.61 Makefile.am
--- client/Makefile.am  24 Sep 2004 15:33:31 -0000      1.61
+++ client/Makefile.am  7 Oct 2004 18:29:43 -0000
@@ -4,9 +4,6 @@
 ##    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
 GUI_SUBDIR = gui-gtk
 endif
@@ -25,10 +22,6 @@
 if CLIENT_GUI_WIN32
 GUI_SUBDIR = gui-win32
 endif
-if CLIENT_GUI_FTWL
-GUI_SUBDIR = gui-ftwl
-LIBFTWL = ../utility/ftwl/libftwl.a
-endif
 
 ALL_ESD_FILES=audio_esd.c audio_esd.h
 ALL_SDL_FILES=audio_sdl.c audio_sdl.h
@@ -194,7 +187,6 @@
 
 civclient_LDFLAGS = @CLIENT_LDFLAGS@
 fc_civclient_libs =    ../utility/libcivutility.a      \
-                       $(LIBFTWL)                      \
                        ../common/libcivcommon.a        \
                        ../common/aicore/libaicore.a    \
                        agents/libagents.a              \
Index: utility/Makefile.am
===================================================================
RCS file: /home/freeciv/CVS/freeciv/utility/Makefile.am,v
retrieving revision 1.7
diff -u -r1.7 Makefile.am
--- utility/Makefile.am 6 Sep 2004 17:13:07 -0000       1.7
+++ utility/Makefile.am 7 Oct 2004 18:29:44 -0000
@@ -1,7 +1,5 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS=        ftwl
-
 noinst_LIBRARIES = libcivutility.a
 
 AM_CPPFLAGS = -I../intl