diff --git a/m4/acinclude.m4 b/m4/acinclude.m4 --- a/m4/acinclude.m4 +++ b/m4/acinclude.m4 @@ -1516,19 +1516,23 @@ AC_DEFUN([OCTAVE_CHECK_QT_VERSION], [AC_ if test -z "$MOC" || test -z "$UIC" || test -z "$RCC" || test -z "$LRELEASE"; then warn_qt_tools="one or more of the Qt utility programs moc, uic, rcc, and lrelease not found; disabling Qt GUI" build_qt_gui=no - MOC_QTVER= - UIC_QTVER= - RCC_QTVER= - LRELEASE_QTVER= MOC_FLAGS= UIC_FLAGS= RCC_FLAGS= LRELEASE_FLAGS= - $as_unset ac_cv_prog_MOC_QTVER - $as_unset ac_cv_prog_UIC_QTVER - $as_unset ac_cv_prog_RCC_QTVER - $as_unset ac_cv_prog_LRELEASE_QTVER fi + + ## Always invalidate these because we might check again for a + ## different version and we don't want to pick up a mix of tools + ## from different Qt versions. + MOC_QTVER= + UIC_QTVER= + RCC_QTVER= + LRELEASE_QTVER= + $as_unset ac_cv_prog_MOC_QTVER + $as_unset ac_cv_prog_UIC_QTVER + $as_unset ac_cv_prog_RCC_QTVER + $as_unset ac_cv_prog_LRELEASE_QTVER fi if test $build_qt_gui = yes; then