Diff of /gettext/gettext-0.18.1.1-msys2.patch [000000] .. [a34f22]  Maximize  Restore

Switch to side-by-side view

--- a
+++ b/gettext/gettext-0.18.1.1-msys2.patch
@@ -0,0 +1,2019 @@
+diff -Naur gettext-0.18.1.1/build-aux/config.guess gettext-0.18.1.1-p/build-aux/config.guess
+--- gettext-0.18.1.1/build-aux/config.guess	2010-05-24 17:05:17.000000000 +0000
++++ gettext-0.18.1.1-p/build-aux/config.guess	2013-03-26 15:15:35.765625000 +0000
+@@ -801,6 +801,9 @@
+     i*:CYGWIN*:*)
+ 	echo ${UNAME_MACHINE}-pc-cygwin
+ 	exit ;;
++    i*:MSYS*:*)
++	echo ${UNAME_MACHINE}-pc-msys
++	exit ;;
+     *:MINGW*:*)
+ 	echo ${UNAME_MACHINE}-pc-mingw32
+ 	exit ;;
+@@ -841,6 +844,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 gettext-0.18.1.1/build-aux/config.libpath gettext-0.18.1.1-p/build-aux/config.libpath
+--- gettext-0.18.1.1/build-aux/config.libpath	2010-02-16 21:31:27.000000000 +0000
++++ gettext-0.18.1.1-p/build-aux/config.libpath	2013-03-26 15:14:48.015625000 +0000
+@@ -56,7 +56,7 @@
+   bsdi[45]*)
+     shlibpath_var=LD_LIBRARY_PATH
+     ;;
+-  cygwin* | mingw* | pw32* | cegcc*)
++  cygwin* | msys* | mingw* | pw32* | cegcc*)
+     # FIXME: first we should search . and the directory the executable is in
+     shlibpath_var=PATH
+     ;;
+diff -Naur gettext-0.18.1.1/build-aux/config.rpath gettext-0.18.1.1-p/build-aux/config.rpath
+--- gettext-0.18.1.1/build-aux/config.rpath	2010-04-02 16:29:39.000000000 +0000
++++ gettext-0.18.1.1-p/build-aux/config.rpath	2013-03-26 15:14:38.250000000 +0000
+@@ -64,7 +64,7 @@
+           ;;
+       esac
+       ;;
+-    mingw* | cygwin* | pw32* | os2* | cegcc*)
++    mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
+       ;;
+     hpux9* | hpux10* | hpux11*)
+       wl='-Wl,'
+@@ -138,7 +138,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++.
+@@ -188,7 +188,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'
+@@ -332,7 +332,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
+@@ -523,7 +523,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 gettext-0.18.1.1/build-aux/config.sub gettext-0.18.1.1-p/build-aux/config.sub
+--- gettext-0.18.1.1/build-aux/config.sub	2010-05-24 17:05:17.000000000 +0000
++++ gettext-0.18.1.1-p/build-aux/config.sub	2013-03-26 15:15:48.437500000 +0000
+@@ -1307,7 +1307,7 @@
+ 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+ 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+ 	      | -chorusos* | -chorusrdb* | -cegcc* \
+-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
++	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+ 	      | -mingw32* | -linux-gnu* | -linux-android* \
+ 	      | -linux-newlib* | -linux-uclibc* \
+ 	      | -uxpv* | -beos* | -mpeix* | -udk* \
+diff -Naur gettext-0.18.1.1/build-aux/ltmain.sh gettext-0.18.1.1-p/build-aux/ltmain.sh
+--- gettext-0.18.1.1/build-aux/ltmain.sh	2010-06-06 12:49:57.000000000 +0000
++++ gettext-0.18.1.1-p/build-aux/ltmain.sh	2013-03-26 15:22:10.187500000 +0000
+@@ -805,7 +805,7 @@
+ 
+ 
+   case $host in
+-    *cygwin* | *mingw* | *pw32* | *cegcc*)
++    *cygwin* | *msys* | *mingw* | *pw32* | *cegcc*)
+       # don't eliminate duplications in $postdeps and $predeps
+       opt_duplicate_compiler_generated_deps=:
+       ;;
+@@ -1276,7 +1276,7 @@
+ 
+     # On Cygwin there's no "real" PIC flag so we must build both object types
+     case $host_os in
+-    cygwin* | mingw* | pw32* | os2* | cegcc*)
++    cygwin* | msys* | mingw* | pw32* | os2* | cegcc*)
+       pic_mode=default
+       ;;
+     esac
+@@ -2063,7 +2063,7 @@
+ 	      'exit $?'
+ 	  tstripme="$stripme"
+ 	  case $host_os in
+-	  cygwin* | mingw* | pw32* | cegcc*)
++	  cygwin* | msys* | mingw* | pw32* | cegcc*)
+ 	    case $realname in
+ 	    *.dll.a)
+ 	      tstripme=""
+@@ -2169,7 +2169,7 @@
+ 
+ 	# Do a test to see if this is really a libtool program.
+ 	case $host in
+-	*cygwin* | *mingw*)
++	*cygwin* | *msys* | *mingw*)
+ 	    if func_ltwrapper_executable_p "$file"; then
+ 	      func_ltwrapper_scriptname "$file"
+ 	      wrapper=$func_ltwrapper_scriptname_result
+@@ -2244,7 +2244,7 @@
+ 	# remove .exe since cygwin /usr/bin/install will append another
+ 	# one anyway
+ 	case $install_prog,$host in
+-	*/usr/bin/install*,*cygwin*)
++	*/usr/bin/install*,*cygwin*|*/usr/bin/install*,*msys*)
+ 	  case $file:$destfile in
+ 	  *.exe:*.exe)
+ 	    # this is ok
+@@ -2375,7 +2375,7 @@
+ 	      $RM $export_symbols
+ 	      eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
+ 	      case $host in
+-	      *cygwin* | *mingw* | *cegcc* )
++	      *cygwin* | *msys* | *mingw* | *cegcc* )
+                 eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
+                 eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
+ 	        ;;
+@@ -2387,7 +2387,7 @@
+ 	      eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
+ 	      eval '$MV "$nlist"T "$nlist"'
+ 	      case $host in
+-	        *cygwin | *mingw* | *cegcc* )
++	        *cygwin | msys* | *mingw* | *cegcc* )
+ 	          eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
+ 	          eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
+ 	          ;;
+@@ -2443,7 +2443,7 @@
+ } lt_dlsymlist;
+ "
+ 	  case $host in
+-	  *cygwin* | *mingw* | *cegcc* )
++	  *cygwin* | *msys* | *mingw* | *cegcc* )
+ 	    $ECHO >> "$output_objdir/$my_dlsyms" "\
+ /* DATA imports from DLLs on WIN32 con't be const, because
+    runtime relocations are performed -- see ld's documentation
+@@ -2529,7 +2529,7 @@
+ 	# Transform the symbol file into the correct name.
+ 	symfileobj="$output_objdir/${my_outputname}S.$objext"
+ 	case $host in
+-	*cygwin* | *mingw* | *cegcc* )
++	*cygwin* | *msys* | *mingw* | *cegcc* )
+ 	  if test -f "$output_objdir/$my_outputname.def"; then
+ 	    compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+ 	    finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+@@ -3007,7 +3007,7 @@
+             func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
+               $SED -e "$lt_sed_naive_backslashify"`
+             ;;
+-          *cygwin* )
++          *cygwin* | *msys* )
+             func_to_host_path_tmp1=`cygpath -w "$1"`
+             func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
+               $SED -e "$lt_sed_naive_backslashify"`
+@@ -3086,7 +3086,7 @@
+             func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
+               $SED -e "$lt_sed_naive_backslashify"`
+             ;;
+-          *cygwin* )
++          *cygwin* | *msys* )
+             func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"`
+             func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
+               $SED -e "$lt_sed_naive_backslashify"`
+@@ -3401,7 +3401,7 @@
+ 	{
+ EOF
+ 	    case "$host" in
+-	      *mingw* | *cygwin* )
++	      *mingw* | *cygwin* | *msys* )
+ 		# make stdout use "unix" line endings
+ 		echo "          setmode(1,_O_BINARY);"
+ 		;;
+@@ -4169,7 +4169,7 @@
+ {
+     $opt_debug
+     case $host in
+-    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
++    *-*-cygwin* | *-*-msys* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+       # It is impossible to link a dll without this setting, and
+       # we shouldn't force the makefile maintainer to figure out
+       # which system we are compiling for in order to pass an extra
+@@ -4638,7 +4638,7 @@
+ 	  ;;
+ 	esac
+ 	case $host in
+-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
++	*-*-cygwin* | *-*-msys* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+ 	  testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'`
+ 	  case :$dllsearchpath: in
+ 	  *":$dir:"*) ;;
+@@ -4658,7 +4658,7 @@
+       -l*)
+ 	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
+ 	  case $host in
+-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*)
++	  *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*)
+ 	    # These systems don't actually have a C or math library (as such)
+ 	    continue
+ 	    ;;
+@@ -4735,7 +4735,7 @@
+ 
+       -no-install)
+ 	case $host in
+-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
++	*-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
+ 	  # The PATH hackery in wrapper scripts is required on Windows
+ 	  # and Darwin in order for the loader to find any dlls it needs.
+ 	  func_warning "\`-no-install' is ignored for $host"
+@@ -5692,7 +5692,7 @@
+ 	if test -n "$library_names" &&
+ 	   { test "$use_static_libs" = no || test -z "$old_library"; }; then
+ 	  case $host in
+-	  *cygwin* | *mingw* | *cegcc*)
++	  *cygwin* | *msys* | *mingw* | *cegcc*)
+ 	      # No point in relinking DLLs because paths are not encoded
+ 	      notinst_deplibs="$notinst_deplibs $lib"
+ 	      need_relink=no
+@@ -5762,7 +5762,7 @@
+ 	    elif test -n "$soname_spec"; then
+ 	      # bleh windows
+ 	      case $host in
+-	      *cygwin* | mingw* | *cegcc*)
++	      *cygwin* | *msys* | mingw* | *cegcc*)
+ 	        func_arith $current - $age
+ 		major=$func_arith_result
+ 		versuffix="-$major"
+@@ -6612,7 +6612,7 @@
+       if test "$build_libtool_libs" = yes; then
+ 	if test -n "$rpath"; then
+ 	  case $host in
+-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*)
++	  *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*)
+ 	    # these systems don't actually have a c library (as such)!
+ 	    ;;
+ 	  *-*-rhapsody* | *-*-darwin1.[012])
+@@ -7111,7 +7111,7 @@
+ 
+ 	orig_export_symbols=
+ 	case $host_os in
+-	cygwin* | mingw* | cegcc*)
++	cygwin* | msys* | mingw* | cegcc*)
+ 	  if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
+ 	    # exporting using user supplied symfile
+ 	    if test "x`$SED 1q $export_symbols`" != xEXPORTS; then
+@@ -7623,7 +7623,7 @@
+ 
+     prog)
+       case $host in
+-	*cygwin*) func_stripname '' '.exe' "$output"
++	*cygwin* | *msys*) func_stripname '' '.exe' "$output"
+ 	          output=$func_stripname_result.exe;;
+       esac
+       test -n "$vinfo" && \
+@@ -7736,7 +7736,7 @@
+ 	  esac
+ 	fi
+ 	case $host in
+-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
++	*-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+ 	  testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'`
+ 	  case :$dllsearchpath: in
+ 	  *":$libdir:"*) ;;
+@@ -7810,7 +7810,7 @@
+ 
+       wrappers_required=yes
+       case $host in
+-      *cygwin* | *mingw* )
++      *cygwin* | *msys* | *mingw* )
+         if test "$build_libtool_libs" != yes; then
+           wrappers_required=no
+         fi
+@@ -7953,14 +7953,14 @@
+ 	esac
+ 	# test for cygwin because mv fails w/o .exe extensions
+ 	case $host in
+-	  *cygwin*)
++	  *cygwin* | *msys*)
+ 	    exeext=.exe
+ 	    func_stripname '' '.exe' "$outputname"
+ 	    outputname=$func_stripname_result ;;
+ 	  *) exeext= ;;
+ 	esac
+ 	case $host in
+-	  *cygwin* | *mingw* )
++	  *cygwin* | *msys* | *mingw* )
+ 	    func_dirname_and_basename "$output" "" "."
+ 	    output_name=$func_basename_result
+ 	    output_path=$func_dirname_result
+@@ -8259,7 +8259,7 @@
+ 	  # place dlname in correct position for cygwin
+ 	  tdlname=$dlname
+ 	  case $host,$output,$installed,$module,$dlname in
+-	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
++	    *cygwin*,*lai,yes,no,*.dll | *msys*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
+ 	  esac
+ 	  $ECHO > $output "\
+ # $outputname - a libtool library file
+diff -Naur gettext-0.18.1.1/gettext-runtime/aclocal.m4 gettext-0.18.1.1-p/gettext-runtime/aclocal.m4
+--- gettext-0.18.1.1/gettext-runtime/aclocal.m4	2010-06-06 20:11:30.000000000 +0000
++++ gettext-0.18.1.1-p/gettext-runtime/aclocal.m4	2013-03-26 15:27:47.699218800 +0000
+@@ -697,7 +697,7 @@
+   ;;
+ 
+ AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
+-[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
++[*-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32*)
+   AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+   AC_CHECK_TOOL(AS, as, false)
+   AC_CHECK_TOOL(OBJDUMP, objdump, false)
+@@ -818,7 +818,7 @@
+     lt_cv_sys_max_cmd_len=-1;
+     ;;
+ 
+-  cygwin* | mingw*)
++  cygwin* | msys* | mingw*)
+     # On Win9x/ME, this test blows up -- it succeeds, but takes
+     # about 5 minutes as the teststring grows exponentially.
+     # Worse, since 9x/ME are not pre-emptively multitasking,
+@@ -1033,7 +1033,7 @@
+     lt_cv_dlopen_libs=
+    ;;
+ 
+-  cygwin*)
++  cygwin* | msys*)
+     lt_cv_dlopen="dlopen"
+     lt_cv_dlopen_libs=
+    ;;
+@@ -1447,14 +1447,14 @@
+   # libtool to hard-code these into programs
+   ;;
+ 
+-cygwin* | mingw* | pw32*)
++cygwin* | msys* | mingw* | pw32*)
+   version_type=windows
+   shrext_cmds=".dll"
+   need_version=no
+   need_lib_prefix=no
+ 
+   case $GCC,$host_os in
+-  yes,cygwin* | yes,mingw* | yes,pw32*)
++  yes,cygwin* | yes,msys* | yes,mingw* | yes,pw32*)
+     library_names_spec='$libname.dll.a'
+     # DLL is installed to $(libdir)/../bin by postinstall_cmds
+     postinstall_cmds='base_file=`basename \${file}`~
+@@ -1474,6 +1474,11 @@
+       soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+       sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+       ;;
++    msys*)
++      # MSYS DLLs use 'msys-' prefix rather than 'lib'
++      soname_spec='`echo ${libname} | sed -e 's/^lib/msys-/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
++      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
++      ;;
+     mingw*)
+       # MinGW DLLs use traditional 'lib' prefix
+       soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+@@ -2418,7 +2423,7 @@
+   lt_cv_file_magic_test_file=/shlib/libc.so
+   ;;
+ 
+-cygwin*)
++cygwin* | msys*)
+   # func_win32_libid is a shell function defined in ltmain.sh
+   lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+   lt_cv_file_magic_cmd='func_win32_libid'
+@@ -2634,7 +2639,7 @@
+ [AC_REQUIRE([AC_CANONICAL_HOST])dnl
+ LIBM=
+ case $host in
+-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
++*-*-beos* | *-*-cygwin* | *-*-msys* | *-*-pw32* | *-*-darwin*)
+   # These system don't have libm, or don't need it
+   ;;
+ *-ncr-sysv4.3*)
+@@ -3142,7 +3147,7 @@
+     esac
+     ;;
+ 
+-  cygwin* | mingw* | pw32*)
++  cygwin* | msys* | mingw* | pw32*)
+     # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+     # as there is no search path for DLLs.
+     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+@@ -4818,7 +4823,7 @@
+ aix*)
+   symcode='[[BCDT]]'
+   ;;
+-cygwin* | mingw* | pw32*)
++cygwin* | msys* | mingw* | pw32*)
+   symcode='[[ABCDGISTW]]'
+   ;;
+ hpux*) # Its linker distinguishes data from code symbols
+@@ -5021,7 +5026,7 @@
+     beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+       # PIC is the default for these OSes.
+       ;;
+-    mingw* | cygwin* | os2* | pw32*)
++    mingw* | cygwin* | msys* | os2* | pw32*)
+       # This hack is so that the source file can tell whether it is being
+       # built for inclusion in a dll (and should export symbols for example).
+       # Although the cygwin gcc ignores -fPIC, still need this for old-style
+@@ -5306,7 +5311,7 @@
+       # PIC is the default for these OSes.
+       ;;
+ 
+-    mingw* | cygwin* | pw32* | os2*)
++    mingw* | cygwin* | msys* | pw32* | os2*)
+       # This hack is so that the source file can tell whether it is being
+       # built for inclusion in a dll (and should export symbols for example).
+       # Although the cygwin gcc ignores -fPIC, still need this for old-style
+@@ -5379,7 +5384,7 @@
+        esac
+        ;;
+ 
+-    mingw* | cygwin* | pw32* | os2*)
++    mingw* | cygwin* | msys* | pw32* | os2*)
+       # This hack is so that the source file can tell whether it is being
+       # built for inclusion in a dll (and should export symbols for example).
+       m4_if([$1], [GCJ], [],
+@@ -5572,7 +5577,7 @@
+   pw32*)
+     _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
+   ;;
+-  cygwin* | mingw*)
++  cygwin* | msys* | mingw*)
+     _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+   ;;
+   *)
+@@ -5622,7 +5627,7 @@
+   # Just being paranoid about ensuring that cc_basename is set.
+   _LT_CC_BASENAME([$compiler])
+   case $host_os in
+-  cygwin* | mingw* | pw32*)
++  cygwin* | msys* | mingw* | pw32*)
+     # 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++.
+@@ -5708,7 +5713,7 @@
+       fi
+       ;;
+ 
+-    cygwin* | mingw* | pw32*)
++    cygwin* | msys* | mingw* | pw32*)
+       # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+       # as there is no search path for DLLs.
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+@@ -6017,7 +6022,7 @@
+       _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
+       ;;
+ 
+-    cygwin* | mingw* | pw32*)
++    cygwin* | msys* | mingw* | pw32*)
+       # When not using gcc, we currently assume that we are using
+       # Microsoft Visual C++.
+       # hardcode_libdir_flag_spec is actually meaningless, as there is
+diff -Naur gettext-0.18.1.1/gettext-runtime/configure gettext-0.18.1.1-p/gettext-runtime/configure
+--- gettext-0.18.1.1/gettext-runtime/configure	2010-06-06 20:11:32.000000000 +0000
++++ gettext-0.18.1.1-p/gettext-runtime/configure	2013-03-26 15:36:28.777343800 +0000
+@@ -6464,7 +6464,7 @@
+ 
+ 
+   case "$host_os" in
+-    mingw* | cygwin*)
++    mingw* | cygwin* | msys*)
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for auto-import of symbols" >&5
+ $as_echo_n "checking for auto-import of symbols... " >&6; }
+       if test "${gl_cv_ld_autoimport+set}" = set; then :
+@@ -7049,7 +7049,7 @@
+     lt_cv_sys_max_cmd_len=-1;
+     ;;
+ 
+-  cygwin* | mingw* | cegcc*)
++  cygwin* | msys* | mingw* | cegcc*)
+     # On Win9x/ME, this test blows up -- it succeeds, but takes
+     # about 5 minutes as the teststring grows exponentially.
+     # Worse, since 9x/ME are not pre-emptively multitasking,
+@@ -7383,7 +7383,7 @@
+   lt_cv_file_magic_test_file=/shlib/libc.so
+   ;;
+ 
+-cygwin*)
++cygwin* | msys*)
+   # func_win32_libid is a shell function defined in ltmain.sh
+   lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+   lt_cv_file_magic_cmd='func_win32_libid'
+@@ -7946,7 +7946,7 @@
+ aix*)
+   symcode='[BCDT]'
+   ;;
+-cygwin* | mingw* | pw32* | cegcc*)
++cygwin* | msys* | mingw* | pw32* | cegcc*)
+   symcode='[ABCDGISTW]'
+   ;;
+ hpux*)
+@@ -8971,7 +8971,7 @@
+ enable_win32_dll=yes
+ 
+ case $host in
+-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
++*-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-cegcc*)
+   if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}as; ac_word=$2
+@@ -9837,7 +9837,7 @@
+       # PIC is the default for these OSes.
+       ;;
+ 
+-    mingw* | cygwin* | pw32* | os2* | cegcc*)
++    mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
+       # This hack is so that the source file can tell whether it is being
+       # built for inclusion in a dll (and should export symbols for example).
+       # Although the cygwin gcc ignores -fPIC, still need this for old-style
+@@ -9906,7 +9906,7 @@
+       fi
+       ;;
+ 
+-    mingw* | cygwin* | pw32* | os2* | cegcc*)
++    mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
+       # This hack is so that the source file can tell whether it is being
+       # built for inclusion in a dll (and should export symbols for example).
+       lt_prog_compiler_pic='-DDLL_EXPORT'
+@@ -10368,7 +10368,7 @@
+   extract_expsyms_cmds=
+ 
+   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++.
+@@ -10455,7 +10455,7 @@
+       fi
+       ;;
+ 
+-    cygwin* | mingw* | pw32* | cegcc*)
++    cygwin* | msys* | mingw* | pw32* | cegcc*)
+       # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
+       # as there is no search path for DLLs.
+       hardcode_libdir_flag_spec='-L$libdir'
+@@ -10868,7 +10868,7 @@
+       export_dynamic_flag_spec=-rdynamic
+       ;;
+ 
+-    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
+@@ -11711,14 +11711,14 @@
+   # libtool to hard-code these into programs
+   ;;
+ 
+-cygwin* | mingw* | pw32* | cegcc*)
++cygwin* | msys* | mingw* | pw32* | cegcc*)
+   version_type=windows
+   shrext_cmds=".dll"
+   need_version=no
+   need_lib_prefix=no
+ 
+   case $GCC,$host_os in
+-  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
++  yes,cygwin* | yes,msys* | yes,mingw* | yes,pw32* | yes,cegcc*)
+     library_names_spec='$libname.dll.a'
+     # DLL is installed to $(libdir)/../bin by postinstall_cmds
+     postinstall_cmds='base_file=`basename \${file}`~
+@@ -11741,6 +11741,11 @@
+       soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+       sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+       ;;
++    msys*)
++      # MSYS DLLs use 'msys-' prefix rather than 'lib'
++      soname_spec='`echo ${libname} | sed -e 's/^lib/msys-/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
++      ;;
+     mingw* | cegcc*)
+       # MinGW DLLs use traditional 'lib' prefix
+       soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+@@ -12371,7 +12376,7 @@
+     lt_cv_dlopen_libs=
+     ;;
+ 
+-  cygwin*)
++  cygwin* | msys*)
+     lt_cv_dlopen="dlopen"
+     lt_cv_dlopen_libs=
+     ;;
+@@ -13138,7 +13143,7 @@
+ 
+ 
+ case "$host_os" in
+-  mingw* | cygwin*) is_woe32=yes ;;
++  mingw* | cygwin* | msys*) is_woe32=yes ;;
+   *) is_woe32=no ;;
+ esac
+  if test $is_woe32 = yes; then
+@@ -14341,7 +14346,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 ;;
+@@ -17348,7 +17353,7 @@
+ 
+                 if test "$enable_shared" = yes; then
+     case "$host_os" in
+-      mingw* | cygwin*) is_woe32dll=yes ;;
++      mingw* | cygwin* | msys*) is_woe32dll=yes ;;
+       *) is_woe32dll=no ;;
+     esac
+   else
+@@ -17358,7 +17363,7 @@
+ 
+ 
+       case "$host_os" in
+-    mingw* | cygwin*) is_woe32=yes ;;
++    mingw* | cygwin* | msys*) is_woe32=yes ;;
+     *) is_woe32=no ;;
+   esac
+   WOE32=$is_woe32
+@@ -18397,7 +18402,7 @@
+         # special semantics and is distinct from /, please report it to
+         # <bug-gnulib@gnu.org>.
+         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
+@@ -22092,7 +22097,7 @@
+         # special semantics and is distinct from /, please report it to
+         # <bug-gnulib@gnu.org>.
+         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
+diff -Naur gettext-0.18.1.1/gettext-runtime/configure.ac gettext-0.18.1.1-p/gettext-runtime/configure.ac
+--- gettext-0.18.1.1/gettext-runtime/configure.ac	2010-06-06 12:49:57.000000000 +0000
++++ gettext-0.18.1.1-p/gettext-runtime/configure.ac	2013-03-26 15:36:55.527343800 +0000
+@@ -75,7 +75,7 @@
+ dnl On mingw and Cygwin, we can activate special Makefile rules which add
+ dnl version information to the shared libraries and executables.
+ case "$host_os" in
+-  mingw* | cygwin*) is_woe32=yes ;;
++  mingw* | cygwin* | msys*) is_woe32=yes ;;
+   *) is_woe32=no ;;
+ esac
+ AM_CONDITIONAL([WOE32], [test $is_woe32 = yes])
+diff -Naur gettext-0.18.1.1/gettext-runtime/gnulib-lib/Makefile.am gettext-0.18.1.1-p/gettext-runtime/gnulib-lib/Makefile.am
+--- gettext-0.18.1.1/gettext-runtime/gnulib-lib/Makefile.am	2010-06-03 21:35:21.000000000 +0000
++++ gettext-0.18.1.1-p/gettext-runtime/gnulib-lib/Makefile.am	2013-03-26 15:37:59.431640700 +0000
+@@ -409,7 +409,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 gettext-0.18.1.1/gettext-runtime/gnulib-lib/Makefile.in gettext-0.18.1.1-p/gettext-runtime/gnulib-lib/Makefile.in
+--- gettext-0.18.1.1/gettext-runtime/gnulib-lib/Makefile.in	2010-06-06 20:11:37.000000000 +0000
++++ gettext-0.18.1.1-p/gettext-runtime/gnulib-lib/Makefile.in	2013-03-26 15:38:43.041015700 +0000
+@@ -1601,7 +1601,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 gettext-0.18.1.1/gettext-runtime/gnulib-m4/double-slash-root.m4 gettext-0.18.1.1-p/gettext-runtime/gnulib-m4/double-slash-root.m4
+--- gettext-0.18.1.1/gettext-runtime/gnulib-m4/double-slash-root.m4	2010-02-16 21:31:29.000000000 +0000
++++ gettext-0.18.1.1-p/gettext-runtime/gnulib-m4/double-slash-root.m4	2013-03-26 15:39:35.761718800 +0000
+@@ -16,7 +16,7 @@
+         # special semantics and is distinct from /, please report it to
+         # <bug-gnulib@gnu.org>.
+         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
+diff -Naur gettext-0.18.1.1/gettext-runtime/intl/Makefile.in gettext-0.18.1.1-p/gettext-runtime/intl/Makefile.in
+--- gettext-0.18.1.1/gettext-runtime/intl/Makefile.in	2010-06-06 12:49:57.000000000 +0000
++++ gettext-0.18.1.1-p/gettext-runtime/intl/Makefile.in	2013-03-26 15:41:37.156250000 +0000
+@@ -414,7 +414,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 ;; \
+@@ -500,7 +500,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 gettext-0.18.1.1/gettext-runtime/libasprintf/aclocal.m4 gettext-0.18.1.1-p/gettext-runtime/libasprintf/aclocal.m4
+--- gettext-0.18.1.1/gettext-runtime/libasprintf/aclocal.m4	2010-06-06 20:11:09.000000000 +0000
++++ gettext-0.18.1.1-p/gettext-runtime/libasprintf/aclocal.m4	2013-03-26 15:50:11.474609400 +0000
+@@ -697,7 +697,7 @@
+   ;;
+ 
+ AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
+-[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
++[*-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32*)
+   AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+   AC_CHECK_TOOL(AS, as, false)
+   AC_CHECK_TOOL(OBJDUMP, objdump, false)
+@@ -818,7 +818,7 @@
+     lt_cv_sys_max_cmd_len=-1;
+     ;;
+ 
+-  cygwin* | mingw*)
++  cygwin* | msys* | mingw*)
+     # On Win9x/ME, this test blows up -- it succeeds, but takes
+     # about 5 minutes as the teststring grows exponentially.
+     # Worse, since 9x/ME are not pre-emptively multitasking,
+@@ -1033,7 +1033,7 @@
+     lt_cv_dlopen_libs=
+    ;;
+ 
+-  cygwin*)
++  cygwin* | msys*)
+     lt_cv_dlopen="dlopen"
+     lt_cv_dlopen_libs=
+    ;;
+@@ -1447,14 +1447,14 @@
+   # libtool to hard-code these into programs
+   ;;
+ 
+-cygwin* | mingw* | pw32*)
++cygwin* | msys* | mingw* | pw32*)
+   version_type=windows
+   shrext_cmds=".dll"
+   need_version=no
+   need_lib_prefix=no
+ 
+   case $GCC,$host_os in
+-  yes,cygwin* | yes,mingw* | yes,pw32*)
++  yes,cygwin* | yes,msys* | yes,mingw* | yes,pw32*)
+     library_names_spec='$libname.dll.a'
+     # DLL is installed to $(libdir)/../bin by postinstall_cmds
+     postinstall_cmds='base_file=`basename \${file}`~
+@@ -1474,6 +1474,11 @@
+       soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+       sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+       ;;
++    msys*)
++      # MSYS DLLs use 'msys-' prefix rather than 'lib'
++      soname_spec='`echo ${libname} | sed -e 's/^lib/msys-/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
++      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
++      ;;
+     mingw*)
+       # MinGW DLLs use traditional 'lib' prefix
+       soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+@@ -2418,7 +2423,7 @@
+   lt_cv_file_magic_test_file=/shlib/libc.so
+   ;;
+ 
+-cygwin*)
++cygwin* | msys*)
+   # func_win32_libid is a shell function defined in ltmain.sh
+   lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+   lt_cv_file_magic_cmd='func_win32_libid'
+@@ -2634,7 +2639,7 @@
+ [AC_REQUIRE([AC_CANONICAL_HOST])dnl
+ LIBM=
+ case $host in
+-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
++*-*-beos* | *-*-cygwin* | *-*-msys* | *-*-pw32* | *-*-darwin*)
+   # These system don't have libm, or don't need it
+   ;;
+ *-ncr-sysv4.3*)
+@@ -3142,7 +3147,7 @@
+     esac
+     ;;
+ 
+-  cygwin* | mingw* | pw32*)
++  cygwin* | msys* | mingw* | pw32*)
+     # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+     # as there is no search path for DLLs.
+     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+@@ -4818,7 +4823,7 @@
+ aix*)
+   symcode='[[BCDT]]'
+   ;;
+-cygwin* | mingw* | pw32*)
++cygwin* | msys* | mingw* | pw32*)
+   symcode='[[ABCDGISTW]]'
+   ;;
+ hpux*) # Its linker distinguishes data from code symbols
+@@ -5021,7 +5026,7 @@
+     beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+       # PIC is the default for these OSes.
+       ;;
+-    mingw* | cygwin* | os2* | pw32*)
++    mingw* | cygwin* | msys* | os2* | pw32*)
+       # This hack is so that the source file can tell whether it is being
+       # built for inclusion in a dll (and should export symbols for example).
+       # Although the cygwin gcc ignores -fPIC, still need this for old-style
+@@ -5306,7 +5311,7 @@
+       # PIC is the default for these OSes.
+       ;;
+ 
+-    mingw* | cygwin* | pw32* | os2*)
++    mingw* | cygwin* | msys* | pw32* | os2*)
+       # This hack is so that the source file can tell whether it is being
+       # built for inclusion in a dll (and should export symbols for example).
+       # Although the cygwin gcc ignores -fPIC, still need this for old-style
+@@ -5379,7 +5384,7 @@
+        esac
+        ;;
+ 
+-    mingw* | cygwin* | pw32* | os2*)
++    mingw* | cygwin* | msys* | pw32* | os2*)
+       # This hack is so that the source file can tell whether it is being
+       # built for inclusion in a dll (and should export symbols for example).
+       m4_if([$1], [GCJ], [],
+@@ -5572,7 +5577,7 @@
+   pw32*)
+     _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
+   ;;
+-  cygwin* | mingw*)
++  cygwin* | msys* | mingw*)
+     _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+   ;;
+   *)
+@@ -5622,7 +5627,7 @@
+   # Just being paranoid about ensuring that cc_basename is set.
+   _LT_CC_BASENAME([$compiler])
+   case $host_os in
+-  cygwin* | mingw* | pw32*)
++  cygwin* | msys* | mingw* | pw32*)
+     # 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++.
+@@ -5708,7 +5713,7 @@
+       fi
+       ;;
+ 
+-    cygwin* | mingw* | pw32*)
++    cygwin* | msys* | mingw* | pw32*)
+       # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+       # as there is no search path for DLLs.
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+@@ -6017,7 +6022,7 @@
+       _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
+       ;;
+ 
+-    cygwin* | mingw* | pw32*)
++    cygwin* | msys* | mingw* | pw32*)
+       # When not using gcc, we currently assume that we are using
+       # Microsoft Visual C++.
+       # hardcode_libdir_flag_spec is actually meaningless, as there is
+diff -Naur gettext-0.18.1.1/gettext-runtime/libasprintf/configure gettext-0.18.1.1-p/gettext-runtime/libasprintf/configure
+--- gettext-0.18.1.1/gettext-runtime/libasprintf/configure	2010-06-06 20:11:10.000000000 +0000
++++ gettext-0.18.1.1-p/gettext-runtime/libasprintf/configure	2013-03-26 15:57:02.115234400 +0000
+@@ -4797,7 +4797,7 @@
+ 
+ 
+   case "$host_os" in
+-    mingw* | cygwin*)
++    mingw* | cygwin* | msys*)
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for auto-import of symbols" >&5
+ $as_echo_n "checking for auto-import of symbols... " >&6; }
+       if test "${gl_cv_ld_autoimport+set}" = set; then :
+@@ -5511,7 +5511,7 @@
+     lt_cv_sys_max_cmd_len=-1;
+     ;;
+ 
+-  cygwin* | mingw* | cegcc*)
++  cygwin* | msys* | mingw* | cegcc*)
+     # On Win9x/ME, this test blows up -- it succeeds, but takes
+     # about 5 minutes as the teststring grows exponentially.
+     # Worse, since 9x/ME are not pre-emptively multitasking,
+@@ -5845,7 +5845,7 @@
+   lt_cv_file_magic_test_file=/shlib/libc.so
+   ;;
+ 
+-cygwin*)
++cygwin* | msys*)
+   # func_win32_libid is a shell function defined in ltmain.sh
+   lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+   lt_cv_file_magic_cmd='func_win32_libid'
+@@ -6408,7 +6408,7 @@
+ aix*)
+   symcode='[BCDT]'
+   ;;
+-cygwin* | mingw* | pw32* | cegcc*)
++cygwin* | msys* | mingw* | pw32* | cegcc*)
+   symcode='[ABCDGISTW]'
+   ;;
+ hpux*)
+@@ -8228,7 +8228,7 @@
+ enable_win32_dll=yes
+ 
+ case $host in
+-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
++*-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-cegcc*)
+   if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}as; ac_word=$2
+@@ -9094,7 +9094,7 @@
+       # PIC is the default for these OSes.
+       ;;
+ 
+-    mingw* | cygwin* | pw32* | os2* | cegcc*)
++    mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
+       # This hack is so that the source file can tell whether it is being
+       # built for inclusion in a dll (and should export symbols for example).
+       # Although the cygwin gcc ignores -fPIC, still need this for old-style
+@@ -9163,7 +9163,7 @@
+       fi
+       ;;
+ 
+-    mingw* | cygwin* | pw32* | os2* | cegcc*)
++    mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
+       # This hack is so that the source file can tell whether it is being
+       # built for inclusion in a dll (and should export symbols for example).
+       lt_prog_compiler_pic='-DDLL_EXPORT'
+@@ -9625,7 +9625,7 @@
+   extract_expsyms_cmds=
+ 
+   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++.
+@@ -9712,7 +9712,7 @@
+       fi
+       ;;
+ 
+-    cygwin* | mingw* | pw32* | cegcc*)
++    cygwin* | msys* | mingw* | pw32* | cegcc*)
+       # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
+       # as there is no search path for DLLs.
+       hardcode_libdir_flag_spec='-L$libdir'
+@@ -10125,7 +10125,7 @@
+       export_dynamic_flag_spec=-rdynamic
+       ;;
+ 
+-    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
+@@ -10968,14 +10968,14 @@
+   # libtool to hard-code these into programs
+   ;;
+ 
+-cygwin* | mingw* | pw32* | cegcc*)
++cygwin* | msys* | mingw* | pw32* | cegcc*)
+   version_type=windows
+   shrext_cmds=".dll"
+   need_version=no
+   need_lib_prefix=no
+ 
+   case $GCC,$host_os in
+-  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
++  yes,cygwin* | yes,msys* | yes,mingw* | yes,pw32* | yes,cegcc*)
+     library_names_spec='$libname.dll.a'
+     # DLL is installed to $(libdir)/../bin by postinstall_cmds
+     postinstall_cmds='base_file=`basename \${file}`~
+@@ -10998,6 +10998,11 @@
+       soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+       sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+       ;;
++    msys*)
++      # MSYS DLLs use 'msys-' prefix rather than 'lib'
++      soname_spec='`echo ${libname} | sed -e 's/^lib/msys-/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
++      ;;
+     mingw* | cegcc*)
+       # MinGW DLLs use traditional 'lib' prefix
+       soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+@@ -11628,7 +11633,7 @@
+     lt_cv_dlopen_libs=
+     ;;
+ 
+-  cygwin*)
++  cygwin* | msys*)
+     lt_cv_dlopen="dlopen"
+     lt_cv_dlopen_libs=
+     ;;
+@@ -12684,7 +12689,7 @@
+         esac
+         ;;
+ 
+-      cygwin* | mingw* | pw32* | cegcc*)
++      cygwin* | msys* | mingw* | pw32* | cegcc*)
+         # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
+         # as there is no search path for DLLs.
+         hardcode_libdir_flag_spec_CXX='-L$libdir'
+@@ -13638,7 +13643,7 @@
+     beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+       # PIC is the default for these OSes.
+       ;;
+-    mingw* | cygwin* | os2* | pw32* | cegcc*)
++    mingw* | cygwin* | msys* | os2* | pw32* | cegcc*)
+       # This hack is so that the source file can tell whether it is being
+       # built for inclusion in a dll (and should export symbols for example).
+       # Although the cygwin gcc ignores -fPIC, still need this for old-style
+@@ -14171,7 +14176,7 @@
+   pw32*)
+     export_symbols_cmds_CXX="$ltdll_cmds"
+   ;;
+-  cygwin* | mingw* | cegcc*)
++  cygwin* | msys* | mingw* | cegcc*)
+     export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
+   ;;
+   *)
+@@ -14429,14 +14434,14 @@
+   # libtool to hard-code these into programs
+   ;;
+ 
+-cygwin* | mingw* | pw32* | cegcc*)
++cygwin* | msys* | mingw* | pw32* | cegcc*)
+   version_type=windows
+   shrext_cmds=".dll"
+   need_version=no
+   need_lib_prefix=no
+ 
+   case $GCC,$host_os in
+-  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
++  yes,cygwin* | yes,msys* | yes,mingw* | yes,pw32* | yes,cegcc*)
+     library_names_spec='$libname.dll.a'
+     # DLL is installed to $(libdir)/../bin by postinstall_cmds
+     postinstall_cmds='base_file=`basename \${file}`~
+@@ -14459,6 +14464,11 @@
+       soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+       sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+       ;;
++    msys*)
++      # MSYS DLLs use 'msys-' prefix rather than 'lib'
++      soname_spec='`echo ${libname} | sed -e 's/^lib/msys-/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
++      ;;
+     mingw* | cegcc*)
+       # MinGW DLLs use traditional 'lib' prefix
+       soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+@@ -15057,7 +15067,7 @@
+ case "$host_os" in
+   # On Cygwin, without -no-undefined, a warning is emitted and only a static
+   # library is built.
+-  beos* | mingw* | cygwin*) LTNOUNDEF='-no-undefined' ;;
++  beos* | mingw* | cygwin* | msys*) LTNOUNDEF='-no-undefined' ;;
+   *) LTNOUNDEF='' ;;
+ esac
+ 
+diff -Naur gettext-0.18.1.1/gettext-runtime/libasprintf/configure.ac gettext-0.18.1.1-p/gettext-runtime/libasprintf/configure.ac
+--- gettext-0.18.1.1/gettext-runtime/libasprintf/configure.ac	2010-06-06 12:49:57.000000000 +0000
++++ gettext-0.18.1.1-p/gettext-runtime/libasprintf/configure.ac	2013-03-26 16:01:33.958984400 +0000
+@@ -44,7 +44,7 @@
+ case "$host_os" in
+   # On Cygwin, without -no-undefined, a warning is emitted and only a static
+   # library is built.
+-  beos* | mingw* | cygwin*) LTNOUNDEF='-no-undefined' ;;
++  beos* | mingw* | cygwin* | msys*) LTNOUNDEF='-no-undefined' ;;
+   *) LTNOUNDEF='' ;;
+ esac
+ AC_SUBST([LTNOUNDEF])
+diff -Naur gettext-0.18.1.1/gettext-runtime/m4/intl.m4 gettext-0.18.1.1-p/gettext-runtime/m4/intl.m4
+--- gettext-0.18.1.1/gettext-runtime/m4/intl.m4	2010-06-06 12:49:57.000000000 +0000
++++ gettext-0.18.1.1-p/gettext-runtime/m4/intl.m4	2013-03-26 16:02:50.859375000 +0000
+@@ -113,7 +113,7 @@
+   dnl    exported variables _also_ in the static library.
+   if test "$enable_shared" = yes; then
+     case "$host_os" in
+-      mingw* | cygwin*) is_woe32dll=yes ;;
++      mingw* | cygwin* | msys*) is_woe32dll=yes ;;
+       *) is_woe32dll=no ;;
+     esac
+   else
+@@ -125,7 +125,7 @@
+   dnl On mingw and Cygwin, we can activate special Makefile rules which add
+   dnl version information to the shared libraries and executables.
+   case "$host_os" in
+-    mingw* | cygwin*) is_woe32=yes ;;
++    mingw* | cygwin* | msys*) is_woe32=yes ;;
+     *) is_woe32=no ;;
+   esac
+   WOE32=$is_woe32
+diff -Naur gettext-0.18.1.1/gettext-runtime/m4/threadlib.m4 gettext-0.18.1.1-p/gettext-runtime/m4/threadlib.m4
+--- gettext-0.18.1.1/gettext-runtime/m4/threadlib.m4	2010-06-06 12:49:57.000000000 +0000
++++ gettext-0.18.1.1-p/gettext-runtime/m4/threadlib.m4	2013-03-26 16:05:46.406250000 +0000
+@@ -61,7 +61,7 @@
+          dnl bugs that lead to endless loops or crashes. See
+          dnl <http://cygwin.com/ml/cygwin/2009-08/msg00283.html>.
+          osf*) gl_use_threads=no ;;
+-         cygwin*)
++         cygwin* | msys*)
+                case `uname -r` in
+                  1.[0-5].*) gl_use_threads=no ;;
+                  *)         gl_use_threads=yes ;;
+diff -Naur gettext-0.18.1.1/gettext-tools/aclocal.m4 gettext-0.18.1.1-p/gettext-tools/aclocal.m4
+--- gettext-0.18.1.1/gettext-tools/aclocal.m4	2010-06-06 20:12:15.000000000 +0000
++++ gettext-0.18.1.1-p/gettext-tools/aclocal.m4	2013-03-26 16:29:01.439453200 +0000
+@@ -697,7 +697,7 @@
+   ;;
+ 
+ AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
+-[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
++[*-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32*)
+   AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+   AC_CHECK_TOOL(AS, as, false)
+   AC_CHECK_TOOL(OBJDUMP, objdump, false)
+@@ -818,7 +818,7 @@
+     lt_cv_sys_max_cmd_len=-1;
+     ;;
+ 
+-  cygwin* | mingw*)
++  cygwin* | msys* | mingw*)
+     # On Win9x/ME, this test blows up -- it succeeds, but takes
+     # about 5 minutes as the teststring grows exponentially.
+     # Worse, since 9x/ME are not pre-emptively multitasking,
+@@ -1033,7 +1033,7 @@
+     lt_cv_dlopen_libs=
+    ;;
+ 
+-  cygwin*)
++  cygwin* | msys*)
+     lt_cv_dlopen="dlopen"
+     lt_cv_dlopen_libs=
+    ;;
+@@ -1447,14 +1447,14 @@
+   # libtool to hard-code these into programs
+   ;;
+ 
+-cygwin* | mingw* | pw32*)
++cygwin* | msys* | mingw* | pw32*)
+   version_type=windows
+   shrext_cmds=".dll"
+   need_version=no
+   need_lib_prefix=no
+ 
+   case $GCC,$host_os in
+-  yes,cygwin* | yes,mingw* | yes,pw32*)
++  yes,cygwin* | yes,msys* | yes,mingw* | yes,pw32*)
+     library_names_spec='$libname.dll.a'
+     # DLL is installed to $(libdir)/../bin by postinstall_cmds
+     postinstall_cmds='base_file=`basename \${file}`~
+@@ -1474,6 +1474,11 @@
+       soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+       sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+       ;;
++    msys*)
++      # MSYS DLLs use 'msys-' prefix rather than 'lib'
++      soname_spec='`echo ${libname} | sed -e 's/^lib/msys-/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
++      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
++      ;;
+     mingw*)
+       # MinGW DLLs use traditional 'lib' prefix
+       soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+@@ -2418,7 +2423,7 @@
+   lt_cv_file_magic_test_file=/shlib/libc.so
+   ;;
+ 
+-cygwin*)
++cygwin* | msys*)
+   # func_win32_libid is a shell function defined in ltmain.sh
+   lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+   lt_cv_file_magic_cmd='func_win32_libid'
+@@ -2634,7 +2639,7 @@
+ [AC_REQUIRE([AC_CANONICAL_HOST])dnl
+ LIBM=
+ case $host in
+-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
++*-*-beos* | *-*-cygwin* | *-*-msys* | *-*-pw32* | *-*-darwin*)
+   # These system don't have libm, or don't need it
+   ;;
+ *-ncr-sysv4.3*)
+@@ -3142,7 +3147,7 @@
+     esac
+     ;;
+ 
+-  cygwin* | mingw* | pw32*)
++  cygwin* | msys* | mingw* | pw32*)
+     # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+     # as there is no search path for DLLs.
+     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+@@ -4818,7 +4823,7 @@
+ aix*)
+   symcode='[[BCDT]]'
+   ;;
+-cygwin* | mingw* | pw32*)
++cygwin* | msys* | mingw* | pw32*)
+   symcode='[[ABCDGISTW]]'
+   ;;
+ hpux*) # Its linker distinguishes data from code symbols
+@@ -5021,7 +5026,7 @@
+     beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+       # PIC is the default for these OSes.
+       ;;
+-    mingw* | cygwin* | os2* | pw32*)
++    mingw* | cygwin* | msys* | os2* | pw32*)
+       # This hack is so that the source file can tell whether it is being
+       # built for inclusion in a dll (and should export symbols for example).
+       # Although the cygwin gcc ignores -fPIC, still need this for old-style
+@@ -5306,7 +5311,7 @@
+       # PIC is the default for these OSes.
+       ;;
+ 
+-    mingw* | cygwin* | pw32* | os2*)
++    mingw* | cygwin* | msys* | pw32* | os2*)
+       # This hack is so that the source file can tell whether it is being
+       # built for inclusion in a dll (and should export symbols for example).
+       # Although the cygwin gcc ignores -fPIC, still need this for old-style
+@@ -5379,7 +5384,7 @@
+        esac
+        ;;
+ 
+-    mingw* | cygwin* | pw32* | os2*)
++    mingw* | cygwin* | msys* | pw32* | os2*)
+       # This hack is so that the source file can tell whether it is being
+       # built for inclusion in a dll (and should export symbols for example).
+       m4_if([$1], [GCJ], [],
+@@ -5572,7 +5577,7 @@
+   pw32*)
+     _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
+   ;;
+-  cygwin* | mingw*)
++  cygwin* | msys* | mingw*)
+     _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+   ;;
+   *)
+@@ -5622,7 +5627,7 @@
+   # Just being paranoid about ensuring that cc_basename is set.
+   _LT_CC_BASENAME([$compiler])
+   case $host_os in
+-  cygwin* | mingw* | pw32*)
++  cygwin* | msys* | mingw* | pw32*)
+     # 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++.
+@@ -5708,7 +5713,7 @@
+       fi
+       ;;
+ 
+-    cygwin* | mingw* | pw32*)
++    cygwin* | msys* | mingw* | pw32*)
+       # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+       # as there is no search path for DLLs.
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+@@ -6017,7 +6022,7 @@
+       _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
+       ;;
+ 
+-    cygwin* | mingw* | pw32*)
++    cygwin* | msys* | mingw* | pw32*)
+       # When not using gcc, we currently assume that we are using
+       # Microsoft Visual C++.
+       # hardcode_libdir_flag_spec is actually meaningless, as there is
+diff -Naur gettext-0.18.1.1/gettext-tools/configure gettext-0.18.1.1-p/gettext-tools/configure
+--- gettext-0.18.1.1/gettext-tools/configure	2010-06-06 20:12:20.000000000 +0000
++++ gettext-0.18.1.1-p/gettext-tools/configure	2013-03-26 16:49:01.271484400 +0000
+@@ -6940,7 +6940,7 @@
+            && clix $srcdir/m4/csharpexec-test.exe >/dev/null 2>/dev/null; then
+           HAVE_CLIX=1
+           case $host_os in
+-            cygwin* | mingw* | pw32*)
++            cygwin* | msys* | mingw* | pw32*)
+               CLIX_PATH_VAR=PATH
+               ;;
+             darwin* | rhapsody*)
+@@ -7786,7 +7786,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 ;;
+@@ -8337,7 +8337,7 @@
+ 
+ 
+   case "$host_os" in
+-    mingw* | cygwin*)
++    mingw* | cygwin* | msys*)
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for auto-import of symbols" >&5
+ $as_echo_n "checking for auto-import of symbols... " >&6; }
+       if test "${gl_cv_ld_autoimport+set}" = set; then :
+@@ -8922,7 +8922,7 @@
+     lt_cv_sys_max_cmd_len=-1;
+     ;;
+ 
+-  cygwin* | mingw* | cegcc*)
++  cygwin* | msys* | mingw* | cegcc*)
+     # On Win9x/ME, this test blows up -- it succeeds, but takes
+     # about 5 minutes as the teststring grows exponentially.
+     # Worse, since 9x/ME are not pre-emptively multitasking,
+@@ -9256,7 +9256,7 @@
+   lt_cv_file_magic_test_file=/shlib/libc.so
+   ;;
+ 
+-cygwin*)
++cygwin* | msys*)
+   # func_win32_libid is a shell function defined in ltmain.sh
+   lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+   lt_cv_file_magic_cmd='func_win32_libid'
+@@ -9819,7 +9819,7 @@
+ aix*)
+   symcode='[BCDT]'
+   ;;
+-cygwin* | mingw* | pw32* | cegcc*)
++cygwin* | msys* | mingw* | pw32* | cegcc*)
+   symcode='[ABCDGISTW]'
+   ;;
+ hpux*)
+@@ -10844,7 +10844,7 @@
+ enable_win32_dll=yes
+ 
+ case $host in
+-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
++*-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-cegcc*)
+   if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}as; ac_word=$2
+@@ -11710,7 +11710,7 @@
+       # PIC is the default for these OSes.
+       ;;
+ 
+-    mingw* | cygwin* | pw32* | os2* | cegcc*)
++    mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
+       # This hack is so that the source file can tell whether it is being
+       # built for inclusion in a dll (and should export symbols for example).
+       # Although the cygwin gcc ignores -fPIC, still need this for old-style
+@@ -11779,7 +11779,7 @@
+       fi
+       ;;
+ 
+-    mingw* | cygwin* | pw32* | os2* | cegcc*)
++    mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
+       # This hack is so that the source file can tell whether it is being
+       # built for inclusion in a dll (and should export symbols for example).
+       lt_prog_compiler_pic='-DDLL_EXPORT'
+@@ -12241,7 +12241,7 @@
+   extract_expsyms_cmds=
+ 
+   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++.
+@@ -12328,7 +12328,7 @@
+       fi
+       ;;
+ 
+-    cygwin* | mingw* | pw32* | cegcc*)
++    cygwin* | msys* | mingw* | pw32* | cegcc*)
+       # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
+       # as there is no search path for DLLs.
+       hardcode_libdir_flag_spec='-L$libdir'
+@@ -12741,7 +12741,7 @@
+       export_dynamic_flag_spec=-rdynamic
+       ;;
+ 
+-    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
+@@ -13584,14 +13584,14 @@
+   # libtool to hard-code these into programs
+   ;;
+ 
+-cygwin* | mingw* | pw32* | cegcc*)
++cygwin* | msys* | mingw* | pw32* | cegcc*)
+   version_type=windows
+   shrext_cmds=".dll"
+   need_version=no
+   need_lib_prefix=no
+ 
+   case $GCC,$host_os in
+-  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
++  yes,cygwin* | yes,msys* | yes,mingw* | yes,pw32* | yes,cegcc*)
+     library_names_spec='$libname.dll.a'
+     # DLL is installed to $(libdir)/../bin by postinstall_cmds
+     postinstall_cmds='base_file=`basename \${file}`~
+@@ -13614,6 +13614,11 @@
+       soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+       sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+       ;;
++    msys*)
++      # MSYS DLLs use 'msys-' prefix rather than 'lib'
++      soname_spec='`echo ${libname} | sed -e 's/^lib/msys-/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
++      ;;
+     mingw* | cegcc*)
+       # MinGW DLLs use traditional 'lib' prefix
+       soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+@@ -14244,7 +14249,7 @@
+     lt_cv_dlopen_libs=
+     ;;
+ 
+-  cygwin*)
++  cygwin* | msys*)
+     lt_cv_dlopen="dlopen"
+     lt_cv_dlopen_libs=
+     ;;
+@@ -15013,13 +15018,13 @@
+ case "$host_os" in
+   # On Cygwin, without -no-undefined, a warning is emitted and only a static
+   # library is built.
+-  beos* | mingw* | cygwin*) LTNOUNDEF='-no-undefined' ;;
++  beos* | mingw* | cygwin* | msys*) LTNOUNDEF='-no-undefined' ;;
+   *) LTNOUNDEF='' ;;
+ esac
+ 
+ 
+ case "$host_os" in
+-  mingw* | cygwin*) is_woe32=yes ;;
++  mingw*) is_woe32=yes ;;
+   *) is_woe32=no ;;
+ esac
+  if test $is_woe32 = yes; then
+@@ -19178,7 +19183,7 @@
+ 
+                 if test "$enable_shared" = yes; then
+     case "$host_os" in
+-      mingw* | cygwin*) is_woe32dll=yes ;;
++      mingw*) is_woe32dll=yes ;;
+       *) is_woe32dll=no ;;
+     esac
+   else
+@@ -19188,7 +19193,7 @@
+ 
+ 
+       case "$host_os" in
+-    mingw* | cygwin*) is_woe32=yes ;;
++    mingw*) is_woe32=yes ;;
+     *) is_woe32=no ;;
+   esac
+   WOE32=$is_woe32
+@@ -20306,7 +20311,7 @@
+         # special semantics and is distinct from /, please report it to
+         # <bug-gnulib@gnu.org>.
+         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
+@@ -31234,7 +31239,7 @@
+         # special semantics and is distinct from /, please report it to
+         # <bug-gnulib@gnu.org>.
+         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
+@@ -31291,7 +31296,7 @@
+   case "$host_os" in
+            mingw*) # on this platform, dup2 always returns 0 for success
+              gl_cv_func_dup2_works=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=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.
+@@ -45845,13 +45850,13 @@
+ 
+                         case "$host_os" in
+             # Guess no on Solaris <= 9 and Cygwin.
+-          solaris2.[1-9] | solaris2.[1-9].* | cygwin*)
++          solaris2.[1-9] | solaris2.[1-9].* | cygwin* | msys*)
+             gl_cv_func_wctob_works="guessing no" ;;
+             # Guess yes otherwise.
+           *) gl_cv_func_wctob_works="guessing yes" ;;
+         esac
+         case "$host_os" in
+-          cygwin*)
++          cygwin* | msys*)
+             if test "$cross_compiling" = yes; then :
+   :
+ else
+@@ -46166,7 +46171,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
+@@ -53689,7 +53694,7 @@
+ 
+ if test "$enable_shared" = yes; then
+   case "$host_os" in
+-    mingw* | cygwin*) is_woe32dll=yes ;;
++    mingw*) is_woe32dll=yes ;;
+     *) is_woe32dll=no ;;
+   esac
+ else
+@@ -54585,7 +54590,7 @@
+ aix*)
+   symcode='[BCDT]'
+   ;;
+-cygwin* | mingw* | pw32*)
++cygwin* | msys* | mingw* | pw32*)
+   symcode='[ABCDGISTW]'
+   ;;
+ hpux*) # Its linker distinguishes data from code symbols
+@@ -56547,7 +56552,7 @@
+         esac
+         ;;
+ 
+-      cygwin* | mingw* | pw32* | cegcc*)
++      cygwin* | msys* | mingw* | pw32* | cegcc*)
+         # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
+         # as there is no search path for DLLs.
+         hardcode_libdir_flag_spec_CXX='-L$libdir'
+@@ -57501,7 +57506,7 @@
+     beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+       # PIC is the default for these OSes.
+       ;;
+-    mingw* | cygwin* | os2* | pw32* | cegcc*)
++    mingw* | cygwin* | msys* | os2* | pw32* | cegcc*)
+       # This hack is so that the source file can tell whether it is being
+       # built for inclusion in a dll (and should export symbols for example).
+       # Although the cygwin gcc ignores -fPIC, still need this for old-style
+@@ -58034,7 +58039,7 @@
+   pw32*)
+     export_symbols_cmds_CXX="$ltdll_cmds"
+   ;;
+-  cygwin* | mingw* | cegcc*)
++  cygwin* | msys* | mingw* | cegcc*)
+     export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
+   ;;
+   *)
+@@ -58292,14 +58297,14 @@
+   # libtool to hard-code these into programs
+   ;;
+ 
+-cygwin* | mingw* | pw32* | cegcc*)
++cygwin* | msys* | mingw* | pw32* | cegcc*)
+   version_type=windows
+   shrext_cmds=".dll"
+   need_version=no
+   need_lib_prefix=no
+ 
+   case $GCC,$host_os in
+-  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
++  yes,cygwin* | yes,msys* | yes,mingw* | yes,pw32* | yes,cegcc*)
+     library_names_spec='$libname.dll.a'
+     # DLL is installed to $(libdir)/../bin by postinstall_cmds
+     postinstall_cmds='base_file=`basename \${file}`~
+@@ -58322,6 +58327,11 @@
+       soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+       sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+       ;;
++    msys*)
++      # MSYS DLLs use 'msys-' prefix rather than 'lib'
++      soname_spec='`echo ${libname} | sed -e 's/^lib/msys-/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
++      ;;
+     mingw* | cegcc*)
+       # MinGW DLLs use traditional 'lib' prefix
+       soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+diff -Naur gettext-0.18.1.1/gettext-tools/configure.ac gettext-0.18.1.1-p/gettext-tools/configure.ac
+--- gettext-0.18.1.1/gettext-tools/configure.ac	2010-06-06 20:04:04.000000000 +0000
++++ gettext-0.18.1.1-p/gettext-tools/configure.ac	2013-03-26 16:52:58.595703200 +0000
+@@ -100,7 +100,7 @@
+ case "$host_os" in
+   # On Cygwin, without -no-undefined, a warning is emitted and only a static
+   # library is built.
+-  beos* | mingw* | cygwin*) LTNOUNDEF='-no-undefined' ;;
++  beos* | mingw* | cygwin* | msys*) LTNOUNDEF='-no-undefined' ;;
+   *) LTNOUNDEF='' ;;
+ esac
+ AC_SUBST([LTNOUNDEF])
+diff -Naur gettext-0.18.1.1/gettext-tools/examples/hello-c++-kde/admin/config.guess gettext-0.18.1.1-p/gettext-tools/examples/hello-c++-kde/admin/config.guess
+--- gettext-0.18.1.1/gettext-tools/examples/hello-c++-kde/admin/config.guess	2010-06-06 12:49:57.000000000 +0000
++++ gettext-0.18.1.1-p/gettext-tools/examples/hello-c++-kde/admin/config.guess	2013-03-26 16:55:06.140625000 +0000
+@@ -762,6 +762,9 @@
+     i*:CYGWIN*:*)
+ 	echo ${UNAME_MACHINE}-pc-cygwin
+ 	exit 0 ;;
++    i*:MSYS*:*)
++	echo ${UNAME_MACHINE}-pc-msys
++	exit 0 ;;
+     i*:MINGW*:*)
+ 	echo ${UNAME_MACHINE}-pc-mingw32
+ 	exit 0 ;;
+diff -Naur gettext-0.18.1.1/gettext-tools/examples/hello-c++-kde/admin/config.sub gettext-0.18.1.1-p/gettext-tools/examples/hello-c++-kde/admin/config.sub
+--- gettext-0.18.1.1/gettext-tools/examples/hello-c++-kde/admin/config.sub	2010-06-06 12:49:57.000000000 +0000
++++ gettext-0.18.1.1-p/gettext-tools/examples/hello-c++-kde/admin/config.sub	2013-03-26 16:55:34.406250000 +0000
+@@ -1111,7 +1111,7 @@
+ 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+ 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+ 	      | -chorusos* | -chorusrdb* \
+-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
++	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+ 	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
+ 	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
+ 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+diff -Naur gettext-0.18.1.1/gettext-tools/gnulib-lib/Makefile.gnulib gettext-0.18.1.1-p/gettext-tools/gnulib-lib/Makefile.gnulib
+--- gettext-0.18.1.1/gettext-tools/gnulib-lib/Makefile.gnulib	2010-06-03 21:36:31.000000000 +0000
++++ gettext-0.18.1.1-p/gettext-tools/gnulib-lib/Makefile.gnulib	2013-03-26 16:57:17.412109400 +0000
+@@ -1545,7 +1545,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 gettext-0.18.1.1/gettext-tools/gnulib-lib/Makefile.in gettext-0.18.1.1-p/gettext-tools/gnulib-lib/Makefile.in
+--- gettext-0.18.1.1/gettext-tools/gnulib-lib/Makefile.in	2010-06-06 20:12:29.000000000 +0000
++++ gettext-0.18.1.1-p/gettext-tools/gnulib-lib/Makefile.in	2013-03-26 16:57:50.318359400 +0000
+@@ -3838,7 +3838,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 gettext-0.18.1.1/gettext-tools/gnulib-m4/csharpexec.m4 gettext-0.18.1.1-p/gettext-tools/gnulib-m4/csharpexec.m4
+--- gettext-0.18.1.1/gettext-tools/gnulib-m4/csharpexec.m4	2010-05-24 10:42:19.000000000 +0000
++++ gettext-0.18.1.1-p/gettext-tools/gnulib-m4/csharpexec.m4	2013-03-26 16:59:04.898437500 +0000
+@@ -53,7 +53,7 @@
+            ifelse([$1], , , [&& clix $2/$1 >/dev/null 2>/dev/null]); then
+           HAVE_CLIX=1
+           case $host_os in
+-            cygwin* | mingw* | pw32*)
++            cygwin* | msys* | mingw* | pw32*)
+               CLIX_PATH_VAR=PATH
+               ;;
+             darwin* | rhapsody*)
+diff -Naur gettext-0.18.1.1/gettext-tools/gnulib-m4/double-slash-root.m4 gettext-0.18.1.1-p/gettext-tools/gnulib-m4/double-slash-root.m4
+--- gettext-0.18.1.1/gettext-tools/gnulib-m4/double-slash-root.m4	2010-05-24 10:42:19.000000000 +0000
++++ gettext-0.18.1.1-p/gettext-tools/gnulib-m4/double-slash-root.m4	2013-03-26 16:59:37.960937500 +0000
+@@ -16,7 +16,7 @@
+         # special semantics and is distinct from /, please report it to
+         # <bug-gnulib@gnu.org>.
+         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
+diff -Naur gettext-0.18.1.1/gettext-tools/gnulib-m4/dup2.m4 gettext-0.18.1.1-p/gettext-tools/gnulib-m4/dup2.m4
+--- gettext-0.18.1.1/gettext-tools/gnulib-m4/dup2.m4	2010-05-24 10:42:19.000000000 +0000
++++ gettext-0.18.1.1-p/gettext-tools/gnulib-m4/dup2.m4	2013-03-26 17:00:21.132812500 +0000
+@@ -32,7 +32,7 @@
+         [case "$host_os" in
+            mingw*) # on this platform, dup2 always returns 0 for success
+              gl_cv_func_dup2_works=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=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.
+diff -Naur gettext-0.18.1.1/gettext-tools/gnulib-m4/printf.m4 gettext-0.18.1.1-p/gettext-tools/gnulib-m4/printf.m4
+--- gettext-0.18.1.1/gettext-tools/gnulib-m4/printf.m4	2010-05-24 10:42:20.000000000 +0000
++++ gettext-0.18.1.1-p/gettext-tools/gnulib-m4/printf.m4	2013-03-26 17:01:24.367187500 +0000
+@@ -694,7 +694,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
+@@ -765,7 +765,7 @@
+       [
+ changequote(,)dnl
+        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";;
+@@ -1318,7 +1318,7 @@
+          darwin[1-6].*)        gl_cv_func_vsnprintf_zerosize_c99="guessing no";;
+          darwin*)              gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
+                                # Guess yes on Cygwin.
+-         cygwin*)              gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
++         cygwin* | msys*)              gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
+                                # Guess yes on Solaris >= 2.6.
+          solaris2.[0-5]*)      gl_cv_func_vsnprintf_zerosize_c99="guessing no";;
+          solaris*)             gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
+diff -Naur gettext-0.18.1.1/gettext-tools/gnulib-m4/wctob.m4 gettext-0.18.1.1-p/gettext-tools/gnulib-m4/wctob.m4
+--- gettext-0.18.1.1/gettext-tools/gnulib-m4/wctob.m4	2010-05-24 10:42:21.000000000 +0000
++++ gettext-0.18.1.1-p/gettext-tools/gnulib-m4/wctob.m4	2013-03-26 17:02:46.007812500 +0000
+@@ -30,14 +30,14 @@
+ changequote(,)dnl
+         case "$host_os" in
+             # Guess no on Solaris <= 9 and Cygwin.
+-          solaris2.[1-9] | solaris2.[1-9].* | cygwin*)
++          solaris2.[1-9] | solaris2.[1-9].* | cygwin* | msys*)
+             gl_cv_func_wctob_works="guessing no" ;;
+             # Guess yes otherwise.
+           *) gl_cv_func_wctob_works="guessing yes" ;;
+         esac
+ changequote([,])dnl
+         case "$host_os" in
+-          cygwin*)
++          cygwin* | msys*)
+             AC_TRY_RUN([
+ #include <locale.h>
+ #include <wchar.h>
+diff -Naur gettext-0.18.1.1/gettext-tools/gnulib-tests/test-copy-acl.sh gettext-0.18.1.1-p/gettext-tools/gnulib-tests/test-copy-acl.sh
+--- gettext-0.18.1.1/gettext-tools/gnulib-tests/test-copy-acl.sh	2009-08-30 15:49:52.000000000 +0000
++++ gettext-0.18.1.1-p/gettext-tools/gnulib-tests/test-copy-acl.sh	2013-03-26 17:03:58.808593800 +0000
+@@ -116,7 +116,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
+@@ -277,7 +277,7 @@
+ 
+         ;;
+ 
+-      cygwin)
++      cygwin | msys)
+ 
+         # Set an ACL for a group.
+         setfacl -m group:0:1 tmpfile0
+diff -Naur gettext-0.18.1.1/gettext-tools/gnulib-tests/test-copy-file.sh gettext-0.18.1.1-p/gettext-tools/gnulib-tests/test-copy-file.sh
+--- gettext-0.18.1.1/gettext-tools/gnulib-tests/test-copy-file.sh	2009-08-30 15:49:52.000000000 +0000
++++ gettext-0.18.1.1-p/gettext-tools/gnulib-tests/test-copy-file.sh	2013-03-26 17:06:13.730468800 +0000
+@@ -110,7 +110,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
+@@ -271,7 +271,7 @@
+ 
+         ;;
+ 
+-      cygwin)
++      cygwin | msys)
+ 
+         # Set an ACL for a group.
+         setfacl -m group:0:1 tmpfile0
+diff -Naur gettext-0.18.1.1/gettext-tools/gnulib-tests/test-file-has-acl.sh gettext-0.18.1.1-p/gettext-tools/gnulib-tests/test-file-has-acl.sh
+--- gettext-0.18.1.1/gettext-tools/gnulib-tests/test-file-has-acl.sh	2009-08-30 15:49:52.000000000 +0000
++++ gettext-0.18.1.1-p/gettext-tools/gnulib-tests/test-file-has-acl.sh	2013-03-26 17:06:56.152343800 +0000
+@@ -235,7 +235,7 @@
+         fi
+         ;;
+ 
+-      cygwin)
++      cygwin | msys)
+ 
+         # Set an ACL for a group.
+         if setfacl -m group:0:1 tmpfile0; then
+diff -Naur gettext-0.18.1.1/gettext-tools/gnulib-tests/test-set-mode-acl.sh gettext-0.18.1.1-p/gettext-tools/gnulib-tests/test-set-mode-acl.sh
+--- gettext-0.18.1.1/gettext-tools/gnulib-tests/test-set-mode-acl.sh	2010-05-09 18:56:36.000000000 +0000
++++ gettext-0.18.1.1-p/gettext-tools/gnulib-tests/test-set-mode-acl.sh	2013-03-26 17:09:22.355468800 +0000
+@@ -165,7 +165,7 @@
+           linux | freebsd | solaris)
+             setfacl -m user:$auid:1 tmpfile0
+             ;;
+-          cygwin)
++          cygwin | msys)
+             setfacl -m group:0:1 tmpfile0
+             ;;
+           hpux)
+diff -Naur gettext-0.18.1.1/gettext-tools/libgettextpo/Makefile.gnulib gettext-0.18.1.1-p/gettext-tools/libgettextpo/Makefile.gnulib
+--- gettext-0.18.1.1/gettext-tools/libgettextpo/Makefile.gnulib	2010-06-03 21:37:14.000000000 +0000
++++ gettext-0.18.1.1-p/gettext-tools/libgettextpo/Makefile.gnulib	2013-03-26 17:10:00.330078200 +0000
+@@ -494,7 +494,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 gettext-0.18.1.1/gettext-tools/libgettextpo/Makefile.in gettext-0.18.1.1-p/gettext-tools/libgettextpo/Makefile.in
+--- gettext-0.18.1.1/gettext-tools/libgettextpo/Makefile.in	2010-06-06 20:12:31.000000000 +0000
++++ gettext-0.18.1.1-p/gettext-tools/libgettextpo/Makefile.in	2013-03-26 17:10:28.064453200 +0000
+@@ -2376,7 +2376,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 gettext-0.18.1.1/gettext-tools/libgrep/gnulib-m4/btowc.m4 gettext-0.18.1.1-p/gettext-tools/libgrep/gnulib-m4/btowc.m4
+--- gettext-0.18.1.1/gettext-tools/libgrep/gnulib-m4/btowc.m4	2010-06-04 10:27:10.000000000 +0000
++++ gettext-0.18.1.1-p/gettext-tools/libgrep/gnulib-m4/btowc.m4	2013-03-26 17:11:27.840820300 +0000
+@@ -42,7 +42,7 @@
+ changequote(,)dnl
+            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
+diff -Naur gettext-0.18.1.1/m4/libtool.m4 gettext-0.18.1.1-p/m4/libtool.m4
+--- gettext-0.18.1.1/m4/libtool.m4	2010-06-06 12:49:58.000000000 +0000
++++ gettext-0.18.1.1-p/m4/libtool.m4	2013-03-26 17:20:30.573242200 +0000
+@@ -1516,7 +1516,7 @@
+     lt_cv_sys_max_cmd_len=-1;
+     ;;
+ 
+-  cygwin* | mingw* | cegcc*)
++  cygwin* | msys* | mingw* | cegcc*)
+     # On Win9x/ME, this test blows up -- it succeeds, but takes
+     # about 5 minutes as the teststring grows exponentially.
+     # Worse, since 9x/ME are not pre-emptively multitasking,
+@@ -1743,7 +1743,7 @@
+     lt_cv_dlopen_libs=
+     ;;
+ 
+-  cygwin*)
++  cygwin* | msys*)
+     lt_cv_dlopen="dlopen"
+     lt_cv_dlopen_libs=
+     ;;
+@@ -2200,14 +2200,14 @@
+   # libtool to hard-code these into programs
+   ;;
+ 
+-cygwin* | mingw* | pw32* | cegcc*)
++cygwin* | msys* | mingw* | pw32* | cegcc*)
+   version_type=windows
+   shrext_cmds=".dll"
+   need_version=no
+   need_lib_prefix=no
+ 
+   case $GCC,$host_os in
+-  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
++  yes,cygwin* | yes,msys* | yes,mingw* | yes,pw32* | yes,cegcc*)
+     library_names_spec='$libname.dll.a'
+     # DLL is installed to $(libdir)/../bin by postinstall_cmds
+     postinstall_cmds='base_file=`basename \${file}`~
+@@ -2230,6 +2230,11 @@
+       soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+       sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+       ;;
++    msys*)
++      # MSYS DLLs use 'msys-' prefix rather than 'lib'
++      soname_spec='`echo ${libname} | sed -e 's/^lib/msys-/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
++      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
++      ;;
+     mingw* | cegcc*)
+       # MinGW DLLs use traditional 'lib' prefix
+       soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+@@ -2993,7 +2998,7 @@
+   lt_cv_file_magic_test_file=/shlib/libc.so
+   ;;
+ 
+-cygwin*)
++cygwin* | msys*)
+   # func_win32_libid is a shell function defined in ltmain.sh
+   lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+   lt_cv_file_magic_cmd='func_win32_libid'
+@@ -3275,7 +3280,7 @@
+ [AC_REQUIRE([AC_CANONICAL_HOST])dnl
+ LIBM=
+ case $host in
+-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
++*-*-beos* | *-*-cygwin* | *-*-msys* | *-*-pw32* | *-*-darwin*)
+   # These system don't have libm, or don't need it
+   ;;
+ *-ncr-sysv4.3*)
+@@ -3344,7 +3349,7 @@
+ aix*)
+   symcode='[[BCDT]]'
+   ;;
+-cygwin* | mingw* | pw32* | cegcc*)
++cygwin* | msys* | mingw* | pw32* | cegcc*)
+   symcode='[[ABCDGISTW]]'
+   ;;
+ hpux*)
+@@ -3590,7 +3595,7 @@
+     beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+       # PIC is the default for these OSes.
+       ;;
+-    mingw* | cygwin* | os2* | pw32* | cegcc*)
++    mingw* | cygwin* | msys* | os2* | pw32* | cegcc*)
+       # This hack is so that the source file can tell whether it is being
+       # built for inclusion in a dll (and should export symbols for example).
+       # Although the cygwin gcc ignores -fPIC, still need this for old-style
+@@ -3897,7 +3902,7 @@
+       # PIC is the default for these OSes.
+       ;;
+ 
+-    mingw* | cygwin* | pw32* | os2* | cegcc*)
++    mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
+       # This hack is so that the source file can tell whether it is being
+       # built for inclusion in a dll (and should export symbols for example).
+       # Although the cygwin gcc ignores -fPIC, still need this for old-style
+@@ -3967,7 +3972,7 @@
+       fi
+       ;;
+ 
+-    mingw* | cygwin* | pw32* | os2* | cegcc*)
++    mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
+       # This hack is so that the source file can tell whether it is being
+       # built for inclusion in a dll (and should export symbols for example).
+       m4_if([$1], [GCJ], [],
+@@ -4198,7 +4203,7 @@
+   pw32*)
+     _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
+   ;;
+-  cygwin* | mingw* | cegcc*)
++  cygwin* | msys* | mingw* | cegcc*)
+     _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+   ;;
+   *)
+@@ -4250,7 +4255,7 @@
+   extract_expsyms_cmds=
+ 
+   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++.
+@@ -4337,7 +4342,7 @@
+       fi
+       ;;
+ 
+-    cygwin* | mingw* | pw32* | cegcc*)
++    cygwin* | msys* | mingw* | pw32* | cegcc*)
+       # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+       # as there is no search path for DLLs.
+       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+@@ -4692,7 +4697,7 @@
+       _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
+       ;;
+ 
+-    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
+@@ -5640,7 +5645,7 @@
+         esac
+         ;;
+ 
+-      cygwin* | mingw* | pw32* | cegcc*)
++      cygwin* | msys* | mingw* | pw32* | cegcc*)
+         # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+         # as there is no search path for DLLs.
+         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+diff -Naur gettext-0.18.1.1/m4/ltoptions.m4 gettext-0.18.1.1-p/m4/ltoptions.m4
+--- gettext-0.18.1.1/m4/ltoptions.m4	2010-06-06 12:49:58.000000000 +0000
++++ gettext-0.18.1.1-p/m4/ltoptions.m4	2013-03-26 17:22:06.604492200 +0000
+@@ -125,7 +125,7 @@
+ [enable_win32_dll=yes
+ 
+ case $host in
+-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
++*-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-cegcc*)
+   AC_CHECK_TOOL(AS, as, false)
+   AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+   AC_CHECK_TOOL(OBJDUMP, objdump, false)

Get latest updates about Open Source Projects, Conferences and News.

Sign up for the SourceForge newsletter:





No, thanks