summaryrefslogtreecommitdiffstats
path: root/unix
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2008-03-28 18:13:34 (GMT)
committerdgp <dgp@users.sourceforge.net>2008-03-28 18:13:34 (GMT)
commit55e852d32399fa8cbd57bf8007e33cabacf7a24a (patch)
tree04b11565844c54f4a19807a02d2dd8124a2eac4a /unix
parent76fc61c1cca370be99f6b5ecac2fd0339057da92 (diff)
downloadtk-55e852d32399fa8cbd57bf8007e33cabacf7a24a.zip
tk-55e852d32399fa8cbd57bf8007e33cabacf7a24a.tar.gz
tk-55e852d32399fa8cbd57bf8007e33cabacf7a24a.tar.bz2
* README: Bump to 8.5.2 for release.
* generic/tk.h: * library/tk.tcl: * unix/configure.in: * unix/tk.spec: * win/configure.in: * unix/configure: autoconf-2.59 * win/configure:
Diffstat (limited to 'unix')
-rwxr-xr-xunix/configure12
-rw-r--r--unix/configure.in4
-rw-r--r--unix/tk.spec4
3 files changed, 10 insertions, 10 deletions
diff --git a/unix/configure b/unix/configure
index e30b3ab..477a9f0 100755
--- a/unix/configure
+++ b/unix/configure
@@ -9398,7 +9398,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. */
@@ -9406,7 +9406,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
@@ -9433,7 +9433,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
@@ -9447,18 +9447,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 3c282b2..d2ca8d1 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.152 2008/03/13 17:44:18 das Exp $
+# RCS: @(#) $Id: configure.in,v 1.153 2008/03/28 18:13:41 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=".1"
+TK_PATCH_LEVEL=".2"
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 a1a6467..d93a62a 100644
--- a/unix/tk.spec
+++ b/unix/tk.spec
@@ -1,11 +1,11 @@
-# $Id: tk.spec,v 1.33 2008/02/04 17:32:41 dgp Exp $
+# $Id: tk.spec,v 1.34 2008/03/28 18:13:42 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.1
+Version: 8.5.2
Release: 2
License: BSD
Group: Development/Languages