From 4befa4516fedf1c591fbd4e39476ca67f89af6b2 Mon Sep 17 00:00:00 2001
From: Luigi Baldoni <luigino@users.noreply.github.com>
Date: Thu, 17 Oct 2019 19:19:05 +0200
Subject: [PATCH] Reduce Qt5 requirements to a minimum (#173)

* Reduce Qt5 requirements to a minimum

* Extend the search path for Qt-related tools
---
 configure.ac                      |  5 ++++
 m4/autoconf-archive/ax_have_qt.m4 | 38 ++-----------------------------
 2 files changed, 7 insertions(+), 36 deletions(-)

diff --git a/configure.ac b/configure.ac
index fb38f9a70..79a42bd73 100644
--- a/configure.ac
+++ b/configure.ac
@@ -172,6 +172,11 @@ AX_CHECK_COMPILE_FLAG([-std=c++11], [
 AC_ARG_ENABLE([qt], AS_HELP_STRING([--enable-qt], [Enable Qt: needed for pulseaudio and jack GUIs]), [], [enable_qt=check])
 AS_IF([test "$enable_qt" != "no"],
   [
+    case $host_os in
+      linux*)
+        PATH="$PATH:`pkg-config --variable=host_bins Qt5Core`"
+      ;;
+    esac
     AX_HAVE_QT  # m4/qt.m4
 
     AS_IF([test "$have_qt" = "yes"], [
diff --git a/m4/autoconf-archive/ax_have_qt.m4 b/m4/autoconf-archive/ax_have_qt.m4
index c71a7606b..ecf860618 100644
--- a/m4/autoconf-archive/ax_have_qt.m4
+++ b/m4/autoconf-archive/ax_have_qt.m4
@@ -73,35 +73,9 @@ AC_DEFUN([AX_HAVE_QT],
     am_have_qt_makefile=`mktemp`
     # http://qt-project.org/doc/qt-5/qmake-variable-reference.html#qt
     cat > $am_have_qt_pro << EOF
-qtHaveModule(axcontainer):       QT += axcontainer
-qtHaveModule(axserver):          QT += axserver
-qtHaveModule(concurrent):        QT += concurrent
 qtHaveModule(core):              QT += core
-qtHaveModule(dbus):              QT += dbus
-qtHaveModule(declarative):       QT += declarative
-qtHaveModule(designer):          QT += designer
-qtHaveModule(gui):               QT += gui
-qtHaveModule(help):              QT += help
-qtHaveModule(multimedia):        QT += multimedia
-qtHaveModule(multimediawidgets): QT += multimediawidgets
-qtHaveModule(network):           QT += network
 qtHaveModule(opengl):            QT += opengl
-qtHaveModule(printsupport):      QT += printsupport
-qtHaveModule(qml):               QT += qml
-qtHaveModule(qmltest):           QT += qmltest
-qtHaveModule(x11extras):         QT += x11extras
-qtHaveModule(script):            QT += script
-qtHaveModule(scripttools):       QT += scripttools
-qtHaveModule(sensors):           QT += sensors
-qtHaveModule(serialport):        QT += serialport
-qtHaveModule(sql):               QT += sql
-qtHaveModule(svg):               QT += svg
-qtHaveModule(testlib):           QT += testlib
-qtHaveModule(uitools):           QT += uitools
-qtHaveModule(webkit):            QT += webkit
-qtHaveModule(webkitwidgets):     QT += webkitwidgets
-qtHaveModule(xml):               QT += xml
-qtHaveModule(xmlpatterns):       QT += xmlpatterns
+qtHaveModule(widgets):           QT += widgets
 percent.target = %
 percent.commands = @echo -n "\$(\$(@))\ "
 QMAKE_EXTRA_TARGETS += percent
@@ -115,8 +89,6 @@ EOF
     QT_MOC=`which moc`
     QT_UIC=`which uic`
     QT_RCC=`which rcc`
-    QT_LRELEASE=`which lrelease`
-    QT_LUPDATE=`which lupdate`
 
     # Get Qt version from qmake
     QT_DIR=`qmake --version | grep -o -E /.+`
@@ -128,9 +100,7 @@ EOF
     QT_LIBS=$QT_LIBS
     QT_UIC=$QT_UIC
     QT_MOC=$QT_MOC
-    QT_RCC=$QT_RCC
-    QT_LRELEASE=$QT_LRELEASE
-    QT_LUPDATE=$QT_LUPDATE])
+    QT_RCC=$QT_RCC])
   else
     # Qt was not found
     have_qt=no
@@ -140,8 +110,6 @@ EOF
     QT_UIC=
     QT_MOC=
     QT_RCC=
-    QT_LRELEASE=
-    QT_LUPDATE=
     AC_MSG_RESULT($have_qt)
   fi
   AC_SUBST(QT_CXXFLAGS)
@@ -150,8 +118,6 @@ EOF
   AC_SUBST(QT_UIC)
   AC_SUBST(QT_MOC)
   AC_SUBST(QT_RCC)
-  AC_SUBST(QT_LRELEASE)
-  AC_SUBST(QT_LUPDATE)
 
   #### Being paranoid:
   if test x"$have_qt" = xyes; then