From f7b46b0b14017f95311e8682d15b3ef681b694ff Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Sat, 2 Sep 2023 14:32:57 +0300
Subject: [PATCH 06/17] Autotools: Make autoconf-2.69 a minimum requirement

This does not affect meson based builds

See osdn #48565

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 INSTALL              |  4 ++--
 autogen.sh           | 14 +++++++-------
 configure.ac         |  2 +-
 doc/README.packaging |  1 +
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/INSTALL b/INSTALL
index 2493f73f7d..fbcaa6a42b 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,7 +4,7 @@ Installing Freeciv:
 
 This file describes how to compile and install Freeciv. Last time we
 made sure this file is up to date was 16-Jul-06.
-Last minor update was 24-Jun-23.
+Last minor update was 02-Sep-23.
 
 There may be a localized version of this file in the ./doc directory,
 named INSTALL.<locale> (e.g., INSTALL.de).
@@ -99,7 +99,7 @@ contains the generated files.
    Especial the xgettext program is required to create the *.gmo
    files which aren't included in the git tree.
 
- - GNU autoconf version 2.65 or better
+ - GNU autoconf version 2.69 or better
 
    Autoconf is required to create configure from configure.ac.
 
diff --git a/autogen.sh b/autogen.sh
index 3611ac2416..c08a746d23 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -236,10 +236,10 @@ cd "$SRCDIR"
 }
 
 # autoconf and autoheader version numbers must be kept in sync
-real_package_name "autoconf" "ftp://ftp.gnu.org/pub/gnu/autoconf/" 2 65 || DIE=1
-AUTOCONF=$REALPKGNAME
-real_package_name "autoheader" "ftp://ftp.gnu.org/pub/gnu/autoconf/" 2 65 || DIE=1
-AUTOHEADER=$REALPKGNAME
+real_package_name "autoconf" "ftp://ftp.gnu.org/pub/gnu/autoconf/" 2 69 || DIE=1
+AUTOCONF="${REALPKGNAME}"
+real_package_name "autoheader" "ftp://ftp.gnu.org/pub/gnu/autoconf/" 2 69 || DIE=1
+AUTOHEADER="${REALPKGNAME}"
 
 # automake and aclocal version numbers must be kept in sync
 real_package_name "automake" "ftp://ftp.gnu.org/pub/gnu/automake/" 1 13 || DIE=1
@@ -292,10 +292,10 @@ $ACLOCAL -I m4 -I dependencies/m4 $ACLOCAL_FLAGS || {
   echo "$ACLOCAL failed on libtool files run"
   exit 1
 }
-echo "+ running $AUTOCONF ... "
-$AUTOCONF || {
+echo "+ running ${AUTOCONF} ... "
+"${AUTOCONF}" || {
   echo
-  echo "$AUTOCONF failed"
+  echo "${AUTOCONF} failed"
   exit 1
 }
 echo "+ running $AUTOMAKE ... "
diff --git a/configure.ac b/configure.ac
index 3549658c88..acf877c495 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT([Freeciv], m4_esyscmd([./fc_version | tr -d '\n']),
         [https://osdn.net/projects/freeciv/ticket/],
         [freeciv], [https://www.freeciv.org/])
-AC_PREREQ(2.65)
+AC_PREREQ(2.69)
 
 if test "x$(pwd)" = "x$(cd $srcdir && pwd)" ; then
   AC_MSG_ERROR([Attempted to configure source directory. You have to use separate build dir])
diff --git a/doc/README.packaging b/doc/README.packaging
index ce3534a53b..202cf727cd 100644
--- a/doc/README.packaging
+++ b/doc/README.packaging
@@ -20,6 +20,7 @@ Updating from 3.2 to 3.3
 * Minimum version of Qt is Qt-5.15, when building in Qt5-mode
 * Configuring source directory is no longer allowed in autotools builds.
   You have to use separate build dir(s)
+* Minimum autoconf version, for autotools based builds, is now 2.69
 * New 'qt6x' mode for building Qt based components linked against
   relatively new Qt6 versions
 * Build with meson supports building gtk4x-client that is linked
-- 
2.40.1