From eec2e2dbf117c18e1946e95eb3b961b6d24e639d Mon Sep 17 00:00:00 2001 From: "nijtmans@users.sourceforge.net" Date: Wed, 16 Jan 2013 15:33:44 +0000 Subject: Don't compile Tk with -DTCL_NO_DEPRECATED by default any more, it might hurt when we compile Tk 8.x against Tcl 8.y with y > x, because new deprecated constructs might be added in higher Tcl versions (except for Tk 8.6, for now, because there is no higher 8.x yet) --- ChangeLog | 14 +++++++++++--- unix/Makefile.in | 8 ++++---- win/Makefile.in | 2 +- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index a963224..be00743 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,12 @@ -2012-12-03 Francois Vogel +2013-01-16 Jan Nijtmans + + * win/Makefile.in: Don't compile Tk with -DTCL_NO_DEPRECATED by default + * unix/Makefile.in: any more, it might hurt when we compile Tk 8.x + against Tcl 8.y with y > x, because new deprecated constructs might be + added in higher Tcl versions (except for Tk 8.6, for now, because there + is no higher 8.x yet) + +2012-12-03 François Vogel * generic/tkTextIndex.c: [Bug 3588824]: bug in image index handling * tests/textIndex.test: for weird image names @@ -44,7 +52,7 @@ * win/nmakehlp.c: Add "-V" option, in order to be able to detect partial version numbers. -2012-08-03 Francois Vogel +2012-08-03 François Vogel * tests/bind.test: [Bug 3554081]: Test bind-22.10 failed @@ -59,7 +67,7 @@ * win/nmakehlp.c: Backport from Tcl 8.6, but add -Q option from sampleextension. -2012-07-19 Francois Vogel +2012-07-19 François Vogel * unix/tkUnixMenuBu.c: [Bug 3545457]: Crash on packing a menubutton diff --git a/unix/Makefile.in b/unix/Makefile.in index 3f99fd8..53579f9 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -189,7 +189,7 @@ KEYSYM_FLAGS = # Tk does not used deprecated Tcl constructs so it should # compile fine with -DTCL_NO_DEPRECATED. To remove its own # set of deprecated code uncomment the second line. -NO_DEPRECATED_FLAGS = -DTCL_NO_DEPRECATED +NO_DEPRECATED_FLAGS = #NO_DEPRECATED_FLAGS = -DTCL_NO_DEPRECATED -DTK_NO_DEPRECATED # Some versions of make, like SGI's, use the following variable to @@ -329,7 +329,7 @@ CC_SWITCHES_NO_STUBS = ${CFLAGS} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \ ${@TK_WINDOWINGSYSTEM@_INCLUDES} ${AC_FLAGS} ${PROTO_FLAGS} ${SECURITY_FLAGS} \ ${MEM_DEBUG_FLAGS} ${KEYSYM_FLAGS} ${NO_DEPRECATED_FLAGS} @EXTRA_CC_SWITCHES@ -CC_SWITCHES = $(CC_SWITCHES_NO_STUBS) ${TCL_STUB_FLAGS} +CC_SWITCHES = $(CC_SWITCHES_NO_STUBS) ${TCL_STUB_FLAGS} APP_CC_SWITCHES = $(CC_SWITCHES_NO_STUBS) @EXTRA_APP_CC_SWITCHES@ @@ -1500,7 +1500,7 @@ BUILD_HTML = \ # # Targets to build Solaris package of the distribution for the current # architecture. To build stream packages for both sun4 and i86pc -# architectures: +# architectures: # # On the sun4 machine, execute the following: # make distclean; ./configure @@ -1556,7 +1556,7 @@ package-common: # Build and install the architecture specific files in the dist directory. # -package-binaries: +package-binaries: cd $(DISTDIR)/unix/`arch`; \ $(MAKE); \ $(MAKE) install-binaries prefix=$(DISTDIR)/SUNWtcl/$(TCLVERSION) \ diff --git a/win/Makefile.in b/win/Makefile.in index 1c47ad2..1c62dfc 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -162,7 +162,7 @@ LDFLAGS_OPTIMIZE = @LDFLAGS_OPTIMIZE@ # Tk does not used deprecated Tcl constructs so it should # compile fine with -DTCL_NO_DEPRECATED. To remove its own # set of deprecated code uncomment the second line. -NO_DEPRECATED_FLAGS = -DTCL_NO_DEPRECATED +NO_DEPRECATED_FLAGS = #NO_DEPRECATED_FLAGS = -DTCL_NO_DEPRECATED -DTK_NO_DEPRECATED # To change the compiler switches, for example to change from optimization to -- cgit v0.12