Index: TODO
===================================================================
diff -u -rb6041f25a964a06f528ccd27ad62fa95f95a931f -rb0adbc0c160788b189124e9988437ef7f2ec036c
--- TODO	(.../TODO)	(revision b6041f25a964a06f528ccd27ad62fa95f95a931f)
+++ TODO	(.../TODO)	(revision b0adbc0c160788b189124e9988437ef7f2ec036c)
@@ -2368,6 +2368,8 @@
     set instance variables)
 - extend regression test
 
+- configure: added flag --with-profile to enable profiling support
+
 TODO:
 
 - serializer: check, why catch is needed for object-level alias 
Index: configure
===================================================================
diff -u -r56203e2407067a525919ac3f5b7d0869eb711a3d -rb0adbc0c160788b189124e9988437ef7f2ec036c
--- configure	(.../configure)	(revision 56203e2407067a525919ac3f5b7d0869eb711a3d)
+++ configure	(.../configure)	(revision b0adbc0c160788b189124e9988437ef7f2ec036c)
@@ -742,6 +742,7 @@
 with_actiweb
 with_all
 with_expat
+with_profile
 with_tcl
 with_tclinclude
 enable_threads
@@ -1401,6 +1402,8 @@
   --with-expat=sys assumes a system-wide expat installation,
            --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 built with profile support
   --with-tcl              directory containing tcl configuration
                           (tclConfig.sh)
   --with-tclinclude       directory containing the public Tcl header files
@@ -2379,6 +2382,14 @@
 fi
 
 
+# Check whether --with-profile was given.
+if test "${with_profile+set}" = set; then :
+  withval=$with_profile; with_profile=$withval
+else
+  with_profile=no
+fi
+
+
 subdirs=""
 
 if test "$with_all" = yes; then
@@ -5510,6 +5521,12 @@
    HAVE_TCL_COMPILE_H=""
 fi
 
+if test "$with_profile" = yes; then
+   NSF_PROFILE_FLAG="-DNSF_PROFILE=1"
+else
+   NSF_PROFILE_FLAG=""
+fi
+
 #-----------------------------------------------------------------------
 # __CHANGE__
 # Specify the C source files to compile in TEA_ADD_SOURCES,
@@ -5588,7 +5605,7 @@
 
 
     PKG_CFLAGS="$PKG_CFLAGS -DNSF_VERSION=\\\"$NSF_VERSION\\\" -DNSF_PATCHLEVEL=\\\"$NSF_PATCH_LEVEL\\\" \
-	$AOL_DEFINES $HAVE_TCL_COMPILE_H"
+	$AOL_DEFINES $HAVE_TCL_COMPILE_H $NSF_PROFILE_FLAG"
 
 
 
Index: configure.in
===================================================================
diff -u -r56203e2407067a525919ac3f5b7d0869eb711a3d -rb0adbc0c160788b189124e9988437ef7f2ec036c
--- configure.in	(.../configure.in)	(revision 56203e2407067a525919ac3f5b7d0869eb711a3d)
+++ configure.in	(.../configure.in)	(revision b0adbc0c160788b189124e9988437ef7f2ec036c)
@@ -48,14 +48,18 @@
            --with-expat=<INC_DIR,LIB_DIR> point to a custom expat installation,
            --without-expat falls back to the bundled expat installation],
         [with_expat=$withval],[with_expat=bundle])
+AC_ARG_WITH(profile,
+        [  --with-profile=yes|no,
+	   --without-profile disables built with profile support],
+        [with_profile=$withval], [with_profile=no])
 
 subdirs=""
 
 if test "$with_all" = yes; then
    with_actiweb=yes
    with_gdbm=yes
 fi
-   
+
 if test "$with_actiweb" = yes; then
    test_actiweb="test-actiweb"
    libdirs_actiweb="actiweb rdf registry store xml patterns"
@@ -171,6 +175,12 @@
    HAVE_TCL_COMPILE_H=""
 fi
 
+if test "$with_profile" = yes; then
+   NSF_PROFILE_FLAG="-DNSF_PROFILE=1"
+else
+   NSF_PROFILE_FLAG=""
+fi
+
 #-----------------------------------------------------------------------
 # __CHANGE__
 # Specify the C source files to compile in TEA_ADD_SOURCES,
@@ -188,7 +198,7 @@
 TEA_ADD_INCLUDES([])
 TEA_ADD_LIBS([])
 TEA_ADD_CFLAGS([-DNSF_VERSION=\\\"$NSF_VERSION\\\" -DNSF_PATCHLEVEL=\\\"$NSF_PATCH_LEVEL\\\" \
-	$AOL_DEFINES $HAVE_TCL_COMPILE_H])
+	$AOL_DEFINES $HAVE_TCL_COMPILE_H $NSF_PROFILE_FLAG])
 TEA_ADD_STUB_SOURCES([nsfStubLib.c])
 TEA_ADD_TCL_SOURCES([])
 
Index: generic/nsf.h
===================================================================
diff -u -r7f1ad54528440269c6a26b63c1cb0f0d35001e9c -rb0adbc0c160788b189124e9988437ef7f2ec036c
--- generic/nsf.h	(.../nsf.h)	(revision 7f1ad54528440269c6a26b63c1cb0f0d35001e9c)
+++ generic/nsf.h	(.../nsf.h)	(revision b0adbc0c160788b189124e9988437ef7f2ec036c)
@@ -73,7 +73,6 @@
    of running the program
 #define NSF_PROFILE 1
 */
-//#define NSF_PROFILE 1
 
 /* are we developing?
 #define NSF_DEVELOPMENT 1