Mercurial > octave

comparison m4/acinclude.m4 @ 29070:ab3e0676b8d6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: merge stable to default.
author Rik <rik@octave.org>
date Wed, 18 Nov 2020 19:45:04 -0800
parents 226df400639c c6796a1c35b2
children d9ac99164c18
comparison
equal deleted inserted replaced
29068:d8089b13d4d7 29070:ab3e0676b8d6
1846 AC_CHECK_TOOLS(m4_toupper([$1])_QTVER, [$1-qt$qt_version]) 1846 AC_CHECK_TOOLS(m4_toupper([$1])_QTVER, [$1-qt$qt_version])
1847 if test -z "$m4_toupper([$1])_QTVER"; then 1847 if test -z "$m4_toupper([$1])_QTVER"; then
1848 AC_CHECK_TOOLS(m4_toupper([$1]), [$1]) 1848 AC_CHECK_TOOLS(m4_toupper([$1]), [$1])
1849 if test -n "$m4_toupper([$1])"; then 1849 if test -n "$m4_toupper([$1])"; then
1850 if test -n "$QTCHOOSER"; then 1850 if test -n "$QTCHOOSER"; then
1851 m4_toupper([$1])FLAGS="-qt$qt_version" 1851 m4_toupper([$1])FLAGS="-qt=$qt_version"
1852 fi 1852 fi
1853 QT_TOOLS_AVAILABLE="$QT_TOOLS_AVAILABLE $1" 1853 QT_TOOLS_AVAILABLE="$QT_TOOLS_AVAILABLE $1"
1854 else 1854 else
1855 QT_TOOLS_MISSING="$QT_TOOLS_MISSING $1" 1855 QT_TOOLS_MISSING="$QT_TOOLS_MISSING $1"
1856 fi 1856 fi