Fix [Bug 2902965] stub related changes

cause tclkit built to break

4 files changed, 13 insertions, 9 deletions

diff --git a/unix/Makefile.in b/unix/Makefile.in
index 5a2e8cf..d42a0e5 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -4,7 +4,7 @@
 # "./configure", which is a configuration script generated by the "autoconf"
 # program (constructs like "@foo@" will get replaced in the actual Makefile.
 #
-# RCS: @(#) $Id: Makefile.in,v 1.281 2009/11/18 23:46:05 nijtmans Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.282 2009/11/26 07:01:47 nijtmans Exp $
 
 VERSION 		= @TCL_VERSION@
 MAJOR_VERSION		= @TCL_MAJOR_VERSION@
@@ -456,7 +456,8 @@ OO_SRCS = \
 	$(GENERIC_DIR)/tclOOStubInit.c
 
 STUB_SRCS = \
-	$(GENERIC_DIR)/tclStubLib.c
+	$(GENERIC_DIR)/tclStubLib.c \
+	$(GENERIC_DIR)/tclOOStubLib.o
 
 TOMMATH_SRCS = \
 	$(TOMMATH_DIR)/bncore.c \
@@ -566,7 +567,6 @@ ZLIB_SRCS = \
 	$(ZLIB_DIR)/compress.c \
 	$(ZLIB_DIR)/crc32.c \
 	$(ZLIB_DIR)/deflate.c \
-	$(ZLIB_DIR)/gzio.c \
 	$(ZLIB_DIR)/infback.c \
 	$(ZLIB_DIR)/inffast.c \
 	$(ZLIB_DIR)/inflate.c \
@@ -612,7 +612,7 @@ objs: ${OBJS}
 
 
 tclsh: ${TCLSH_OBJS} ${TCL_LIB_FILE}
-	${CC} ${CFLAGS} ${LDFLAGS} ${TCLSH_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} @EXTRA_TCLSH_LIBS@ \
+	${CC} ${CFLAGS} ${LDFLAGS} ${TCLSH_OBJS} @TCL_BUILD_LIB_SPEC@ ${TCL_STUB_LIB_FILE} ${LIBS} @EXTRA_TCLSH_LIBS@ \
 		${CC_SEARCH_FLAGS} -o tclsh
 
 # Resetting the LIB_RUNTIME_DIR below is required so that the generated
diff --git a/unix/configure b/unix/configure
index 991879c..f8dcb5e 100755
--- a/unix/configure
+++ b/unix/configure
@@ -8971,12 +8971,12 @@ else
 
         if test "$RANLIB" = ""; then
 
-            MAKE_LIB='$(STLIB_LD) $@ ${OBJS}'
+            MAKE_LIB='$(STLIB_LD) $@ ${OBJS} ${STUB_LIB_OBJS}'
             INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)"/$(LIB_FILE)'
 
 else
 
-            MAKE_LIB='${STLIB_LD} $@ ${OBJS} ; ${RANLIB} $@'
+            MAKE_LIB='${STLIB_LD} $@ ${OBJS} ${STUB_LIB_OBJS} ; ${RANLIB} $@'
             INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)"/$(LIB_FILE) ; (cd "$(LIB_INSTALL_DIR)" ; $(RANLIB) $(LIB_FILE))'
 
 fi
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index 6c23ace..d315658 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -2066,10 +2066,10 @@ dnl # preprocessing tests use only CPPFLAGS.
         LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}
 
         AS_IF([test "$RANLIB" = ""], [
-            MAKE_LIB='$(STLIB_LD) [$]@ ${OBJS}'
+            MAKE_LIB='$(STLIB_LD) [$]@ ${OBJS} ${STUB_LIB_OBJS}'
             INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)"/$(LIB_FILE)'
         ], [
-            MAKE_LIB='${STLIB_LD} [$]@ ${OBJS} ; ${RANLIB} [$]@'
+            MAKE_LIB='${STLIB_LD} [$]@ ${OBJS} ${STUB_LIB_OBJS} ; ${RANLIB} [$]@'
             INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)"/$(LIB_FILE) ; (cd "$(LIB_INSTALL_DIR)" ; $(RANLIB) $(LIB_FILE))'
         ])
     ])
diff --git a/unix/tclAppInit.c b/unix/tclAppInit.c
index a39b448..715a098 100644
--- a/unix/tclAppInit.c
+++ b/unix/tclAppInit.c
@@ -11,7 +11,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclAppInit.c,v 1.20 2009/11/19 16:31:10 dgp Exp $
+ * RCS: @(#) $Id: tclAppInit.c,v 1.21 2009/11/26 07:01:46 nijtmans Exp $
  */
 
 #include "tcl.h"
@@ -110,6 +110,10 @@ int
 Tcl_AppInit(
     Tcl_Interp *interp)		/* Interpreter for application. */
 {
+#undef Tcl_InitStubs
+    if (!Tcl_InitStubs(interp, TCL_VERSION, 0)) {
+	return TCL_ERROR;
+    }
     if (Tcl_Init(interp) == TCL_ERROR) {
 	return TCL_ERROR;
     }