# HG changeset patch # User Rik # Date 1364316498 25200 # Node ID effe80808118ab734027fc165c04baec38154636 # Parent 7ce21619a4b94f3b40e0910c72a08be004a4260b configure.ac: Fix Java version detection on NixOS (bug #38593) * configure.ac: sed pattern now looks only for 'version "xxx.xxx.xxx"'. diff --git a/configure.ac b/configure.ac --- 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/'`]