From 9a4119c67bf51687d6201c504edc360a9ea9f08d Mon Sep 17 00:00:00 2001
From: Moritz Bunkus <mo@bunkus.online>
Date: Wed, 2 Mar 2022 19:26:12 +0100
Subject: [PATCH] configure: Qt6: detect if multimedia module is actually
 available

---
 ac/qt6.m4 | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/ac/qt6.m4 b/ac/qt6.m4
index 0013775f6..d6ae4f407 100644
--- a/ac/qt6.m4
+++ b/ac/qt6.m4
@@ -45,9 +45,11 @@ EOT
 
   qmake_qtplugin_ui=""
   qmake_qt_ui=""
+  qmake_qt_ui_try=""
 
   if ! test x"$MINGW" = x1; then
-    qmake_qt_ui="dbus multimedia"
+    qmake_qt_ui="dbus"
+    qmake_qt_ui_try="multimedia"
   fi
 
   cat > "$qmake_dir/configure_non_gui.pro" <<EOT
@@ -72,8 +74,11 @@ EOT
     fi
   fi
 
-  cat > "$qmake_dir/configure.pro" <<EOT
-QT = core $qmake_qt_ui gui widgets network concurrent
+  while true; do
+    rm -f Makefile Makefile.Release
+
+    cat > "$qmake_dir/configure.pro" <<EOT
+QT = core $qmake_qt_ui $qmake_qt_ui_try gui widgets network concurrent
 QTPLUGIN += $qmake_qtplugin_ui
 
 FORMS = configure.ui
@@ -82,8 +87,15 @@ HEADERS = configure.h
 SOURCES = configure.cpp
 EOT
 
-  "$QMAKE6" -makefile -nocache configure.pro > /dev/null
-  result2=$?
+    "$QMAKE6" -makefile -nocache configure.pro > /dev/null
+    result2=$?
+
+    if test -z $qmake_qt_ui_try; then
+      break
+    fi
+
+    qmake_qt_ui_try=""
+  done
 
   if test $result2 = 0; then
     if test -f Makefile.Release; then