Index: TODO
===================================================================
diff -u -r043dc9b94b99894cc9b7ad6b61e469f67023c705 -r6b67a152a9c351a6669aec517b4e982adeafb641
--- TODO	(.../TODO)	(revision 043dc9b94b99894cc9b7ad6b61e469f67023c705)
+++ TODO	(.../TODO)	(revision 6b67a152a9c351a6669aec517b4e982adeafb641)
@@ -1543,6 +1543,16 @@
 - added error handling to all scripted shells
 - removed old xotclsh.in and xowish.in (from apps/utils)
 
+- altered xotcl.m4 to nsf.m4 in 
+   ., 
+   library/xotcl/library/store/XOTclGdbm/, 
+   library/xotcl/library/store/XOTclSdbm/, 
+   library/xotcl/library/xml/TclExpat-1.1/
+
+- removed build flags with-nxsh, with-xowish
+  (since these are scripted now)
+- removed flag --with-tk (not needed anymore)
+
 TODO: 
 - extend coro regression test
 - remove traces of xowish. remove tclAppInt?
Index: configure
===================================================================
diff -u -r043dc9b94b99894cc9b7ad6b61e469f67023c705 -r6b67a152a9c351a6669aec517b4e982adeafb641
--- configure	(.../configure)	(revision 043dc9b94b99894cc9b7ad6b61e469f67023c705)
+++ configure	(.../configure)	(revision 6b67a152a9c351a6669aec517b4e982adeafb641)
@@ -681,17 +681,6 @@
 TCL_EXTRA_CFLAGS
 TCL_LD_FLAGS
 TCL_SHLIB_LD_LIBS
-TK_VERSION
-TK_BIN_DIR
-TK_SRC_DIR
-TK_LIB_FILE
-TK_LIB_FLAG
-TK_LIB_SPEC
-TK_STUB_LIB_FILE
-TK_STUB_LIB_FLAG
-TK_STUB_LIB_SPEC
-TK_LIBS
-TK_XINCLUDES
 CC
 CFLAGS
 LDFLAGS
@@ -1356,10 +1345,6 @@
            --without-aolserver3 disables build of AOLserver 3 module
   --with-actiweb=yes|no,
            --without-actiweb disables actiweb components
-  --with-nxsh=yes|no,
-	   --without-nxsh disables built of nxsh
-  --with-xowish=yes|no,
-	   --without-xowish disables built of xowish
   --with-all=yes|no,
 	   --without-all disables built of all
   --with-tclinclude       directory containing the public Tcl  header files.
@@ -1368,7 +1353,6 @@
            --without-expat falls back to the bundled expat installation
   --with-tcl              directory containing tcl configuration
                           (tclConfig.sh)
-  --with-tk               directory containing tk configuration (tkConfig.sh)
   --with-tclinclude       directory containing the public Tcl header files
   --with-celib=DIR        use Windows/CE support library from DIR
 
@@ -1988,22 +1972,6 @@
 fi
 
 
-# Check whether --with-nxsh was given.
-if test "${with_nxsh+set}" = set; then
-  withval=$with_nxsh; with_nxsh=$withval
-else
-  with_nxsh=no
-fi
-
-
-# Check whether --with-xowish was given.
-if test "${with_xowish+set}" = set; then
-  withval=$with_xowish; with_xowish=$withval
-else
-  with_xowish=no
-fi
-
-
 # Check whether --with-all was given.
 if test "${with_all+set}" = set; then
   withval=$with_all; with_all=$withval
@@ -2030,8 +1998,6 @@
 
 if test "$with_all" = yes; then
    with_actiweb=yes
-   with_nxsh=yes
-   with_xowish=yes
    with_gdbm=yes
 fi
 
@@ -2057,9 +2023,6 @@
 
 
 
-if test "$with_tk" = no; then with_xowish="" ; fi
-if test "$with_nxsh" = yes; then NXSH="nxsh" ; else NXSH=""; fi
-if test "$with_xowish" = yes;  then XOWISH="xowish"   ; else XOWISH=""; fi
 
 
 #--------------------------------------------------------------------
@@ -2355,250 +2318,7 @@
 # check for TK
 #--------------------------------------------------------------------
 
-if test "$with_xowish" = yes; then
 
-    #
-    # Ok, lets find the tk configuration
-    # First, look for one uninstalled.
-    # the alternative search directory is invoked by --with-tk
-    #
-
-    if test x"${no_tk}" = x ; then
-	# we reset no_tk in case something fails here
-	no_tk=true
-
-# Check whether --with-tk was given.
-if test "${with_tk+set}" = set; then
-  withval=$with_tk; with_tkconfig="${withval}"
-fi
-
-	{ echo "$as_me:$LINENO: checking for Tk configuration" >&5
-echo $ECHO_N "checking for Tk configuration... $ECHO_C" >&6; }
-	if test "${ac_cv_c_tkconfig+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-
-	    # First check to see if --with-tkconfig was specified.
-	    if test x"${with_tkconfig}" != x ; then
-		case "${with_tkconfig}" in
-		    */tkConfig.sh )
-			if test -f "${with_tkconfig}"; then
-			    { echo "$as_me:$LINENO: WARNING: --with-tk argument should refer to directory containing tkConfig.sh, not to tkConfig.sh itself" >&5
-echo "$as_me: WARNING: --with-tk argument should refer to directory containing tkConfig.sh, not to tkConfig.sh itself" >&2;}
-			    with_tkconfig="`echo "${with_tkconfig}" | sed 's!/tkConfig\.sh$!!'`"
-			fi ;;
-		esac
-		if test -f "${with_tkconfig}/tkConfig.sh" ; then
-		    ac_cv_c_tkconfig="`(cd "${with_tkconfig}"; pwd)`"
-		else
-		    { { echo "$as_me:$LINENO: error: ${with_tkconfig} directory doesn't contain tkConfig.sh" >&5
-echo "$as_me: error: ${with_tkconfig} directory doesn't contain tkConfig.sh" >&2;}
-   { (exit 1); exit 1; }; }
-		fi
-	    fi
-
-	    # then check for a private Tk library
-	    if test x"${ac_cv_c_tkconfig}" = x ; then
-		for i in \
-			../tk \
-			`ls -dr ../tk[8-9].[0-9].[0-9]* 2>/dev/null` \
-			`ls -dr ../tk[8-9].[0-9] 2>/dev/null` \
-			`ls -dr ../tk[8-9].[0-9]* 2>/dev/null` \
-			../../tk \
-			`ls -dr ../../tk[8-9].[0-9].[0-9]* 2>/dev/null` \
-			`ls -dr ../../tk[8-9].[0-9] 2>/dev/null` \
-			`ls -dr ../../tk[8-9].[0-9]* 2>/dev/null` \
-			../../../tk \
-			`ls -dr ../../../tk[8-9].[0-9].[0-9]* 2>/dev/null` \
-			`ls -dr ../../../tk[8-9].[0-9] 2>/dev/null` \
-			`ls -dr ../../../tk[8-9].[0-9]* 2>/dev/null` ; do
-		    if test "${TEA_PLATFORM}" = "windows" \
-			    -a -f "$i/win/tkConfig.sh" ; then
-			ac_cv_c_tkconfig="`(cd $i/win; pwd)`"
-			break
-		    fi
-		    if test -f "$i/unix/tkConfig.sh" ; then
-			ac_cv_c_tkconfig="`(cd $i/unix; pwd)`"
-			break
-		    fi
-		done
-	    fi
-
-	    # on Darwin, check in Framework installation locations
-	    if test "`uname -s`" = "Darwin" -a x"${ac_cv_c_tkconfig}" = x ; then
-		for i in `ls -d ~/Library/Frameworks 2>/dev/null` \
-			`ls -d /Library/Frameworks 2>/dev/null` \
-			`ls -d /Network/Library/Frameworks 2>/dev/null` \
-			`ls -d /System/Library/Frameworks 2>/dev/null` \
-			; do
-		    if test -f "$i/Tk.framework/tkConfig.sh" ; then
-			ac_cv_c_tkconfig="`(cd $i/Tk.framework; pwd)`"
-			break
-		    fi
-		done
-	    fi
-
-	    # check in a few common install locations
-	    if test x"${ac_cv_c_tkconfig}" = x ; then
-		for i in `ls -d ${libdir} 2>/dev/null` \
-			`ls -d ${exec_prefix}/lib 2>/dev/null` \
-			`ls -d ${prefix}/lib 2>/dev/null` \
-			`ls -d /usr/local/lib 2>/dev/null` \
-			`ls -d /usr/contrib/lib 2>/dev/null` \
-			`ls -d /usr/lib 2>/dev/null` \
-			`ls -d /usr/lib64 2>/dev/null` \
-			; do
-		    if test -f "$i/tkConfig.sh" ; then
-			ac_cv_c_tkconfig="`(cd $i; pwd)`"
-			break
-		    fi
-		done
-	    fi
-
-	    # TEA specific: on Windows, check in common installation locations
-	    if test "${TEA_PLATFORM}" = "windows" \
-		-a x"${ac_cv_c_tkconfig}" = x ; then
-		for i in `ls -d C:/Tcl/lib 2>/dev/null` \
-			`ls -d C:/Progra~1/Tcl/lib 2>/dev/null` \
-			; do
-		    if test -f "$i/tkConfig.sh" ; then
-			ac_cv_c_tkconfig="`(cd $i; pwd)`"
-			break
-		    fi
-		done
-	    fi
-
-	    # check in a few other private locations
-	    if test x"${ac_cv_c_tkconfig}" = x ; then
-		for i in \
-			${srcdir}/../tk \
-			`ls -dr ${srcdir}/../tk[8-9].[0-9].[0-9]* 2>/dev/null` \
-			`ls -dr ${srcdir}/../tk[8-9].[0-9] 2>/dev/null` \
-			`ls -dr ${srcdir}/../tk[8-9].[0-9]* 2>/dev/null` ; do
-		    if test "${TEA_PLATFORM}" = "windows" \
-			    -a -f "$i/win/tkConfig.sh" ; then
-			ac_cv_c_tkconfig="`(cd $i/win; pwd)`"
-			break
-		    fi
-		    if test -f "$i/unix/tkConfig.sh" ; then
-			ac_cv_c_tkconfig="`(cd $i/unix; pwd)`"
-			break
-		    fi
-		done
-	    fi
-
-fi
-
-
-	if test x"${ac_cv_c_tkconfig}" = x ; then
-	    TK_BIN_DIR="# no Tk configs found"
-	    { { echo "$as_me:$LINENO: error: Can't find Tk configuration definitions" >&5
-echo "$as_me: error: Can't find Tk configuration definitions" >&2;}
-   { (exit 1); exit 1; }; }
-	else
-	    no_tk=
-	    TK_BIN_DIR="${ac_cv_c_tkconfig}"
-	    { echo "$as_me:$LINENO: result: found ${TK_BIN_DIR}/tkConfig.sh" >&5
-echo "${ECHO_T}found ${TK_BIN_DIR}/tkConfig.sh" >&6; }
-	fi
-    fi
-
-
-    { echo "$as_me:$LINENO: checking for existence of ${TK_BIN_DIR}/tkConfig.sh" >&5
-echo $ECHO_N "checking for existence of ${TK_BIN_DIR}/tkConfig.sh... $ECHO_C" >&6; }
-
-    if test -f "${TK_BIN_DIR}/tkConfig.sh" ; then
-        { echo "$as_me:$LINENO: result: loading" >&5
-echo "${ECHO_T}loading" >&6; }
-	. "${TK_BIN_DIR}/tkConfig.sh"
-    else
-        { echo "$as_me:$LINENO: result: could not find ${TK_BIN_DIR}/tkConfig.sh" >&5
-echo "${ECHO_T}could not find ${TK_BIN_DIR}/tkConfig.sh" >&6; }
-    fi
-
-    # eval is required to do the TK_DBGX substitution
-    eval "TK_LIB_FILE=\"${TK_LIB_FILE}\""
-    eval "TK_STUB_LIB_FILE=\"${TK_STUB_LIB_FILE}\""
-
-    # If the TK_BIN_DIR is the build directory (not the install directory),
-    # then set the common variable name to the value of the build variables.
-    # For example, the variable TK_LIB_SPEC will be set to the value
-    # of TK_BUILD_LIB_SPEC. An extension should make use of TK_LIB_SPEC
-    # instead of TK_BUILD_LIB_SPEC since it will work with both an
-    # installed and uninstalled version of Tcl.
-    if test -f "${TK_BIN_DIR}/Makefile" ; then
-        TK_LIB_SPEC="${TK_BUILD_LIB_SPEC}"
-        TK_STUB_LIB_SPEC="${TK_BUILD_STUB_LIB_SPEC}"
-        TK_STUB_LIB_PATH="${TK_BUILD_STUB_LIB_PATH}"
-    elif test "`uname -s`" = "Darwin"; then
-	# If Tk was built as a framework, attempt to use the libraries
-	# from the framework at the given location so that linking works
-	# against Tk.framework installed in an arbitrary location.
-	case ${TK_DEFS} in
-	    *TK_FRAMEWORK*)
-		if test -f "${TK_BIN_DIR}/${TK_LIB_FILE}"; then
-		    for i in "`cd "${TK_BIN_DIR}"; pwd`" \
-			     "`cd "${TK_BIN_DIR}"/../..; pwd`"; do
-			if test "`basename "$i"`" = "${TK_LIB_FILE}.framework"; then
-			    TK_LIB_SPEC="-F`dirname "$i" | sed -e 's/ /\\\\ /g'` -framework ${TK_LIB_FILE}"
-			    break
-			fi
-		    done
-		fi
-		if test -f "${TK_BIN_DIR}/${TK_STUB_LIB_FILE}"; then
-		    TK_STUB_LIB_SPEC="-L` echo "${TK_BIN_DIR}"  | sed -e 's/ /\\\\ /g'` ${TK_STUB_LIB_FLAG}"
-		    TK_STUB_LIB_PATH="${TK_BIN_DIR}/${TK_STUB_LIB_FILE}"
-		fi
-		;;
-	esac
-    fi
-
-    # eval is required to do the TK_DBGX substitution
-    eval "TK_LIB_FLAG=\"${TK_LIB_FLAG}\""
-    eval "TK_LIB_SPEC=\"${TK_LIB_SPEC}\""
-    eval "TK_STUB_LIB_FLAG=\"${TK_STUB_LIB_FLAG}\""
-    eval "TK_STUB_LIB_SPEC=\"${TK_STUB_LIB_SPEC}\""
-
-    # TEA specific: Ensure windowingsystem is defined
-    if test "${TEA_PLATFORM}" = "unix" ; then
-	case ${TK_DEFS} in
-	    *MAC_OSX_TK*)
-
-cat >>confdefs.h <<\_ACEOF
-#define MAC_OSX_TK 1
-_ACEOF
-
-		TEA_WINDOWINGSYSTEM="aqua"
-		;;
-	    *)
-		TEA_WINDOWINGSYSTEM="x11"
-		;;
-	esac
-    elif test "${TEA_PLATFORM}" = "windows" ; then
-	TEA_WINDOWINGSYSTEM="win32"
-    fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-    # TEA specific:
-
-
-
-#	TEA_PUBLIC_TK_HEADERS
-#	TEA_PATH_X
-fi
-
 #--------------------------------------------------------------------
 # Handle the --prefix=... option by defaulting to what Tcl gave.
 # Must be called after TEA_LOAD_TCLCONFIG and before TEA_SETUP_COMPILER.
@@ -11661,17 +11381,6 @@
 TCL_EXTRA_CFLAGS!$TCL_EXTRA_CFLAGS$ac_delim
 TCL_LD_FLAGS!$TCL_LD_FLAGS$ac_delim
 TCL_SHLIB_LD_LIBS!$TCL_SHLIB_LD_LIBS$ac_delim
-TK_VERSION!$TK_VERSION$ac_delim
-TK_BIN_DIR!$TK_BIN_DIR$ac_delim
-TK_SRC_DIR!$TK_SRC_DIR$ac_delim
-TK_LIB_FILE!$TK_LIB_FILE$ac_delim
-TK_LIB_FLAG!$TK_LIB_FLAG$ac_delim
-TK_LIB_SPEC!$TK_LIB_SPEC$ac_delim
-TK_STUB_LIB_FILE!$TK_STUB_LIB_FILE$ac_delim
-TK_STUB_LIB_FLAG!$TK_STUB_LIB_FLAG$ac_delim
-TK_STUB_LIB_SPEC!$TK_STUB_LIB_SPEC$ac_delim
-TK_LIBS!$TK_LIBS$ac_delim
-TK_XINCLUDES!$TK_XINCLUDES$ac_delim
 CC!$CC$ac_delim
 CFLAGS!$CFLAGS$ac_delim
 LDFLAGS!$LDFLAGS$ac_delim
@@ -11689,6 +11398,17 @@
 MATH_LIBS!$MATH_LIBS$ac_delim
 aol_prefix!$aol_prefix$ac_delim
 PKG_SOURCES!$PKG_SOURCES$ac_delim
+PKG_OBJECTS!$PKG_OBJECTS$ac_delim
+TCL_INCLUDES!$TCL_INCLUDES$ac_delim
+TCL_TOP_DIR_NATIVE!$TCL_TOP_DIR_NATIVE$ac_delim
+TCL_THREADS!$TCL_THREADS$ac_delim
+SHARED_BUILD!$SHARED_BUILD$ac_delim
+AR!$AR$ac_delim
+CELIB_DIR!$CELIB_DIR$ac_delim
+CFLAGS_DEBUG!$CFLAGS_DEBUG$ac_delim
+CFLAGS_OPTIMIZE!$CFLAGS_OPTIMIZE$ac_delim
+CFLAGS_WARNING!$CFLAGS_WARNING$ac_delim
+STLIB_LD!$STLIB_LD$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -11730,17 +11450,6 @@
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
-PKG_OBJECTS!$PKG_OBJECTS$ac_delim
-TCL_INCLUDES!$TCL_INCLUDES$ac_delim
-TCL_TOP_DIR_NATIVE!$TCL_TOP_DIR_NATIVE$ac_delim
-TCL_THREADS!$TCL_THREADS$ac_delim
-SHARED_BUILD!$SHARED_BUILD$ac_delim
-AR!$AR$ac_delim
-CELIB_DIR!$CELIB_DIR$ac_delim
-CFLAGS_DEBUG!$CFLAGS_DEBUG$ac_delim
-CFLAGS_OPTIMIZE!$CFLAGS_OPTIMIZE$ac_delim
-CFLAGS_WARNING!$CFLAGS_WARNING$ac_delim
-STLIB_LD!$STLIB_LD$ac_delim
 SHLIB_LD!$SHLIB_LD$ac_delim
 SHLIB_LD_LIBS!$SHLIB_LD_LIBS$ac_delim
 SHLIB_CFLAGS!$SHLIB_CFLAGS$ac_delim
@@ -11781,7 +11490,7 @@
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 49; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 38; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
Index: configure.in
===================================================================
diff -u -r043dc9b94b99894cc9b7ad6b61e469f67023c705 -r6b67a152a9c351a6669aec517b4e982adeafb641
--- configure.in	(.../configure.in)	(revision 043dc9b94b99894cc9b7ad6b61e469f67023c705)
+++ configure.in	(.../configure.in)	(revision 6b67a152a9c351a6669aec517b4e982adeafb641)
@@ -39,14 +39,6 @@
         [  --with-actiweb=yes|no,
            --without-actiweb disables actiweb components],
         [with_actiweb=$withval], [with_actiweb=no])
-AC_ARG_WITH(nxsh,
-        [  --with-nxsh=yes|no,
-	   --without-nxsh disables built of nxsh],
-        [with_nxsh=$withval], [with_nxsh=no])
-AC_ARG_WITH(xowish,
-        [  --with-xowish=yes|no,
-	   --without-xowish disables built of xowish],
-        [with_xowish=$withval], [with_xowish=no])
 AC_ARG_WITH(all,
         [  --with-all=yes|no,
 	   --without-all disables built of all],
@@ -64,8 +56,6 @@
 
 if test "$with_all" = yes; then
    with_actiweb=yes
-   with_nxsh=yes
-   with_xowish=yes
    with_gdbm=yes
 fi
    
@@ -90,9 +80,6 @@
 
 AC_SUBST(subdirs)
 
-if test "$with_tk" = no; then with_xowish="" ; fi
-if test "$with_nxsh" = yes; then NXSH="nxsh" ; else NXSH=""; fi
-if test "$with_xowish" = yes;  then XOWISH="xowish"   ; else XOWISH=""; fi
 
 
 #--------------------------------------------------------------------
@@ -130,12 +117,6 @@
 # check for TK
 #--------------------------------------------------------------------
 
-if test "$with_xowish" = yes; then
-	TEA_PATH_TKCONFIG
-	TEA_LOAD_TKCONFIG
-#	TEA_PUBLIC_TK_HEADERS
-#	TEA_PATH_X
-fi
 
 #--------------------------------------------------------------------
 # Handle the --prefix=... option by defaulting to what Tcl gave.
Index: library/xotcl/library/store/XOTclGdbm/aclocal.m4
===================================================================
diff -u -rf3b7952aabc9e4f9079febd1f5b7f5fb833fd50c -r6b67a152a9c351a6669aec517b4e982adeafb641
--- library/xotcl/library/store/XOTclGdbm/aclocal.m4	(.../aclocal.m4)	(revision f3b7952aabc9e4f9079febd1f5b7f5fb833fd50c)
+++ library/xotcl/library/store/XOTclGdbm/aclocal.m4	(.../aclocal.m4)	(revision 6b67a152a9c351a6669aec517b4e982adeafb641)
@@ -1,3 +1,3 @@
-builtin(include,xotcl.m4)
+builtin(include,nsf.m4)
 builtin(include,tcl.m4)
 
Index: library/xotcl/library/store/XOTclGdbm/configure
===================================================================
diff -u -r6976a6a231789f39a2c9567ed31ad98cde821e8c -r6b67a152a9c351a6669aec517b4e982adeafb641
--- library/xotcl/library/store/XOTclGdbm/configure	(.../configure)	(revision 6976a6a231789f39a2c9567ed31ad98cde821e8c)
+++ library/xotcl/library/store/XOTclGdbm/configure	(.../configure)	(revision 6b67a152a9c351a6669aec517b4e982adeafb641)
@@ -670,6 +670,7 @@
 TCL_STUB_LIB_FILE
 TCL_STUB_LIB_FLAG
 TCL_STUB_LIB_SPEC
+CLEANFILES
 TCL_LIBS
 TCL_DEFS
 TCL_EXTRA_CFLAGS
@@ -692,13 +693,11 @@
 MATH_LIBS
 PKG_SOURCES
 PKG_OBJECTS
-CLEANFILES
 TCL_INCLUDES
 TCL_THREADS
 SHARED_BUILD
 AR
 CELIB_DIR
-DL_LIBS
 CFLAGS_DEBUG
 CFLAGS_OPTIMIZE
 CFLAGS_WARNING
@@ -1304,8 +1303,6 @@
   --enable-64bit-vis      enable 64bit Sparc VIS support (default: off)
   --disable-rpath         disable rpath support (default: on)
   --enable-wince          enable Win/CE support (where applicable)
-  --enable-load           allow dynamic loading and "load" command (default:
-                          on)
   --enable-symbols        build with debugging symbols (default: off)
 
 Optional Packages:
@@ -1314,9 +1311,9 @@
   --with-gdbm=GDBM_INCLUDE_DIR,GDBM_LIB_DIR
             absolute path to gdbm.h and optionally the path to the library,
            --without-gdbm disables build of Tcl Gdbm
-  --with-xotcl=DIR_CONTAINING_XOTCLCONFIG_SH
-            absolute path to xotclConfig.sh,
-           --without-xotcl disables, but this is pointless
+  --with-nsf=DIR_CONTAINING_NSFCONFIG_SH
+            absolute path to nsfConfig.sh,
+           --without-nsf disables, but this is pointless
   --with-tcl              directory containing tcl configuration
                           (tclConfig.sh)
   --with-tclinclude       directory containing the public Tcl header files
@@ -1772,7 +1769,7 @@
 
     # TEA extensions pass this us the version of TEA they think they
     # are compatible with.
-    TEA_VERSION="3.8"
+    TEA_VERSION="3.9"
 
     { echo "$as_me:$LINENO: checking for correct TEA configuration" >&5
 echo $ECHO_N "checking for correct TEA configuration... $ECHO_C" >&6; }
@@ -1783,15 +1780,15 @@
 The PACKAGE_NAME variable must be defined by your TEA configure.in" >&2;}
    { (exit 1); exit 1; }; }
     fi
-    if test x"3.7" = x ; then
+    if test x"3.9" = x ; then
 	{ { echo "$as_me:$LINENO: error:
 TEA version not specified." >&5
 echo "$as_me: error:
 TEA version not specified." >&2;}
    { (exit 1); exit 1; }; }
-    elif test "3.7" != "${TEA_VERSION}" ; then
-	{ echo "$as_me:$LINENO: result: warning: requested TEA version \"3.7\", have \"${TEA_VERSION}\"" >&5
-echo "${ECHO_T}warning: requested TEA version \"3.7\", have \"${TEA_VERSION}\"" >&6; }
+    elif test "3.9" != "${TEA_VERSION}" ; then
+	{ echo "$as_me:$LINENO: result: warning: requested TEA version \"3.9\", have \"${TEA_VERSION}\"" >&5
+echo "${ECHO_T}warning: requested TEA version \"3.9\", have \"${TEA_VERSION}\"" >&6; }
     else
 	{ echo "$as_me:$LINENO: result: ok (TEA ${TEA_VERSION})" >&5
 echo "${ECHO_T}ok (TEA ${TEA_VERSION})" >&6; }
@@ -1842,7 +1839,7 @@
 	*CYGWIN_*)
 	    CYGPATH=echo
 	    EXEEXT=".exe"
-	    # TEA_PLATFORM is determined later
+	    # TEA_PLATFORM is determined later in LOAD_TCLCONFIG
 	    ;;
 	*)
 	    CYGPATH=echo
@@ -1924,12 +1921,12 @@
 
 
 
-# Check whether --with-xotcl was given.
-if test "${with_xotcl+set}" = set; then
-  withval=$with_xotcl; with_xotcl=$withval
+# Check whether --with-nsf was given.
+if test "${with_nsf+set}" = set; then
+  withval=$with_nsf; with_nsf=$withval
 else
-  { { echo "$as_me:$LINENO: error: --with-xotcl is required" >&5
-echo "$as_me: error: --with-xotcl is required" >&2;}
+  { { echo "$as_me:$LINENO: error: --with-nsf is required" >&5
+echo "$as_me: error: --with-nsf is required" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -2043,6 +2040,7 @@
 			`ls -d /usr/local/lib 2>/dev/null` \
 			`ls -d /usr/contrib/lib 2>/dev/null` \
 			`ls -d /usr/lib 2>/dev/null` \
+			`ls -d /usr/lib64 2>/dev/null` \
 			; do
 		    if test -f "$i/tclConfig.sh" ; then
 			ac_cv_c_tclconfig="`(cd $i; pwd)`"
@@ -2064,9 +2062,9 @@
 			break
 		    fi
 		    if test -f "$i/unix/tclConfig.sh" ; then
-		    ac_cv_c_tclconfig="`(cd $i/unix; pwd)`"
-		    break
-		fi
+			ac_cv_c_tclconfig="`(cd $i/unix; pwd)`"
+			break
+		    fi
 		done
 	    fi
 
@@ -2178,6 +2176,17 @@
 	    ;;
     esac
 
+    # Do this here as we have fully defined TEA_PLATFORM now
+    if test "${TEA_PLATFORM}" = "windows" ; then
+	# The BUILD_$pkg is to define the correct extern storage class
+	# handling when making this package
+	cat >>confdefs.h <<_ACEOF
+#define BUILD_${PACKAGE_NAME} 1
+_ACEOF
+
+	CLEANFILES="$CLEANFILES *.lib *.dll *.pdb"
+    fi
+
     # TEA specific:
 
 
@@ -2186,6 +2195,7 @@
 
 
 
+
 #--------------------------------------------------------------------
 # Load the tkConfig.sh file if necessary (Tk extension)
 #--------------------------------------------------------------------
@@ -6648,13 +6658,13 @@
         Could not locate gdbm.h on your machine to build XOTclGdbm.
         You can download a precompiled lib 'libgdbm'
         and the header file 'gdbm.h' from http://www.gnu.org/software/gdbm/
-        and compile again. Alternatively, you can compile XOTcl without gdbm.
+        and compile again. Alternatively, you can compile nsf without gdbm.
         " >&5
 echo "$as_me: error:
         Could not locate gdbm.h on your machine to build XOTclGdbm.
         You can download a precompiled lib 'libgdbm'
         and the header file 'gdbm.h' from http://www.gnu.org/software/gdbm/
-        and compile again. Alternatively, you can compile XOTcl without gdbm.
+        and compile again. Alternatively, you can compile nsf without gdbm.
         " >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -6669,12 +6679,12 @@
 #echo "Gdbm lib spec = '${GDBM_LIB_SPEC}'"
 
 #--------------------------------------------------------------------
-# Load the xotclConfig.sh file
+# Load the nsfConfig.sh file
 #--------------------------------------------------------------------
 
-{ echo "$as_me:$LINENO: Reading file ${with_xotcl}/xotclConfig.sh" >&5
-echo "$as_me: Reading file ${with_xotcl}/xotclConfig.sh" >&6;}
-source ${with_xotcl}/xotclConfig.sh
+{ echo "$as_me:$LINENO: Reading file ${with_nsf}/nsfConfig.sh" >&5
+echo "$as_me: Reading file ${with_nsf}/nsfConfig.sh" >&6;}
+source ${with_nsf}/nsfConfig.sh
 
 
     vars="xotclgdbm.c"
@@ -6691,6 +6701,7 @@
 		# in Makefile.in as well
 		if test ! -f "${srcdir}/$i" -a ! -f "${srcdir}/generic/$i" \
 		    -a ! -f "${srcdir}/win/$i" -a ! -f "${srcdir}/unix/$i" \
+		    -a ! -f "${srcdir}/macosx/$i" \
 		    ; then
 		    { { echo "$as_me:$LINENO: error: could not find source file '$i'" >&5
 echo "$as_me: error: could not find source file '$i'" >&2;}
@@ -6726,14 +6737,14 @@
 
 
 
-    vars="-I${with_xotcl}/generic ${XOTCL_BUILD_INCLUDE_SPEC} ${GDBM_INC_SPEC}"
+    vars="-I${with_nsf}/generic ${NSF_BUILD_INCLUDE_SPEC} ${GDBM_INC_SPEC}"
     for i in $vars; do
 	PKG_INCLUDES="$PKG_INCLUDES $i"
     done
 
 
 
-    vars="$XOTCL_BUILD_STUB_LIB_SPEC $XOTCL_BUILD_LIB_SPEC $GDBM_LIB_SPEC -lgdbm"
+    vars="$NSF_BUILD_STUB_LIB_SPEC $NSF_BUILD_LIB_SPEC $GDBM_LIB_SPEC -lgdbm"
     for i in $vars; do
 	if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
 	    # Convert foo.lib to -lfoo for GCC.  No-op if not *.lib
@@ -6753,6 +6764,7 @@
 	# check for existence - allows for generic/win/unix VPATH
 	if test ! -f "${srcdir}/$i" -a ! -f "${srcdir}/generic/$i" \
 	    -a ! -f "${srcdir}/win/$i" -a ! -f "${srcdir}/unix/$i" \
+	    -a ! -f "${srcdir}/macosx/$i" \
 	    ; then
 	    { { echo "$as_me:$LINENO: error: could not find stub source file '$i'" >&5
 echo "$as_me: error: could not find stub source file '$i'" >&2;}
@@ -6801,10 +6813,6 @@
 #--------------------------------------------------------------------
 
 if test "${TEA_PLATFORM}" = "windows" ; then
-    cat >>confdefs.h <<\_ACEOF
-#define BUILD_sample 1
-_ACEOF
-
     CLEANFILES="pkgIndex.tcl *.lib *.dll *.exp *.ilk *.pdb vc*.pch"
     #TEA_ADD_SOURCES([win/winFile.c])
     #TEA_ADD_INCLUDES([-I\"$(${CYGPATH} ${srcdir}/win)\"])
@@ -7564,7 +7572,7 @@
 fi
 
 
-    # Step 1: set the variable "system" to hold the name and version number
+    # Set the variable "system" to hold the name and version number
     # for the system.
 
 
@@ -7577,21 +7585,13 @@
 	# TEA specific:
 	if test "${TEA_PLATFORM}" = "windows" ; then
 	    tcl_cv_sys_version=windows
-	elif test -f /usr/lib/NextStep/software_version; then
-	    tcl_cv_sys_version=NEXTSTEP-`awk '/3/,/3/' /usr/lib/NextStep/software_version`
 	else
 	    tcl_cv_sys_version=`uname -s`-`uname -r`
 	    if test "$?" -ne 0 ; then
 		{ echo "$as_me:$LINENO: WARNING: can't find uname command" >&5
 echo "$as_me: WARNING: can't find uname command" >&2;}
 		tcl_cv_sys_version=unknown
 	    else
-		# Special check for weird MP-RAS system (uname returns weird
-		# results, and the version is kept in special file).
-
-		if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
-		    tcl_cv_sys_version=MP-RAS-`awk '{print $3}' /etc/.relid`
-		fi
 		if test "`uname -s`" = "AIX" ; then
 		    tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
 		fi
@@ -7604,87 +7604,17 @@
     system=$tcl_cv_sys_version
 
 
-    # Step 2: check for existence of -ldl library.  This is needed because
-    # Linux can use either -ldl or -ldld for dynamic loading.
-
-    { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_lib_dl_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_dl_dlopen=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
-if test $ac_cv_lib_dl_dlopen = yes; then
-  have_dl=yes
-else
-  have_dl=no
-fi
-
-
     # Require ranlib early so we can override it in special cases below.
 
 
 
-    # Step 3: set configuration options based on system name and version.
+    # Set configuration options based on system name and version.
     # This is similar to Tcl's unix/tcl.m4 except that we've added a
-    # "windows" case.
+    # "windows" case and removed some core-only vars.
 
     do64bit_ok=no
-    LDFLAGS_ORIG="$LDFLAGS"
+    # default to '{$LIBS}' and set to "" on per-platform necessary basis
+    SHLIB_LD_LIBS='${LIBS}'
     # When ld needs options to work in 64-bit mode, put them in
     # LDFLAGS_ARCH so they eventually end up in LDFLAGS even if [load]
     # is disabled by the user. [Bug 1016796]
@@ -8022,13 +7952,10 @@
 		fi
 	    fi
 
-	    SHLIB_LD_LIBS='${LIBS}'
 	    SHLIB_SUFFIX=".dll"
 	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.dll'
 
 	    TCL_LIB_VERSIONS_OK=nodots
-	    # Bogus to avoid getting this turned off
-	    DL_OBJS="tclLoadNone.obj"
     	    ;;
 	AIX-*)
 	    if test "${TCL_THREADS}" = "1" -a "$GCC" != "yes"; then
@@ -8050,10 +7977,8 @@
 
 	    LIBS="$LIBS -lc"
 	    SHLIB_CFLAGS=""
-	    SHLIB_LD_LIBS='${LIBS}'
 	    SHLIB_SUFFIX=".so"
 
-	    DL_OBJS="tclLoadDl.o"
 	    LD_LIBRARY_PATH_VAR="LIBPATH"
 
 	    # Check to enable 64-bit flags for compiler/linker
@@ -8083,8 +8008,6 @@
 
 		# AIX-5 uses ELF style dynamic libraries on IA-64, but not PPC
 		SHLIB_LD="/usr/ccs/bin/ld -G -z text"
-		# AIX-5 has dl* in libc.so
-		DL_LIBS=""
 		if test "$GCC" = yes; then
 
 		    CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
@@ -8111,7 +8034,6 @@
 fi
 
 		SHLIB_LD="${SHLIB_LD} ${SHLIB_LD_FLAGS}"
-		DL_LIBS="-ldl"
 		CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
 		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
 
@@ -8121,10 +8043,7 @@
 	BeOS*)
 	    SHLIB_CFLAGS="-fPIC"
 	    SHLIB_LD='${CC} -nostart'
-	    SHLIB_LD_LIBS='${LIBS}'
 	    SHLIB_SUFFIX=".so"
-	    DL_OBJS="tclLoadDl.o"
-	    DL_LIBS="-ldl"
 
 	    #-----------------------------------------------------------
 	    # Check for inet_ntoa in -lbind, for BeOS (which also needs
@@ -8200,33 +8119,24 @@
 	BSD/OS-4.*)
 	    SHLIB_CFLAGS="-export-dynamic -fPIC"
 	    SHLIB_LD='${CC} -shared'
-	    SHLIB_LD_LIBS='${LIBS}'
 	    SHLIB_SUFFIX=".so"
-	    DL_OBJS="tclLoadDl.o"
-	    DL_LIBS="-ldl"
 	    LDFLAGS="$LDFLAGS -export-dynamic"
 	    CC_SEARCH_FLAGS=""
 	    LD_SEARCH_FLAGS=""
 	    ;;
 	CYGWIN_*)
 	    SHLIB_CFLAGS=""
 	    SHLIB_LD='${CC} -shared'
-	    SHLIB_LD_LIBS='${LIBS}'
 	    SHLIB_SUFFIX=".dll"
 	    EXE_SUFFIX=".exe"
-	    DL_OBJS="tclLoadDl.o"
-	    DL_LIBS="-ldl"
 	    CC_SEARCH_FLAGS=""
 	    LD_SEARCH_FLAGS=""
 	    ;;
 	Haiku*)
 	    LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
 	    SHLIB_CFLAGS="-fPIC"
-	    SHLIB_LD_LIBS='${LIBS}'
 	    SHLIB_SUFFIX=".so"
 	    SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
-	    DL_OBJS="tclLoadDl.o"
-	    DL_LIBS="-lroot"
 	    { echo "$as_me:$LINENO: checking for inet_ntoa in -lnetwork" >&5
 echo $ECHO_N "checking for inet_ntoa in -lnetwork... $ECHO_C" >&6; }
 if test "${ac_cv_lib_network_inet_ntoa+set}" = set; then
@@ -8387,9 +8297,6 @@
 
 	    if test "$tcl_ok" = yes; then
 
-		SHLIB_LD_LIBS='${LIBS}'
-		DL_OBJS="tclLoadShl.o"
-		DL_LIBS="-ldld"
 		LDFLAGS="$LDFLAGS -E"
 		CC_SEARCH_FLAGS='-Wl,+s,+b,${LIB_RUNTIME_DIR}:.'
 		LD_SEARCH_FLAGS='+s +b ${LIB_RUNTIME_DIR}:.'
@@ -8423,7 +8330,6 @@
 			    # 64-bit gcc in use.  Fix flags for GNU ld.
 			    do64bit_ok=yes
 			    SHLIB_LD='${CC} -shared'
-			    SHLIB_LD_LIBS='${LIBS}'
 			    if test $doRpath = yes; then
 
 				CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
@@ -8451,10 +8357,7 @@
 	IRIX-6.*)
 	    SHLIB_CFLAGS=""
 	    SHLIB_LD="ld -n32 -shared -rdata_shared"
-	    SHLIB_LD_LIBS='${LIBS}'
 	    SHLIB_SUFFIX=".so"
-	    DL_OBJS="tclLoadDl.o"
-	    DL_LIBS=""
 	    if test $doRpath = yes; then
 
 		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
@@ -8485,10 +8388,7 @@
 	IRIX64-6.*)
 	    SHLIB_CFLAGS=""
 	    SHLIB_LD="ld -n32 -shared -rdata_shared"
-	    SHLIB_LD_LIBS='${LIBS}'
 	    SHLIB_SUFFIX=".so"
-	    DL_OBJS="tclLoadDl.o"
-	    DL_LIBS=""
 	    if test $doRpath = yes; then
 
 		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
@@ -8520,20 +8420,13 @@
 	    ;;
 	Linux*)
 	    SHLIB_CFLAGS="-fPIC"
-	    SHLIB_LD_LIBS='${LIBS}'
 	    SHLIB_SUFFIX=".so"
 
 	    # TEA specific:
 	    CFLAGS_OPTIMIZE="-O2 -fomit-frame-pointer"
-	    # egcs-2.91.66 on Redhat Linux 6.0 generates lots of warnings
-	    # when you inline the string and math operations.  Turn this off to
-	    # get rid of the warnings.
-	    #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
 
 	    # TEA specific: use LDFLAGS_DEFAULT instead of LDFLAGS
 	    SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS_DEFAULT}'
-	    DL_OBJS="tclLoadDl.o"
-	    DL_LIBS="-ldl"
 	    LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
 	    if test $doRpath = yes; then
 
@@ -8627,12 +8520,9 @@
 	    ;;
 	GNU*)
 	    SHLIB_CFLAGS="-fPIC"
-	    SHLIB_LD_LIBS='${LIBS}'
 	    SHLIB_SUFFIX=".so"
 
 	    SHLIB_LD='${CC} -shared'
-	    DL_OBJS=""
-	    DL_LIBS="-ldl"
 	    LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
 	    CC_SEARCH_FLAGS=""
 	    LD_SEARCH_FLAGS=""
@@ -8643,12 +8533,9 @@
 	    ;;
 	Lynx*)
 	    SHLIB_CFLAGS="-fPIC"
-	    SHLIB_LD_LIBS='${LIBS}'
 	    SHLIB_SUFFIX=".so"
 	    CFLAGS_OPTIMIZE=-02
 	    SHLIB_LD='${CC} -shared'
-	    DL_OBJS="tclLoadDl.o"
-	    DL_LIBS="-mshared -ldl"
 	    LD_FLAGS="-Wl,--export-dynamic"
 	    if test $doRpath = yes; then
 
@@ -8660,10 +8547,7 @@
 	OpenBSD-*)
 	    SHLIB_CFLAGS="-fPIC"
 	    SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS}'
-	    SHLIB_LD_LIBS='${LIBS}'
 	    SHLIB_SUFFIX=".so"
-	    DL_OBJS="tclLoadDl.o"
-	    DL_LIBS=""
 	    if test $doRpath = yes; then
 
 		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
@@ -8726,10 +8610,7 @@
 	    # NetBSD 2.* has ELF and can use 'cc -shared' to build shared libs
 	    SHLIB_CFLAGS="-fPIC"
 	    SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS}'
-	    SHLIB_LD_LIBS='${LIBS}'
 	    SHLIB_SUFFIX=".so"
-	    DL_OBJS="tclLoadDl.o"
-	    DL_LIBS=""
 	    LDFLAGS="$LDFLAGS -export-dynamic"
 	    if test $doRpath = yes; then
 
@@ -8760,10 +8641,7 @@
 	    SHLIB_CFLAGS="-fPIC"
 	    SHLIB_LD="${CC} -shared"
 	    TCL_SHLIB_LD_EXTRAS="-soname \$@"
-	    SHLIB_LD_LIBS='${LIBS}'
 	    SHLIB_SUFFIX=".so"
-	    DL_OBJS="tclLoadDl.o"
-	    DL_LIBS=""
 	    LDFLAGS=""
 	    if test $doRpath = yes; then
 
@@ -9009,10 +8887,7 @@
 	    # TEA specific: link shlib with current and compatiblity version flags
 	    vers=`echo ${PACKAGE_VERSION} | sed -e 's/^\([0-9]\{1,5\}\)\(\(\.[0-9]\{1,3\}\)\{0,2\}\).*$/\1\2/p' -e d`
 	    SHLIB_LD="${SHLIB_LD} -current_version ${vers:-0} -compatibility_version ${vers:-0}"
-	    SHLIB_LD_LIBS='${LIBS}'
 	    SHLIB_SUFFIX=".dylib"
-	    DL_OBJS="tclLoadDyld.o"
-	    DL_LIBS=""
 	    # Don't use -prebind when building for Mac OS X 10.4 or later only:
 	    if test "`echo "${MACOSX_DEPLOYMENT_TARGET}" | awk -F '10\\.' '{print int($2)}'`" -lt 4 -a \
 		"`echo "${CPPFLAGS}" | awk -F '-mmacosx-version-min=10\\.' '{print int($2)}'`" -lt 4; then
@@ -9266,10 +9141,7 @@
 
 fi
 
-	    SHLIB_LD_LIBS=""
 	    SHLIB_SUFFIX=".so"
-	    DL_OBJS="tclLoadDl.o"
-	    DL_LIBS=""
 	    if test $doRpath = yes; then
 
 		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
@@ -9311,12 +9183,28 @@
 	    SHLIB_LD="ld -Bshareable -x"
 	    SHLIB_LD_LIBS=""
 	    SHLIB_SUFFIX=".so"
-	    DL_OBJS="tclLoadDl.o"
-	    # dlopen is in -lc on QNX
-	    DL_LIBS=""
 	    CC_SEARCH_FLAGS=""
 	    LD_SEARCH_FLAGS=""
 	    ;;
+	SCO_SV-3.2*)
+	    if test "$GCC" = yes; then
+
+		SHLIB_CFLAGS="-fPIC -melf"
+		LDFLAGS="$LDFLAGS -melf -Wl,-Bexport"
+
+else
+
+	       SHLIB_CFLAGS="-Kpic -belf"
+	       LDFLAGS="$LDFLAGS -belf -Wl,-Bexport"
+
+fi
+
+	    SHLIB_LD="ld -G"
+	    SHLIB_LD_LIBS=""
+	    SHLIB_SUFFIX=".so"
+	    CC_SEARCH_FLAGS=""
+	    LD_SEARCH_FLAGS=""
+	    ;;
 	SunOS-5.[0-6])
 	    # Careful to not let 5.10+ fall into this case
 
@@ -9335,14 +9223,7 @@
 
 
 	    SHLIB_CFLAGS="-KPIC"
-
-	    # Note: need the LIBS below, otherwise Tk won't find Tcl's
-	    # symbols when dynamically loaded into tclsh.
-
-	    SHLIB_LD_LIBS='${LIBS}'
 	    SHLIB_SUFFIX=".so"
-	    DL_OBJS="tclLoadDl.o"
-	    DL_LIBS="-ldl"
 	    if test "$GCC" = yes; then
 
 		SHLIB_LD='${CC} -shared'
@@ -9460,13 +9341,7 @@
 fi
 
 
-	    # Note: need the LIBS below, otherwise Tk won't find Tcl's
-	    # symbols when dynamically loaded into tclsh.
-
-	    SHLIB_LD_LIBS='${LIBS}'
 	    SHLIB_SUFFIX=".so"
-	    DL_OBJS="tclLoadDl.o"
-	    DL_LIBS="-ldl"
 	    if test "$GCC" = yes; then
 
 		SHLIB_LD='${CC} -shared'
@@ -9528,45 +9403,15 @@
 
 
 
-    # Step 4: disable dynamic loading if requested via a command-line switch.
-
-    # Check whether --enable-load was given.
-if test "${enable_load+set}" = set; then
-  enableval=$enable_load; tcl_ok=$enableval
-else
-  tcl_ok=yes
-fi
-
-    if test "$tcl_ok" = no; then
-  DL_OBJS=""
-fi
-
-
-    if test "x$DL_OBJS" != x; then
-  BUILD_DLTEST="\$(DLTEST_TARGETS)"
-else
-
-	{ echo "$as_me:$LINENO: WARNING: Can't figure out how to do dynamic loading or shared libraries on this system." >&5
-echo "$as_me: WARNING: Can't figure out how to do dynamic loading or shared libraries on this system." >&2;}
-	SHLIB_CFLAGS=""
-	SHLIB_LD=""
-	SHLIB_SUFFIX=""
-	DL_OBJS="tclLoadNone.o"
-	DL_LIBS=""
-	LDFLAGS="$LDFLAGS_ORIG"
-	CC_SEARCH_FLAGS=""
-	LD_SEARCH_FLAGS=""
-	BUILD_DLTEST=""
-
-fi
-
+    # Add in the arch flags late to ensure it wasn't removed.
+    # Not necessary in TEA, but this is aligned with core
     LDFLAGS="$LDFLAGS $LDFLAGS_ARCH"
 
     # If we're running gcc, then change the C flags for compiling shared
     # libraries to the right flags for gcc, instead of those for the
     # standard manufacturer compiler.
 
-    if test "$DL_OBJS" != "tclLoadNone.o" -a "$GCC" = yes; then
+    if test "$GCC" = yes; then
 
 	case $system in
 	    AIX-*) ;;
@@ -9622,8 +9467,6 @@
 
 
 
-
-
     # These must be called after we do the basic CFLAGS checks and
     # verify any possible 64-bit or similar switches are necessary
 
@@ -11220,6 +11063,7 @@
 TCL_STUB_LIB_FILE!$TCL_STUB_LIB_FILE$ac_delim
 TCL_STUB_LIB_FLAG!$TCL_STUB_LIB_FLAG$ac_delim
 TCL_STUB_LIB_SPEC!$TCL_STUB_LIB_SPEC$ac_delim
+CLEANFILES!$CLEANFILES$ac_delim
 TCL_LIBS!$TCL_LIBS$ac_delim
 TCL_DEFS!$TCL_DEFS$ac_delim
 TCL_EXTRA_CFLAGS!$TCL_EXTRA_CFLAGS$ac_delim
@@ -11242,13 +11086,11 @@
 MATH_LIBS!$MATH_LIBS$ac_delim
 PKG_SOURCES!$PKG_SOURCES$ac_delim
 PKG_OBJECTS!$PKG_OBJECTS$ac_delim
-CLEANFILES!$CLEANFILES$ac_delim
 TCL_INCLUDES!$TCL_INCLUDES$ac_delim
 TCL_THREADS!$TCL_THREADS$ac_delim
 SHARED_BUILD!$SHARED_BUILD$ac_delim
 AR!$AR$ac_delim
 CELIB_DIR!$CELIB_DIR$ac_delim
-DL_LIBS!$DL_LIBS$ac_delim
 CFLAGS_DEBUG!$CFLAGS_DEBUG$ac_delim
 CFLAGS_OPTIMIZE!$CFLAGS_OPTIMIZE$ac_delim
 CFLAGS_WARNING!$CFLAGS_WARNING$ac_delim
@@ -11259,6 +11101,7 @@
 LD_LIBRARY_PATH_VAR!$LD_LIBRARY_PATH_VAR$ac_delim
 CFLAGS_DEFAULT!$CFLAGS_DEFAULT$ac_delim
 LDFLAGS_DEFAULT!$LDFLAGS_DEFAULT$ac_delim
+TCL_DBGX!$TCL_DBGX$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -11300,7 +11143,6 @@
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
-TCL_DBGX!$TCL_DBGX$ac_delim
 MAKE_LIB!$MAKE_LIB$ac_delim
 MAKE_SHARED_LIB!$MAKE_SHARED_LIB$ac_delim
 MAKE_STATIC_LIB!$MAKE_STATIC_LIB$ac_delim
@@ -11311,7 +11153,7 @@
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 9; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 8; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
Index: library/xotcl/library/store/XOTclGdbm/configure.in
===================================================================
diff -u -r8eddf67371ec031084a6ef98fdec21e38dff85ff -r6b67a152a9c351a6669aec517b4e982adeafb641
--- library/xotcl/library/store/XOTclGdbm/configure.in	(.../configure.in)	(revision 8eddf67371ec031084a6ef98fdec21e38dff85ff)
+++ library/xotcl/library/store/XOTclGdbm/configure.in	(.../configure.in)	(revision 6b67a152a9c351a6669aec517b4e982adeafb641)
@@ -41,11 +41,11 @@
            --without-gdbm disables build of Tcl Gdbm],
         [with_gdbm=$withval], [with_gdbm=no])
 
-AC_ARG_WITH(xotcl,
-        [  --with-xotcl=DIR_CONTAINING_XOTCLCONFIG_SH
-            absolute path to xotclConfig.sh, 
-           --without-xotcl disables, but this is pointless],
-        [with_xotcl=$withval], [AC_MSG_ERROR([--with-xotcl is required])])
+AC_ARG_WITH(nsf,
+        [  --with-nsf=DIR_CONTAINING_NSFCONFIG_SH
+            absolute path to nsfConfig.sh, 
+           --without-nsf disables, but this is pointless],
+        [with_nsf=$withval], [AC_MSG_ERROR([--with-nsf is required])])
 
 #--------------------------------------------------------------------
 # Load the tclConfig.sh file
@@ -108,7 +108,7 @@
         Could not locate gdbm.h on your machine to build XOTclGdbm.
         You can download a precompiled lib 'libgdbm'
         and the header file 'gdbm.h' from http://www.gnu.org/software/gdbm/
-        and compile again. Alternatively, you can compile XOTcl without gdbm.
+        and compile again. Alternatively, you can compile nsf without gdbm.
         ])
 fi
                                                                               
@@ -122,15 +122,15 @@
 #echo "Gdbm lib spec = '${GDBM_LIB_SPEC}'"
 
 #--------------------------------------------------------------------
-# Load the xotclConfig.sh file
+# Load the nsfConfig.sh file
 #--------------------------------------------------------------------
 
-AC_MSG_NOTICE([Reading file ${with_xotcl}/xotclConfig.sh])
-source ${with_xotcl}/xotclConfig.sh
+AC_MSG_NOTICE([Reading file ${with_nsf}/nsfConfig.sh])
+source ${with_nsf}/nsfConfig.sh
 
 TEA_ADD_SOURCES([xotclgdbm.c])
 TEA_ADD_HEADERS([])
-TEA_ADD_INCLUDES([-I${with_xotcl}/generic ${NSF_BUILD_INCLUDE_SPEC} ${GDBM_INC_SPEC}])
+TEA_ADD_INCLUDES([-I${with_nsf}/generic ${NSF_BUILD_INCLUDE_SPEC} ${GDBM_INC_SPEC}])
 TEA_ADD_LIBS([$NSF_BUILD_STUB_LIB_SPEC $NSF_BUILD_LIB_SPEC $GDBM_LIB_SPEC -lgdbm])
 TEA_ADD_CFLAGS([])
 TEA_ADD_STUB_SOURCES([])
Index: library/xotcl/library/store/XOTclGdbm/nsf.m4
===================================================================
diff -u
--- library/xotcl/library/store/XOTclGdbm/nsf.m4	(revision 0)
+++ library/xotcl/library/store/XOTclGdbm/nsf.m4	(revision 6b67a152a9c351a6669aec517b4e982adeafb641)
@@ -0,0 +1,140 @@
+# nsf.m4 --
+#
+#	This file provides a set of autoconf macros to help TEA-enable
+#	a Tcl extension.
+#
+# Copyright (c) 1999 Scriptics Corporation.
+# Copyright (c) 1999-2008 Gustaf Neumann, Uwe Zdun
+#
+# See the file "tcl-license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+
+#------------------------------------------------------------------------
+# SC_PATH_NSFCONFIG --
+#
+#	Locate the nsfConfig.sh file and perform a sanity check on
+#	the Tcl compile flags
+#
+# Arguments:
+#	none
+#
+# Results:
+#
+#	Adds the following arguments to configure:
+#		--with-nsf=...
+#
+#	Defines the following vars:
+#		NX_BIN_DIR	Full path to the directory containing
+#				the nsfConfig.sh file
+#------------------------------------------------------------------------
+
+AC_DEFUN(SC_PATH_NSFCONFIG, [
+    #
+    # Ok, lets find the tcl configuration
+    # First, look for one uninstalled.
+    # the alternative search directory is invoked by --with-tcl
+    #
+    if test x"${no_nsf}" = x ; then
+	# we reset no_nsf in case something fails here
+	no_nsf=true
+	AC_ARG_WITH(nsf, [  --with-nsf              directory containing nsf configuration (nsfConfig.sh)], with_nsfconfig=${withval})
+	AC_MSG_CHECKING([for nsf configuration])
+	AC_CACHE_VAL(ac_cv_c_nsfconfig,[
+
+	    # First check to see if --with-nsf was specified.
+	    if test x"${with_nsfconfig}" != x ; then
+		if test -f "${with_nsfconfig}/nsfConfig.sh" ; then
+		    ac_cv_c_nsfconfig=`(cd ${with_nsfconfig}; pwd)`
+		else
+		    AC_MSG_ERROR([${with_nsfconfig} directory doesn't contain nsfConfig.sh])
+		fi
+	    fi
+
+	    # then check for a private Tcl installation
+	    if test x"${ac_cv_c_nsfconfig}" = x ; then
+		for i in \
+			${srcdir}/../nsf \
+			`ls -dr ${srcdir}/../nsf-* 2>/dev/null` \
+			${srcdir}/../../nsf \
+			`ls -dr ${srcdir}/../../nsf-* 2>/dev/null` \
+			${srcdir}/../../../nsf \
+			`ls -dr ${srcdir}/../../../nsf-* 2>/dev/null` \
+			${srcdir}/../../../../nsf \
+			`ls -dr ${srcdir}/../../../../nsf-* 2>/dev/null` \
+			${srcdir}/../../../../../nsf \
+			`ls -dr ${srcdir}/../../../../../nsf-* 2>/dev/null` ; do
+		    if test -f "$i/nsfConfig.sh" ; then
+			ac_cv_c_nsfconfig=`(cd $i; pwd)`
+			break
+		    fi
+		done
+	    fi
+
+	    # check in a few common install locations
+	    if test x"${ac_cv_c_nsfconfig}" = x ; then
+		for i in `ls -d ${prefix}/lib 2>/dev/null` \
+			`ls -d /usr/local/lib 2>/dev/null` ; do
+		    if test -f "$i/nsfConfig.sh" ; then
+			ac_cv_c_nsfconfig=`(cd $i; pwd)`
+			break
+		    fi
+		done
+	    fi
+
+	])
+
+	if test x"${ac_cv_c_nsfconfig}" = x ; then
+	    NX_BIN_DIR="# no nsf configs found"
+	    AC_MSG_WARN(Can't find nsf configuration definitions)
+	    exit 0
+	else
+	    no_nsf=
+	    NX_BIN_DIR=${ac_cv_c_nsfconfig}
+	    AC_MSG_RESULT(found $NX_BIN_DIR/nsfConfig.sh)
+	fi
+    fi
+])
+
+#------------------------------------------------------------------------
+# SC_LOAD_NSFCONFIG --
+#
+#	Load the tclConfig.sh file
+#
+# Arguments:
+#	
+#	Requires the following vars to be set:
+#		NX_BIN_DIR
+#
+# Results:
+#
+#	Subst the vars:
+#
+#------------------------------------------------------------------------
+
+AC_DEFUN(SC_LOAD_NSFCONFIG, [
+    AC_MSG_CHECKING([for existence of $NX_BIN_DIR/nsfConfig.sh])
+
+    if test -f "$NX_BIN_DIR/nsfConfig.sh" ; then
+        AC_MSG_RESULT([loading])
+	. $NX_BIN_DIR/nsfConfig.sh
+    else
+        AC_MSG_RESULT([file not found])
+    fi
+
+    #
+    # The eval is required to do the TCL_DBGX substitution in the
+    # TCL_LIB_FILE variable
+    #
+    AC_SUBST(NX_VERSION)
+    AC_SUBST(NX_MAJOR_VERSION)
+    AC_SUBST(NX_MINOR_VERSION)
+    AC_SUBST(NX_RELEASE_LEVEL)
+    AC_SUBST(NX_LIB_FILE)
+    AC_SUBST(NX_BUILD_LIB_SPEC)
+    AC_SUBST(NX_LIB_SPEC)
+    AC_SUBST(NX_STUB_LIB_FILE)
+    AC_SUBST(NX_BUILD_STUB_LIB_SPEC)
+    AC_SUBST(NX_STUB_LIB_SPEC)
+    AC_SUBST(NX_SRC_DIR)
+])
+
Fisheye: Tag 6b67a152a9c351a6669aec517b4e982adeafb641 refers to a dead (removed) revision in file `library/xotcl/library/store/XOTclGdbm/xotcl.m4'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: library/xotcl/library/store/XOTclSdbm/aclocal.m4
===================================================================
diff -u -rf3b7952aabc9e4f9079febd1f5b7f5fb833fd50c -r6b67a152a9c351a6669aec517b4e982adeafb641
--- library/xotcl/library/store/XOTclSdbm/aclocal.m4	(.../aclocal.m4)	(revision f3b7952aabc9e4f9079febd1f5b7f5fb833fd50c)
+++ library/xotcl/library/store/XOTclSdbm/aclocal.m4	(.../aclocal.m4)	(revision 6b67a152a9c351a6669aec517b4e982adeafb641)
@@ -1,3 +1,3 @@
-builtin(include,xotcl.m4)
+builtin(include,nsf.m4)
 builtin(include,tcl.m4)
 
Index: library/xotcl/library/store/XOTclSdbm/configure
===================================================================
diff -u -r85e95479856b97a27083b3a7d3513ee417f1371a -r6b67a152a9c351a6669aec517b4e982adeafb641
--- library/xotcl/library/store/XOTclSdbm/configure	(.../configure)	(revision 85e95479856b97a27083b3a7d3513ee417f1371a)
+++ library/xotcl/library/store/XOTclSdbm/configure	(.../configure)	(revision 6b67a152a9c351a6669aec517b4e982adeafb641)
@@ -1308,9 +1308,9 @@
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-xotcl=DIR_CONTAINING_XOTCLCONFIG_SH
-            absolute path to xotclConfig.sh,
-           --without-xotcl disables, but this is pointless
+  --with-nsf=DIR_CONTAINING_NSFCONFIG_SH
+            absolute path to nsfConfig.sh,
+           --without-nsf disables, but this is pointless
   --with-tcl              directory containing tcl configuration
                           (tclConfig.sh)
   --with-tclinclude       directory containing the public Tcl header files
@@ -1910,12 +1910,12 @@
 #--------------------------------------------------------------------
 
 
-# Check whether --with-xotcl was given.
-if test "${with_xotcl+set}" = set; then
-  withval=$with_xotcl; with_xotcl=$withval
+# Check whether --with-nsf was given.
+if test "${with_nsf+set}" = set; then
+  withval=$with_nsf; with_nsf=$withval
 else
-  { { echo "$as_me:$LINENO: error: --with-xotcl is required" >&5
-echo "$as_me: error: --with-xotcl is required" >&2;}
+  { { echo "$as_me:$LINENO: error: --with-nsf is required" >&5
+echo "$as_me: error: --with-nsf is required" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -6617,12 +6617,12 @@
 
 
 #--------------------------------------------------------------------
-# Load the xotclConfig.sh file
+# Load the nsfConfig.sh file
 #--------------------------------------------------------------------
 
-{ echo "$as_me:$LINENO: Reading file ${with_xotcl}/xotclConfig.sh" >&5
-echo "$as_me: Reading file ${with_xotcl}/xotclConfig.sh" >&6;}
-source ${with_xotcl}/xotclConfig.sh
+{ echo "$as_me:$LINENO: Reading file ${with_nsf}/nsfConfig.sh" >&5
+echo "$as_me: Reading file ${with_nsf}/nsfConfig.sh" >&6;}
+source ${with_nsf}/nsfConfig.sh
 
 #-----------------------------------------------------------------------
 # __CHANGE__
@@ -6685,14 +6685,14 @@
 
 
 
-    vars="-I${with_xotcl}/generic ${XOTCL_BUILD_INCLUDE_SPEC}"
+    vars="-I${with_nsf}/generic ${NSF_BUILD_INCLUDE_SPEC}"
     for i in $vars; do
 	PKG_INCLUDES="$PKG_INCLUDES $i"
     done
 
 
 
-    vars="$XOTCL_BUILD_STUB_LIB_SPEC $XOTCL_BUILD_LIB_SPEC"
+    vars="$NSF_BUILD_STUB_LIB_SPEC $NSF_BUILD_LIB_SPEC"
     for i in $vars; do
 	if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
 	    # Convert foo.lib to -lfoo for GCC.  No-op if not *.lib
Index: library/xotcl/library/store/XOTclSdbm/configure.in
===================================================================
diff -u -r8eddf67371ec031084a6ef98fdec21e38dff85ff -r6b67a152a9c351a6669aec517b4e982adeafb641
--- library/xotcl/library/store/XOTclSdbm/configure.in	(.../configure.in)	(revision 8eddf67371ec031084a6ef98fdec21e38dff85ff)
+++ library/xotcl/library/store/XOTclSdbm/configure.in	(.../configure.in)	(revision 6b67a152a9c351a6669aec517b4e982adeafb641)
@@ -36,11 +36,11 @@
 # specify some extra flags
 #--------------------------------------------------------------------
 
-AC_ARG_WITH(xotcl,
-        [  --with-xotcl=DIR_CONTAINING_XOTCLCONFIG_SH
-            absolute path to xotclConfig.sh, 
-           --without-xotcl disables, but this is pointless],
-        [with_xotcl=$withval], [AC_MSG_ERROR([--with-xotcl is required])])
+AC_ARG_WITH(nsf,
+        [  --with-nsf=DIR_CONTAINING_NSFCONFIG_SH
+            absolute path to nsfConfig.sh, 
+           --without-nsf disables, but this is pointless],
+        [with_nsf=$withval], [AC_MSG_ERROR([--with-nsf is required])])
 
 #--------------------------------------------------------------------
 # Load the tclConfig.sh file
@@ -73,11 +73,11 @@
 TEA_SETUP_COMPILER
 
 #--------------------------------------------------------------------
-# Load the xotclConfig.sh file
+# Load the nsfConfig.sh file
 #--------------------------------------------------------------------
 
-AC_MSG_NOTICE([Reading file ${with_xotcl}/xotclConfig.sh])
-source ${with_xotcl}/xotclConfig.sh
+AC_MSG_NOTICE([Reading file ${with_nsf}/nsfConfig.sh])
+source ${with_nsf}/nsfConfig.sh
 
 #-----------------------------------------------------------------------
 # __CHANGE__
@@ -91,7 +91,7 @@
 
 TEA_ADD_SOURCES([hash.c pair.c sdbm.c xotclsdbm.c])
 TEA_ADD_HEADERS([])
-TEA_ADD_INCLUDES([-I${with_xotcl}/generic ${NSF_BUILD_INCLUDE_SPEC}])
+TEA_ADD_INCLUDES([-I${with_nsf}/generic ${NSF_BUILD_INCLUDE_SPEC}])
 TEA_ADD_LIBS([$NSF_BUILD_STUB_LIB_SPEC $NSF_BUILD_LIB_SPEC])
 TEA_ADD_CFLAGS([])
 TEA_ADD_STUB_SOURCES([])
Index: library/xotcl/library/store/XOTclSdbm/nsf.m4
===================================================================
diff -u
--- library/xotcl/library/store/XOTclSdbm/nsf.m4	(revision 0)
+++ library/xotcl/library/store/XOTclSdbm/nsf.m4	(revision 6b67a152a9c351a6669aec517b4e982adeafb641)
@@ -0,0 +1,140 @@
+# nsf.m4 --
+#
+#	This file provides a set of autoconf macros to help TEA-enable
+#	a Tcl extension.
+#
+# Copyright (c) 1999 Scriptics Corporation.
+# Copyright (c) 1999-2008 Gustaf Neumann, Uwe Zdun
+#
+# See the file "tcl-license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+
+#------------------------------------------------------------------------
+# SC_PATH_NSFCONFIG --
+#
+#	Locate the nsfConfig.sh file and perform a sanity check on
+#	the Tcl compile flags
+#
+# Arguments:
+#	none
+#
+# Results:
+#
+#	Adds the following arguments to configure:
+#		--with-nsf=...
+#
+#	Defines the following vars:
+#		NX_BIN_DIR	Full path to the directory containing
+#				the nsfConfig.sh file
+#------------------------------------------------------------------------
+
+AC_DEFUN(SC_PATH_NSFCONFIG, [
+    #
+    # Ok, lets find the tcl configuration
+    # First, look for one uninstalled.
+    # the alternative search directory is invoked by --with-tcl
+    #
+    if test x"${no_nsf}" = x ; then
+	# we reset no_nsf in case something fails here
+	no_nsf=true
+	AC_ARG_WITH(nsf, [  --with-nsf              directory containing nsf configuration (nsfConfig.sh)], with_nsfconfig=${withval})
+	AC_MSG_CHECKING([for nsf configuration])
+	AC_CACHE_VAL(ac_cv_c_nsfconfig,[
+
+	    # First check to see if --with-nsf was specified.
+	    if test x"${with_nsfconfig}" != x ; then
+		if test -f "${with_nsfconfig}/nsfConfig.sh" ; then
+		    ac_cv_c_nsfconfig=`(cd ${with_nsfconfig}; pwd)`
+		else
+		    AC_MSG_ERROR([${with_nsfconfig} directory doesn't contain nsfConfig.sh])
+		fi
+	    fi
+
+	    # then check for a private Tcl installation
+	    if test x"${ac_cv_c_nsfconfig}" = x ; then
+		for i in \
+			${srcdir}/../nsf \
+			`ls -dr ${srcdir}/../nsf-* 2>/dev/null` \
+			${srcdir}/../../nsf \
+			`ls -dr ${srcdir}/../../nsf-* 2>/dev/null` \
+			${srcdir}/../../../nsf \
+			`ls -dr ${srcdir}/../../../nsf-* 2>/dev/null` \
+			${srcdir}/../../../../nsf \
+			`ls -dr ${srcdir}/../../../../nsf-* 2>/dev/null` \
+			${srcdir}/../../../../../nsf \
+			`ls -dr ${srcdir}/../../../../../nsf-* 2>/dev/null` ; do
+		    if test -f "$i/nsfConfig.sh" ; then
+			ac_cv_c_nsfconfig=`(cd $i; pwd)`
+			break
+		    fi
+		done
+	    fi
+
+	    # check in a few common install locations
+	    if test x"${ac_cv_c_nsfconfig}" = x ; then
+		for i in `ls -d ${prefix}/lib 2>/dev/null` \
+			`ls -d /usr/local/lib 2>/dev/null` ; do
+		    if test -f "$i/nsfConfig.sh" ; then
+			ac_cv_c_nsfconfig=`(cd $i; pwd)`
+			break
+		    fi
+		done
+	    fi
+
+	])
+
+	if test x"${ac_cv_c_nsfconfig}" = x ; then
+	    NX_BIN_DIR="# no nsf configs found"
+	    AC_MSG_WARN(Can't find nsf configuration definitions)
+	    exit 0
+	else
+	    no_nsf=
+	    NX_BIN_DIR=${ac_cv_c_nsfconfig}
+	    AC_MSG_RESULT(found $NX_BIN_DIR/nsfConfig.sh)
+	fi
+    fi
+])
+
+#------------------------------------------------------------------------
+# SC_LOAD_NSFCONFIG --
+#
+#	Load the tclConfig.sh file
+#
+# Arguments:
+#	
+#	Requires the following vars to be set:
+#		NX_BIN_DIR
+#
+# Results:
+#
+#	Subst the vars:
+#
+#------------------------------------------------------------------------
+
+AC_DEFUN(SC_LOAD_NSFCONFIG, [
+    AC_MSG_CHECKING([for existence of $NX_BIN_DIR/nsfConfig.sh])
+
+    if test -f "$NX_BIN_DIR/nsfConfig.sh" ; then
+        AC_MSG_RESULT([loading])
+	. $NX_BIN_DIR/nsfConfig.sh
+    else
+        AC_MSG_RESULT([file not found])
+    fi
+
+    #
+    # The eval is required to do the TCL_DBGX substitution in the
+    # TCL_LIB_FILE variable
+    #
+    AC_SUBST(NX_VERSION)
+    AC_SUBST(NX_MAJOR_VERSION)
+    AC_SUBST(NX_MINOR_VERSION)
+    AC_SUBST(NX_RELEASE_LEVEL)
+    AC_SUBST(NX_LIB_FILE)
+    AC_SUBST(NX_BUILD_LIB_SPEC)
+    AC_SUBST(NX_LIB_SPEC)
+    AC_SUBST(NX_STUB_LIB_FILE)
+    AC_SUBST(NX_BUILD_STUB_LIB_SPEC)
+    AC_SUBST(NX_STUB_LIB_SPEC)
+    AC_SUBST(NX_SRC_DIR)
+])
+
Fisheye: Tag 6b67a152a9c351a6669aec517b4e982adeafb641 refers to a dead (removed) revision in file `library/xotcl/library/store/XOTclSdbm/xotcl.m4'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: library/xotcl/library/xml/TclExpat-1.1/aclocal.m4
===================================================================
diff -u -rf3b7952aabc9e4f9079febd1f5b7f5fb833fd50c -r6b67a152a9c351a6669aec517b4e982adeafb641
--- library/xotcl/library/xml/TclExpat-1.1/aclocal.m4	(.../aclocal.m4)	(revision f3b7952aabc9e4f9079febd1f5b7f5fb833fd50c)
+++ library/xotcl/library/xml/TclExpat-1.1/aclocal.m4	(.../aclocal.m4)	(revision 6b67a152a9c351a6669aec517b4e982adeafb641)
@@ -1,3 +1,3 @@
-builtin(include,xotcl.m4)
+builtin(include,nsf.m4)
 builtin(include,tcl.m4)
 
Index: library/xotcl/library/xml/TclExpat-1.1/configure
===================================================================
diff -u -r85e95479856b97a27083b3a7d3513ee417f1371a -r6b67a152a9c351a6669aec517b4e982adeafb641
--- library/xotcl/library/xml/TclExpat-1.1/configure	(.../configure)	(revision 85e95479856b97a27083b3a7d3513ee417f1371a)
+++ library/xotcl/library/xml/TclExpat-1.1/configure	(.../configure)	(revision 6b67a152a9c351a6669aec517b4e982adeafb641)
@@ -1308,9 +1308,9 @@
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-xotcl=DIR_CONTAINING_XOTCLCONFIG_SH
-            absolute path to xotclConfig.sh,
-           --without-xotcl disables, but this is pointless
+  --with-nsf=DIR_CONTAINING_NSFCONFIG_SH
+            absolute path to nsfConfig.sh,
+           --without-nsf disables, but this is pointless
   --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
@@ -1913,12 +1913,12 @@
 #--------------------------------------------------------------------
 
 
-# Check whether --with-xotcl was given.
-if test "${with_xotcl+set}" = set; then
-  withval=$with_xotcl; with_xotcl=$withval
+# Check whether --with-nsf was given.
+if test "${with_nsf+set}" = set; then
+  withval=$with_nsf; with_nsf=$withval
 else
-  { { echo "$as_me:$LINENO: error: --with-xotcl is required" >&5
-echo "$as_me: error: --with-xotcl is required" >&2;}
+  { { echo "$as_me:$LINENO: error: --with-nsf is required" >&5
+echo "$as_me: error: --with-nsf is required" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -6660,12 +6660,12 @@
 
 
 #--------------------------------------------------------------------
-# Load the xotclConfig.sh file
+# Load the nsfConfig.sh file
 #--------------------------------------------------------------------
 
-{ echo "$as_me:$LINENO: Reading file ${with_xotcl}/xotclConfig.sh" >&5
-echo "$as_me: Reading file ${with_xotcl}/xotclConfig.sh" >&6;}
-source ${with_xotcl}/xotclConfig.sh
+{ echo "$as_me:$LINENO: Reading file ${with_nsf}/nsfConfig.sh" >&5
+echo "$as_me: Reading file ${with_nsf}/nsfConfig.sh" >&6;}
+source ${with_nsf}/nsfConfig.sh
 
 #-----------------------------------------------------------------------
 # __CHANGE__
@@ -6806,14 +6806,14 @@
 
 
 
-    vars="-I${with_xotcl}/generic ${XOTCL_BUILD_INCLUDE_SPEC}"
+    vars="-I${with_nsf}/generic ${NSF_BUILD_INCLUDE_SPEC}"
     for i in $vars; do
 	PKG_INCLUDES="$PKG_INCLUDES $i"
     done
 
 
 
-    vars="$XOTCL_BUILD_STUB_LIB_SPEC"
+    vars="$NSF_BUILD_STUB_LIB_SPEC"
     for i in $vars; do
 	if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
 	    # Convert foo.lib to -lfoo for GCC.  No-op if not *.lib
Index: library/xotcl/library/xml/TclExpat-1.1/configure.in
===================================================================
diff -u -r8eddf67371ec031084a6ef98fdec21e38dff85ff -r6b67a152a9c351a6669aec517b4e982adeafb641
--- library/xotcl/library/xml/TclExpat-1.1/configure.in	(.../configure.in)	(revision 8eddf67371ec031084a6ef98fdec21e38dff85ff)
+++ library/xotcl/library/xml/TclExpat-1.1/configure.in	(.../configure.in)	(revision 6b67a152a9c351a6669aec517b4e982adeafb641)
@@ -36,11 +36,11 @@
 # specify some extra flags
 #--------------------------------------------------------------------
 
-AC_ARG_WITH(xotcl,
-        [  --with-xotcl=DIR_CONTAINING_XOTCLCONFIG_SH
-            absolute path to xotclConfig.sh, 
-           --without-xotcl disables, but this is pointless],
-        [with_xotcl=$withval], [AC_MSG_ERROR([--with-xotcl is required])])
+AC_ARG_WITH(nsf,
+        [  --with-nsf=DIR_CONTAINING_NSFCONFIG_SH
+            absolute path to nsfConfig.sh, 
+           --without-nsf disables, but this is pointless],
+        [with_nsf=$withval], [AC_MSG_ERROR([--with-nsf is required])])
 
 AC_ARG_WITH(expat,
         [  --with-expat=sys assumes a system-wide expat installation, 
@@ -107,11 +107,11 @@
 TEA_SETUP_COMPILER
 
 #--------------------------------------------------------------------
-# Load the xotclConfig.sh file
+# Load the nsfConfig.sh file
 #--------------------------------------------------------------------
 
-AC_MSG_NOTICE([Reading file ${with_xotcl}/xotclConfig.sh])
-source ${with_xotcl}/xotclConfig.sh
+AC_MSG_NOTICE([Reading file ${with_nsf}/nsfConfig.sh])
+source ${with_nsf}/nsfConfig.sh
 
 #-----------------------------------------------------------------------
 # __CHANGE__
@@ -149,7 +149,7 @@
 fi
 
 TEA_ADD_HEADERS([])
-TEA_ADD_INCLUDES([-I${with_xotcl}/generic ${NSF_BUILD_INCLUDE_SPEC}])
+TEA_ADD_INCLUDES([-I${with_nsf}/generic ${NSF_BUILD_INCLUDE_SPEC}])
 TEA_ADD_LIBS([$NSF_BUILD_STUB_LIB_SPEC])
 TEA_ADD_CFLAGS([])
 TEA_ADD_STUB_SOURCES([])
Index: library/xotcl/library/xml/TclExpat-1.1/nsf.m4
===================================================================
diff -u
--- library/xotcl/library/xml/TclExpat-1.1/nsf.m4	(revision 0)
+++ library/xotcl/library/xml/TclExpat-1.1/nsf.m4	(revision 6b67a152a9c351a6669aec517b4e982adeafb641)
@@ -0,0 +1,140 @@
+# nsf.m4 --
+#
+#	This file provides a set of autoconf macros to help TEA-enable
+#	a Tcl extension.
+#
+# Copyright (c) 1999 Scriptics Corporation.
+# Copyright (c) 1999-2008 Gustaf Neumann, Uwe Zdun
+#
+# See the file "tcl-license.terms" for information on usage and redistribution
+# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+
+#------------------------------------------------------------------------
+# SC_PATH_NSFCONFIG --
+#
+#	Locate the nsfConfig.sh file and perform a sanity check on
+#	the Tcl compile flags
+#
+# Arguments:
+#	none
+#
+# Results:
+#
+#	Adds the following arguments to configure:
+#		--with-nsf=...
+#
+#	Defines the following vars:
+#		NX_BIN_DIR	Full path to the directory containing
+#				the nsfConfig.sh file
+#------------------------------------------------------------------------
+
+AC_DEFUN(SC_PATH_NSFCONFIG, [
+    #
+    # Ok, lets find the tcl configuration
+    # First, look for one uninstalled.
+    # the alternative search directory is invoked by --with-tcl
+    #
+    if test x"${no_nsf}" = x ; then
+	# we reset no_nsf in case something fails here
+	no_nsf=true
+	AC_ARG_WITH(nsf, [  --with-nsf              directory containing nsf configuration (nsfConfig.sh)], with_nsfconfig=${withval})
+	AC_MSG_CHECKING([for nsf configuration])
+	AC_CACHE_VAL(ac_cv_c_nsfconfig,[
+
+	    # First check to see if --with-nsf was specified.
+	    if test x"${with_nsfconfig}" != x ; then
+		if test -f "${with_nsfconfig}/nsfConfig.sh" ; then
+		    ac_cv_c_nsfconfig=`(cd ${with_nsfconfig}; pwd)`
+		else
+		    AC_MSG_ERROR([${with_nsfconfig} directory doesn't contain nsfConfig.sh])
+		fi
+	    fi
+
+	    # then check for a private Tcl installation
+	    if test x"${ac_cv_c_nsfconfig}" = x ; then
+		for i in \
+			${srcdir}/../nsf \
+			`ls -dr ${srcdir}/../nsf-* 2>/dev/null` \
+			${srcdir}/../../nsf \
+			`ls -dr ${srcdir}/../../nsf-* 2>/dev/null` \
+			${srcdir}/../../../nsf \
+			`ls -dr ${srcdir}/../../../nsf-* 2>/dev/null` \
+			${srcdir}/../../../../nsf \
+			`ls -dr ${srcdir}/../../../../nsf-* 2>/dev/null` \
+			${srcdir}/../../../../../nsf \
+			`ls -dr ${srcdir}/../../../../../nsf-* 2>/dev/null` ; do
+		    if test -f "$i/nsfConfig.sh" ; then
+			ac_cv_c_nsfconfig=`(cd $i; pwd)`
+			break
+		    fi
+		done
+	    fi
+
+	    # check in a few common install locations
+	    if test x"${ac_cv_c_nsfconfig}" = x ; then
+		for i in `ls -d ${prefix}/lib 2>/dev/null` \
+			`ls -d /usr/local/lib 2>/dev/null` ; do
+		    if test -f "$i/nsfConfig.sh" ; then
+			ac_cv_c_nsfconfig=`(cd $i; pwd)`
+			break
+		    fi
+		done
+	    fi
+
+	])
+
+	if test x"${ac_cv_c_nsfconfig}" = x ; then
+	    NX_BIN_DIR="# no nsf configs found"
+	    AC_MSG_WARN(Can't find nsf configuration definitions)
+	    exit 0
+	else
+	    no_nsf=
+	    NX_BIN_DIR=${ac_cv_c_nsfconfig}
+	    AC_MSG_RESULT(found $NX_BIN_DIR/nsfConfig.sh)
+	fi
+    fi
+])
+
+#------------------------------------------------------------------------
+# SC_LOAD_NSFCONFIG --
+#
+#	Load the tclConfig.sh file
+#
+# Arguments:
+#	
+#	Requires the following vars to be set:
+#		NX_BIN_DIR
+#
+# Results:
+#
+#	Subst the vars:
+#
+#------------------------------------------------------------------------
+
+AC_DEFUN(SC_LOAD_NSFCONFIG, [
+    AC_MSG_CHECKING([for existence of $NX_BIN_DIR/nsfConfig.sh])
+
+    if test -f "$NX_BIN_DIR/nsfConfig.sh" ; then
+        AC_MSG_RESULT([loading])
+	. $NX_BIN_DIR/nsfConfig.sh
+    else
+        AC_MSG_RESULT([file not found])
+    fi
+
+    #
+    # The eval is required to do the TCL_DBGX substitution in the
+    # TCL_LIB_FILE variable
+    #
+    AC_SUBST(NX_VERSION)
+    AC_SUBST(NX_MAJOR_VERSION)
+    AC_SUBST(NX_MINOR_VERSION)
+    AC_SUBST(NX_RELEASE_LEVEL)
+    AC_SUBST(NX_LIB_FILE)
+    AC_SUBST(NX_BUILD_LIB_SPEC)
+    AC_SUBST(NX_LIB_SPEC)
+    AC_SUBST(NX_STUB_LIB_FILE)
+    AC_SUBST(NX_BUILD_STUB_LIB_SPEC)
+    AC_SUBST(NX_STUB_LIB_SPEC)
+    AC_SUBST(NX_SRC_DIR)
+])
+
Fisheye: Tag 6b67a152a9c351a6669aec517b4e982adeafb641 refers to a dead (removed) revision in file `library/xotcl/library/xml/TclExpat-1.1/xotcl.m4'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: unix/pkgIndex.unix.in
===================================================================
diff -u -r00e168b160c8ad9d3785b0f32972577ac980c73a -r6b67a152a9c351a6669aec517b4e982adeafb641
--- unix/pkgIndex.unix.in	(.../pkgIndex.unix.in)	(revision 00e168b160c8ad9d3785b0f32972577ac980c73a)
+++ unix/pkgIndex.unix.in	(.../pkgIndex.unix.in)	(revision 6b67a152a9c351a6669aec517b4e982adeafb641)
@@ -1,4 +1,3 @@
-  package ifneeded nx @PACKAGE_VERSION@ [list load \
-    [file join $dir @PKG_LIB_FILE@] nx]
+package ifneeded nsf @PACKAGE_VERSION@ [list load [file join $dir @PKG_LIB_FILE@] nsf]
 
 
Fisheye: Tag 6b67a152a9c351a6669aec517b4e982adeafb641 refers to a dead (removed) revision in file `unix/tclAppInit.c'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 6b67a152a9c351a6669aec517b4e982adeafb641 refers to a dead (removed) revision in file `unix/tkAppInit.c'.
Fisheye: No comparison available.  Pass `N' to diff?