# HG changeset patch
# User kevinw
# Date 1523096919 25200
# Node ID a05ed58d5ae04e0d806af690e0d0473efadccf4b
# Parent  cddffb220808ff3c078cd818e6a6d25d130f0726
8176033: New cygwin grep does not match \r as newline
Reviewed-by: erikj, tbell, ihse

diff -r cddffb220808 -r a05ed58d5ae0 common/autoconf/basics_windows.m4
--- a/common/autoconf/basics_windows.m4	Fri Apr 06 04:20:26 2018 -0700
+++ b/common/autoconf/basics_windows.m4	Sat Apr 07 03:28:39 2018 -0700
@@ -321,8 +321,8 @@
       AC_MSG_ERROR([Something is wrong with your cygwin installation since I cannot find cygpath.exe in your path])
     fi
     AC_MSG_CHECKING([cygwin root directory as unix-style path])
-    # The cmd output ends with Windows line endings (CR/LF), the grep command will strip that away
-    cygwin_winpath_root=`cd / ; cmd /c cd | grep ".*"`
+    # The cmd output ends with Windows line endings (CR/LF)
+    cygwin_winpath_root=`cd / ; cmd /c cd | $TR -d '\r\n'`
     # Force cygpath to report the proper root by including a trailing space, and then stripping it off again.
     CYGWIN_ROOT_PATH=`$CYGPATH -u "$cygwin_winpath_root " | $CUT -f 1 -d " "`
     AC_MSG_RESULT([$CYGWIN_ROOT_PATH])
diff -r cddffb220808 -r a05ed58d5ae0 common/autoconf/generated-configure.sh
--- a/common/autoconf/generated-configure.sh	Fri Apr 06 04:20:26 2018 -0700
+++ b/common/autoconf/generated-configure.sh	Sat Apr 07 03:28:39 2018 -0700
@@ -4219,7 +4219,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1523013611
+DATE_WHEN_GENERATED=1523096909
 
 ###############################################################################
 #
@@ -13930,8 +13930,8 @@
     fi
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking cygwin root directory as unix-style path" >&5
 $as_echo_n "checking cygwin root directory as unix-style path... " >&6; }
-    # The cmd output ends with Windows line endings (CR/LF), the grep command will strip that away
-    cygwin_winpath_root=`cd / ; cmd /c cd | grep ".*"`
+    # The cmd output ends with Windows line endings (CR/LF)
+    cygwin_winpath_root=`cd / ; cmd /c cd | $TR -d '\r\n'`
     # Force cygpath to report the proper root by including a trailing space, and then stripping it off again.
     CYGWIN_ROOT_PATH=`$CYGPATH -u "$cygwin_winpath_root " | $CUT -f 1 -d " "`
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CYGWIN_ROOT_PATH" >&5