equal
deleted
inserted
replaced
500 MAKE_VERSION_STRING=`$MAKE_CANDIDATE --version | $HEAD -n 1` |
500 MAKE_VERSION_STRING=`$MAKE_CANDIDATE --version | $HEAD -n 1` |
501 IS_GNU_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP 'GNU Make'` |
501 IS_GNU_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP 'GNU Make'` |
502 if test "x$IS_GNU_MAKE" = x; then |
502 if test "x$IS_GNU_MAKE" = x; then |
503 AC_MSG_NOTICE([Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring.]) |
503 AC_MSG_NOTICE([Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring.]) |
504 else |
504 else |
505 IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP '3.8[[12346789]]'` |
505 IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP '\(3\.8[[12]]\)\|\(4\.\)'` |
506 if test "x$IS_MODERN_MAKE" = x; then |
506 if test "x$IS_MODERN_MAKE" = x; then |
507 AC_MSG_NOTICE([Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring.]) |
507 AC_MSG_NOTICE([Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring.]) |
508 else |
508 else |
509 if test "x$OPENJDK_BUILD_OS" = "xwindows"; then |
509 if test "x$OPENJDK_BUILD_OS" = "xwindows"; then |
510 if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then |
510 if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then |