Mercurial > mxe-octave

diff configure.ac @ 6837:6adeb47401d6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add qt6 usage to mxe-octave * src/qt6-qtbase-1-fixes.patch, src/qt6-qtbase.mk, src/qt6-qtimageformats-1-fixes.patch, src/qt6-qtimageformats.mk, src/qt6-qtsvg.mk, src/qt6-qttools.mk, src/qt6-qttranslations.mk, src/qt6.mk, src/qt6-qt5compat.mk: new files * Makefile.in: add use of ENABLE_QT and add qt6 values * configure.ac: add --enable-qt=xxx option, remove--enable-qt5 * dist-files.mk, index.html: add refs to new files * src/blas_switch.mk, src/gnuplot.mk, src/opengl_switch.mk, src/default-octave.mk, src/qscintilla.mk, src/release-octave.mk, src/stable-octave.mk: add prrocessing of ENABLE_QT value * src/qt5.mk: dont include qt6* files in dependancies * src/gnuplot-2-qt6.patch: new patch file * binary-dist-rules.mk: include qtversion in build of octave-launch * installer-files/octave-firsttime.vbs, installer-files/octave-launch.c installer-files/octave.bat, installer-files/octave.vbs : include qt6 file paths
author John Donoghue <john.donoghue@ieee.org>
date Wed, 23 Aug 2023 08:48:00 -0400
parents 92633c7288cd
children 30d5d0df1cee
line wrap: on
line diff
--- a/configure.ac	Thu Aug 17 16:44:07 2023 -0400
+++ b/configure.ac	Wed Aug 23 08:48:00 2023 -0400
@@ -360,15 +360,18 @@
    esac], [ENABLE_DEVEL_TOOLS=no])
 AC_SUBST(ENABLE_DEVEL_TOOLS)
 
-AC_ARG_ENABLE([qt5],
-  [AS_HELP_STRING([--disable-qt5],
-    [Build GNU Octave using Qt 4 instead of the default Qt 5 (default: enable, i.e. use Qt5)])],
+AC_ARG_ENABLE([qt],
+  [AS_HELP_STRING([--enable-qt=VER],
+    [Build GNU Octave using a spacified Qt version])],
   [case "$enableval" in
-     no) ENABLE_QT5=no ;;
-     yes) ENABLE_QT5=yes ;;
-     *) AC_MSG_ERROR([bad value "$enableval" for --enable-qt5]) ;;
-   esac], [ENABLE_QT5=yes])
-AC_SUBST(ENABLE_QT5)
+     no) ENABLE_QT=5 ;;
+     yes) ENABLE_QT=5 ;;
+     4) ENABLE_QT=4 ;;
+     5) ENABLE_QT=5 ;;
+     6) ENABLE_QT=6 ;;
+     *) AC_MSG_ERROR([bad value "$enableval" for --enable-qt]) ;;
+   esac], [ENABLE_QT=5])
+AC_SUBST(ENABLE_QT)
 
 # install documentation of build dependency packages (or not to save space)
 AC_ARG_ENABLE([dep-docs],