From 735845a29f1f5d008325374d989c978c071f465d Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Sat, 27 Aug 2022 10:45:59 +0300
Subject: [PATCH 41/41] Move AC_ARG_VAR(MOCCMD) to main configure.ac

autoupdate can't handle AC_ARG_VAR() outside configure.ac,
but crashed.

See osdn #43027

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 configure.ac | 4 ++++
 m4/qt.m4     | 2 --
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index b435cf080e..868284080a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,6 +43,10 @@ m4_include(fc_version)
 
 AC_ARG_VAR([FREECIV_LABEL_FORCE], [Forced version label format])
 
+dnl Logical place for this would be m4/qt.m4, but autoupdate can't
+dnl handle AC_ARG_VAR() outside configure.ac
+AC_ARG_VAR([MOCCMD], [QT moc command (autodetected if not set)])
+
 AC_DEFINE_UNQUOTED([MAJOR_VERSION], [$MAJOR_VERSION], [Major version])
 AC_DEFINE_UNQUOTED([MINOR_VERSION], [$MINOR_VERSION], [Minor version])
 AC_DEFINE_UNQUOTED([PATCH_VERSION], [$PATCH_VERSION], [Patch version])
diff --git a/m4/qt.m4 b/m4/qt.m4
index fecea89253..384767d02f 100644
--- a/m4/qt.m4
+++ b/m4/qt.m4
@@ -1,7 +1,5 @@
 # Detect Qt headers and libraries and set flag variables
 
-AC_ARG_VAR([MOCCMD], [QT moc command (autodetected it if not set)])
-
 AC_DEFUN([FC_QT],
 [
   case "x$1" in
-- 
2.35.1

