merged tcl 8.1 branch back into the main trunk

4 files changed, 13 insertions, 7 deletions

diff --git a/unix/dltest/Makefile.in b/unix/dltest/Makefile.in
index 1c0ab0f..96b7cc0 100644
--- a/unix/dltest/Makefile.in
+++ b/unix/dltest/Makefile.in
@@ -1,10 +1,11 @@
 # 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.4 1999/03/11 21:47:39 stanton Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.5 1999/04/16 00:48:06 stanton Exp $
 
+TCL_DBGX =		@TCL_DBGX@
 CC = @CC@
-LIBS =			@TCL_BUILD_STUB_LIB_SPEC@ @SHLIB_LD_LIBS@
+LIBS =			@TCL_BUILD_STUB_LIB_SPEC@ @TCL_LIBS@
 AC_FLAGS =		@EXTRA_CFLAGS@
 SHLIB_CFLAGS =		@SHLIB_CFLAGS@
 SHLIB_LD =		@SHLIB_LD@
diff --git a/unix/dltest/configure.in b/unix/dltest/configure.in
index a65ac38..bd7b904 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.4 1999/03/11 21:47:39 stanton Exp $
+# RCS: @(#) $Id: configure.in,v 1.5 1999/04/16 00:48:06 stanton Exp $
 
 # Recover information that Tcl computed with its configure script.
 
@@ -27,5 +27,7 @@ TCL_LIBS=$TCL_LIBS
 AC_SUBST(TCL_LIBS)
 TCL_VERSION=$TCL_VERSION
 AC_SUBST(TCL_VERSION)
+TCL_DBGX=$TCL_DBGX
+AC_SUBST(TCL_DBGX)
 
 AC_OUTPUT(Makefile)
diff --git a/unix/dltest/pkge.c b/unix/dltest/pkge.c
index 16acf56..6c74366 100644
--- a/unix/dltest/pkge.c
+++ b/unix/dltest/pkge.c
@@ -10,8 +10,9 @@
  * 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.3 1999/03/11 21:47:40 stanton Exp $
+ * RCS: @(#) $Id: pkge.c,v 1.4 1999/04/16 00:48:06 stanton Exp $
  */
+
 #include "tcl.h"
 
 /*
@@ -45,8 +46,9 @@ Pkge_Init(interp)
     Tcl_Interp *interp;		/* Interpreter in which the package is
 				 * to be made available. */
 {
+    static char script[] = "if 44 {open non_existent}";
     if (Tcl_InitStubs(interp, TCL_VERSION, 1) == NULL) {
 	return TCL_ERROR;
     }
-    return Tcl_Eval(interp, "if 44 {open non_existent}");
+    return Tcl_Eval(interp, script);
 }
diff --git a/unix/dltest/pkgf.c b/unix/dltest/pkgf.c
index 7e988d4..fc7a936 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.3 1999/03/11 21:47:40 stanton Exp $
+ * RCS: @(#) $Id: pkgf.c,v 1.4 1999/04/16 00:48:06 stanton Exp $
  */
 #include "tcl.h"
 
@@ -45,8 +45,9 @@ Pkgf_Init(interp)
     Tcl_Interp *interp;		/* Interpreter in which the package is
 				 * to be made available. */
 {
+    static char script[] = "if 44 {open non_existent}";
     if (Tcl_InitStubs(interp, TCL_VERSION, 1) == NULL) {
 	return TCL_ERROR;
     }
-    return Tcl_Eval(interp, "if 44 {open non_existent}");
+    return Tcl_Eval(interp, script);
 }