changeset 5545:78a98ff1efd8

configure.ac: Default USE_SYSTEM_OCTAVE to MXE_NATIVE_BUILD (bug #49503).
author Markus Mützel <markus.muetzel@gmx.de>
date Fri, 02 Oct 2020 13:54:27 +0200
parents e2582a427c2a
children bab15e146dfa
files configure.ac
diffstat 1 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/configure.ac	Tue Sep 22 09:04:50 2020 -0400
+++ b/configure.ac	Fri Oct 02 13:54:27 2020 +0200
@@ -219,7 +219,7 @@
 
 AC_ARG_ENABLE([system-fontconfig],
   [AS_HELP_STRING([--enable-system-fontconfig],
-    [Use fontconfig already installed on system (default: disable, i.e. build package)])],
+    [Use fontconfig already installed on system (default: same as native-build)])],
   [case "$enableval" in
      no) USE_SYSTEM_FONTCONFIG=no ;;
      yes) USE_SYSTEM_FONTCONFIG=yes ;;
@@ -229,7 +229,7 @@
 
 AC_ARG_ENABLE([system-opengl],
   [AS_HELP_STRING([--disable-system-opengl],
-    [Use OpenGL libraries already installed on system (default: disable, i.e. build package)])],
+    [Use OpenGL libraries already installed on system (default: same as native-build)])],
   [case "$enableval" in
      no) USE_SYSTEM_OPENGL=no ;;
      yes) USE_SYSTEM_OPENGL=yes ;;
@@ -239,7 +239,7 @@
 
 AC_ARG_ENABLE([system-x11-libs],
   [AS_HELP_STRING([--enable-system-x11-libs],
-    [Use X11 libraries already installed on system (default: disable, i.e. build package)])],
+    [Use X11 libraries already installed on system (default: same as native-build)])],
   [case "$enableval" in
      no) USE_SYSTEM_X11_LIBS=no ;;
      yes) USE_SYSTEM_X11_LIBS=yes ;;
@@ -249,7 +249,7 @@
 
 AC_ARG_ENABLE([system-gcc],
   [AS_HELP_STRING([--enable-system-gcc],
-    [Use GCC already installed on system (default: disable, i.e. build package)])],
+    [Use GCC already installed on system (default: same as native-build)])],
   [case "$enableval" in
      no) USE_SYSTEM_GCC=no ;;
      yes) USE_SYSTEM_GCC=yes ;;
@@ -328,12 +328,12 @@
 
 AC_ARG_ENABLE([system-octave],
   [AS_HELP_STRING([--disable-system-octave],
-    [Build a minimal Octave that runs on the build system. This only applies if binary packages are cross-built (default: enable, i.e. use an already installed Octave)])],
+    [Build a minimal Octave that runs on the build system. This only applies if binary packages are cross-built (default: same as native-build)])],
   [case "$enableval" in
      no) USE_SYSTEM_OCTAVE=no ;;
      yes) USE_SYSTEM_OCTAVE=yes ;;
      *) AC_MSG_ERROR([bad value "$enableval" for --disable-system-octave]) ;;
-   esac], [USE_SYSTEM_OCTAVE=yes])
+   esac], [USE_SYSTEM_OCTAVE=$MXE_NATIVE_BUILD])
 AC_SUBST(USE_SYSTEM_OCTAVE)
 
 AC_ARG_ENABLE([devel-tools],