Mercurial > octave
diff m4/acinclude.m4 @ 23088:e2b1f3546978
fix caching error with Qt tool configuration (bug #50129)
* acinclude.m4 (OCTAVE_CHECK_QT_VERSION): Use separate variable names
when checking for Qt tools wit and without versions appended. For
example, use MOC_QTVER when checking for "moc-qt$ver" and MOC when
checking for "moc". Likewise for other Qt tools (uic, rcc, lrelease).
If all tools with the version number appended are found, set the simple
variable to the value of the version variable (MOC from MOC_QTVER, for
example).
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Tue, 24 Jan 2017 18:35:08 -0500 |
| parents | ef4d915df748 |
| children | 80a2434ba83c |
line wrap: on
line diff
--- a/m4/acinclude.m4 Tue Jan 24 18:00:05 2017 -0500 +++ b/m4/acinclude.m4 Tue Jan 24 18:35:08 2017 -0500 @@ -1477,12 +1477,12 @@ fi if test $build_qt_gui = yes; then - AC_CHECK_TOOLS(MOC, [moc-qt$qt_version]) - AC_CHECK_TOOLS(UIC, [uic-qt$qt_version]) - AC_CHECK_TOOLS(RCC, [rcc-qt$qt_version]) - AC_CHECK_TOOLS(LRELEASE, [lrelease-qt$qt_version]) + AC_CHECK_TOOLS(MOC_QTVER, [moc-qt$qt_version]) + AC_CHECK_TOOLS(UIC_QTVER, [uic-qt$qt_version]) + AC_CHECK_TOOLS(RCC_QTVER, [rcc-qt$qt_version]) + AC_CHECK_TOOLS(LRELEASE_QTVER, [lrelease-qt$qt_version]) - if test -z "$MOC" || test -z "$UIC" || test -z "$RCC" || test -z "$LRELEASE"; then + if test -z "$MOC_QTVER" || test -z "$UIC_QTVER" || test -z "$RCC_QTVER" || test -z "$LRELEASE_QTVER"; then AC_CHECK_TOOLS(QTCHOOSER, [qtchooser]) if test -z "$MOC"; then @@ -1509,6 +1509,11 @@ LRELEASEFLAGS="-qt$qt_version" fi fi + else + MOC="$MOC_QTVER" + UIC="$UIC_QTVER" + RCC="$RCC_QTVER" + LRELEASE="$LRELEASE_QTVER" fi if test -z "$MOC" || test -z "$UIC" || test -z "$RCC" || test -z "$LRELEASE"; then