# HG changeset patch # User Rik # Date 1530806236 25200 # Node ID e76d54c038ef4fb8594ca71108ea9cd2f9c444ea # Parent 36b2178e7475d75ac10e4f2c887783b563fe9f86 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. diff -r 36b2178e7475 -r e76d54c038ef tools/makeinst-script.sh.in --- 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