summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2020-12-01 09:11:18 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2020-12-01 09:11:18 (GMT)
commitc8f65d7cc015b7740935d3491ee4dd92805ae47f (patch)
treefcaa1eae8dd0d8c06b44c8159cbe044b5c170a3f
parent388c648cd73beb602f64b0af4537ca6771224bf7 (diff)
parentee2b3bf1f8dde21c17795d277a8b708b8a29b8c0 (diff)
downloadtk-c8f65d7cc015b7740935d3491ee4dd92805ae47f.zip
tk-c8f65d7cc015b7740935d3491ee4dd92805ae47f.tar.gz
tk-c8f65d7cc015b7740935d3491ee4dd92805ae47f.tar.bz2
Merge 8.5
-rwxr-xr-xunix/configure4
-rw-r--r--unix/tcl.m44
2 files changed, 4 insertions, 4 deletions
diff --git a/unix/configure b/unix/configure
index 4be5c70..13c3696 100755
--- a/unix/configure
+++ b/unix/configure
@@ -4683,7 +4683,7 @@ fi
CC_SEARCH_FLAGS=""
LD_SEARCH_FLAGS=""
;;
- CYGWIN_*|MINGW32*)
+ CYGWIN_*|MINGW32_*|MSYS_*)
SHLIB_CFLAGS=""
SHLIB_LD='${CC} -shared'
SHLIB_SUFFIX=".dll"
@@ -6609,7 +6609,7 @@ fi
case $system in
AIX-*) ;;
BSD/OS*) ;;
- CYGWIN_*) ;;
+ CYGWIN_*|MINGW32_*|MSYS_*) ;;
IRIX*) ;;
NetBSD-*|DragonFly-*|FreeBSD-*|OpenBSD-*) ;;
Darwin-*) ;;
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index 51ac8d9..fa027b1 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -1189,7 +1189,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
CC_SEARCH_FLAGS=""
LD_SEARCH_FLAGS=""
;;
- CYGWIN_*|MINGW32*)
+ CYGWIN_*|MINGW32_*|MSYS_*)
SHLIB_CFLAGS=""
SHLIB_LD='${CC} -shared'
SHLIB_SUFFIX=".dll"
@@ -1986,7 +1986,7 @@ dnl # preprocessing tests use only CPPFLAGS.
case $system in
AIX-*) ;;
BSD/OS*) ;;
- CYGWIN_*) ;;
+ CYGWIN_*|MINGW32_*|MSYS_*) ;;
IRIX*) ;;
NetBSD-*|DragonFly-*|FreeBSD-*|OpenBSD-*) ;;
Darwin-*) ;;