# HG changeset patch
# User erikj
# Date 1430836847 -7200
# Node ID ff2690c06dd897a43b335db2faf829492c449c56
# Parent  455a74ebdf59e91116e58d1545b15fd143624e36
8079087: Add support for Cygwin 2.0
Reviewed-by: tbell

diff -r 455a74ebdf59 -r ff2690c06dd8 common/autoconf/basics_windows.m4
--- a/common/autoconf/basics_windows.m4	Wed Apr 29 14:04:33 2015 -0700
+++ b/common/autoconf/basics_windows.m4	Tue May 05 16:40:47 2015 +0200
@@ -312,8 +312,8 @@
     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 -r 455a74ebdf59 -r ff2690c06dd8 common/autoconf/generated-configure.sh
--- a/common/autoconf/generated-configure.sh	Wed Apr 29 14:04:33 2015 -0700
+++ b/common/autoconf/generated-configure.sh	Tue May 05 16:40:47 2015 +0200
@@ -3878,7 +3878,7 @@
 #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 @@
     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