Mercurial > hg > octave-lyh
changeset 16371:effe80808118
configure.ac: Fix Java version detection on NixOS (bug #38593)
* configure.ac: sed pattern now looks only for 'version "xxx.xxx.xxx"'.
| author | Rik <rik@octave.org> |
|---|---|
| date | Tue, 26 Mar 2013 09:48:18 -0700 |
| parents | 7ce21619a4b9 |
| children | 4e7a9f950cdc |
| files | configure.ac |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac +++ b/configure.ac @@ -2385,7 +2385,7 @@ ## Check Java version is recent enough. AC_MSG_CHECKING([for Java version]) - java_version=[`"$JAVA" -version 2>&1 | sed -n -e 's/^java version[^0-9"]*"\([^"]*\)"/\1/p'`] + java_version=[`"$JAVA" -version 2>&1 | sed -n -e 's/^[^ ]* version[^0-9"]*"\([^"]*\)"/\1/p'`] 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/'`]