DBGX changes

3 files changed, 17 insertions, 11 deletions

diff --git a/unix/Makefile.in b/unix/Makefile.in
index 6071a3e..3d76d60 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -72,7 +72,7 @@ MAN3_INSTALL_DIR =	$(MAN_INSTALL_DIR)/man3
 MANN_INSTALL_DIR =	$(MAN_INSTALL_DIR)/mann
 
 # Libraries built with optimization switches have this additional extension
-DBGX =			@DBGX@
+TCL_DBGX =		@TCL_DBGX@
 
 # warning flags
 CFLAGS_WARNING =	@CFLAGS_WARNING@
@@ -883,7 +883,7 @@ dist: $(UNIX_DIR)/configure
 	mkdir $(DISTDIR)/tests
 	cp -p $(TOP_DIR)/license.terms $(DISTDIR)/tests
 	cp -p $(TOP_DIR)/tests/*.test $(TOP_DIR)/tests/README \
-		$(TOP_DIR)/tests/all $(TOP_DIR)/tests/remote.tcl \
+		$(TOP_DIR)/tests/all $(TOP_DIR)/tests/*.tcl \
 		$(TOP_DIR)/tests/defs $(DISTDIR)/tests
 	mkdir $(DISTDIR)/win
 	cp -p $(TOP_DIR)/win/*.c $(TOP_DIR)/win/*.h $(TOP_DIR)/win/*.rc \
diff --git a/unix/configure.in b/unix/configure.in
index 0e4a264..0aa8848 100644
--- a/unix/configure.in
+++ b/unix/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 during Tcl installation
 dnl	to configure the system for the local environment.
 AC_INIT(../generic/tcl.h)
-# SCCS: %Z% $Id: configure.in,v 1.10 1998/07/24 15:04:12 welch Exp $ 
+# SCCS: @(#) configure.in 1.10 98/07/24 15:04:12
 
 TCL_VERSION=8.0
 TCL_MAJOR_VERSION=8
@@ -1096,10 +1096,10 @@ AC_ARG_ENABLE(symbols, [  --enable-symbols        build with debugging symbols],
     [tcl_ok=$enableval], [tcl_ok=no])
 if test "$tcl_ok" = "yes"; then
     CFLAGS_DEFAULT=CFLAGS_DEBUG
-    DBGX=g
+    TCL_DBGX=g
 else
     CFLAGS_DEFAULT=CFLAGS_OPTIMIZE
-    DBGX=""
+    TCL_DBGX=""
 fi
 
 #--------------------------------------------------------------------
@@ -1205,15 +1205,20 @@ VERSION='${VERSION}'
 eval "CFG_TCL_SHARED_LIB_SUFFIX=${TCL_SHARED_LIB_SUFFIX}"
 eval "CFG_TCL_UNSHARED_LIB_SUFFIX=${TCL_UNSHARED_LIB_SUFFIX}"
 
+# Trick to replace ${DBGX} with ${TCL_DBGX} in TCL_LIB_FILE def
+DBGX='${TCL_DBGX}'
+eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
+
+
 # Note:  in the following variable, it's important to use the absolute
 # path name of the Tcl directory rather than "..":  this is because
 # AIX remembers this path and will attempt to use it at run-time to look
 # up the Tcl library.
 
 if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
-    TCL_LIB_FLAG="-ltcl${TCL_VERSION}\${DBGX}"
+    TCL_LIB_FLAG="-ltcl${TCL_VERSION}\${TCL_DBGX}"
 else
-    TCL_LIB_FLAG="-ltcl`echo ${TCL_VERSION} | tr -d .`\${DBGX}"
+    TCL_LIB_FLAG="-ltcl`echo ${TCL_VERSION} | tr -d .`\${TCL_DBGX}"
 fi
 TCL_BUILD_LIB_SPEC="-L`pwd` \${TCL_LIB_FLAG}"
 TCL_LIB_SPEC="-L${exec_prefix}/lib \${TCL_LIB_FLAG}"
@@ -1238,7 +1243,8 @@ AC_SUBST(CFLAGS_OPTIMIZE)
 AC_SUBST(CFLAGS_WARNING)
 AC_SUBST(CFG_TCL_SHARED_LIB_SUFFIX)
 AC_SUBST(CFG_TCL_UNSHARED_LIB_SUFFIX)
-AC_SUBST(DBGX)
+AC_SUBST(CFG_TCL_LIB_FILE)
+AC_SUBST(TCL_DBGX)
 AC_SUBST(DL_LIBS)
 AC_SUBST(DL_OBJS)
 AC_SUBST(LD_FLAGS)
diff --git a/unix/tclConfig.sh.in b/unix/tclConfig.sh.in
index 4379a79..c6661e1 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.
 #
-# SCCS: %Z% $Id: tclConfig.sh.in,v 1.3 1998/07/21 15:22:15 escoffon Exp $ 
+# SCCS: %Z% $Id: tclConfig.sh.in,v 1.4 1998/07/28 17:33:45 welch Exp $ 
 
 # Tcl's version number.
 TCL_VERSION='@TCL_VERSION@'
@@ -25,7 +25,7 @@ TCL_DEFS='@DEFS@'
 
 # If TCL was built with debugging symbols, generated libraries contain
 # this string at the end of the library name (before the extension).
-TCL_DBGX=@DBGX@
+TCL_DBGX=@TCL_DBGX@
 
 # Default flags used in an optimized and debuggable build, respectively.
 TCL_CFLAGS_DEBUG='@CFLAGS_DEBUG@'
@@ -35,7 +35,7 @@ TCL_CFLAGS_OPTIMIZE='@CFLAGS_OPTIMIZE@'
 TCL_SHARED_BUILD=@TCL_SHARED_BUILD@
 
 # The name of the Tcl library (may be either a .a file or a shared library):
-TCL_LIB_FILE=@TCL_LIB_FILE@
+TCL_LIB_FILE='@TCL_LIB_FILE@'
 
 # Additional libraries to use when linking Tcl.
 TCL_LIBS='@DL_LIBS@ @LIBS@ @MATH_LIBS@'