allow recursive C++ source directories

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
+    for f in $(find test src -name makefile.in); do
+      test -f "$f" && cat >> "$f" <<EOF
 ${AX_ADDITIONAL_QT_RULES_HACK}    
 EOF
+    done
   fi
 ])

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}])
 ])