Mercurial > octave

comparison m4/acinclude.m4 @ 25119:14b9e2a1f3e1 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
if some Qt tools are instaslled, don't check for another version * acinclude.m4 (OCTAVE_CHECK_QT): Also consider Qt tools when deciding whether the Qt installation appears to be incomplete. (OCTAVE_CHECK_QT_VERSION): Accumulate lists of available and missing Qt tools.
author John W. Eaton <jwe@octave.org>
date Wed, 04 Apr 2018 10:06:04 -0400
parents f191e1a26095
children 5fccb7373bc4
comparison
equal deleted inserted replaced
25117:98596e4522bc 25119:14b9e2a1f3e1
1709 for ver in $octave_qt_versions; do 1709 for ver in $octave_qt_versions; do
1710 OCTAVE_CHECK_QT_VERSION([$ver]) 1710 OCTAVE_CHECK_QT_VERSION([$ver])
1711 if test $build_qt_gui = yes; then 1711 if test $build_qt_gui = yes; then
1712 have_qt_version=$ver 1712 have_qt_version=$ver
1713 break 1713 break
1714 elif test -n "$QT_MODULES_AVAILABLE"; then 1714 elif test -n "$QT_MODULES_AVAILABLE" || -n "$QT_TOOLS_AVAILABLE"; then
1715 ## If some modules were found for $ver, then warn about possible 1715 ## If some modules were found for $ver, then warn about possible
1716 ## incomplete or broken Qt installation instead of checking for 1716 ## incomplete or broken Qt installation instead of checking for
1717 ## next version in the list. 1717 ## next version in the list.
1718 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." 1718 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."
1719 break 1719 break
1727 fi 1727 fi
1728 if test x"$have_qt_version" = x5; then 1728 if test x"$have_qt_version" = x5; then
1729 AC_DEFINE(HAVE_QT5, 1, [Define to 1 if using Qt version 5.]) 1729 AC_DEFINE(HAVE_QT5, 1, [Define to 1 if using Qt version 5.])
1730 fi 1730 fi
1731 else 1731 else
1732 if test -n "$QT_MODULES_MISSING"; then 1732 if test -n "$QT_MODULES_MISSING" || test -n "$QT_TOOLS_MISSING"; then
1733 BUILD_QT_SUMMARY_MSG="no (missing:$QT_MODULES_MISSING)" 1733 qt_missing=`echo $QT_MODULES_MISSING$QT_TOOLS_MISSING | sed 's/ *$//'`
1734 BUILD_QT_SUMMARY_MSG="no (missing:$qt_missing)"
1734 else 1735 else
1735 BUILD_QT_SUMMARY_MSG="no" 1736 BUILD_QT_SUMMARY_MSG="no"
1736 fi 1737 fi
1737 if test -n "$warn_qt_modules"; then 1738 if test -n "$warn_qt_modules"; then
1738 OCTAVE_CONFIGURE_WARNING([warn_qt_modules]) 1739 OCTAVE_CONFIGURE_WARNING([warn_qt_modules])
1971 warn_qt_version="Qt >= 4.0.0 not found; disabling Qt GUI" 1972 warn_qt_version="Qt >= 4.0.0 not found; disabling Qt GUI"
1972 fi 1973 fi
1973 fi 1974 fi
1974 fi 1975 fi
1975 1976
1977 QT_TOOLS_AVAILABLE=
1978 QT_TOOLS_MISSING=
1979
1976 if test $build_qt_gui = yes; then 1980 if test $build_qt_gui = yes; then
1977 AC_CHECK_TOOLS(QTCHOOSER, [qtchooser]) 1981 AC_CHECK_TOOLS(QTCHOOSER, [qtchooser])
1978 1982
1979 AC_CHECK_TOOLS(MOC_QTVER, [moc-qt$qt_version]) 1983 AC_CHECK_TOOLS(MOC_QTVER, [moc-qt$qt_version])
1980 if test -z "$MOC_QTVER"; then 1984 if test -z "$MOC_QTVER"; then
1981 AC_CHECK_TOOLS(MOC, [moc]) 1985 AC_CHECK_TOOLS(MOC, [moc])
1982 if test -n "$MOC" && test -n "$QTCHOOSER"; then 1986 if test -n "$MOC" && test -n "$QTCHOOSER"; then
1983 MOCFLAGS="-qt$qt_version" 1987 MOCFLAGS="-qt$qt_version"
1988 QT_TOOLS_AVAILABLE="$QT_TOOLS_AVAILABLE moc"
1989 else
1990 QT_TOOLS_MISSING="$QT_TOOLS_MISSING moc"
1984 fi 1991 fi
1985 else 1992 else
1986 MOC="$MOC_QTVER" 1993 MOC="$MOC_QTVER"
1987 fi 1994 fi
1988 1995
1989 AC_CHECK_TOOLS(UIC_QTVER, [uic-qt$qt_version]) 1996 AC_CHECK_TOOLS(UIC_QTVER, [uic-qt$qt_version])
1990 if test -z "$UIC_QTVER"; then 1997 if test -z "$UIC_QTVER"; then
1991 AC_CHECK_TOOLS(UIC, [uic]) 1998 AC_CHECK_TOOLS(UIC, [uic])
1992 if test -n "$UIC" && test -n "$QTCHOOSER"; then 1999 if test -n "$UIC" && test -n "$QTCHOOSER"; then
1993 UICFLAGS="-qt$qt_version" 2000 UICFLAGS="-qt$qt_version"
2001 QT_TOOLS_AVAILABLE="$QT_TOOLS_AVAILABLE uic"
2002 else
2003 QT_TOOLS_MISSING="$QT_TOOLS_MISSING uic"
1994 fi 2004 fi
1995 else 2005 else
1996 UIC="$UIC_QTVER" 2006 UIC="$UIC_QTVER"
1997 fi 2007 fi
1998 2008
1999 AC_CHECK_TOOLS(RCC_QTVER, [rcc-qt$qt_version]) 2009 AC_CHECK_TOOLS(RCC_QTVER, [rcc-qt$qt_version])
2000 if test -z "$RCC_QTVER"; then 2010 if test -z "$RCC_QTVER"; then
2001 AC_CHECK_TOOLS(RCC, [rcc]) 2011 AC_CHECK_TOOLS(RCC, [rcc])
2002 if test -n "$RCC" && test -n "$QTCHOOSER"; then 2012 if test -n "$RCC" && test -n "$QTCHOOSER"; then
2003 RCCFLAGS="-qt$qt_version" 2013 RCCFLAGS="-qt$qt_version"
2014 QT_TOOLS_AVAILABLE="$QT_TOOLS_AVAILABLE rcc"
2015 else
2016 QT_TOOLS_MISSING="$QT_TOOLS_MISSING rcc"
2004 fi 2017 fi
2005 else 2018 else
2006 RCC="$RCC_QTVER" 2019 RCC="$RCC_QTVER"
2007 fi 2020 fi
2008 2021
2009 AC_CHECK_TOOLS(LRELEASE_QTVER, [lrelease-qt$qt_version]) 2022 AC_CHECK_TOOLS(LRELEASE_QTVER, [lrelease-qt$qt_version])
2010 if test -z "$LRELEASE_QTVER"; then 2023 if test -z "$LRELEASE_QTVER"; then
2011 AC_CHECK_TOOLS(LRELEASE, [lrelease]) 2024 AC_CHECK_TOOLS(LRELEASE, [lrelease])
2012 if test -n "$LRELEASE" && test -n "$QTCHOOSER"; then 2025 if test -n "$LRELEASE" && test -n "$QTCHOOSER"; then
2013 LRELEASEFLAGS="-qt$qt_version" 2026 LRELEASEFLAGS="-qt$qt_version"
2027 QT_TOOLS_AVAILABLE="$QT_TOOLS_AVAILABLE lrelease"
2028 else
2029 QT_TOOLS_MISSING="$QT_TOOLS_MISSING lrelease"
2014 fi 2030 fi
2015 else 2031 else
2016 LRELEASE="$LRELEASE_QTVER" 2032 LRELEASE="$LRELEASE_QTVER"
2017 fi 2033 fi
2018 2034
2019 AC_CHECK_TOOLS(QCOLLECTIONGENERATOR_QTVER, [qcollectiongenerator-qt$qt_version]) 2035 AC_CHECK_TOOLS(QCOLLECTIONGENERATOR_QTVER, [qcollectiongenerator-qt$qt_version])
2020 if test -z "$QCOLLECTIONGENERATOR_QTVER"; then 2036 if test -z "$QCOLLECTIONGENERATOR_QTVER"; then
2021 AC_CHECK_TOOLS(QCOLLECTIONGENERATOR, [qcollectiongenerator]) 2037 AC_CHECK_TOOLS(QCOLLECTIONGENERATOR, [qcollectiongenerator])
2022 if test -n "$QCOLLECTIONGENERATOR" && test -n "$QTCHOOSER"; then 2038 if test -n "$QCOLLECTIONGENERATOR" && test -n "$QTCHOOSER"; then
2023 QCOLLECTIONGENERATORFLAGS="-qt$qt_version" 2039 QCOLLECTIONGENERATORFLAGS="-qt$qt_version"
2040 QT_TOOLS_AVAILABLE="$QT_TOOLS_AVAILABLE qcollectiongenerator"
2041 else
2042 QT_TOOLS_MISSING="$QT_TOOLS_MISSING qcollectiongenerator"
2024 fi 2043 fi
2025 else 2044 else
2026 QCOLLECTIONGENERATOR="$QCOLLECTIONGENERATOR_QTVER" 2045 QCOLLECTIONGENERATOR="$QCOLLECTIONGENERATOR_QTVER"
2027 fi 2046 fi
2028 2047
2029 AC_CHECK_TOOLS(QHELPGENERATOR_QTVER, [qhelpgenerator-qt$qt_version]) 2048 AC_CHECK_TOOLS(QHELPGENERATOR_QTVER, [qhelpgenerator-qt$qt_version])
2030 if test -z "$QHELPGENERATOR_QTVER"; then 2049 if test -z "$QHELPGENERATOR_QTVER"; then
2031 AC_CHECK_TOOLS(QHELPGENERATOR, [qhelpgenerator]) 2050 AC_CHECK_TOOLS(QHELPGENERATOR, [qhelpgenerator])
2032 if test -n "$QHELPGENERATOR" && test -n "$QTCHOOSER"; then 2051 if test -n "$QHELPGENERATOR" && test -n "$QTCHOOSER"; then
2033 QHELPGENERATORFLAGS="-qt$qt_version" 2052 QHELPGENERATORFLAGS="-qt$qt_version"
2053 QT_TOOLS_AVAILABLE="$QT_TOOLS_AVAILABLE qhelpgenerator"
2054 else
2055 QT_TOOLS_MISSING="$QT_TOOLS_MISSING qhelpgenerator"
2034 fi 2056 fi
2035 else 2057 else
2036 QHELPGENERATOR="$QHELPGENERATOR_QTVER" 2058 QHELPGENERATOR="$QHELPGENERATOR_QTVER"
2037 fi 2059 fi
2038 2060
2039 if test -z "$MOC" || test -z "$UIC" || test -z "$RCC" || test -z "$LRELEASE" || test -z "$QCOLLECTIONGENERATOR" || test -z "$QHELPGENERATOR"; then 2061 if test -n "$QT_TOOLS_MISSING"; then
2040 warn_qt_tools="one or more of the Qt utilities moc, uic, rcc, lrelease, qcollectiongenerator, and qhelpgenerator not found; disabling Qt GUI" 2062 warn_qt_tools="one or more of the Qt utilities moc, uic, rcc, lrelease, qcollectiongenerator, and qhelpgenerator not found; disabling Qt GUI"
2041 build_qt_gui=no 2063 build_qt_gui=no
2042 MOC_QTVER= 2064 MOC_QTVER=
2043 UIC_QTVER= 2065 UIC_QTVER=
2044 RCC_QTVER= 2066 RCC_QTVER=