File tree 1 file changed +2
-2
lines changed
1 file changed +2
-2
lines changed Original file line number Diff line number Diff line change @@ -75,7 +75,7 @@ AC_DEFUN([BOOTJDK_DO_CHECK],
75
75
else
76
76
# Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
77
77
# Additional [ ] needed to keep m4 from mangling shell constructs.
78
- [ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java$EXE_SUFFIX" $USER_BOOT_JDK_OPTIONS -version 2>&1 | $AWK '/version \ "[ 0-9a-zA-Z\._\-] +\"/ {print $ 0; exit;}'` ]
78
+ [ BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java$EXE_SUFFIX" $USER_BOOT_JDK_OPTIONS -version 2>&1 | $AWK '/version "[ 0-9a-zA-Z\._\-] +"/ {print $ 0; exit;}'` ]
79
79
if [ [ [ "$BOOT_JDK_VERSION" =~ "Picked up" ] ] ] ; then
80
80
AC_MSG_NOTICE ( [ You have _JAVA_OPTIONS or JAVA_TOOL_OPTIONS set. This can mess up the build. Please use --with-boot-jdk-jvmargs instead.] )
81
81
AC_MSG_NOTICE ( [ Java reports: "$BOOT_JDK_VERSION".] )
@@ -516,7 +516,7 @@ AC_DEFUN([BOOTJDK_CHECK_BUILD_JDK],
516
516
else
517
517
# Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
518
518
# Additional [ ] needed to keep m4 from mangling shell constructs.
519
- [ BUILD_JDK_VERSION=`"$BUILD_JDK/bin/java" -version 2>&1 | $AWK '/version \ "[ 0-9a-zA-Z\._\-] +\"/ {print $ 0; exit;}'` ]
519
+ [ BUILD_JDK_VERSION=`"$BUILD_JDK/bin/java" -version 2>&1 | $AWK '/version "[ 0-9a-zA-Z\._\-] +"/ {print $ 0; exit;}'` ]
520
520
521
521
# Extra M4 quote needed to protect [ ] in grep expression.
522
522
[ FOUND_CORRECT_VERSION=`echo $BUILD_JDK_VERSION | $EGREP "\"$VERSION_FEATURE([ \.+-] .*)?\""`]
You can’t perform that action at this time.
0 commit comments