Index: generic/nsfDebug.c
===================================================================
diff -u -r7495af656ca04a32826ecb0b6e207f886eaaa7f8 -r5783e727c52c408aeecaca7f2870ea732ee3fc2d
--- generic/nsfDebug.c	(.../nsfDebug.c)	(revision 7495af656ca04a32826ecb0b6e207f886eaaa7f8)
+++ generic/nsfDebug.c	(.../nsfDebug.c)	(revision 5783e727c52c408aeecaca7f2870ea732ee3fc2d)
@@ -43,57 +43,36 @@
  *
  *----------------------------------------------------------------------
  */
+
 void
 NsfReportVars(Tcl_Interp *interp) {
 
   Tcl_SetVar(interp, "::nsf::version", NSF_VERSION, TCL_GLOBAL_ONLY);
   Tcl_SetVar(interp, "::nsf::patchLevel", NSF_PATCHLEVEL, TCL_GLOBAL_ONLY);
+  
   Tcl_SetVar(interp, "::nsf::config(development)", 
-#if defined(NSF_DEVELOPMENT)
-	     "1",
-#else
-	     "0",
-#endif
+	     NsfConfigEnabled(NSF_DEVELOPMENT),
 	     TCL_GLOBAL_ONLY);
-
+  
+  
   Tcl_SetVar(interp, "::nsf::config(memcount)", 
-#if defined(NSF_MEM_COUNT)
-	     "1",
-#else
-	     "0",
-#endif
+	     NsfConfigEnabled(NSF_MEM_COUNT),
 	     TCL_GLOBAL_ONLY);
 
   Tcl_SetVar(interp, "::nsf::config(memtrace)", 
-#if defined(NSF_MEM_TRACE)
-	     "1",
-#else
-	     "0",
-#endif
+	     NsfConfigEnabled(NSF_MEM_TRACE),
 	     TCL_GLOBAL_ONLY);
-
+  
   Tcl_SetVar(interp, "::nsf::config(profile)", 
-#if defined(NSF_PROFILE)
-	     "1",
-#else
-	     "0",
-#endif
+	     NsfConfigEnabled(NSF_PROFILE),
 	     TCL_GLOBAL_ONLY);
-
+  
   Tcl_SetVar(interp, "::nsf::config(dtrace)", 
-#if defined(NSF_DTRACE)
-	     "1",
-#else
-	     "0",
-#endif
+	     NsfConfigEnabled(NSF_DTRACE),
 	     TCL_GLOBAL_ONLY);
-
+  
   Tcl_SetVar(interp, "::nsf::config(assertions)", 
-#if defined(NSF_WITH_ASSERTIONS)
-	     "1",
-#else
-	     "0",
-#endif
+	     NsfConfigEnabled(NSF_WITH_ASSERTIONS),
 	     TCL_GLOBAL_ONLY);
 }