Mercurial > octave-nkf

comparison configure.ac @ 16371:effe80808118

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 5293cee91891
children bfff338c56d1
comparison
equal deleted inserted replaced
16370:7ce21619a4b9 16371:effe80808118
2383 break 2383 break
2384 fi 2384 fi
2385 2385
2386 ## Check Java version is recent enough. 2386 ## Check Java version is recent enough.
2387 AC_MSG_CHECKING([for Java version]) 2387 AC_MSG_CHECKING([for Java version])
2388 java_version=[`"$JAVA" -version 2>&1 | sed -n -e 's/^java version[^0-9"]*"\([^"]*\)"/\1/p'`] 2388 java_version=[`"$JAVA" -version 2>&1 | sed -n -e 's/^[^ ]* version[^0-9"]*"\([^"]*\)"/\1/p'`]
2389 AC_MSG_RESULT([$java_version]) 2389 AC_MSG_RESULT([$java_version])
2390 java_major=[`echo $java_version | sed -e 's/^\([0-9][0-9]*\)\.\([0-9][0-9]*\)\..*$/\1/'`] 2390 java_major=[`echo $java_version | sed -e 's/^\([0-9][0-9]*\)\.\([0-9][0-9]*\)\..*$/\1/'`]
2391 java_minor=[`echo $java_version | sed -e 's/^\([0-9][0-9]*\)\.\([0-9][0-9]*\)\..*$/\2/'`] 2391 java_minor=[`echo $java_version | sed -e 's/^\([0-9][0-9]*\)\.\([0-9][0-9]*\)\..*$/\2/'`]
2392 if test $java_major -ge 1 && test $java_minor -ge 5; then 2392 if test $java_major -ge 1 && test $java_minor -ge 5; then
2393 : # Version is ok. Do nothing. 2393 : # Version is ok. Do nothing.