From 4c4ed12073ccf2cbc8425644db85e7cf2bd5e00b Mon Sep 17 00:00:00 2001
From: mdejong <mdejong>
Date: Wed, 25 Apr 2001 20:52:48 +0000
Subject: 	* unix/Makefile.in: Use TCL_STUB_LIB_FILE instead of
 STUB_LIB_FILE. 	* unix/configure: Regen. 	* unix/configure.in:
 Don't subst STUB_LIB_FILE, use TCL_STUB_LIB_FILE 	instead.

---
 ChangeLog         | 7 +++++++
 unix/Makefile.in  | 4 ++--
 unix/configure    | 5 +----
 unix/configure.in | 4 +---
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 687f766..370974b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-04-25  Mo DeJong  <mdejong@redhat.com>
+
+	* unix/Makefile.in: Use TCL_STUB_LIB_FILE instead of STUB_LIB_FILE.
+	* unix/configure: Regen.
+	* unix/configure.in: Don't subst STUB_LIB_FILE, use TCL_STUB_LIB_FILE
+	instead.
+
 2001-04-12  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
 
 	* generic/tkImage.c (Tk_ImageObjCmd,DeleteImage): Better detection
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 2fe60ef..d2cd6a0 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -5,7 +5,7 @@
 # "autoconf" program (constructs like "@foo@" will get replaced in the
 # actual Makefile.
 #
-# RCS: @(#) $Id: Makefile.in,v 1.49 2000/09/29 21:40:54 hobbs Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.50 2001/04/25 20:52:48 mdejong Exp $
 
 # Current Tk version;  used in various names.
 
@@ -174,7 +174,7 @@ TCL_EXE			= tclsh
 SHLIB_CFLAGS		= @SHLIB_CFLAGS@
 
 # To enable support for stubs in Tcl.
-STUB_LIB_FILE		= @STUB_LIB_FILE@
+STUB_LIB_FILE		= @TK_STUB_LIB_FILE@
 
 TK_STUB_LIB_FILE	= @TK_STUB_LIB_FILE@
 #TK_STUB_LIB_FILE	= libtkstub.a
diff --git a/unix/configure b/unix/configure
index bef897f..be1df67 100755
--- a/unix/configure
+++ b/unix/configure
@@ -537,7 +537,7 @@ else
 fi
 
 
-# RCS: @(#) $Id: configure.in,v 1.55 2000/09/06 19:05:16 hobbs Exp $
+# RCS: @(#) $Id: configure.in,v 1.56 2001/04/02 02:08:55 hobbs Exp $
 
 TK_VERSION=8.4
 TK_MAJOR_VERSION=8
@@ -4205,8 +4205,6 @@ TK_STUB_LIB_PATH="${exec_prefix}/lib/${TK_STUB_LIB_FILE}"
 
 
 
-
-
 eval "TK_LIB_FILE=${TK_LIB_FILE}"
 
 
@@ -4405,7 +4403,6 @@ s%@DL_LIBS@%$DL_LIBS%g
 s%@CFLAGS_DEBUG@%$CFLAGS_DEBUG%g
 s%@CFLAGS_OPTIMIZE@%$CFLAGS_OPTIMIZE%g
 s%@CFLAGS_WARNING@%$CFLAGS_WARNING%g
-s%@STUB_LIB_FILE@%$STUB_LIB_FILE%g
 s%@TK_STUB_LIB_FILE@%$TK_STUB_LIB_FILE%g
 s%@TK_STUB_LIB_FLAG@%$TK_STUB_LIB_FLAG%g
 s%@TK_BUILD_STUB_LIB_SPEC@%$TK_BUILD_STUB_LIB_SPEC%g
diff --git a/unix/configure.in b/unix/configure.in
index fa0c83c..57085a9 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.
 AC_INIT(../generic/tk.h)
-# RCS: @(#) $Id: configure.in,v 1.56 2001/04/02 02:08:55 hobbs Exp $
+# RCS: @(#) $Id: configure.in,v 1.57 2001/04/25 20:52:48 mdejong Exp $
 
 TK_VERSION=8.4
 TK_MAJOR_VERSION=8
@@ -400,8 +400,6 @@ TK_STUB_LIB_SPEC="-L${exec_prefix}/lib ${TK_STUB_LIB_FLAG}"
 TK_BUILD_STUB_LIB_PATH="`pwd`/${TK_STUB_LIB_FILE}"
 TK_STUB_LIB_PATH="${exec_prefix}/lib/${TK_STUB_LIB_FILE}"
 
-AC_SUBST(STUB_LIB_FILE)
-
 AC_SUBST(TK_STUB_LIB_FILE)
 AC_SUBST(TK_STUB_LIB_FLAG)
 AC_SUBST(TK_BUILD_STUB_LIB_SPEC)
-- 
cgit v0.12