summaryrefslogtreecommitdiffstats
path: root/unix
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2009-04-10 18:13:05 (GMT)
committerdgp <dgp@users.sourceforge.net>2009-04-10 18:13:05 (GMT)
commit160c8cf0ae81eaa0cf4ecefdcb2ff5615af28266 (patch)
treebd215af362d7cdd75aa561b5b5984a27af5936bb /unix
parent05ed473e3558628339f3bf7d400eb41e04f04df7 (diff)
downloadtk-160c8cf0ae81eaa0cf4ecefdcb2ff5615af28266.zip
tk-160c8cf0ae81eaa0cf4ecefdcb2ff5615af28266.tar.gz
tk-160c8cf0ae81eaa0cf4ecefdcb2ff5615af28266.tar.bz2
* 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:
Diffstat (limited to 'unix')
-rwxr-xr-xunix/configure14
-rw-r--r--unix/configure.in4
-rw-r--r--unix/tk.spec4
3 files changed, 11 insertions, 11 deletions
diff --git a/unix/configure b/unix/configure
index ed8ba0a..c59687f 100755
--- a/unix/configure
+++ b/unix/configure
@@ -1337,7 +1337,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
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"
@@ -9904,7 +9904,7 @@ ac_x_header_dirs='
/usr/openwin/share/include'
if test "$ac_x_includes" = no; then
- # Guess where to find include files, by looking for Intrinsic.h.
+ # Guess where to find include files, by looking for Xlib.h.
# First, try using that file with no special directory specified.
cat >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 <X11/Intrinsic.h>
+#include <X11/Xlib.h>
_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 <X11/Intrinsic.h>
+#include <X11/Xlib.h>
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