Mercurial > mxe-octave

changeset 4759:e76d54c038ef

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Don't run JRE check during install if Octave was built with --disable-java (bug #54427). * tools/makeinst-script.sh.in: Check configure variable ENABLE_JAVA before having installer check for JRE.
author Rik <rik@octave.org>
date Thu, 05 Jul 2018 08:57:16 -0700
parents 36b2178e7475
children 3f4bda7a6373
files tools/makeinst-script.sh.in
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/tools/makeinst-script.sh.in	Thu Jul 05 11:30:25 2018 -0400
+++ b/tools/makeinst-script.sh.in	Thu Jul 05 08:57:16 2018 -0700
@@ -209,7 +209,9 @@
 Function .onInit
   Call CheckWinVer
   Call CheckCurrVersion
-  Call CheckJRE
+  \${If} @ENABLE_JAVA@ == yes
+    Call CheckJRE
+  \${EndIf} 
   InitPluginsDir
 FunctionEnd