From 55aefd852ee49287c6f85c8b87abd7abeb5b4f9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc@mrw.sh>
Date: Wed, 29 Nov 2017 15:57:41 +0000
Subject: [PATCH] allow recursive C++ source directories

---
 scripts/ax_check_qt.m4              | 6 ++++--
 scripts/ax_init_standard_project.m4 | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/scripts/ax_check_qt.m4 b/scripts/ax_check_qt.m4
index 2d88048..f17af0e 100644
--- a/scripts/ax_check_qt.m4
+++ b/scripts/ax_check_qt.m4
@@ -275,8 +275,10 @@ AC_DEFUN([AX_QT_NO_KEYWORDS], [
 
 AC_DEFUN([AX_INIT_QT], [
   if test -n "${AX_ADDITIONAL_QT_RULES_HACK}"; then
-    test -f src/makefile.in && cat >> src/makefile.in <<EOF
-${AX_ADDITIONAL_QT_RULES_HACK}
+    for f in $(find test src -name makefile.in); do
+      test -f "$f" && cat >> "$f" <<EOF
+${AX_ADDITIONAL_QT_RULES_HACK}    
 EOF
+    done
   fi
 ])
diff --git a/scripts/ax_init_standard_project.m4 b/scripts/ax_init_standard_project.m4
index a71a1bc..4329a20 100644
--- a/scripts/ax_init_standard_project.m4
+++ b/scripts/ax_init_standard_project.m4
@@ -1225,9 +1225,9 @@ AC_DEFUN([AX_ALL_DEPEND], [
 
 # finish configuration - to be called instead of AC_OUTPUT
 AC_DEFUN([AX_OUTPUT], [
+  AX_INIT_QT
   AX_DEB_RESOLVE
   AX_RPM_RESOLVE
   AC_OUTPUT
-  AX_INIT_QT
   AC_MSG_NOTICE([configured for ${PACKAGE_NAME}-${VERSION}])
 ])