Remove some dead code

4 files changed, 12 insertions, 70 deletions

diff --git a/generic/tkPkgConfig.c b/generic/tkPkgConfig.c
index 2c32a18..44c5e5e 100644
--- a/generic/tkPkgConfig.c
+++ b/generic/tkPkgConfig.c
@@ -14,20 +14,9 @@
 /* Note, the definitions in this module are influenced by the following C
  * preprocessor macros:
  *
- * OSCMa  = shortcut for "old style configuration macro activates"
- * NSCMdt = shortcut for "new style configuration macro declares that"
- *
- * - TCL_THREADS		OSCMa compilation as threaded.
- * - TCL_MEM_DEBUG		OSCMa memory debugging.
- *
- * - TCL_CFG_DO64BIT		NSCMdt tk is compiled for a 64bit system.
- * - NDEBUG			NSCMdt tk is compiled with symbol info off.
- * - TCL_CFG_OPTIMIZED		NSCMdt tk is compiled with cc optimizations on
- * - TCL_CFG_PROFILED		NSCMdt tk is compiled with profiling info.
- *
  * - _WIN32 || __CYGWIN__	The value for the fontsytem key will be
  *   MAC_OSX_TK			chosen based on these macros/defines.
- *   HAVE_XFT			NSCMdt xft font support was requested.
+ *   HAVE_XFT			declares that xft font support was requested.
  *
  * - CFG_RUNTIME_*		Paths to various stuff at runtime.
  * - CFG_INSTALL_*		Paths to various stuff at installation time.
@@ -48,42 +37,6 @@
  * configuration information.
  */
 
-#ifdef TCL_THREADS
-#  define  CFG_THREADED		"1"
-#else
-#  define  CFG_THREADED		"0"
-#endif
-
-#ifdef TCL_MEM_DEBUG
-#  define CFG_MEMDEBUG		"1"
-#else
-#  define CFG_MEMDEBUG		"0"
-#endif
-
-#ifdef TCL_CFG_DO64BIT
-#  define CFG_64		"1"
-#else
-#  define CFG_64		"0"
-#endif
-
-#ifndef NDEBUG
-#  define CFG_DEBUG		"1"
-#else
-#  define CFG_DEBUG		"0"
-#endif
-
-#ifdef TCL_CFG_OPTIMIZED
-#  define CFG_OPTIMIZED		"1"
-#else
-#  define CFG_OPTIMIZED		"0"
-#endif
-
-#ifdef TCL_CFG_PROFILED
-#  define CFG_PROFILED		"1"
-#else
-#  define CFG_PROFILED		"0"
-#endif
-
 #if defined(_WIN32)
 #  define CFG_FONTSYSTEM	"gdi"
 #elif defined(MAC_OSX_TK)
diff --git a/unix/configure b/unix/configure
index a229774..5b92069 100755
--- a/unix/configure
+++ b/unix/configure
@@ -5219,16 +5219,12 @@ fi
 
 	    case $system in
 	    DragonFly-*|FreeBSD-*)
-		if test "${TCL_THREADS}" = "1"
-then :
-
-		    # The -pthread needs to go in the LDFLAGS, not LIBS
-		    LIBS=`echo $LIBS | sed s/-pthread//`
-		    CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-		    LDFLAGS="$LDFLAGS $PTHREAD_LIBS"
-fi
+		# The -pthread needs to go in the LDFLAGS, not LIBS
+		LIBS=`echo $LIBS | sed s/-pthread//`
+		CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+		LDFLAGS="$LDFLAGS $PTHREAD_LIBS"
 	    ;;
-            esac
+	    esac
 
 	    if test $doRpath = yes
 then :
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index 4a9fe40..7b84923 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -1276,13 +1276,12 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
 
 	    case $system in
 	    DragonFly-*|FreeBSD-*)
-		AS_IF([test "${TCL_THREADS}" = "1"], [
-		    # The -pthread needs to go in the LDFLAGS, not LIBS
-		    LIBS=`echo $LIBS | sed s/-pthread//`
-		    CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-		    LDFLAGS="$LDFLAGS $PTHREAD_LIBS"])
+		# The -pthread needs to go in the LDFLAGS, not LIBS
+		LIBS=`echo $LIBS | sed s/-pthread//`
+		CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+		LDFLAGS="$LDFLAGS $PTHREAD_LIBS"
 	    ;;
-            esac
+	    esac
 
 	    AS_IF([test $doRpath = yes], [
 		CC_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"'])
diff --git a/win/rc/tktest.rc b/win/rc/tktest.rc
index 7bfd44b..4dfb522 100644
--- a/win/rc/tktest.rc
+++ b/win/rc/tktest.rc
@@ -8,12 +8,6 @@
 //
 // build-up the name suffix that defines the type of build this is.
 //
-#if TCL_THREADS
-#define SUFFIX_THREADS	    "t"
-#else
-#define SUFFIX_THREADS	    ""
-#endif
-
 #if STATIC_BUILD
 #define SUFFIX_STATIC	    "s"
 #else
@@ -26,7 +20,7 @@
 #define SUFFIX_DEBUG	    ""
 #endif
 
-#define SUFFIX		    SUFFIX_THREADS SUFFIX_STATIC SUFFIX_DEBUG
+#define SUFFIX		    SUFFIX_STATIC SUFFIX_DEBUG
 
 
 VS_VERSION_INFO VERSIONINFO