improved waiting for elements: defaults to timeout-1 if element should be there, defaults to timeout/3 if element is optional

2017-07-28 09:29:36 +00:00
parent 248d3b5032
commit 605c4eea79
8 changed files with 356 additions and 43 deletions
@@ -274,9 +274,9 @@ AC_DEFUN([AX_QT_NO_KEYWORDS], [
 ])

 AC_DEFUN([AX_INIT_QT], [
-  test -f src/makefile.in && cat >> src/makefile.in <<EOF
-#### HERE
+  if test -n "${AX_ADDITIONAL_QT_RULES_HACK}"; then
+    test -f src/makefile.in && cat >> src/makefile.in <<EOF
 ${AX_ADDITIONAL_QT_RULES_HACK}
-#### WE ARE
 EOF
+  fi
 ])