From ac083aedfadcfa6d28df56073b063dc447772efd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= <me@dawidwrobel.com>
Date: Thu, 18 Feb 2021 16:22:53 -0500
Subject: [PATCH] ax_have_qt: fix building out of tree

This updates the ax_have_qt.m4 to the current upstream version,
which includes a fix (b15e688294b3be8481e477b16b52c7f81bc7eb58) for
a bug causing issue with  building in a directory relative to the
current one.

The previous change enabling custom path for Qt5 qmake was kept.
---
 m4/ax_have_qt.m4 | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/m4/ax_have_qt.m4 b/m4/ax_have_qt.m4
index 91fbba4f..f035a818 100644
--- a/m4/ax_have_qt.m4
+++ b/m4/ax_have_qt.m4
@@ -1,5 +1,5 @@
 # ===========================================================================
-#        http://www.gnu.org/software/autoconf-archive/ax_have_qt.html
+#        https://www.gnu.org/software/autoconf-archive/ax_have_qt.html
 # ===========================================================================
 #
 # SYNOPSIS
@@ -21,6 +21,7 @@
 #     QT_LIBS
 #     QT_MOC
 #     QT_UIC
+#     QT_RCC
 #     QT_LRELEASE
 #     QT_LUPDATE
 #     QT_DIR
@@ -59,7 +60,7 @@
 #   and this notice are preserved. This file is offered as-is, without any
 #   warranty.
 
-#serial 12
+#serial 17
 
 AU_ALIAS([BNV_HAVE_QT], [AX_HAVE_QT])
 AC_DEFUN([AX_HAVE_QT],
@@ -73,15 +74,15 @@ AC_DEFUN([AX_HAVE_QT],
     [QT_QMAKE="$withval"],
     [QT_QMAKE="qmake"]
   )
-
   AC_MSG_CHECKING(for Qt)
   # If we have Qt5 or later in the path, we're golden
   ver=`$QT_QMAKE --version | grep -o "Qt version ."`
   if test "$ver" ">" "Qt version 4"; then
     have_qt=yes
     # This pro file dumps qmake's variables, but it only works on Qt 5 or later
-    am_have_qt_pro=`mktemp`
-    am_have_qt_makefile=`mktemp`
+    am_have_qt_dir=`mktemp -d`
+    am_have_qt_pro="$am_have_qt_dir/test.pro"
+    am_have_qt_makefile="$am_have_qt_dir/Makefile"
     # http://qt-project.org/doc/qt-5/qmake-variable-reference.html#qt
     cat > $am_have_qt_pro << EOF
 win32 {
@@ -96,9 +97,10 @@ percent.commands = @echo -n "\$(\$(@))\ "
 QMAKE_EXTRA_TARGETS += percent
 EOF
     $QT_QMAKE $am_have_qt_pro -o $am_have_qt_makefile
-    QT_CXXFLAGS=`make -s -f $am_have_qt_makefile CXXFLAGS INCPATH`
-    QT_LIBS=`make -s -f $am_have_qt_makefile LIBS`
+    QT_CXXFLAGS=`cd $am_have_qt_dir; make -s -f $am_have_qt_makefile CXXFLAGS INCPATH`
+    QT_LIBS=`cd $am_have_qt_dir; make -s -f $am_have_qt_makefile LIBS`
     rm $am_have_qt_pro $am_have_qt_makefile
+    rmdir $am_have_qt_dir
 
     # Look for specific tools in $PATH
     AC_ARG_WITH(qt5-moc,
@@ -106,13 +108,13 @@ EOF
       [QT_MOC="$withval"],
       [QT_MOC=`which moc`]
     )
-
     AC_ARG_WITH(qt5-uic,
       [  --with-qt5-uic=FILE      uses given qt uic],
       [QT_UIC="$withval"],
       [QT_UIC=`which uic`]
     )
 
+    QT_RCC=`which rcc`
     QT_LRELEASE=`which lrelease`
     QT_LUPDATE=`which lupdate`
 
@@ -126,6 +128,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])
   else
@@ -136,6 +139,7 @@ EOF
     QT_LIBS=
     QT_UIC=
     QT_MOC=
+    QT_RCC=
     QT_LRELEASE=
     QT_LUPDATE=
     AC_MSG_RESULT($have_qt)
@@ -145,6 +149,7 @@ EOF
   AC_SUBST(QT_LIBS)
   AC_SUBST(QT_UIC)
   AC_SUBST(QT_MOC)
+  AC_SUBST(QT_RCC)
   AC_SUBST(QT_LRELEASE)
   AC_SUBST(QT_LUPDATE)
 
-- 
2.24.3 (Apple Git-128)