Changed package tests to build against the stubs library.core_8_1_merge_latest

11 files changed, 60 insertions, 20 deletions

diff --git a/ChangeLog b/ChangeLog
index b372a39..3456513 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+1999-03-11    <stanton@GASPODE>
+
+	* unix/tclConfig.sh.in:
+	* unix/dltest/Makefile.in:
+	* unix/dltest/configure.in:
+	* unix/dltest/pkga.c:
+	* unix/dltest/pkgb.c:
+	* unix/dltest/pkgc.c:
+	* unix/dltest/pkgd.c:
+	* unix/dltest/pkge.c:
+	* unix/dltest/pkgf.c: Changed package tests to build against the
+	stubs library.
+
 1999-03-10    <stanton@GASPODE>
 
 	* generic/tclAlloc.c: Changed TCL_NATIVE_MALLOC to USE_TCLALLOC so
diff --git a/unix/Makefile.in b/unix/Makefile.in
index ec5d09c..0c51267 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.19 1999/03/11 02:49:35 stanton Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.20 1999/03/11 21:47:39 stanton Exp $
 
 # Current Tcl version;  used in various names.
 
@@ -375,7 +375,7 @@ all: ${TCL_LIB_FILE} $(TCL_STUB_LIB_FILE) tclsh
 
 # The following target is configured by autoconf to generate either
 # a shared library or non-shared library for Tcl.
-${TCL_LIB_FILE}: ${OBJS}
+${TCL_LIB_FILE}: ${OBJS} ${STUB_LIB_FILE}
 	rm -f ${TCL_LIB_FILE}
 	@MAKE_LIB@
 	$(RANLIB) ${TCL_LIB_FILE}
diff --git a/unix/dltest/Makefile.in b/unix/dltest/Makefile.in
index 2b0e43b..1c0ab0f 100644
--- a/unix/dltest/Makefile.in
+++ b/unix/dltest/Makefile.in
@@ -1,10 +1,10 @@
 # This Makefile is used to create several test cases for Tcl's load
 # command.  It also illustrates how to take advantage of configuration
 # exported by Tcl to set up Makefiles for shared libraries.
-# RCS: @(#) $Id: Makefile.in,v 1.3 1998/12/10 19:09:55 rjohnson Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.4 1999/03/11 21:47:39 stanton Exp $
 
 CC = @CC@
-LIBS =			@TCL_BUILD_LIB_SPEC@ @TCL_LIBS@ -lc
+LIBS =			@TCL_BUILD_STUB_LIB_SPEC@ @SHLIB_LD_LIBS@
 AC_FLAGS =		@EXTRA_CFLAGS@
 SHLIB_CFLAGS =		@SHLIB_CFLAGS@
 SHLIB_LD =		@SHLIB_LD@
@@ -15,29 +15,29 @@ TCL_VERSION=		@TCL_VERSION@
 
 CFLAGS = -g
 CC_SWITCHES = $(CFLAGS) -I${SRC_DIR}/../../generic -DTCL_MEM_DEBUG \
-	${SHLIB_CFLAGS} ${AC_FLAGS}
+	${SHLIB_CFLAGS} -DUSE_TCL_STUBS ${AC_FLAGS}
 
 all: pkga${SHLIB_SUFFIX} pkgb${SHLIB_SUFFIX} pkgc${SHLIB_SUFFIX} pkgd${SHLIB_SUFFIX} pkge${SHLIB_SUFFIX}
 
 pkga${SHLIB_SUFFIX}: $(SRC_DIR)/pkga.c
 	$(CC) -c $(CC_SWITCHES) $(SRC_DIR)/pkga.c
-	${SHLIB_LD} -o pkga${SHLIB_SUFFIX} pkga.o @SHLIB_LD_LIBS@
+	${SHLIB_LD} -o pkga${SHLIB_SUFFIX} pkga.o ${LIBS}
 
 pkgb${SHLIB_SUFFIX}: $(SRC_DIR)/pkgb.c
 	$(CC) -c $(CC_SWITCHES) $(SRC_DIR)/pkgb.c
-	${SHLIB_LD} -o pkgb${SHLIB_SUFFIX} pkgb.o @SHLIB_LD_LIBS@
+	${SHLIB_LD} -o pkgb${SHLIB_SUFFIX} pkgb.o ${LIBS}
 
 pkgc${SHLIB_SUFFIX}: $(SRC_DIR)/pkgc.c
 	$(CC) -c $(CC_SWITCHES) $(SRC_DIR)/pkgc.c
-	${SHLIB_LD} -o pkgc${SHLIB_SUFFIX} pkgc.o @SHLIB_LD_LIBS@
+	${SHLIB_LD} -o pkgc${SHLIB_SUFFIX} pkgc.o ${LIBS}
 
 pkgd${SHLIB_SUFFIX}: $(SRC_DIR)/pkgd.c
 	$(CC) -c $(CC_SWITCHES) $(SRC_DIR)/pkgd.c
-	${SHLIB_LD} -o pkgd${SHLIB_SUFFIX} pkgd.o @SHLIB_LD_LIBS@
+	${SHLIB_LD} -o pkgd${SHLIB_SUFFIX} pkgd.o ${LIBS}
 
 pkge${SHLIB_SUFFIX}: $(SRC_DIR)/pkge.c
 	$(CC) -c $(CC_SWITCHES) $(SRC_DIR)/pkge.c
-	${SHLIB_LD} -o pkge${SHLIB_SUFFIX} pkge.o @SHLIB_LD_LIBS@
+	${SHLIB_LD} -o pkge${SHLIB_SUFFIX} pkge.o ${LIBS}
 
 clean:
 	rm -f *.o *${SHLIB_SUFFIX} config.cache config.log config.status lib.exp
diff --git a/unix/dltest/configure.in b/unix/dltest/configure.in
index 11ded26..a65ac38 100644
--- a/unix/dltest/configure.in
+++ b/unix/dltest/configure.in
@@ -2,7 +2,7 @@ dnl	This file is an input file used by the GNU "autoconf" program to
 dnl	generate the file "configure", which is run to configure the
 dnl	Makefile in this directory.
 AC_INIT(pkga.c)
-# RCS: @(#) $Id: configure.in,v 1.3 1998/12/10 19:09:55 rjohnson Exp $
+# RCS: @(#) $Id: configure.in,v 1.4 1999/03/11 21:47:39 stanton Exp $
 
 # Recover information that Tcl computed with its configure script.
 
@@ -22,7 +22,7 @@ SHLIB_SUFFIX=$TCL_SHLIB_SUFFIX
 AC_SUBST(SHLIB_SUFFIX)
 SHLIB_VERSION=$TCL_SHLIB_VERSION
 AC_SUBST(SHLIB_VERSION)
-AC_SUBST(TCL_BUILD_LIB_SPEC)
+AC_SUBST(TCL_BUILD_STUB_LIB_SPEC)
 TCL_LIBS=$TCL_LIBS
 AC_SUBST(TCL_LIBS)
 TCL_VERSION=$TCL_VERSION
diff --git a/unix/dltest/pkga.c b/unix/dltest/pkga.c
index 7faeebf..4cda651 100644
--- a/unix/dltest/pkga.c
+++ b/unix/dltest/pkga.c
@@ -9,7 +9,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: pkga.c,v 1.2 1998/09/14 18:40:18 stanton Exp $
+ * RCS: @(#) $Id: pkga.c,v 1.3 1999/03/11 21:47:40 stanton Exp $
  */
 #include "tcl.h"
 
@@ -118,6 +118,9 @@ Pkga_Init(interp)
 {
     int code;
 
+    if (Tcl_InitStubs(interp, TCL_VERSION, 1) == NULL) {
+	return TCL_ERROR;
+    }
     code = Tcl_PkgProvide(interp, "Pkga", "1.0");
     if (code != TCL_OK) {
 	return code;
diff --git a/unix/dltest/pkgb.c b/unix/dltest/pkgb.c
index 3f67c3d..5104e7c 100644
--- a/unix/dltest/pkgb.c
+++ b/unix/dltest/pkgb.c
@@ -10,7 +10,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: pkgb.c,v 1.2 1998/09/14 18:40:18 stanton Exp $
+ * RCS: @(#) $Id: pkgb.c,v 1.3 1999/03/11 21:47:40 stanton Exp $
  */
 #include "tcl.h"
 
@@ -114,6 +114,9 @@ Pkgb_Init(interp)
 {
     int code;
 
+    if (Tcl_InitStubs(interp, TCL_VERSION, 1) == NULL) {
+	return TCL_ERROR;
+    }
     code = Tcl_PkgProvide(interp, "Pkgb", "2.3");
     if (code != TCL_OK) {
 	return code;
@@ -147,6 +150,9 @@ Pkgb_SafeInit(interp)
     Tcl_Interp *interp;		/* Interpreter in which the package is
 				 * to be made available. */
 {
+    if (Tcl_InitStubs(interp, TCL_VERSION, 1) == NULL) {
+	return TCL_ERROR;
+    }
     Tcl_CreateCommand(interp, "pkgb_sub", Pkgb_SubCmd, (ClientData) 0,
 	    (Tcl_CmdDeleteProc *) NULL);
     return TCL_OK;
diff --git a/unix/dltest/pkgc.c b/unix/dltest/pkgc.c
index 33a5b43..9aac361 100644
--- a/unix/dltest/pkgc.c
+++ b/unix/dltest/pkgc.c
@@ -10,7 +10,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: pkgc.c,v 1.2 1998/09/14 18:40:18 stanton Exp $
+ * RCS: @(#) $Id: pkgc.c,v 1.3 1999/03/11 21:47:40 stanton Exp $
  */
 #include "tcl.h"
 
@@ -114,6 +114,9 @@ Pkgc_Init(interp)
 {
     int code;
 
+    if (Tcl_InitStubs(interp, TCL_VERSION, 1) == NULL) {
+	return TCL_ERROR;
+    }
     code = Tcl_PkgProvide(interp, "Pkgc", "1.7.2");
     if (code != TCL_OK) {
 	return code;
@@ -147,6 +150,9 @@ Pkgc_SafeInit(interp)
     Tcl_Interp *interp;		/* Interpreter in which the package is
 				 * to be made available. */
 {
+    if (Tcl_InitStubs(interp, TCL_VERSION, 1) == NULL) {
+	return TCL_ERROR;
+    }
     Tcl_CreateCommand(interp, "pkgc_sub", Pkgc_SubCmd, (ClientData) 0,
 	    (Tcl_CmdDeleteProc *) NULL);
     return TCL_OK;
diff --git a/unix/dltest/pkgd.c b/unix/dltest/pkgd.c
index 6d0152b..8780b47 100644
--- a/unix/dltest/pkgd.c
+++ b/unix/dltest/pkgd.c
@@ -10,7 +10,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: pkgd.c,v 1.2 1998/09/14 18:40:18 stanton Exp $
+ * RCS: @(#) $Id: pkgd.c,v 1.3 1999/03/11 21:47:40 stanton Exp $
  */
 
 #include "tcl.h"
@@ -115,6 +115,9 @@ Pkgd_Init(interp)
 {
     int code;
 
+    if (Tcl_InitStubs(interp, TCL_VERSION, 1) == NULL) {
+	return TCL_ERROR;
+    }
     code = Tcl_PkgProvide(interp, "Pkgd", "7.3");
     if (code != TCL_OK) {
 	return code;
@@ -148,6 +151,9 @@ Pkgd_SafeInit(interp)
     Tcl_Interp *interp;		/* Interpreter in which the package is
 				 * to be made available. */
 {
+    if (Tcl_InitStubs(interp, TCL_VERSION, 1) == NULL) {
+	return TCL_ERROR;
+    }
     Tcl_CreateCommand(interp, "pkgd_sub", Pkgd_SubCmd, (ClientData) 0,
 	    (Tcl_CmdDeleteProc *) NULL);
     return TCL_OK;
diff --git a/unix/dltest/pkge.c b/unix/dltest/pkge.c
index aa8cca0..16acf56 100644
--- a/unix/dltest/pkge.c
+++ b/unix/dltest/pkge.c
@@ -10,7 +10,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: pkge.c,v 1.2 1998/09/14 18:40:18 stanton Exp $
+ * RCS: @(#) $Id: pkge.c,v 1.3 1999/03/11 21:47:40 stanton Exp $
  */
 #include "tcl.h"
 
@@ -45,5 +45,8 @@ Pkge_Init(interp)
     Tcl_Interp *interp;		/* Interpreter in which the package is
 				 * to be made available. */
 {
+    if (Tcl_InitStubs(interp, TCL_VERSION, 1) == NULL) {
+	return TCL_ERROR;
+    }
     return Tcl_Eval(interp, "if 44 {open non_existent}");
 }
diff --git a/unix/dltest/pkgf.c b/unix/dltest/pkgf.c
index e2a0653..7e988d4 100644
--- a/unix/dltest/pkgf.c
+++ b/unix/dltest/pkgf.c
@@ -10,7 +10,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: pkgf.c,v 1.2 1998/09/14 18:40:18 stanton Exp $
+ * RCS: @(#) $Id: pkgf.c,v 1.3 1999/03/11 21:47:40 stanton Exp $
  */
 #include "tcl.h"
 
@@ -45,5 +45,8 @@ Pkgf_Init(interp)
     Tcl_Interp *interp;		/* Interpreter in which the package is
 				 * to be made available. */
 {
+    if (Tcl_InitStubs(interp, TCL_VERSION, 1) == NULL) {
+	return TCL_ERROR;
+    }
     return Tcl_Eval(interp, "if 44 {open non_existent}");
 }
diff --git a/unix/tclConfig.sh.in b/unix/tclConfig.sh.in
index ae7c03c..c412561 100644
--- a/unix/tclConfig.sh.in
+++ b/unix/tclConfig.sh.in
@@ -9,7 +9,7 @@
 #
 # The information in this file is specific to a single platform.
 #
-# RCS: @(#) $Id: tclConfig.sh.in,v 1.9 1999/03/10 05:52:52 stanton Exp $
+# RCS: @(#) $Id: tclConfig.sh.in,v 1.10 1999/03/11 21:47:39 stanton Exp $
 
 # Tcl's version number.
 TCL_VERSION='@TCL_VERSION@'
@@ -139,7 +139,7 @@ TCL_SRC_DIR='@TCL_SRC_DIR@'
 TCL_PACKAGE_PATH='@TCL_PACKAGE_PATH@'
 
 # Tcl supports stub.
-TCL_SUPPORTS_STUBS=@TCL_SUPPORTS_STUBS@
+TCL_SUPPORTS_STUBS=1
 
 # The name of the Tcl stub library (.a):
 TCL_STUB_LIB_FILE='@TCL_STUB_LIB_FILE@'