From f89a0b6a6fcf5e5762b7fc90440d6f437fdf5d95 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sun, 17 Sep 2023 22:11:47 +0300 Subject: [PATCH 23/23] autotools: Define HOMEPAGE_URL at .project file See osdn #42934 Signed-off-by: Marko Lindqvist --- bootstrap/freeciv.project | 3 +++ configure.ac | 10 +++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/bootstrap/freeciv.project b/bootstrap/freeciv.project index 5bf136a460..4a95d6c6cd 100644 --- a/bootstrap/freeciv.project +++ b/bootstrap/freeciv.project @@ -20,3 +20,6 @@ fi FREECIV_DEFAULT_PORT=5556 # Default + 1000 FREECIV_JSON_PORT=6556 + +# Project homepage URL +HOMEPAGE_URL="https://www.freeciv.org/" diff --git a/configure.ac b/configure.ac index acf877c495..792a184a30 100644 --- a/configure.ac +++ b/configure.ac @@ -28,7 +28,6 @@ m4_ifdef([AC_SYS_YEAR2038], FC_EMSCRIPTEN BUG_URL="$PACKAGE_BUGREPORT" -HOMEPAGE_URL="https://www.freeciv.org/" MAIL_ADDRESS="freeciv-dev AT freelists.org" dnl Explain fc_config.h to end users (e.g., on Windows) @@ -39,10 +38,8 @@ AH_TOP( AC_DEFINE(FC_CONFIG_H, 1, [Configuration autogenerated]) AC_DEFINE_UNQUOTED([BUG_URL], ["$BUG_URL"], [Bug reporting URL]) -AC_DEFINE_UNQUOTED([HOMEPAGE_URL], ["$HOMEPAGE_URL"], [Informational URL]) AC_SUBST([BUG_URL]) -AC_SUBST([HOMEPAGE_URL]) AC_SUBST([MAIL_ADDRESS]) dnl client/server should always have the same major and minor versions @@ -367,15 +364,22 @@ AC_ARG_WITH([project-definition], . ${project_definition} +if test "x$HOMEPAGE_URL" = "x" ; then + AC_MSG_ERROR([${project_definition} did not define HOMEPAGE_URL]) +fi + 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]) +AC_DEFINE_UNQUOTED([HOMEPAGE_URL], ["$HOMEPAGE_URL"], [Informational URL]) if test "x$MODPACK_LIST_URL" != "x" ; then AC_DEFINE_UNQUOTED([MODPACK_LIST_URL], ["${MODPACK_LIST_URL}"], [Default modpack list URL]) fi +AC_SUBST([HOMEPAGE_URL]) + AC_ARG_WITH([readline], AS_HELP_STRING([--with-readline], [support fancy command line editing]), [WITH_READLINE=$withval], dnl yes/no - required to use / never use -- 2.40.1