Mercurial > mxe-octave

changeset 6988:8cffc9e9e770

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
build: Default to Qt5 only when building the Octave release tarball. * configure.ac: Default to Qt5 when building release-octave. Default to Qt6 otherwise.
author Markus Mützel <markus.muetzel@gmx.de>
date Wed, 29 Nov 2023 18:39:44 +0100
parents 6bef17ab3e08
children 5f2c92da4d9c
files configure.ac
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/configure.ac	Tue Nov 28 10:33:52 2023 -0500
+++ b/configure.ac	Wed Nov 29 18:39:44 2023 +0100
@@ -360,11 +360,11 @@
    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
+# FIXME: Adjust this condition for the release candidate of Octave 9.
+if test "$ENABLE_OCTAVE" = "release-"; then
+  default_qt=5
+else
   default_qt=6
-else
-  default_qt=5
 fi
 
 AC_ARG_ENABLE([qt],