From c6010a724e2a6f4da416e90f243a940679737755 Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Wed, 19 Jul 2023 11:01:45 +0300
Subject: [PATCH 18/18] Drop support for building web version with autotools
Meson must be used for building the web version.
See osdn #47807
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
Makefile.am | 1 -
bootstrap/fcser.in | 2 +-
configure.ac | 22 ----------------------
doc/README.packaging | 2 ++
m4/web-client.m4 | 36 ------------------------------------
server/Makefile.am | 16 +---------------
6 files changed, 4 insertions(+), 75 deletions(-)
delete mode 100644 m4/web-client.m4
diff --git a/Makefile.am b/Makefile.am
index 22133b75ea..37e2513a79 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -94,7 +94,6 @@ EXTRA_DIST = autogen.sh \
m4/sound.m4 \
m4/tcc.m4 \
m4/vsnprintf.m4 \
- m4/web-client.m4 \
m4/winsock2.m4 \
m4/testmatic.m4 \
meson.build \
diff --git a/bootstrap/fcser.in b/bootstrap/fcser.in
index a88328bb4c..72c27dc4df 100755
--- a/bootstrap/fcser.in
+++ b/bootstrap/fcser.in
@@ -15,7 +15,7 @@
#***********************************************************************/
BUILDDIR=`dirname $0`
-EXENAME=@SRVBIN@@EXEEXT@
+EXENAME=freeciv-server@EXEEXT@
if test "x$FREECIV_DATA_PATH" = "x" ; then
FREECIV_DATA_PATH=".@HOST_PATH_SEPARATOR@data@HOST_PATH_SEPARATOR@@FREECIV_STORAGE_DIR@@HOST_DIR_SEPARATOR@@DATASUBDIR@"
diff --git a/configure.ac b/configure.ac
index b558d80199..3549658c88 100644
--- a/configure.ac
+++ b/configure.ac
@@ -486,24 +486,6 @@ AS_IF([test "x$enable_delta_protocol" = "xno"], [
dnl extra arguments for the packet generator
AC_ARG_VAR([GENERATE_PACKETS_ARGS], [Additional arguments for the packet generator])
-FC_WEB_OPTIONS
-
-AC_ARG_ENABLE([fcweb],
- AS_HELP_STRING([--enable-fcweb], [build fcweb version of server [false]]),
-[case "${enableval}" in
- yes)
- fcweb=true ;;
- no)
- fcweb=false ;;
- *) AC_MSG_ERROR([bad value ${enableval} for --enable-fcweb]) ;;
-esac], [fcweb=false])
-
-FC_WEB_CLIENT
-
-AS_IF([test "x$fcweb" = "xtrue"],
- AC_SUBST([SRVBIN], [freeciv-web]),
- AC_SUBST([SRVBIN], [freeciv-server]))
-
FC_TESTMATIC
dnl no: Do not compile client.
@@ -516,10 +498,6 @@ AC_ARG_ENABLE([client],
[clients=${enableval}],
[client=auto])
-if test "x$fcweb" = "xtrue" && test "x$client" = "xauto" ; then
- clients=no
-fi
-
gui_gtk3_22=no
gui_gtk4=no
gui_sdl2=no
diff --git a/doc/README.packaging b/doc/README.packaging
index 31d42e1ec5..ce3534a53b 100644
--- a/doc/README.packaging
+++ b/doc/README.packaging
@@ -27,6 +27,8 @@ Updating from 3.2 to 3.3
* Build with meson supports building gtk4x modpack installer that is linked
against relatively new gtk4 versions
* va_copy support is now mandatory
+* Building web version of the server with autotools is no longer supported.
+ Make such builds with meson instead.
----------------------------------------------------------------------
Compatibility of modified versions
diff --git a/m4/web-client.m4 b/m4/web-client.m4
deleted file mode 100644
index ab8c06de7e..0000000000
--- a/m4/web-client.m4
+++ /dev/null
@@ -1,36 +0,0 @@
-# Configure checks for freeciv-web
-
-AC_DEFUN([FC_WEB_CLIENT],
-[
- AM_CONDITIONAL([FREECIV_WEB], [test "x$fcweb" = "xtrue"])
-
- if test "x$fcweb" = "xtrue" ; then
- AC_DEFINE([FREECIV_WEB], [1], [Build freeciv-web version instead of regular freeciv])
- fi
-])
-
-AC_DEFUN([FC_WEB_OPTIONS],
-[
-AC_ARG_ENABLE([json],
- AS_HELP_STRING([--enable-json], [enable json network protocol]),
-[case "${enableval}" in
- yes|no) json_enabled=${enableval} ;;
- *) AC_MSG_ERROR([bad value ${enableval} for --enable-json]) ;;
-esac], [json_enabled=no])
-
-JANSSON_CFLAGS=""
-JANSSON_LIBS=""
-
-if test "x$json_enabled" = "xyes" ; then
- PKG_CHECK_MODULES([JANSSON], [jansson], [], [
- AC_CHECK_LIB([jansson], [json_object_set_new],
-[JANSSON_LIBS="-ljansson"],
-[AC_MSG_ERROR([cannot find libjansson])])
- AC_CHECK_HEADER([jansson.h], [],
-[AC_MSG_ERROR([libjansson found but not jansson.h])])])
-
- AC_DEFINE([FREECIV_JSON_CONNECTION], [1], [jansson network protocol in use])
-
- COMMON_LIBS="${COMMON_LIBS} ${JANSSON_LIBS}"
-fi
-])
diff --git a/server/Makefile.am b/server/Makefile.am
index 293f4b68cd..82ebc9cef2 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -2,15 +2,7 @@
SUBDIRS = advisors generator savegame scripting
-if FREECIV_WEB
-srvbin = freeciv-web
-else
-srvbin = freeciv-server
-endif
-
-if SERVER
-bin_PROGRAMS = $(srvbin)
-endif
+bin_PROGRAMS = freeciv-server
lib_LTLIBRARIES = libfreeciv-srv.la
AM_CPPFLAGS = \
@@ -171,12 +163,6 @@ exe_ldadd = \
$(TINYCTHR_LIBS) \
$(SERVER_LIBS) $(SERVERICON)
-if FREECIV_WEB
-freeciv_web_SOURCES = $(exe_sources)
-freeciv_web_LDFLAGS = $(exe_ldflags)
-freeciv_web_LDADD = $(exe_ldadd)
-else
freeciv_server_SOURCES = $(exe_sources)
freeciv_server_LDFLAGS = $(exe_ldflags)
freeciv_server_LDADD = $(exe_ldadd)
-endif
--
2.40.1