Mercurial > octave
diff m4/acinclude.m4 @ 32356:0cdf8fe8533c
build: Look for Qt6 tools also in QT_HOSTS_BINS directory.
* m4/acinclude.m4 (OCTAVE_CHECK_QT_VERSION): Get path for QT_HOSTS_BINS.
(OCTAVE_CHECK_QT_TOOL): Check for Qt6 tools also in QT_HOSTS_BINS directory.
| author | Markus Mützel <markus.muetzel@gmx.de> |
|---|---|
| date | Wed, 27 Sep 2023 17:52:20 +0200 |
| parents | bf77e0f86f74 |
| children | 523613891d2f |
line wrap: on
line diff
--- a/m4/acinclude.m4 Wed Sep 27 17:18:24 2023 +0200 +++ b/m4/acinclude.m4 Wed Sep 27 17:52:20 2023 +0200 @@ -1960,9 +1960,8 @@ AC_DEFUN([OCTAVE_CHECK_QT_TOOL], [ AC_CHECK_TOOLS(m4_toupper([$1])_QTVER, [$1-qt$qt_version]) if test -z "$m4_toupper([$1])_QTVER"; then - if test -n "$QT_HOST_LIBEXECS"; then - AC_PATH_TOOL(m4_toupper([$1]), [$1], [], [$QT_HOST_LIBEXECS]) - fi + AC_PATH_TOOL(m4_toupper([$1]), [$1], [], + [$QT_HOST_LIBEXECS$PATH_SEPARATOR$QT_HOST_BINS$PATH_SEPARATOR]) if test -z "$m4_toupper([$1])"; then AC_CHECK_TOOLS(m4_toupper([$1]), [$1]) fi @@ -2110,6 +2109,29 @@ ;; esac fi + ac_octave_save_QT_HOST_BINS="$QT_HOST_BINS" + if test -z "$QT_HOST_BINS"; then + AC_CHECK_TOOLS(QTPATHS6, [qtpaths6 qtpaths-qt6]) + if test -n "$QTPATHS6"; then + QT_HOST_BINS="`$QTPATHS6 --query QT_HOST_BINS`" + fi + fi + if test -z "$QT_HOST_BINS"; then + AC_CHECK_TOOLS(QMAKE6, [qmake6 qmake-qt6]) + if test -n "$QMAKE6"; then + QT_HOST_BINS="`$QMAKE6 -query QT_HOST_BINS`" + fi + fi + if test -n "$QT_HOST_BINS"; then + case $host_os in + mingw*) + AC_CHECK_TOOL(CYGPATH, [cygpath]) + if test -n "$CYGPATH"; then + QT_HOST_BINS="`$CYGPATH -u $QT_HOST_BINS`" + fi + ;; + esac + fi ;; esac @@ -2143,6 +2165,7 @@ QCOLLECTIONGENERATORFLAGS= QHELPGENERATORFLAGS= QT_HOST_LIBEXECS="$ac_octave_save_QT_HOST_LIBEXECS" + QT_HOST_BINS="$ac_octave_save_QT_HOST_BINS" $as_unset ac_cv_prog_MOC_QTVER $as_unset ac_cv_prog_ac_ct_MOC_QTVER $as_unset ac_cv_prog_UIC_QTVER