Index: TODO
===================================================================
diff -u -r96716c484bb18d390fef1eecdca764b56121dc4d -rb3c57743ba237eec2a7bae9f920d8728997766cf
--- TODO	(.../TODO)	(revision 96716c484bb18d390fef1eecdca764b56121dc4d)
+++ TODO	(.../TODO)	(revision b3c57743ba237eec2a7bae9f920d8728997766cf)
@@ -1898,6 +1898,10 @@
 - disallow type "switch" for positional arguments (use boolean instead)
 - extended regression test
 
+- configure.in: removed --with-tclinclude option, since it
+  appears to be included in tcl.m4 (since a while). Many thanks
+  to Victor Guerra for noticing it.
+
 TODO:
 
 - For preexisting namespaces, we do not set the deleteProc. 
Index: configure
===================================================================
diff -u -r8651e9f7d6d526196cfe4dad14d08b857a66f5d8 -rb3c57743ba237eec2a7bae9f920d8728997766cf
--- configure	(.../configure)	(revision 8651e9f7d6d526196cfe4dad14d08b857a66f5d8)
+++ configure	(.../configure)	(revision b3c57743ba237eec2a7bae9f920d8728997766cf)
@@ -1347,7 +1347,6 @@
            --without-actiweb disables actiweb components
   --with-all=yes|no,
 	   --without-all disables built of all
-  --with-tclinclude       directory containing the public Tcl  header files.
   --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
@@ -1980,12 +1979,6 @@
 fi
 
 
-# Check whether --with-tclinclude was given.
-if test "${with_tclinclude+set}" = set; then
-  withval=$with_tclinclude; with_tclinclude=${withval}
-fi
-
-
 # Check whether --with-expat was given.
 if test "${with_expat+set}" = set; then
   withval=$with_expat; with_expat=$withval
@@ -7059,16 +7052,6 @@
 echo "${ECHO_T}${result}" >&6; }
 
 
-if test x"${with_tclinclude}" != x ; then
-   if test -f "${with_tclinclude}/tcl.h" ; then
-      TCL_INCLUDES="-I${with_tclinclude} ${TCL_INCLUDES}"
-   else
-      { { echo "$as_me:$LINENO: error: ${with_tclinclude} directory does not contain Tcl header file tcl.h" >&5
-echo "$as_me: error: ${with_tclinclude} directory does not contain Tcl header file tcl.h" >&2;}
-   { (exit 1); exit 1; }; }
-   fi
-fi
-
 #--------------------------------------------------------------------
 # __CHANGE__
 # A few miscellaneous platform-specific items:
Index: configure.in
===================================================================
diff -u -r8651e9f7d6d526196cfe4dad14d08b857a66f5d8 -rb3c57743ba237eec2a7bae9f920d8728997766cf
--- configure.in	(.../configure.in)	(revision 8651e9f7d6d526196cfe4dad14d08b857a66f5d8)
+++ configure.in	(.../configure.in)	(revision b3c57743ba237eec2a7bae9f920d8728997766cf)
@@ -43,9 +43,6 @@
         [  --with-all=yes|no,
 	   --without-all disables built of all],
         [with_all=$withval], [with_all=no])
-AC_ARG_WITH(tclinclude, 
-        [  --with-tclinclude       directory containing the public Tcl  header files.], 
-         with_tclinclude=${withval})
 AC_ARG_WITH(expat,
         [  --with-expat=sys assumes a system-wide expat installation, 
            --with-expat=<INC_DIR,LIB_DIR> point to a custom expat installation,
@@ -199,14 +196,6 @@
 #TEA_PUBLIC_TCL_HEADERS
 TEA_PRIVATE_TCL_HEADERS
 
-if test x"${with_tclinclude}" != x ; then
-   if test -f "${with_tclinclude}/tcl.h" ; then
-      TCL_INCLUDES="-I${with_tclinclude} ${TCL_INCLUDES}"
-   else
-      AC_MSG_ERROR([${with_tclinclude} directory does not contain Tcl header file tcl.h])
-   fi
-fi
-
 #--------------------------------------------------------------------
 # __CHANGE__
 # A few miscellaneous platform-specific items:
Index: generic/nsf.h
===================================================================
diff -u -rc4db8ed59a42cf23cc9a7eac511e556d6b077f14 -rb3c57743ba237eec2a7bae9f920d8728997766cf
--- generic/nsf.h	(.../nsf.h)	(revision c4db8ed59a42cf23cc9a7eac511e556d6b077f14)
+++ generic/nsf.h	(.../nsf.h)	(revision b3c57743ba237eec2a7bae9f920d8728997766cf)
@@ -77,7 +77,7 @@
 /* are we developing?
 #define NSF_DEVELOPMENT 1
 */
-#define NSF_DEVELOPMENT 1
+//#define NSF_DEVELOPMENT 1
 
 /* activate/deacticate assert 
 #define NDEBUG 1