Mercurial > mxe-octave

comparison configure.ac @ 7130:889fdc83694c release

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
configure: Always default to Qt6. * configure.ac: Remove condition that set the default version of Qt to Qt5 when building with a release tarball of Octave. I.e., the default is now Qt6 unconditionally. It can still be overridden with `--enable-qt=5`.
author Markus Mützel <markus.muetzel@gmx.de>
date Thu, 28 Mar 2024 15:36:42 +0100
parents 8cffc9e9e770
children
comparison
equal deleted inserted replaced
7124:80fbbf281737 7130:889fdc83694c
358 yes) ENABLE_DEVEL_TOOLS=yes ;; 358 yes) ENABLE_DEVEL_TOOLS=yes ;;
359 *) AC_MSG_ERROR([bad value "$enableval" for --enable-devel-tools]) ;; 359 *) AC_MSG_ERROR([bad value "$enableval" for --enable-devel-tools]) ;;
360 esac], [ENABLE_DEVEL_TOOLS=no]) 360 esac], [ENABLE_DEVEL_TOOLS=no])
361 AC_SUBST(ENABLE_DEVEL_TOOLS) 361 AC_SUBST(ENABLE_DEVEL_TOOLS)
362 362
363 # FIXME: Adjust this condition for the release candidate of Octave 9. 363 default_qt=6
364 if test "$ENABLE_OCTAVE" = "release-"; then
365 default_qt=5
366 else
367 default_qt=6
368 fi
369 364
370 AC_ARG_ENABLE([qt], 365 AC_ARG_ENABLE([qt],
371 [AS_HELP_STRING([--enable-qt=VER], 366 [AS_HELP_STRING([--enable-qt=VER],
372 [Build GNU Octave using a specified Qt version])], 367 [Build GNU Octave using a specified Qt version])],
373 [case "$enableval" in 368 [case "$enableval" in