Index: configure
===================================================================
diff -u -rb03af92ee24792b6ea79e8d7ff39a3571997f975 -r7c0fa49f01d0a37ccb4e36778e72ac1c1e3f6b30
--- configure	(.../configure)	(revision b03af92ee24792b6ea79e8d7ff39a3571997f975)
+++ configure	(.../configure)	(revision 7c0fa49f01d0a37ccb4e36778e72ac1c1e3f6b30)
@@ -742,8 +742,10 @@
 with_aolserver3
 with_actiweb
 with_expat
-with_profile
-enable_dtrace
+with_dtrace
+enable_profile
+enable_memcount
+enable_development
 with_tcl
 with_tclinclude
 enable_threads
@@ -1375,7 +1377,12 @@
   --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-dtrace         build with dtrace (default: off)
+  --enable-profile        build nsf with profile support (default disabled)
+  --enable-memcount=yes|trace
+                          build nsf with memcount debug support (default
+                          disabled)
+  --enable-development    build nsf with development support (assertion
+                          checking, etc.; default disabled)
   --enable-threads        build with threads
   --enable-shared         build and link with shared libraries (default: on)
   --enable-64bit          enable 64bit support (default: off)
@@ -1399,8 +1406,7 @@
                           --with-expat=<INC_DIR,LIB_DIR> point to a custom
                           expat installation, --without-expat falls back to
                           the bundled expat installation
-  --with-profile=yes|no   --without-profile disables builds with profile
-                          support
+  --with-dtrace           build nsf with dtrace (default: without)
   --with-tcl              directory containing tcl configuration
                           (tclConfig.sh)
   --with-tclinclude       directory containing the public Tcl header files
@@ -2337,8 +2343,11 @@
 #--------------------------------------------------------------------
 # specify some extra flags
 #--------------------------------------------------------------------
+# According to http://www.gnu.org/software/autoconf/manual/autoconf.html
+#  - "with" is for external software (optional packages)
+#  - "enable" is for optional features
+#
 
-
 # Check whether --with-gdbm was given.
 if test "${with_gdbm+set}" = set; then :
   withval=$with_gdbm; with_gdbm=$withval
@@ -2371,21 +2380,35 @@
 fi
 
 
-# Check whether --with-profile was given.
-if test "${with_profile+set}" = set; then :
-  withval=$with_profile; with_profile=$withval
+# Check whether --with-dtrace was given.
+if test "${with_dtrace+set}" = set; then :
+  withval=$with_dtrace; with_dtrace=$enableval
 else
-  with_profile=no
+  with_dtrace=no
 fi
 
-# Check whether --enable-dtrace was given.
-if test "${enable_dtrace+set}" = set; then :
-  enableval=$enable_dtrace; enable_dtrace=$enableval
+# Check whether --enable-profile was given.
+if test "${enable_profile+set}" = set; then :
+  enableval=$enable_profile; enable_profile=$enableval
 else
-  enable_dtrace=no
+  enable_profile=no
 fi
 
+# Check whether --enable-memcount was given.
+if test "${enable_memcount+set}" = set; then :
+  enableval=$enable_memcount; enable_memcount=$enableval
+else
+  enable_memcount=no
+fi
 
+# Check whether --enable-development was given.
+if test "${enable_development+set}" = set; then :
+  enableval=$enable_development; enable_development=$enableval
+else
+  enable_development=no
+fi
+
+
 subdirs=""
 
 if test "$with_actiweb" = yes; then
@@ -2426,7 +2449,6 @@
 NSF_MINOR_VERSION=0
 
 NSF_PATCH_LEVEL=$PACKAGE_VERSION
-#NSF_PATCH_LEVEL=${NSF_MAJOR_VERSION}.${NSF_MINOR_VERSION}.${NSF_RELEASE_SERIAL}
 
 NSF_VERSION=${NSF_MAJOR_VERSION}.${NSF_MINOR_VERSION}
 NODOT_VERSION=${NSF_MAJOR_VERSION}${NSF_MINOR_VERSION}
@@ -5512,14 +5534,31 @@
 
 fi
 
-if test "$with_profile" = yes; then
+if test "$enable_profile" = yes; then
 
 $as_echo "#define NSF_PROFILE 1" >>confdefs.h
 
 fi
 
+if test "$enable_development" = yes; then
+
+$as_echo "#define NSF_DEVLOPMENT 1" >>confdefs.h
+
+fi
+
+if test "$enable_memcount" = yes; then
+
+$as_echo "#define NSF_MEM_COUNT 1" >>confdefs.h
+
+fi
+if test "$enable_memcount" = trace; then
+
+$as_echo "#define NSF_MEM_TRACE 1" >>confdefs.h
+
+fi
+
 DTRACE_OBJ=
-if test "$enable_dtrace" = yes; then
+if test "$with_dtrace" = yes; then
 
 $as_echo "#define NSF_DTRACE 1" >>confdefs.h