diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-12-11 14:11:14 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-12-11 14:11:14 (GMT) |
| commit | 76eb475a1c171000446b21fb488202f2b1a124db (patch) | |
| tree | 8b054d2dc9f1ba3071bd8194ece265b0445d0f8b /unix/configure | |
| parent | 8fb4a031ef0229ae94bd43a06ac1779baab3049e (diff) | |
| parent | 46f4476afd4803621152594669922f4d8b8afc3d (diff) | |
| download | tk-76eb475a1c171000446b21fb488202f2b1a124db.zip tk-76eb475a1c171000446b21fb488202f2b1a124db.tar.gz tk-76eb475a1c171000446b21fb488202f2b1a124db.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'unix/configure')
| -rwxr-xr-x | unix/configure | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/unix/configure b/unix/configure index 584d7d6..47aafdd 100755 --- a/unix/configure +++ b/unix/configure @@ -1437,8 +1437,7 @@ Optional Packages: --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --with-tcl directory containing tcl configuration (tclConfig.sh) - --with-encoding encoding for configuration values (default: - iso8859-1) + --with-encoding encoding for configuration values (default: utf-8) --with-x use the X Window System Some influential environment variables: @@ -3518,7 +3517,7 @@ _ACEOF else -$as_echo "#define TCL_CFGVAL_ENCODING \"iso8859-1\"" >>confdefs.h +$as_echo "#define TCL_CFGVAL_ENCODING \"utf-8\"" >>confdefs.h fi @@ -3533,14 +3532,6 @@ else tcl_ok=yes fi - - if test "${enable_shared+set}" = set; then - enableval="$enable_shared" - tcl_ok=$enableval - else - tcl_ok=yes - fi - if test "$tcl_ok" = "yes" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: shared" >&5 $as_echo "shared" >&6; } @@ -4246,12 +4237,12 @@ fi if test "$GCC" = yes; then : CFLAGS_OPTIMIZE=-O2 - CFLAGS_WARNING="-Wall -Wextra -Wshadow -Wundef -Wwrite-strings -Wpointer-arith" + CFLAGS_WARNING="-Wall -Wextra -Wshadow -Wundef -Wwrite-strings -Wpointer-arith -finput-charset=UTF-8" case "${CC}" in *++|*++-*) ;; *) - CFLAGS_WARNING="${CFLAGS_WARNING} -Wc++-compat -Wdeclaration-after-statement" + CFLAGS_WARNING="${CFLAGS_WARNING} -Wc++-compat -fextended-identifiers -Wdeclaration-after-statement" ;; esac @@ -4520,7 +4511,7 @@ fi CC_SEARCH_FLAGS="" LD_SEARCH_FLAGS="" ;; - CYGWIN_*) + CYGWIN_*|MINGW32_*|MSYS_*) SHLIB_CFLAGS="-fno-common" SHLIB_LD='${CC} -shared' SHLIB_SUFFIX=".dll" @@ -5769,7 +5760,7 @@ fi case $system in AIX-*) ;; BSD/OS*) ;; - CYGWIN_*) ;; + CYGWIN_*|MINGW32_*|MSYS_*) ;; HP_UX*) ;; Darwin-*) ;; IRIX*) ;; @@ -6611,10 +6602,10 @@ fi if test "$TCL_PREFIX" != "$prefix"; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Different --prefix selected for Tk and Tcl! - [package require Tk] may not work correctly in tclsh." >&5 + [package require tk] may not work correctly in tclsh." >&5 $as_echo "$as_me: WARNING: Different --prefix selected for Tk and Tcl! - [package require Tk] may not work correctly in tclsh." >&2;} + [package require tk] may not work correctly in tclsh." >&2;} fi #-------------------------------------------------------------------- |