summaryrefslogtreecommitdiffstats
path: root/unix
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2017-01-20 14:39:30 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2017-01-20 14:39:30 (GMT)
commite926662190cc08e5f057d0d90cdf9da4a1aab15f (patch)
treef3b12d2d826c6e25cca57d001a750db48b3c5fca /unix
parentb8a68d0c335e5b303b12e9fd8194e27be780a219 (diff)
downloadtk-e926662190cc08e5f057d0d90cdf9da4a1aab15f.zip
tk-e926662190cc08e5f057d0d90cdf9da4a1aab15f.tar.gz
tk-e926662190cc08e5f057d0d90cdf9da4a1aab15f.tar.bz2
Compile with -Wwrite-strings, as does Tcl. In pkgIndex files, allow "8.6-" to match, for better interoperability with "novem"
Diffstat (limited to 'unix')
-rw-r--r--unix/Makefile.in2
-rwxr-xr-xunix/configure2
-rw-r--r--unix/tcl.m42
3 files changed, 3 insertions, 3 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 8e6433a..1b8677e 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -723,7 +723,7 @@ install-binaries: $(TK_STUB_LIB_FILE) $(TK_LIB_FILE) ${WISH_EXE}
echo "Creating package index $(PKG_INDEX)"; \
rm -f "$(PKG_INDEX)"; \
(\
- echo "if {[catch {package present Tcl 8.6.0}]} return";\
+ echo "if {[catch {package present Tcl 8.6-}]} return";\
relative=`echo | awk '{ORS=" "; split("$(TK_PKG_DIR)",a,"/"); for (f in a) {print ".."}}'`;\
if test "x$(DLL_INSTALL_DIR)" != "x$(BIN_INSTALL_DIR)"; then \
echo "package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION)$(PATCH_LEVEL) [list load [file normalize [file join \$$dir $${relative}$(TK_LIB_FILE)]] Tk]";\
diff --git a/unix/configure b/unix/configure
index 1ed0275..f76ae3b 100755
--- a/unix/configure
+++ b/unix/configure
@@ -4595,7 +4595,7 @@ fi
if test "$GCC" = yes; then :
CFLAGS_OPTIMIZE=-O2
- CFLAGS_WARNING="-Wall -Wsign-compare -Wdeclaration-after-statement"
+ CFLAGS_WARNING="-Wall -Wwrite-strings -Wsign-compare -Wdeclaration-after-statement"
else
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index a1d4021..2ab432c 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -1096,7 +1096,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
CFLAGS_DEBUG=-g
AS_IF([test "$GCC" = yes], [
CFLAGS_OPTIMIZE=-O2
- CFLAGS_WARNING="-Wall -Wsign-compare -Wdeclaration-after-statement"
+ CFLAGS_WARNING="-Wall -Wwrite-strings -Wsign-compare -Wdeclaration-after-statement"
], [
CFLAGS_OPTIMIZE=-O
CFLAGS_WARNING=""