Index: generic/nsf.h
===================================================================
diff -u -r95c4d29515cfda9283b406ba7a7ac1dd029de8c9 -r7c0fa49f01d0a37ccb4e36778e72ac1c1e3f6b30
--- generic/nsf.h	(.../nsf.h)	(revision 95c4d29515cfda9283b406ba7a7ac1dd029de8c9)
+++ generic/nsf.h	(.../nsf.h)	(revision 7c0fa49f01d0a37ccb4e36778e72ac1c1e3f6b30)
@@ -78,7 +78,6 @@
 /* are we developing?
 #define NSF_DEVELOPMENT 1
 */
-#define NSF_DEVELOPMENT 1
 
 /* activate/deacticate assert 
 #define NDEBUG 1
@@ -96,8 +95,6 @@
 #define NSF_MEM_TRACE 1
 #define NSF_MEM_COUNT 1
 */
-//#define NSF_MEM_COUNT 1
-//#define NSF_MEM_TRACE 1
 //#define PARSE_TRACE 1
 
 /* turn  tracing output on/off
@@ -176,6 +173,10 @@
   CscFinish_(interp, cscPtr)
 #endif
 
+#if defined(NSF_MEM_TRACE) && !defined(NSF_MEM_COUNT)
+# define NSF_MEM_COUNT 1
+#endif
+
 #if defined(NSF_PROFILE) || defined(NSF_DTRACE)
 # define CscInit(cscPtr, object, cl, cmd, frametype, flags, method) \
   CscInit_(cscPtr, object, cl, cmd, frametype, flags); cscPtr->methodName = (method);