From b83262b694e18963f910e5d5404e05d1efd6a1d7 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Mon, 19 Apr 2021 17:32:51 +0300 Subject: [PATCH 56/56] Define default port in .project file See osdn #42030 Signed-off-by: Marko Lindqvist --- bootstrap/freeciv.project | 5 +++++ configure.ac | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/bootstrap/freeciv.project b/bootstrap/freeciv.project index 7934e54d47..9657ef6cee 100644 --- a/bootstrap/freeciv.project +++ b/bootstrap/freeciv.project @@ -15,3 +15,8 @@ if test "x$HAIKU" != "xyes" ; then else FREECIV_STORAGE_DIR="~/config/settings/freeciv" fi + +# Default ports +FREECIV_DEFAULT_PORT=5556 +# Default + 1000 +FREECIV_JSON_PORT=6556 diff --git a/configure.ac b/configure.ac index 5b3be6a621..f59b089595 100644 --- a/configure.ac +++ b/configure.ac @@ -32,9 +32,6 @@ AC_DEFINE(FC_CONFIG_H, 1, [Configuration autogenerated]) AC_DEFINE_UNQUOTED([BUG_URL], ["$BUG_URL"], [Bug reporting URL]) AC_DEFINE_UNQUOTED([WIKI_URL], ["$WIKI_URL"], [Informational URL]) -AC_DEFINE([DEFAULT_SOCK_PORT], [5556], [Connection TCP Port]) -AC_DEFINE([FREECIV_JSON_PORT], [6556], [Json Connection TCP Port]) dnl raw default + 1000 - AC_SUBST([BUG_URL]) AC_SUBST([WIKI_URL]) AC_SUBST([MAIL_ADDRESS]) @@ -304,6 +301,9 @@ AC_ARG_WITH([project-definition], . ${project_definition} +AC_DEFINE_UNQUOTED([DEFAULT_SOCK_PORT], [$FREECIV_DEFAULT_PORT], [Connection TCP Port]) +AC_DEFINE_UNQUOTED([FREECIV_JSON_PORT], [$FREECIV_JSON_PORT], [Json Connection TCP Port]) + AC_DEFINE_UNQUOTED([FREECIV_META_URL], ["$META_URL"], [Metaserver URL]) if test "x$MODPACK_LIST_URL" != "x" ; then -- 2.30.2