Date: Wed Dec 08 12:21:25 PST 2004
Files: unix/tcl.m4 unix/Makefile.in unix/configure.in unix/tkConfig.sh.in

--- unix/Makefile.in.die-dbgx-die.old	2004-12-08 11:32:57.000000000 -0800
+++ unix/Makefile.in	2004-12-08 12:20:53.000000000 -0800
@@ -96,14 +96,11 @@
 # The linker flags needed to link in the Tcl library (ex: -ltcl8.2)
 TCL_LIB_FLAG		= @TCL_LIB_FLAG@
 
-# Libraries built with optimization switches have this additional extension
-TK_DBGX			= @TK_DBGX@
-
 # Flag, 1: we're building a shared lib, 0 we're not
 TK_SHARED_BUILD		= @TK_SHARED_BUILD@
 
 # Directory in which to install the pkgIndex.tcl file for loadable Tk
-PKG_INSTALL_DIR		= $(LIB_INSTALL_DIR)/tk$(VERSION)$(TK_DBGX)
+PKG_INSTALL_DIR		= $(LIB_INSTALL_DIR)/tk$(VERSION)
 
 # Package index file for loadable Tk
 PKG_INDEX		= $(PKG_INSTALL_DIR)/pkgIndex.tcl
--- unix/configure.in.die-dbgx-die.old	2004-12-08 11:32:58.000000000 -0800
+++ unix/configure.in	2004-12-08 12:19:17.000000000 -0800
@@ -101,8 +101,6 @@
 
 SC_ENABLE_SYMBOLS
 
-TK_DBGX=${DBGX}
-
 #--------------------------------------------------------------------
 #	Detect what compiler flags to set for 64-bit support.
 #--------------------------------------------------------------------
@@ -356,9 +354,9 @@
 
 if test "$SHARED_BUILD" = 0 -o $TCL_NEEDS_EXP_FILE = 0; then
     if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
-	eval TK_LIB_FLAG="-ltk${VERSION}\${TK_DBGX}"
+	eval TK_LIB_FLAG="-ltk${VERSION}"
     else
-	eval TK_LIB_FLAG="-ltk`echo ${VERSION} | tr -d .`\${TK_DBGX}"
+	eval TK_LIB_FLAG="-ltk`echo ${VERSION} | tr -d .`"
     fi
     TK_BUILD_LIB_SPEC="-L`pwd` ${TK_LIB_FLAG}"
     TK_LIB_SPEC="-L${libdir} ${TK_LIB_FLAG}"
@@ -391,9 +389,9 @@
 eval "TK_STUB_LIB_FILE=libtkstub${TK_UNSHARED_LIB_SUFFIX}"
 
 if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
-    eval TK_STUB_LIB_FLAG="-ltkstub${TK_VERSION}\${TK_DBGX}"
+    eval TK_STUB_LIB_FLAG="-ltkstub${TK_VERSION}"
 else
-    eval TK_STUB_LIB_FLAG="-ltkstub`echo ${TK_VERSION} | tr -d .`\${TK_DBGX}"
+    eval TK_STUB_LIB_FLAG="-ltkstub`echo ${TK_VERSION} | tr -d .`"
 fi
 
 TK_BUILD_STUB_LIB_SPEC="-L`pwd` ${TK_STUB_LIB_FLAG}"
@@ -410,7 +408,6 @@
 AC_SUBST(TK_MAJOR_VERSION)
 AC_SUBST(TK_MINOR_VERSION)
 AC_SUBST(TK_PATCH_LEVEL)
-AC_SUBST(TK_DBGX)
 
 AC_SUBST(TK_STUB_LIB_FILE)
 AC_SUBST(TK_STUB_LIB_FLAG)
--- unix/tkConfig.sh.in.die-dbgx-die.old	2003-09-24 22:36:08.000000000 -0700
+++ unix/tkConfig.sh.in	2004-12-08 12:20:45.000000000 -0800
@@ -25,8 +25,10 @@
 # Flag, 1: we built a shared lib, 0 we didn't
 TK_SHARED_BUILD=@TK_SHARED_BUILD@
 
-# This indicates if Tk was build with debugging symbols
-TK_DBGX=@TK_DBGX@
+
+# TK_DBGX used to be used to distinguish debug vs. non-debug builds.
+# This was a righteous pain so the core doesn't do that any more.
+TK_DBGX=
 
 # The name of the Tk library (may be either a .a file or a shared library):
 TK_LIB_FILE='@TK_LIB_FILE@'
