Remove unrelated ::tk::pkgconfig variables: compile_debug and compile_stats. Adjust test. Add copyright.

2 files changed, 13 insertions, 19 deletions

diff --git a/generic/tkPkgConfig.c b/generic/tkPkgConfig.c
index 8ea2c29..56aa106 100644
--- a/generic/tkPkgConfig.c
+++ b/generic/tkPkgConfig.c
@@ -5,6 +5,7 @@
  *	binary library.
  *
  * Copyright (c) 2002 Andreas Kupries <andreas_kupries@users.sourceforge.net>
+ * Copyright (c) 2017 Stuart Cassoff <stwo@users.sourceforge.net>
  *
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
@@ -16,16 +17,17 @@
  * OSCMa  = shortcut for "old style configuration macro activates"
  * NSCMdt = shortcut for "new style configuration macro declares that"
  *
- * - TCL_THREADS		OSCMa compilation as threaded core.
+ * - TCL_THREADS		OSCMa compilation as threaded.
  * - TCL_MEM_DEBUG		OSCMa memory debugging.
- * - TCL_COMPILE_DEBUG		OSCMa debugging of bytecode compiler.
- * - TCL_COMPILE_STATS		OSCMa bytecode compiler statistics.
  *
  * - 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.
- * - HAVE_XFT			NSCMdt tk is compiled with xft font support.
+ *
+ * - _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.
  *
  * - CFG_RUNTIME_*		Paths to various stuff at runtime.
  * - CFG_INSTALL_*		Paths to various stuff at installation time.
@@ -58,18 +60,6 @@
 #  define CFG_MEMDEBUG		"0"
 #endif
 
-#ifdef TCL_COMPILE_DEBUG
-#  define CFG_COMPILE_DEBUG	"1"
-#else
-#  define CFG_COMPILE_DEBUG	"0"
-#endif
-
-#ifdef TCL_COMPILE_STATS
-#  define CFG_COMPILE_STATS	"1"
-#else
-#  define CFG_COMPILE_STATS	"0"
-#endif
-
 #ifdef TCL_CFG_DO64BIT
 #  define CFG_64		"1"
 #else
@@ -111,8 +101,6 @@ static Tcl_Config const cfg[] = {
     {"64bit",			CFG_64},
     {"optimized",		CFG_OPTIMIZED},
     {"mem_debug",		CFG_MEMDEBUG},
-    {"compile_debug",		CFG_COMPILE_DEBUG},
-    {"compile_stats",		CFG_COMPILE_STATS},
     {"fontsystem",		CFG_FONTSYSTEM},
 
     /* Runtime paths to various stuff */
diff --git a/tests/pkgconfig.test b/tests/pkgconfig.test
index 5cb5081..1694eea 100644
--- a/tests/pkgconfig.test
+++ b/tests/pkgconfig.test
@@ -8,6 +8,7 @@
 # Copyright (c) 1991-1993 The Regents of the University of California.
 # Copyright (c) 1994-1996 Sun Microsystems, Inc.
 # Copyright (c) 1998-1999 by Scriptics Corporation.
+# Copyright (c) 2017 Stuart Cassoff <stwo@users.sourceforge.net>
 #
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
@@ -19,7 +20,12 @@ tcltest::loadTestedCommands
 
 test pkgconfig-1.1 {query keys} {
     lsort [::tk::pkgconfig list]
-} {64bit bindir,install bindir,runtime compile_debug compile_stats debug demodir,install demodir,runtime docdir,install docdir,runtime fontsystem includedir,install includedir,runtime libdir,install libdir,runtime mem_debug optimized profiled scriptdir,install scriptdir,runtime threaded}
+} [list \
+    64bit bindir,install bindir,runtime debug demodir,install demodir,runtime \
+    docdir,install docdir,runtime fontsystem includedir,install includedir,runtime \
+    libdir,install libdir,runtime mem_debug optimized profiled \
+    scriptdir,install scriptdir,runtime threaded \
+]
 test pkgconfig-1.2 {query keys multiple times} {
     string compare [::tk::pkgconfig list] [::tk::pkgconfig list]
 } 0