Mercurial > mxe-octave
changeset 6896:09595fdc9c6f
build: Default to Qt6 only if building default-octave.
* configure.ac: Default to Qt6 when building default-octave. Default to Qt5
otherwise.
| author | Markus Mützel <markus.muetzel@gmx.de> |
|---|---|
| date | Sun, 01 Oct 2023 21:57:56 +0200 |
| parents | c2892f53d123 |
| children | 2e72cfa4eecf |
| files | configure.ac |
| diffstat | 1 files changed, 10 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Sun Oct 01 15:48:01 2023 +0200 +++ b/configure.ac Sun Oct 01 21:57:56 2023 +0200 @@ -360,17 +360,24 @@ esac], [ENABLE_DEVEL_TOOLS=no]) AC_SUBST(ENABLE_DEVEL_TOOLS) +# FIXME: Adjust this condition when Octave 9 is on the stable branch or released. +if test "$ENABLE_OCTAVE" = "default-"; then + default_qt=6 +else + default_qt=5 +fi + AC_ARG_ENABLE([qt], [AS_HELP_STRING([--enable-qt=VER], [Build GNU Octave using a specified Qt version])], [case "$enableval" in - no) ENABLE_QT=6 ;; - yes) ENABLE_QT=6 ;; + no) ENABLE_QT=$default_qt ;; + yes) ENABLE_QT=$default_qt ;; 4) ENABLE_QT=4 ;; 5) ENABLE_QT=5 ;; 6) ENABLE_QT=6 ;; *) AC_MSG_ERROR([bad value "$enableval" for --enable-qt]) ;; - esac], [ENABLE_QT=6]) + esac], [ENABLE_QT=$default_qt]) AC_SUBST(ENABLE_QT) # install documentation of build dependency packages (or not to save space)