diff -Naur a/build-aux/compile b/build-aux/compile --- a/build-aux/compile 2014-07-19 02:02:06.000000000 +0400 +++ b/build-aux/compile 2014-07-20 20:19:52.863800000 +0400 @@ -53,7 +53,7 @@ MINGW*) file_conv=mingw ;; - CYGWIN*) + CYGWIN* | MSYS*) file_conv=cygwin ;; *) @@ -67,7 +67,7 @@ mingw/*) file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` ;; - cygwin/*) + cygwin/* | msys/*) file=`cygpath -m "$file" || echo "$file"` ;; wine/*) diff -Naur a/build-aux/config.guess b/build-aux/config.guess --- a/build-aux/config.guess 2014-06-25 12:43:35.000000000 +0400 +++ b/build-aux/config.guess 2014-07-20 20:19:52.863800000 +0400 @@ -823,6 +823,9 @@ *:MINGW64*:*) echo ${UNAME_MACHINE}-pc-mingw64 exit ;; + i*:MSYS*:*) + echo ${UNAME_MACHINE}-pc-msys + exit ;; *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; @@ -866,6 +869,9 @@ amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) echo x86_64-unknown-cygwin exit ;; + amd64:MSYS*:*:* | x86_64:MSYS*:*:*) + echo x86_64-unknown-msys + exit ;; p*:CYGWIN*:*) echo powerpcle-unknown-cygwin exit ;; diff -Naur a/build-aux/config.rpath b/build-aux/config.rpath --- a/build-aux/config.rpath 2014-06-25 12:43:35.000000000 +0400 +++ b/build-aux/config.rpath 2014-07-20 20:19:52.863800000 +0400 @@ -57,7 +57,7 @@ aix*) wl='-Wl,' ;; - mingw* | cygwin* | pw32* | os2* | cegcc*) + mingw* | cygwin* | msys* | pw32* | os2* | cegcc*) ;; hpux9* | hpux10* | hpux11*) wl='-Wl,' @@ -149,7 +149,7 @@ hardcode_minus_L=no case "$host_os" in - cygwin* | mingw* | pw32* | cegcc*) + cygwin* | msys* | mingw* | pw32* | cegcc*) # FIXME: the MSVC++ port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using # Microsoft Visual C++. @@ -198,7 +198,7 @@ ld_shlibs=no fi ;; - cygwin* | mingw* | pw32* | cegcc*) + cygwin* | msys* | mingw* | pw32* | cegcc*) # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. hardcode_libdir_flag_spec='-L$libdir' @@ -348,7 +348,7 @@ ;; bsdi[45]*) ;; - cygwin* | mingw* | pw32* | cegcc*) + cygwin* | msys* | mingw* | pw32* | cegcc*) # When not using gcc, we currently assume that we are using # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is @@ -533,7 +533,7 @@ bsdi[45]*) library_names_spec='$libname$shrext' ;; - cygwin* | mingw* | pw32* | cegcc*) + cygwin* | msys* | mingw* | pw32* | cegcc*) shrext=.dll library_names_spec='$libname.dll.a $libname.lib' ;; diff -Naur a/configure b/configure --- a/configure 2014-07-20 20:19:46.483400000 +0400 +++ b/configure 2014-07-20 20:19:52.895000000 +0400 @@ -7270,7 +7270,7 @@ else case "$host_os" in osf*) gl_use_threads=no ;; - cygwin*) + cygwin* | msys*) case `uname -r` in 1.[0-5].*) gl_use_threads=no ;; *) gl_use_threads=yes ;; @@ -9130,7 +9130,7 @@ # special semantics and is distinct from /, please report it to # . case $host in - *-cygwin | i370-ibm-openedition) + *-cygwin | *-msys | i370-ibm-openedition) gl_cv_double_slash_root=yes ;; *) # Be optimistic and assume that / and // are the same when we @@ -13168,7 +13168,7 @@ # Guess yes on glibc systems. *-gnu*) gl_cv_func_getcwd_null="guessing yes";; # Guess yes on Cygwin. - cygwin*) gl_cv_func_getcwd_null="guessing yes";; + cygwin* | msys*) gl_cv_func_getcwd_null="guessing yes";; # If we don't know, assume the worst. *) gl_cv_func_getcwd_null="guessing no";; esac @@ -23344,7 +23344,7 @@ openbsd*) gl_cv_func_printf_directive_ls="guessing no";; irix*) gl_cv_func_printf_directive_ls="guessing no";; solaris*) gl_cv_func_printf_directive_ls="guessing no";; - cygwin*) gl_cv_func_printf_directive_ls="guessing no";; + cygwin* | msys*) gl_cv_func_printf_directive_ls="guessing no";; beos* | haiku*) gl_cv_func_printf_directive_ls="guessing no";; *) gl_cv_func_printf_directive_ls="guessing yes";; esac @@ -23428,7 +23428,7 @@ if test "$cross_compiling" = yes; then : case "$host_os" in - cygwin*) gl_cv_func_printf_flag_grouping="guessing no";; + cygwin* | msys*) gl_cv_func_printf_flag_grouping="guessing no";; netbsd*) gl_cv_func_printf_flag_grouping="guessing no";; mingw* | pw*) gl_cv_func_printf_flag_grouping="guessing no";; *) gl_cv_func_printf_flag_grouping="guessing yes";; @@ -24509,7 +24509,7 @@ case "$host_os" in # Guess no on Cygwin. - cygwin*) gl_cv_func_btowc_nul="guessing no" ;; + cygwin* | msys*) gl_cv_func_btowc_nul="guessing no" ;; # Guess yes otherwise. *) gl_cv_func_btowc_nul="guessing yes" ;; esac @@ -26047,7 +26047,7 @@ # special semantics and is distinct from /, please report it to # . case $host in - *-cygwin | i370-ibm-openedition) + *-cygwin | *-msys | i370-ibm-openedition) gl_cv_double_slash_root=yes ;; *) # Be optimistic and assume that / and // are the same when we @@ -26138,7 +26138,7 @@ case "$host_os" in mingw*) # on this platform, dup2 always returns 0 for success gl_cv_func_dup2_works="guessing no" ;; - cygwin*) # on cygwin 1.5.x, dup2(1,1) returns 0 + cygwin* | msys*) # on cygwin 1.5.x, dup2(1,1) returns 0 gl_cv_func_dup2_works="guessing no" ;; linux*) # On linux between 2008-07-27 and 2009-05-11, dup2 of a # closed fd may yield -EBADF instead of -1 / errno=EBADF. @@ -57481,7 +57481,7 @@ case "$host_os" in mingw*) REPLACE_SETLOCALE=1 ;; - cygwin*) + cygwin* | msys*) case `uname -r` in 1.5.*) REPLACE_SETLOCALE=1 ;; esac @@ -58532,7 +58532,7 @@ gnu[0-9]* | \ linux-* | linux | \ freebsd2.2* | freebsd[3-9]* | freebsd[1-9][0-9]* | \ - cygwin | \ + cygwin | msys | \ mingw*) $as_echo "#define UNLINK_CANNOT_UNLINK_DIR 1" >>confdefs.h @@ -59105,7 +59105,7 @@ *) gl_cv_func_wctob_works="guessing yes" ;; esac case "$host_os" in - cygwin*) + cygwin* | msys*) if test "$cross_compiling" = yes; then : : else diff -Naur a/gnulib-tests/test-copy-acl.sh b/gnulib-tests/test-copy-acl.sh --- a/gnulib-tests/test-copy-acl.sh 2013-12-04 18:53:33.000000000 +0400 +++ b/gnulib-tests/test-copy-acl.sh 2014-07-20 20:19:52.895000000 +0400 @@ -128,7 +128,7 @@ # the programs. # func_test_same_acls file1 file2 case $acl_flavor in - linux | cygwin | freebsd | solaris) + linux | cygwin | msys | freebsd | solaris) func_test_same_acls () { getfacl "$1" | sed -e "s/$1/FILENAME/g" > tmpaclout1 @@ -302,7 +302,7 @@ ;; - cygwin) + cygwin | msys) # Set an ACL for a group. setfacl -m group:0:1 tmpfile0 diff -Naur a/gnulib-tests/test-file-has-acl.sh b/gnulib-tests/test-file-has-acl.sh --- a/gnulib-tests/test-file-has-acl.sh 2013-12-04 18:53:33.000000000 +0400 +++ b/gnulib-tests/test-file-has-acl.sh 2014-07-20 20:19:52.910600000 +0400 @@ -247,7 +247,7 @@ fi ;; - cygwin) + cygwin | msys) # Set an ACL for a group. if setfacl -m group:0:1 tmpfile0; then diff -Naur a/gnulib-tests/test-set-mode-acl.sh b/gnulib-tests/test-set-mode-acl.sh --- a/gnulib-tests/test-set-mode-acl.sh 2013-12-04 18:53:33.000000000 +0400 +++ b/gnulib-tests/test-set-mode-acl.sh 2014-07-20 20:19:52.910600000 +0400 @@ -177,7 +177,7 @@ linux | freebsd | solaris) setfacl -m user:$auid:1 tmpfile0 ;; - cygwin) + cygwin | msys) setfacl -m group:0:1 tmpfile0 ;; hpux) diff -Naur a/install.exe.manifest b/install.exe.manifest --- a/install.exe.manifest 1970-01-01 03:00:00.000000000 +0300 +++ b/install.exe.manifest 2014-07-20 20:19:52.910600000 +0400 @@ -0,0 +1,11 @@ + + + + + + + + + + + diff -Naur a/lib/gnulib.mk b/lib/gnulib.mk --- a/lib/gnulib.mk 2014-07-20 20:19:50.742200000 +0400 +++ b/lib/gnulib.mk 2014-07-20 20:19:52.910600000 +0400 @@ -1891,7 +1891,7 @@ case '$(host_os)' in \ darwin[56]*) \ need_charset_alias=true ;; \ - darwin* | cygwin* | mingw* | pw32* | cegcc*) \ + darwin* | cygwin* | msys* | mingw* | pw32* | cegcc*) \ need_charset_alias=false ;; \ *) \ need_charset_alias=true ;; \ diff -Naur a/Makefile.in b/Makefile.in --- a/Makefile.in 2014-07-20 20:19:52.754600000 +0400 +++ b/Makefile.in 2014-07-20 20:19:52.926200000 +0400 @@ -12298,7 +12298,7 @@ case '$(host_os)' in \ darwin[56]*) \ need_charset_alias=true ;; \ - darwin* | cygwin* | mingw* | pw32* | cegcc*) \ + darwin* | cygwin* | msys* | mingw* | pw32* | cegcc*) \ need_charset_alias=false ;; \ *) \ need_charset_alias=true ;; \