From b77bf2e4d4bf7e99343ad1be20a268988ffb4f0b Mon Sep 17 00:00:00 2001
From: mancoast <RobertPancoast77@gmail.com>
Date: Sat, 2 Nov 2019 14:24:30 -0400
Subject: [PATCH] Update ax_have_qt.m4

---
 m4/autoconf-archive/ax_have_qt.m4 | 38 +++++++++++++++++++++++++++++--
 1 file changed, 36 insertions(+), 2 deletions(-)

diff --git a/m4/autoconf-archive/ax_have_qt.m4 b/m4/autoconf-archive/ax_have_qt.m4
index ecf860618..c71a7606b 100644
--- a/m4/autoconf-archive/ax_have_qt.m4
+++ b/m4/autoconf-archive/ax_have_qt.m4
@@ -73,9 +73,35 @@ 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(widgets):           QT += widgets
+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
 percent.target = %
 percent.commands = @echo -n "\$(\$(@))\ "
 QMAKE_EXTRA_TARGETS += percent
@@ -89,6 +115,8 @@ 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 /.+`
@@ -100,7 +128,9 @@ EOF
     QT_LIBS=$QT_LIBS
     QT_UIC=$QT_UIC
     QT_MOC=$QT_MOC
-    QT_RCC=$QT_RCC])
+    QT_RCC=$QT_RCC
+    QT_LRELEASE=$QT_LRELEASE
+    QT_LUPDATE=$QT_LUPDATE])
   else
     # Qt was not found
     have_qt=no
@@ -110,6 +140,8 @@ EOF
     QT_UIC=
     QT_MOC=
     QT_RCC=
+    QT_LRELEASE=
+    QT_LUPDATE=
     AC_MSG_RESULT($have_qt)
   fi
   AC_SUBST(QT_CXXFLAGS)
@@ -118,6 +150,8 @@ 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