Mercurial > octave
changeset 24390:3ef6430ab807
maint: merge stable to default.
| author | Rik <rik@octave.org> |
|---|---|
| date | Thu, 07 Dec 2017 21:47:53 -0800 |
| parents | 206ef5cb8b16 (current diff) 295664c0c922 (diff) |
| children | 06a7646a5619 |
| files | configure.ac |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Thu Dec 07 17:37:05 2017 -0800 +++ b/configure.ac Thu Dec 07 21:47:53 2017 -0800 @@ -2611,8 +2611,8 @@ AC_MSG_RESULT([$java_version]) java_major=[`echo $java_version | $SED -e 's/^\([0-9][0-9]*\)\.\([0-9][0-9]*\)\..*$/\1/'`] java_minor=[`echo $java_version | $SED -e 's/^\([0-9][0-9]*\)\.\([0-9][0-9]*\)\..*$/\2/'`] - if test $java_major -ge 1 && test $java_minor -ge 5; then - : # Version is ok. Do nothing. + if test $java_major -gt 1 || (test $java_major -eq 1 && test $java_minor -ge 5); then + : # Version is OK. Do nothing. else warn_java="Java version is too old (< 1.5). Octave will not be able to call Java methods." break