Mercurial > octave
changeset 25134:5fccb7373bc4 stable
allow configure to continue if some Qt tools are found (bug #53571)
* acinclude.m4 (OCTAVE_CHECK_QT): Don't fail if some Qt tools are
missing and some are found.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Fri, 06 Apr 2018 08:14:39 -0400 |
| parents | 4ccb4f6e59ca |
| children | ab3904f253c5 |
| files | m4/acinclude.m4 |
| diffstat | 1 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/m4/acinclude.m4 Thu Apr 05 17:42:03 2018 -0700 +++ b/m4/acinclude.m4 Fri Apr 06 08:14:39 2018 -0400 @@ -1711,10 +1711,13 @@ if test $build_qt_gui = yes; then have_qt_version=$ver break - elif test -n "$QT_MODULES_AVAILABLE" || -n "$QT_TOOLS_AVAILABLE"; then + elif test -n "$QT_MODULES_AVAILABLE"; then ## If some modules were found for $ver, then warn about possible ## incomplete or broken Qt installation instead of checking for - ## next version in the list. + ## next version in the list. Don't attempt a similar check for + ## tools here becuase Qt4 and Qt5 tools may be installed with + ## the same name so determining whether there is a mix of versions + ## will require more work than just looking which tools are installed. warn_qt_modules="Your installation of Qt version $ver appears incomplete or broken in some way. Fix that or use --with-qt=VER to use another version." break fi