From 8d7f5ef96a1d687c95b5791b93a86eb044102a81 Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Fri, 23 Sep 2022 22:42:28 +0300
Subject: [PATCH 30/30] Meson: Drop ack_experimental option

See osdn #44491

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 .github/workflows/ci.yml | 2 +-
 doc/INSTALL.meson        | 6 ------
 meson.build              | 5 -----
 meson_options.txt        | 5 -----
 scripts/ci-build.sh      | 8 ++++++--
 5 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c67dcd1ef9..4f57f28c83 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -47,7 +47,7 @@ jobs:
         shell: msys2 {0}
         run: |
           cd windows/installer_msys2
-          make ci && EXTRA_CONFIG="-Dack_experimental=true" make -f Makefile.meson ci
+          make ci && make -f Makefile.meson ci
   os_x:
     runs-on: macos-12
     steps:
diff --git a/doc/INSTALL.meson b/doc/INSTALL.meson
index 162ac2064d..7dc9166963 100644
--- a/doc/INSTALL.meson
+++ b/doc/INSTALL.meson
@@ -98,12 +98,6 @@ default_library ('shared'/'static'/'both')
 Freeciv specific configure options:
 -----------------------------------
 
-ack_experimental (boolean):
-  As the official build system for freeciv is still autotools, user
-  has to acknowledge that they are using experimental build system when
-  using meson. This configure options must be set to 'true', or build
-  refuses to start
-
 clients (array):
   List of clients to build. To disable client build completely, give an
   empty array ('-Dclients=[]'). Currently gtk3.22-, sdl2-, qt-,
diff --git a/meson.build b/meson.build
index 4c15804cad..833851bfbc 100644
--- a/meson.build
+++ b/meson.build
@@ -1,11 +1,6 @@
 
 project('freeciv', ['c', 'cpp'], meson_version: '>= 0.57.0')
 
-if not get_option('ack_experimental')
-  error('Autotools are still the only fully supported way to build freeciv.\nSet configure option "ack_experimental" to true if you really want to do experimental meson build.\n' +
-        'Most scripts that do freeciv build with meson allow you to pass configure options\nvia environment variable EXTRA_CONFIG.')
-endif
-
 c_compiler = meson.get_compiler('c')
 
 if c_compiler.has_argument('-Wno-nonnull-compare')
diff --git a/meson_options.txt b/meson_options.txt
index f0bb4331b9..c0b5e0a3b7 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,8 +1,3 @@
-option('ack_experimental',
-       type: 'boolean',
-       value: false,
-       description: 'User acknowledges experimental build')
-
 option('clients',
        type: 'array',
        choices: ['gtk3.22','sdl2', 'qt', 'gtk4'],
diff --git a/scripts/ci-build.sh b/scripts/ci-build.sh
index f59219b125..850eb2fcd0 100755
--- a/scripts/ci-build.sh
+++ b/scripts/ci-build.sh
@@ -44,7 +44,12 @@ fi
 
 mkdir build
 cd build
-meson .. -Dprefix=${HOME}/freeciv/meson -Ddebug=true -Dack_experimental=true -Dclients='gtk3.22','qt','sdl2','gtk4' -Dfcmp='gtk3','qt','cli','gtk4' -Dqtver=qt6
+meson .. \
+  -Dprefix=${HOME}/freeciv/meson \
+  -Ddebug=true \
+  -Dclients='gtk3.22','qt','sdl2','gtk4' \
+  -Dfcmp='gtk3','qt','cli','gtk4' \
+  -Dqtver=qt6
 ninja
 ninja install
 ;;
@@ -87,7 +92,6 @@ export PKG_CONFIG_PATH="$(brew --prefix icu4c)/lib/pkgconfig"
 mkdir build
 cd build
 meson .. \
-  -Dack_experimental=true \
   -Ddebug=true \
   -Druledit=false \
   -Dsyslua=true \
-- 
2.35.1