From 7f8c2ba5a4793a5dc431d2bb0d9e306c1aef35aa Mon Sep 17 00:00:00 2001 From: dgp Date: Fri, 10 Apr 2009 18:13:05 +0000 Subject: * generic/tk.h: Bump to 8.5.6 for release. * library/tk.tcl: * unix/configure.in: * unix/tk.spec: * win/configure.in: * README: * unix/configure: autoconf-2.59 * win/configure: FossilOrigin-Name: c6bda164cb457aab08781c8a6da06e9f28a646d4 --- ChangeLog | 12 ++++++++++++ README | 4 ++-- generic/tk.h | 6 +++--- library/tk.tcl | 4 ++-- unix/configure | 14 +++++++------- unix/configure.in | 4 ++-- unix/tk.spec | 4 ++-- win/configure | 2 +- win/configure.in | 4 ++-- 9 files changed, 33 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index 142c39d..5027bc2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2008-12-21 Don Porter + + * generic/tk.h: Bump to 8.5.6 for release. + * library/tk.tcl: + * unix/configure.in: + * unix/tk.spec: + * win/configure.in: + * README: + + * unix/configure: autoconf-2.59 + * win/configure: + 2008-04-10 Joe English conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -9912,7 +9912,7 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 @@ -9939,7 +9939,7 @@ else sed 's/^/| /' conftest.$ac_ext >&5 for ac_dir in $ac_x_header_dirs; do - if test -r "$ac_dir/X11/Intrinsic.h"; then + if test -r "$ac_dir/X11/Xlib.h"; then ac_x_includes=$ac_dir break fi @@ -9953,18 +9953,18 @@ if test "$ac_x_libraries" = no; then # See if we find them without any special options. # Don't add to $LIBS permanently. ac_save_LIBS=$LIBS - LIBS="-lXt $LIBS" + LIBS="-lX11 $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include int main () { -XtMalloc (0) +XrmInitialize () ; return 0; } diff --git a/unix/configure.in b/unix/configure.in index cd27253..8106659 100644 --- a/unix/configure.in +++ b/unix/configure.in @@ -3,7 +3,7 @@ dnl This file is an input file used by the GNU "autoconf" program to dnl generate the file "configure", which is run during Tk installation dnl to configure the system for the local environment. # -# RCS: @(#) $Id: configure.in,v 1.153.2.8 2009/04/10 18:01:48 das Exp $ +# RCS: @(#) $Id: configure.in,v 1.153.2.9 2009/04/10 18:13:06 dgp Exp $ AC_INIT([tk],[8.5]) AC_PREREQ(2.59) @@ -27,7 +27,7 @@ m4_ifdef([SC_USE_CONFIG_HEADERS], [ TK_VERSION=8.5 TK_MAJOR_VERSION=8 TK_MINOR_VERSION=5 -TK_PATCH_LEVEL=".6" +TK_PATCH_LEVEL=".7" VERSION=${TK_VERSION} LOCALES="cs da de el en en_gb eo es fr hu it nl pl pt ru sv" diff --git a/unix/tk.spec b/unix/tk.spec index 6e9957e..f05e6bb 100644 --- a/unix/tk.spec +++ b/unix/tk.spec @@ -1,11 +1,11 @@ -# $Id: tk.spec,v 1.34.2.7 2008/12/21 21:02:58 dgp Exp $ +# $Id: tk.spec,v 1.34.2.8 2009/04/10 18:13:06 dgp Exp $ # This file is the basis for a binary Tk Linux RPM. %{!?directory:%define directory /usr/local} Name: tk Summary: Tk graphical toolkit for the Tcl scripting language. -Version: 8.5.6 +Version: 8.5.7 Release: 2 License: BSD Group: Development/Languages diff --git a/win/configure b/win/configure index b9fdf1d..33dc5b7 100755 --- a/win/configure +++ b/win/configure @@ -1309,7 +1309,7 @@ SHELL=/bin/sh TK_VERSION=8.5 TK_MAJOR_VERSION=8 TK_MINOR_VERSION=5 -TK_PATCH_LEVEL=".6" +TK_PATCH_LEVEL=".7" VER=$TK_MAJOR_VERSION$TK_MINOR_VERSION #------------------------------------------------------------------------ diff --git a/win/configure.in b/win/configure.in index b7152ca..9a143bb 100644 --- a/win/configure.in +++ b/win/configure.in @@ -3,7 +3,7 @@ # generate the file "configure", which is run during Tk installation # to configure the system for the local environment. # -# RCS: @(#) $Id: configure.in,v 1.77.2.10 2009/02/16 18:11:50 hobbs Exp $ +# RCS: @(#) $Id: configure.in,v 1.77.2.11 2009/04/10 18:13:06 dgp Exp $ AC_INIT(../generic/tk.h) AC_PREREQ(2.59) @@ -16,7 +16,7 @@ SHELL=/bin/sh TK_VERSION=8.5 TK_MAJOR_VERSION=8 TK_MINOR_VERSION=5 -TK_PATCH_LEVEL=".6" +TK_PATCH_LEVEL=".7" VER=$TK_MAJOR_VERSION$TK_MINOR_VERSION #------------------------------------------------------------------------ -- cgit v0.12