Mercurial > mxe-octave
comparison configure.ac @ 6988:8cffc9e9e770
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 | 09595fdc9c6f |
children | 889fdc83694c |
comparison
equal
deleted
inserted
replaced
6987:6bef17ab3e08 | 6988:8cffc9e9e770 |
---|---|
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 when Octave 9 is on the stable branch or released. | 363 # FIXME: Adjust this condition for the release candidate of Octave 9. |
364 if test "$ENABLE_OCTAVE" = "default-"; then | 364 if test "$ENABLE_OCTAVE" = "release-"; then |
365 default_qt=5 | |
366 else | |
365 default_qt=6 | 367 default_qt=6 |
366 else | |
367 default_qt=5 | |
368 fi | 368 fi |
369 | 369 |
370 AC_ARG_ENABLE([qt], | 370 AC_ARG_ENABLE([qt], |
371 [AS_HELP_STRING([--enable-qt=VER], | 371 [AS_HELP_STRING([--enable-qt=VER], |
372 [Build GNU Octave using a specified Qt version])], | 372 [Build GNU Octave using a specified Qt version])], |