341 lines
15 KiB
Diff
341 lines
15 KiB
Diff
diff -Naur m4-1.4.18-orig/build-aux/compile m4-1.4.18/build-aux/compile
|
|
--- m4-1.4.18-orig/build-aux/compile 2016-12-30 04:32:31.000000000 +0800
|
|
+++ m4-1.4.18/build-aux/compile 2017-01-02 03:35:23.243966200 +0800
|
|
@@ -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 m4-1.4.18-orig/build-aux/config.guess m4-1.4.18/build-aux/config.guess
|
|
--- m4-1.4.18-orig/build-aux/config.guess 2016-12-30 04:32:31.000000000 +0800
|
|
+++ m4-1.4.18/build-aux/config.guess 2017-01-02 03:35:23.258982000 +0800
|
|
@@ -891,6 +891,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 m4-1.4.18-orig/build-aux/config.rpath m4-1.4.18/build-aux/config.rpath
|
|
--- m4-1.4.18-orig/build-aux/config.rpath 2016-12-31 21:54:40.000000000 +0800
|
|
+++ m4-1.4.18/build-aux/config.rpath 2017-01-02 03:35:23.268971600 +0800
|
|
@@ -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 m4-1.4.18-orig/configure m4-1.4.18/configure
|
|
--- m4-1.4.18-orig/configure 2017-01-01 06:36:36.000000000 +0800
|
|
+++ m4-1.4.18/configure 2017-01-02 03:35:23.358999700 +0800
|
|
@@ -7052,7 +7052,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 ;;
|
|
@@ -10164,7 +10164,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
|
|
@@ -15599,7 +15599,7 @@
|
|
case "$host_os" in
|
|
# Guess yes on platforms where we know the result.
|
|
*-gnu* | freebsd* | netbsd* | openbsd* \
|
|
- | hpux* | solaris* | cygwin* | mingw*)
|
|
+ | hpux* | solaris* | cygwin* | mingw* | msys*)
|
|
ac_cv_func_malloc_0_nonnull=yes ;;
|
|
# If we don't know, assume the worst.
|
|
*) ac_cv_func_malloc_0_nonnull=no ;;
|
|
@@ -20078,7 +20078,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
|
|
@@ -20162,7 +20162,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";;
|
|
@@ -20735,7 +20735,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
|
|
@@ -21305,7 +21305,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
|
|
@@ -21784,7 +21784,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
|
|
@@ -21826,7 +21826,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" ;;
|
|
aix* | freebsd*)
|
|
# on AIX 7.1 and FreeBSD 6.1, dup2 (1,toobig) gives EMFILE,
|
|
@@ -40900,13 +40900,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
|
|
diff -Naur m4-1.4.18-orig/lib/Makefile.in m4-1.4.18/lib/Makefile.in
|
|
--- m4-1.4.18-orig/lib/Makefile.in 2017-01-01 06:25:58.000000000 +0800
|
|
+++ m4-1.4.18/lib/Makefile.in 2017-01-02 03:35:23.414002200 +0800
|
|
@@ -2323,7 +2323,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 m4-1.4.18-orig/lib/gnulib.mk m4-1.4.18/lib/gnulib.mk
|
|
--- m4-1.4.18-orig/lib/gnulib.mk 2017-01-01 05:34:31.000000000 +0800
|
|
+++ m4-1.4.18/lib/gnulib.mk 2017-01-02 03:35:23.384004500 +0800
|
|
@@ -824,7 +824,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 m4-1.4.18-orig/m4/btowc.m4 m4-1.4.18/m4/btowc.m4
|
|
--- m4-1.4.18-orig/m4/btowc.m4 2016-12-31 21:54:42.000000000 +0800
|
|
+++ m4-1.4.18/m4/btowc.m4 2017-01-02 03:35:23.419012100 +0800
|
|
@@ -49,7 +49,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 m4-1.4.18-orig/m4/double-slash-root.m4 m4-1.4.18/m4/double-slash-root.m4
|
|
--- m4-1.4.18-orig/m4/double-slash-root.m4 2016-12-31 21:54:42.000000000 +0800
|
|
+++ m4-1.4.18/m4/double-slash-root.m4 2017-01-02 03:35:23.424012700 +0800
|
|
@@ -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 m4-1.4.18-orig/m4/dup2.m4 m4-1.4.18/m4/dup2.m4
|
|
--- m4-1.4.18-orig/m4/dup2.m4 2016-12-31 21:54:42.000000000 +0800
|
|
+++ m4-1.4.18/m4/dup2.m4 2017-01-02 03:35:23.429014400 +0800
|
|
@@ -78,7 +78,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" ;;
|
|
aix* | freebsd*)
|
|
# on AIX 7.1 and FreeBSD 6.1, dup2 (1,toobig) gives EMFILE,
|
|
diff -Naur m4-1.4.18-orig/m4/getcwd.m4 m4-1.4.18/m4/getcwd.m4
|
|
--- m4-1.4.18-orig/m4/getcwd.m4 2016-12-31 21:54:42.000000000 +0800
|
|
+++ m4-1.4.18/m4/getcwd.m4 2017-01-02 03:35:23.439015500 +0800
|
|
@@ -51,7 +51,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
|
|
diff -Naur m4-1.4.18-orig/m4/malloc.m4 m4-1.4.18/m4/malloc.m4
|
|
--- m4-1.4.18-orig/m4/malloc.m4 2016-12-31 21:54:42.000000000 +0800
|
|
+++ m4-1.4.18/m4/malloc.m4 2017-01-02 03:35:23.444017200 +0800
|
|
@@ -33,7 +33,7 @@
|
|
[case "$host_os" in
|
|
# Guess yes on platforms where we know the result.
|
|
*-gnu* | freebsd* | netbsd* | openbsd* \
|
|
- | hpux* | solaris* | cygwin* | mingw*)
|
|
+ | hpux* | solaris* | cygwin* | msys* | mingw*)
|
|
ac_cv_func_malloc_0_nonnull=yes ;;
|
|
# If we don't know, assume the worst.
|
|
*) ac_cv_func_malloc_0_nonnull=no ;;
|
|
diff -Naur m4-1.4.18-orig/m4/printf.m4 m4-1.4.18/m4/printf.m4
|
|
--- m4-1.4.18-orig/m4/printf.m4 2016-12-31 21:54:42.000000000 +0800
|
|
+++ m4-1.4.18/m4/printf.m4 2017-01-02 03:35:23.454019200 +0800
|
|
@@ -722,7 +722,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
|
|
@@ -799,7 +799,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";;
|
|
@@ -1451,7 +1451,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] | solaris2.[0-5].*)
|
|
gl_cv_func_vsnprintf_zerosize_c99="guessing no";;
|
|
diff -Naur m4-1.4.18-orig/m4/setlocale.m4 m4-1.4.18/m4/setlocale.m4
|
|
--- m4-1.4.18-orig/m4/setlocale.m4 2016-12-31 21:54:42.000000000 +0800
|
|
+++ m4-1.4.18/m4/setlocale.m4 2017-01-02 03:35:23.464021200 +0800
|
|
@@ -14,7 +14,7 @@
|
|
mingw*) REPLACE_SETLOCALE=1 ;;
|
|
dnl On Cygwin 1.5.x, setlocale always succeeds but setlocale(LC_CTYPE,NULL)
|
|
dnl is then still "C".
|
|
- cygwin*)
|
|
+ cygwin* | msys*)
|
|
case `uname -r` in
|
|
1.5.*) REPLACE_SETLOCALE=1 ;;
|
|
esac
|
|
diff -Naur m4-1.4.18-orig/m4/threadlib.m4 m4-1.4.18/m4/threadlib.m4
|
|
--- m4-1.4.18-orig/m4/threadlib.m4 2016-12-31 21:54:42.000000000 +0800
|
|
+++ m4-1.4.18/m4/threadlib.m4 2017-01-02 03:35:23.474022900 +0800
|
|
@@ -68,7 +68,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 m4-1.4.18-orig/m4/wctob.m4 m4-1.4.18/m4/wctob.m4
|
|
--- m4-1.4.18-orig/m4/wctob.m4 2016-12-31 21:54:42.000000000 +0800
|
|
+++ m4-1.4.18/m4/wctob.m4 2017-01-02 03:35:23.484024300 +0800
|
|
@@ -29,14 +29,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_RUN_IFELSE(
|
|
[AC_LANG_SOURCE([[
|
|
#include <locale.h>
|