8137259: configure needs to parse Verona-style version strings for bootjdk

Reviewed-by: erikj, iris
This commit is contained in:
Magnus Ihse Bursie 2015-09-30 14:09:32 +02:00
parent 46097af9a7
commit f7c3ebda02
2 changed files with 607 additions and 163 deletions

View File

@ -77,7 +77,7 @@ AC_DEFUN([BOOTJDK_DO_CHECK],
BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
# Extra M4 quote needed to protect [] in grep expression.
[FOUND_CORRECT_VERSION=`echo $BOOT_JDK_VERSION | grep '\"1\.[89]\.'`]
[FOUND_CORRECT_VERSION=`$ECHO $BOOT_JDK_VERSION | $EGREP '\"9([\.+-].*)?\"|(1\.[89]\.)'`]
if test "x$FOUND_CORRECT_VERSION" = x; then
AC_MSG_NOTICE([Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring])
AC_MSG_NOTICE([(Your Boot JDK must be version 8 or 9)])

File diff suppressed because it is too large Load Diff