86 lines
2.7 KiB
Diff
86 lines
2.7 KiB
Diff
diff -Naur mc-4.8.10-orig/config/compile mc-4.8.10/config/compile
|
|
--- mc-4.8.10-orig/config/compile 2012-09-26 18:03:18.000000000 +0400
|
|
+++ mc-4.8.10/config/compile 2013-08-22 19:25:17.311523500 +0400
|
|
@@ -53,7 +53,7 @@
|
|
MINGW*)
|
|
file_conv=mingw
|
|
;;
|
|
- CYGWIN*)
|
|
+ CYGWIN*|MSYS*)
|
|
file_conv=cygwin
|
|
;;
|
|
*)
|
|
@@ -67,7 +67,7 @@
|
|
mingw/*)
|
|
file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
|
|
;;
|
|
- cygwin/*)
|
|
+ cygwin/*|msys/*)
|
|
file=`cygpath -m "$file" || echo "$file"`
|
|
;;
|
|
wine/*)
|
|
diff -Naur mc-4.8.10-orig/config/config.guess mc-4.8.10/config/config.guess
|
|
--- mc-4.8.10-orig/config/config.guess 2012-09-26 18:03:18.000000000 +0400
|
|
+++ mc-4.8.10/config/config.guess 2013-08-22 19:25:57.655273500 +0400
|
|
@@ -844,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 mc-4.8.10-orig/config/config.rpath mc-4.8.10/config/config.rpath
|
|
--- mc-4.8.10-orig/config/config.rpath 2013-08-02 01:52:17.000000000 +0400
|
|
+++ mc-4.8.10/config/config.rpath 2013-08-22 19:26:49.780273500 +0400
|
|
@@ -112,7 +112,7 @@
|
|
hardcode_minus_L=no
|
|
|
|
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++.
|
|
@@ -152,7 +152,7 @@
|
|
ld_shlibs=no
|
|
fi
|
|
;;
|
|
- cygwin* | mingw* | pw32*)
|
|
+ cygwin* | msys* | mingw* | pw32*)
|
|
# hardcode_libdir_flag_spec is actually meaningless, as there is
|
|
# no search path for DLLs.
|
|
hardcode_libdir_flag_spec='-L$libdir'
|
|
@@ -278,7 +278,7 @@
|
|
;;
|
|
bsdi[45]*)
|
|
;;
|
|
- 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
|
|
@@ -459,7 +459,7 @@
|
|
;;
|
|
bsdi[45]*)
|
|
;;
|
|
- cygwin* | mingw* | pw32*)
|
|
+ cygwin* | msys* | mingw* | pw32*)
|
|
shrext=.dll
|
|
;;
|
|
darwin* | rhapsody*)
|
|
diff -Naur mc-4.8.10-orig/m4.include/mc-tests.m4 mc-4.8.10/m4.include/mc-tests.m4
|
|
--- mc-4.8.10-orig/m4.include/mc-tests.m4 2013-06-26 01:29:14.000000000 +0400
|
|
+++ mc-4.8.10/m4.include/mc-tests.m4 2013-08-22 19:36:58.295898500 +0400
|
|
@@ -25,7 +25,7 @@
|
|
|
|
# on cygwin, the linker does not accept the "-z" option
|
|
case $host_os in
|
|
- cygwin*)
|
|
+ cygwin* | msys*)
|
|
TESTS_LDFLAGS="-Wl,--allow-multiple-definition"
|
|
;;
|
|
*)
|