equal
deleted
inserted
replaced
72 AC_MSG_NOTICE([Potential Boot JDK found at $BOOT_JDK did not contain bin/javac; ignoring]) |
72 AC_MSG_NOTICE([Potential Boot JDK found at $BOOT_JDK did not contain bin/javac; ignoring]) |
73 AC_MSG_NOTICE([(This might be an JRE instead of an JDK)]) |
73 AC_MSG_NOTICE([(This might be an JRE instead of an JDK)]) |
74 BOOT_JDK_FOUND=no |
74 BOOT_JDK_FOUND=no |
75 else |
75 else |
76 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? |
76 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? |
77 BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1` |
77 BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | $HEAD -n 1` |
78 |
78 |
79 # Extra M4 quote needed to protect [] in grep expression. |
79 # Extra M4 quote needed to protect [] in grep expression. |
80 [FOUND_CORRECT_VERSION=`$ECHO $BOOT_JDK_VERSION | $EGREP '\"9([\.+-].*)?\"|(1\.[89]\.)'`] |
80 [FOUND_CORRECT_VERSION=`$ECHO $BOOT_JDK_VERSION | $EGREP '\"9([\.+-].*)?\"|(1\.[89]\.)'`] |
81 if test "x$FOUND_CORRECT_VERSION" = x; then |
81 if test "x$FOUND_CORRECT_VERSION" = x; then |
82 AC_MSG_NOTICE([Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring]) |
82 AC_MSG_NOTICE([Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring]) |
443 AC_MSG_NOTICE([Potential Build JDK found at $BUILD_JDK did not contain bin/javac; ignoring]) |
443 AC_MSG_NOTICE([Potential Build JDK found at $BUILD_JDK did not contain bin/javac; ignoring]) |
444 AC_MSG_NOTICE([(This might be a JRE instead of an JDK)]) |
444 AC_MSG_NOTICE([(This might be a JRE instead of an JDK)]) |
445 BUILD_JDK_FOUND=no |
445 BUILD_JDK_FOUND=no |
446 else |
446 else |
447 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? |
447 # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version? |
448 BUILD_JDK_VERSION=`"$BUILD_JDK/bin/java" -version 2>&1 | head -n 1` |
448 BUILD_JDK_VERSION=`"$BUILD_JDK/bin/java" -version 2>&1 | $HEAD -n 1` |
449 |
449 |
450 # Extra M4 quote needed to protect [] in grep expression. |
450 # Extra M4 quote needed to protect [] in grep expression. |
451 [FOUND_CORRECT_VERSION=`echo $BUILD_JDK_VERSION | $EGREP '\"9([\.+-].*)?\"'`] |
451 [FOUND_CORRECT_VERSION=`echo $BUILD_JDK_VERSION | $EGREP '\"9([\.+-].*)?\"'`] |
452 if test "x$FOUND_CORRECT_VERSION" = x; then |
452 if test "x$FOUND_CORRECT_VERSION" = x; then |
453 AC_MSG_NOTICE([Potential Build JDK found at $BUILD_JDK is incorrect JDK version ($BUILD_JDK_VERSION); ignoring]) |
453 AC_MSG_NOTICE([Potential Build JDK found at $BUILD_JDK is incorrect JDK version ($BUILD_JDK_VERSION); ignoring]) |