diff options
| author | erikj <none@none> | 2015-05-05 16:40:47 +0200 |
|---|---|---|
| committer | erikj <none@none> | 2015-05-05 16:40:47 +0200 |
| commit | d41c13442c0b87b0371c8288b3d003f5e40a1f81 (patch) | |
| tree | 24fd339de7258267001fd1d0b410604a3e401630 /common/autoconf | |
| parent | 7f63c1ae8e83abbfc87d380cdc96be8c0cdab1ff (diff) | |
| download | jdk8u-d41c13442c0b87b0371c8288b3d003f5e40a1f81.tar.gz | |
8079087: Add support for Cygwin 2.0
Reviewed-by: tbell
Diffstat (limited to 'common/autoconf')
| -rw-r--r-- | common/autoconf/basics_windows.m4 | 4 | ||||
| -rw-r--r-- | common/autoconf/generated-configure.sh | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/common/autoconf/basics_windows.m4 b/common/autoconf/basics_windows.m4 index 0d43553..df3b3bf 100644 --- a/common/autoconf/basics_windows.m4 +++ b/common/autoconf/basics_windows.m4 @@ -312,8 +312,8 @@ AC_DEFUN([BASIC_CHECK_PATHS_WINDOWS], WINDOWS_ENV_VENDOR='cygwin' WINDOWS_ENV_VERSION="$CYGWIN_VERSION" - CYGWIN_VERSION_OK=`$ECHO $CYGWIN_VERSION | $GREP ^1.7.` - if test "x$CYGWIN_VERSION_OK" = x; then + CYGWIN_VERSION_OLD=`$ECHO $CYGWIN_VERSION | $GREP -e '^1\.[0-6]'` + if test "x$CYGWIN_VERSION_OLD" != x; then AC_MSG_NOTICE([Your cygwin is too old. You are running $CYGWIN_VERSION, but at least cygwin 1.7 is required. Please upgrade.]) AC_MSG_ERROR([Cannot continue]) fi diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh index 5f55460..0093e93 100644 --- a/common/autoconf/generated-configure.sh +++ b/common/autoconf/generated-configure.sh @@ -3878,7 +3878,7 @@ fi #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1426765548 +DATE_WHEN_GENERATED=1430836833 ############################################################################### # @@ -7265,8 +7265,8 @@ $as_echo "$CYGWIN_VERSION" >&6; } WINDOWS_ENV_VENDOR='cygwin' WINDOWS_ENV_VERSION="$CYGWIN_VERSION" - CYGWIN_VERSION_OK=`$ECHO $CYGWIN_VERSION | $GREP ^1.7.` - if test "x$CYGWIN_VERSION_OK" = x; then + CYGWIN_VERSION_OLD=`$ECHO $CYGWIN_VERSION | $GREP -e '^1\.0-6'` + if test "x$CYGWIN_VERSION_OLD" != x; then { $as_echo "$as_me:${as_lineno-$LINENO}: Your cygwin is too old. You are running $CYGWIN_VERSION, but at least cygwin 1.7 is required. Please upgrade." >&5 $as_echo "$as_me: Your cygwin is too old. You are running $CYGWIN_VERSION, but at least cygwin 1.7 is required. Please upgrade." >&6;} as_fn_error $? "Cannot continue" "$LINENO" 5 |