Mercurial > octave
changeset 25029:91671d57817e stable
configure: mention qcollectiongenerator and qhelpgenerator in diagnostics (bug #53474)
* acinclude.m4 (OCTAVE_CHECK_QT_VERSION): Mention qcollectiongenerator and
qhelpgenerator in Qt warning message. Do not list all utilities in comment
associated with HAVE_QT preprocessor symbol.
| author | Mike Miller <mtmiller@octave.org> |
|---|---|
| date | Tue, 27 Mar 2018 16:51:29 -0700 |
| parents | acb7094aebb3 |
| children | 62186547b752 |
| files | m4/acinclude.m4 |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/m4/acinclude.m4 Fri Mar 23 15:28:08 2018 +0100 +++ b/m4/acinclude.m4 Tue Mar 27 16:51:29 2018 -0700 @@ -1943,7 +1943,7 @@ fi if test -z "$MOC" || test -z "$UIC" || test -z "$RCC" || test -z "$LRELEASE" || test -z "$QCOLLECTIONGENERATOR" || test -z "$QHELPGENERATOR"; then - warn_qt_tools="one or more of the Qt utility programs moc, uic, rcc, and lrelease not found; disabling Qt GUI" + warn_qt_tools="one or more of the Qt utilities moc, uic, rcc, lrelease, qcollectiongenerator, and qhelpgenerator not found; disabling Qt GUI" build_qt_gui=no MOC_QTVER= UIC_QTVER= @@ -2013,7 +2013,7 @@ ## checks below are for optional features related to the Qt GUI. AC_DEFINE(HAVE_QT, 1, - [Define to 1 if Qt is available, with all required functions, libraries, developer header files, and utility programs (moc, uic, rcc, and lrelease).]) + [Define to 1 if Qt is available, with all required functions, libraries, developer header files, and utilities.]) AC_LANG_PUSH(C++) ac_octave_save_CPPFLAGS="$CPPFLAGS"