From edcb3e90968df73c09bcfee525ff12ecc493077b Mon Sep 17 00:00:00 2001
From: Martin Pulec <martin.pulec@cesnet.cz>
Date: Wed, 3 Nov 2021 13:39:10 +0100
Subject: [PATCH] Configure: Qt6 fixes

- fixed [,] special meaning in M4
- qmake version >6 -> >=6
- typo: QMAKE_VER instead of QMAKE_VERSION
---
 configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 6e95d837d..9b2230b48 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2763,11 +2763,11 @@ fi
 
 if test "$QMAKE" -a "$QMAKE" != ":"
 then
-        QMAKE_VERSION=`$QMAKE -v | sed -n 's/.*Qt version \([^ ]*\).*/\1/p'`
+        QMAKE_VERSION=`$QMAKE -v | sed -n 's/.*Qt version \(@<:@^ @:>@*\).*/\1/p'`
 fi
 
 # Qt deps not found with pkg-config but qmake found (eg. in Qt 6)
-if test $FOUND_QT_DEP = no -a -n "$QMAKE_VERSION" && expr "$QMAKE_VER" \> 6 >/dev/null
+if test $FOUND_QT_DEP = no && test -n "$QMAKE_VERSION" && expr "$QMAKE_VERSION" \>= 6 >/dev/null
 then
         touch qt.pro
         $QMAKE qt.pro -o Make.qt