Index: configure
===================================================================
diff -u -r60d83a2fa5b5b46b6aa49e61ccc4ac4533cfeb88 -rb37bf2deab94b6294509fa79bb7b922d6e8a5635
--- configure	(.../configure)	(revision 60d83a2fa5b5b46b6aa49e61ccc4ac4533cfeb88)
+++ configure	(.../configure)	(revision b37bf2deab94b6294509fa79bb7b922d6e8a5635)
@@ -742,6 +742,7 @@
 enable_profile
 enable_memcount
 enable_development
+enable_assertions
 with_tcl
 with_tclinclude
 enable_threads
@@ -1373,12 +1374,13 @@
   --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-profile        build nsf with profile support (default disabled)
+  --enable-profile        build nsf with profile support (default: disabled)
   --enable-memcount=yes|trace
-                          build nsf with memcount debug support (default
+                          build nsf with memcount debug support (default:
                           disabled)
-  --enable-development    build nsf with development support (assertion
-                          checking, etc.; default disabled)
+  --enable-development    build nsf with development support (intensive
+                          runtime checking, etc.; default: disabled)
+  --enable-assertions     build nsf with assertion support (default: enabled)
   --enable-threads        build with threads
   --enable-shared         build and link with shared libraries (default: on)
   --enable-64bit          enable 64bit support (default: off)
@@ -2404,7 +2406,14 @@
   enable_development=no
 fi
 
+# Check whether --enable-assertions was given.
+if test "${enable_assertions+set}" = set; then :
+  enableval=$enable_assertions; enable_assertions=$enableval
+else
+  enable_assertions=yes
+fi
 
+
 subdirs=""
 
 if test "$with_actiweb" = yes; then
@@ -5530,6 +5539,12 @@
 
 fi
 
+if test "$enable_assertions" = yes; then
+
+$as_echo "#define NSF_WITH_ASSERTIONS 1" >>confdefs.h
+
+fi
+
 if test "$enable_profile" = yes; then
 
 $as_echo "#define NSF_PROFILE 1" >>confdefs.h