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

This commit is contained in:
Marc Wäckerlin
2017-07-28 09:29:36 +00:00
parent 248d3b5032
commit 605c4eea79
8 changed files with 356 additions and 43 deletions
+2 -1
View File
@@ -90,7 +90,7 @@ dnl refers to ${prefix}. Thus we have to use `eval' twice.
# $3 = filename of makefile.in
AC_DEFUN([AX_ADD_MAKEFILE_TARGET_DEP], [
sh_add_makefile_target_dep() {
sed -i -e ':a;/^'${1}':.*\\$/{N;s/\\\n//;ta};s/^'${1}':.*$/& '${2}'/' "${srcdir}/${3}"
sed -i -e ':a;/^'${1}':.*\\$/{N;s/\\\n//;ta};s/^'"${1}"':.*$/& '"${2}"'/' "${srcdir}/${3}"
if ! egrep -q "${1}:.* ${2}" "${srcdir}/${3}"; then
echo "${1}: ${2}" >> "${srcdir}/${3}"
fi
@@ -1229,4 +1229,5 @@ AC_DEFUN([AX_OUTPUT], [
AX_RPM_RESOLVE
AC_OUTPUT
AX_INIT_QT
AC_MSG_NOTICE([configured for ${PACKAGE_NAME}-${VERSION}])
])