summaryrefslogtreecommitdiffstats
path: root/unix
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2020-12-01 08:54:39 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2020-12-01 08:54:39 (GMT)
commit7fa83c30734e18f3f97c053f20846bed5a6fa3ec (patch)
treec84a406d51e6708615dc86716368726b12beb545 /unix
parent48dcc2b09643011dc7532ac12a7bdad4d33c8a88 (diff)
parent3df3c35057b08295d492f62ebdc8491c66694620 (diff)
downloadtcl-7fa83c30734e18f3f97c053f20846bed5a6fa3ec.zip
tcl-7fa83c30734e18f3f97c053f20846bed5a6fa3ec.tar.gz
tcl-7fa83c30734e18f3f97c053f20846bed5a6fa3ec.tar.bz2
Merge 8.7
Diffstat (limited to 'unix')
-rwxr-xr-xunix/configure7
-rw-r--r--unix/tcl.m42
2 files changed, 4 insertions, 5 deletions
diff --git a/unix/configure b/unix/configure
index 1f3d419..8594956 100755
--- a/unix/configure
+++ b/unix/configure
@@ -1429,8 +1429,7 @@ Optional Features:
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
- --with-encoding encoding for configuration values (default:
- utf-8)
+ --with-encoding encoding for configuration values (default: utf-8)
--with-system-libtommath
use external libtommath (default: true if available,
false otherwise)
@@ -5310,7 +5309,7 @@ fi
CC_SEARCH_FLAGS=""
LD_SEARCH_FLAGS=""
;;
- CYGWIN_*|MINGW32*|MSYS_*)
+ CYGWIN_*|MINGW32_*|MSYS_*)
SHLIB_CFLAGS="-fno-common"
SHLIB_LD='${CC} -shared'
SHLIB_SUFFIX=".dll"
@@ -6559,7 +6558,7 @@ fi
case $system in
AIX-*) ;;
BSD/OS*) ;;
- CYGWIN_*|MINGW32*|MSYS_*) ;;
+ CYGWIN_*|MINGW32_*|MSYS_*) ;;
HP_UX*) ;;
Darwin-*) ;;
IRIX*) ;;
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index 019027c..bd1b9ba 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -1083,7 +1083,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
CC_SEARCH_FLAGS=""
LD_SEARCH_FLAGS=""
;;
- CYGWIN_*|MINGW32*|MSYS_*)
+ CYGWIN_*|MINGW32_*|MSYS_*)
SHLIB_CFLAGS="-fno-common"
SHLIB_LD='${CC} -shared'
SHLIB_SUFFIX=".dll"