update patchlevel to 8.5a1

9 files changed, 38 insertions, 22 deletions

diff --git a/ChangeLog b/ChangeLog
index ca7dafd..4eafa66 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,18 @@
+2004-03-01  Jeff Hobbs  <jeffh@ActiveState.com>
+
+	* README:       update to patchlevel 8.5a1
+	* generic/tk.h:
+	* macosx/Wish.pbproj/project.pbxproj:
+	* unix/configure, unix/configure.in, unix/tk.spec:
+	* win/configure, win/configure.in:
+
+	* unix/tcl.m4: update HP-11 build libs setup
+
 2004-03-01  Don Porter  <dgp@users.sourceforge.net>
 
-        * unix/tcl.m4 (SC_CONFIG_CFLAGS):       Allow 64-bit enabling on
-        IRIX64-6.5* systems.  [Bug 218561]
-        * unix/configure:       autoconf-2.57
+	* unix/tcl.m4 (SC_CONFIG_CFLAGS):	Allow 64-bit enabling on
+	IRIX64-6.5* systems.  [Bug 218561]
+	* unix/configure:	autoconf-2.57
 
 2004-02-28  Vince Darley  <vincentdarley@users.sourceforge.net>
 
diff --git a/README b/README
index 994dcc8..45d684c 100644
--- a/README
+++ b/README
@@ -1,11 +1,11 @@
 README:  Tk
-    This is the Tk 8.5a0 source distribution.
+    This is the Tk 8.5a1 source distribution.
     Tcl/Tk is also available through NetCVS:
 	http://tcl.sourceforge.net/
     You can get any source release of Tcl from the file distributions
     link at the above URL.
 
-RCS: @(#) $Id: README,v 1.40 2003/03/04 23:50:41 dgp Exp $
+RCS: @(#) $Id: README,v 1.41 2004/03/02 00:49:13 hobbs Exp $
 
 1. Introduction
 ---------------
diff --git a/generic/tk.h b/generic/tk.h
index 459c9f6..9a23e3e 100644
--- a/generic/tk.h
+++ b/generic/tk.h
@@ -12,7 +12,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tk.h,v 1.77 2003/12/23 03:00:33 davygrvy Exp $
+ * RCS: @(#) $Id: tk.h,v 1.78 2004/03/02 00:49:13 hobbs Exp $
  */
 
 #ifndef _TK
@@ -49,10 +49,10 @@ extern "C" {
 #define TK_MAJOR_VERSION   8
 #define TK_MINOR_VERSION   5
 #define TK_RELEASE_LEVEL   TCL_ALPHA_RELEASE
-#define TK_RELEASE_SERIAL  0
+#define TK_RELEASE_SERIAL  1
 
 #define TK_VERSION	"8.5"
-#define TK_PATCH_LEVEL	"8.5a0"
+#define TK_PATCH_LEVEL	"8.5a1"
 
 /*
  * The following definitions set up the proper options for Macintosh
diff --git a/macosx/Wish.pbproj/project.pbxproj b/macosx/Wish.pbproj/project.pbxproj
index b965269..3a873b7 100644
--- a/macosx/Wish.pbproj/project.pbxproj
+++ b/macosx/Wish.pbproj/project.pbxproj
@@ -1929,11 +1929,11 @@ MacOS X Port by Jim Ingham &lt;jingham@apple.com&gt; &amp; Ian Reid, Copyright Â
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>8.5a0</string>
+	<string>8.5a1</string>
 	<key>CFBundleSignature</key>
 	<string>WiSH</string>
 	<key>CFBundleVersion</key>
-	<string>8.5a0</string>
+	<string>8.5a1</string>
 </dict>
 </plist>
 ";
@@ -3346,11 +3346,11 @@ MacOS X Port by Jim Ingham &lt;jingham@apple.com&gt; &amp; Ian Reid, Copyright Â
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>8.5a0</string>
+	<string>8.5a1</string>
 	<key>CFBundleSignature</key>
 	<string>WiSH</string>
 	<key>CFBundleVersion</key>
-	<string>8.5a0</string>
+	<string>8.5a1</string>
 </dict>
 </plist>
 ";
diff --git a/unix/configure b/unix/configure
index e9b009e..119e912 100755
--- a/unix/configure
+++ b/unix/configure
@@ -1279,7 +1279,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 TK_VERSION=8.5
 TK_MAJOR_VERSION=8
 TK_MINOR_VERSION=5
-TK_PATCH_LEVEL="a0"
+TK_PATCH_LEVEL="a1"
 VERSION=${TK_VERSION}
 LOCALES="cs de el en en_gb es fr it nl ru"
 
@@ -4220,6 +4220,12 @@ fi
 		LD_SEARCH_FLAGS='+s +b ${LIB_RUNTIME_DIR}:.'
 		LD_LIBRARY_PATH_VAR="SHLIB_PATH"
 	    fi
+	    if test "$GCC" = "yes" ; then
+		SHLIB_LD="gcc -shared"
+		SHLIB_LD_LIBS='${LIBS}'
+		LD_SEARCH_FLAGS=''
+		CC_SEARCH_FLAGS=''
+	    fi
 
 	    # Users may want PA-RISC 1.1/2.0 portable code - needs HP cc
 	    #EXTRA_CFLAGS="+DAportable"
@@ -4233,7 +4239,7 @@ fi
 			    # 64-bit gcc in use.  Fix flags for GNU ld.
 			    do64bit_ok=yes
 			    SHLIB_LD="gcc -shared"
-			    SHLIB_LD_LIBS=""
+			    SHLIB_LD_LIBS='${LIBS}'
 			    LD_SEARCH_FLAGS=''
 			    CC_SEARCH_FLAGS=''
 			    ;;
diff --git a/unix/configure.in b/unix/configure.in
index 8861f3f..662b059 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.92 2003/11/12 01:10:40 hobbs Exp $
+# RCS: @(#) $Id: configure.in,v 1.93 2004/03/02 00:49:13 hobbs Exp $
 
 AC_INIT(../generic/tk.h)
 AC_PREREQ(2.57)
@@ -11,7 +11,7 @@ AC_PREREQ(2.57)
 TK_VERSION=8.5
 TK_MAJOR_VERSION=8
 TK_MINOR_VERSION=5
-TK_PATCH_LEVEL="a0"
+TK_PATCH_LEVEL="a1"
 VERSION=${TK_VERSION}
 LOCALES="cs de el en en_gb es fr it nl ru"
 
diff --git a/unix/tk.spec b/unix/tk.spec
index befe1af..6fe28fe 100644
--- a/unix/tk.spec
+++ b/unix/tk.spec
@@ -1,7 +1,7 @@
-# $Id: tk.spec,v 1.16 2003/03/04 23:50:45 dgp Exp $
+# $Id: tk.spec,v 1.17 2004/03/02 00:49:13 hobbs Exp $
 # This file is the basis for a binary Tk Linux RPM.
 
-%define version 8.5a0
+%define version 8.5a1
 %define directory /usr/local
 
 Summary: Tk graphical toolkit for the Tcl scripting language.
@@ -14,7 +14,7 @@ Source: http://prdownloads.sourceforge.net/tcl/tk%{version}-src.tar.gz
 URL: http://www.tcl.tk/
 Packager: Carina
 Buildroot: /var/tmp/%{name}%{version}
-Requires: XFree86-libs >= 3.3.3, XFree86-devel >= 3.3.3, tcl = 8.5a0
+Requires: XFree86-libs >= 3.3.3, XFree86-devel >= 3.3.3, tcl = 8.5a1
 
 %description
 The Tcl (Tool Command Language) provides a powerful platform for
diff --git a/win/configure b/win/configure
index fa887bb..49840a0 100755
--- a/win/configure
+++ b/win/configure
@@ -1274,7 +1274,7 @@ SHELL=/bin/sh
 TK_VERSION=8.5
 TK_MAJOR_VERSION=8
 TK_MINOR_VERSION=5
-TK_PATCH_LEVEL="a0"
+TK_PATCH_LEVEL="a1"
 VER=$TK_MAJOR_VERSION$TK_MINOR_VERSION
 
 #------------------------------------------------------------------------
diff --git a/win/configure.in b/win/configure.in
index 54a8bf7..7eed2f2 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.56 2003/11/11 00:07:59 hobbs Exp $
+# RCS: @(#) $Id: configure.in,v 1.57 2004/03/02 00:49:13 hobbs Exp $
 
 AC_INIT(../generic/tk.h)
 AC_PREREQ(2.57)
@@ -16,7 +16,7 @@ SHELL=/bin/sh
 TK_VERSION=8.5
 TK_MAJOR_VERSION=8
 TK_MINOR_VERSION=5
-TK_PATCH_LEVEL="a0"
+TK_PATCH_LEVEL="a1"
 VER=$TK_MAJOR_VERSION$TK_MINOR_VERSION
 
 #------------------------------------------------------------------------