Index: configure
===================================================================
diff -u -r85e95479856b97a27083b3a7d3513ee417f1371a -r1d47ca3db133ff4eef6bf13f35c5f4e7bfd49a20
--- configure	(.../configure)	(revision 85e95479856b97a27083b3a7d3513ee417f1371a)
+++ configure	(.../configure)	(revision 1d47ca3db133ff4eef6bf13f35c5f4e7bfd49a20)
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for nx 2.0.0.
+# Generated by GNU Autoconf 2.61 for nsf 2.0.0.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -570,10 +570,10 @@
 SHELL=${CONFIG_SHELL-/bin/sh}
 
 # Identity of this package.
-PACKAGE_NAME='nx'
-PACKAGE_TARNAME='nx'
+PACKAGE_NAME='nsf'
+PACKAGE_TARNAME='nsf'
 PACKAGE_VERSION='2.0.0'
-PACKAGE_STRING='nx 2.0.0'
+PACKAGE_STRING='nsf 2.0.0'
 PACKAGE_BUGREPORT=''
 
 # Factoring default headers for most tests.
@@ -661,10 +661,10 @@
 PKG_LIBS
 PKG_CFLAGS
 subdirs
-NX_VERSION
-NX_MAJOR_VERSION
-NX_MINOR_VERSION
-NX_RELEASE_LEVEL
+NSF_VERSION
+NSF_MAJOR_VERSION
+NSF_MINOR_VERSION
+NSF_RELEASE_LEVEL
 TCL_VERSION
 TCL_PATCH_LEVEL
 TCL_BIN_DIR
@@ -733,24 +733,24 @@
 MAKE_STUB_LIB
 RANLIB_STUB
 TCLSH_PROG
-NX_COMPATIBLE_TCLSH
+NSF_COMPATIBLE_TCLSH
 PKG_DIR
 pkgdatadir
 pkglibdir
 pkgincludedir
 SHARED_LIB_SUFFIX
 UNSHARED_LIB_SUFFIX
-NX_BUILD_LIB_SPEC
-NX_LIB_SPEC
-NX_BUILD_STUB_LIB_SPEC
-NX_STUB_LIB_SPEC
-NX_BUILD_STUB_LIB_PATH
-NX_STUB_LIB_PATH
-NX_SRC_DIR
+NSF_BUILD_LIB_SPEC
+NSF_LIB_SPEC
+NSF_BUILD_STUB_LIB_SPEC
+NSF_STUB_LIB_SPEC
+NSF_BUILD_STUB_LIB_PATH
+NSF_STUB_LIB_PATH
+NSF_SRC_DIR
 NXSH
 XOWISH
-NX_BUILD_INCLUDE_DIR
-NX_BUILD_INCLUDE_SPEC
+NSF_BUILD_INCLUDE_DIR
+NSF_BUILD_INCLUDE_SPEC
 test_actiweb
 libdirs_actiweb
 apps_actiweb
@@ -1270,7 +1270,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures nx 2.0.0 to adapt to many kinds of systems.
+\`configure' configures nsf 2.0.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1318,7 +1318,7 @@
   --infodir=DIR          info documentation [DATAROOTDIR/info]
   --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
   --mandir=DIR           man documentation [DATAROOTDIR/man]
-  --docdir=DIR           documentation root [DATAROOTDIR/doc/nx]
+  --docdir=DIR           documentation root [DATAROOTDIR/doc/nsf]
   --htmldir=DIR          html documentation [DOCDIR]
   --dvidir=DIR           dvi documentation [DOCDIR]
   --pdfdir=DIR           pdf documentation [DOCDIR]
@@ -1331,7 +1331,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of nx 2.0.0:";;
+     short | recursive ) echo "Configuration of nsf 2.0.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1445,7 +1445,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-nx configure 2.0.0
+nsf configure 2.0.0
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1459,7 +1459,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by nx $as_me 2.0.0, which was
+It was created by nsf $as_me 2.0.0, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -2072,12 +2072,12 @@
 
 # do not modify the following lines manually, they are generated with
 # the script changeXOTclVersion
-NX_MAJOR_VERSION=2
-NX_MINOR_VERSION=0
-NX_RELEASE_LEVEL=.0
+NSF_MAJOR_VERSION=2
+NSF_MINOR_VERSION=0
+NSF_RELEASE_LEVEL=.0
 
-NX_VERSION=${NX_MAJOR_VERSION}.${NX_MINOR_VERSION}
-NODOT_VERSION=${NX_MAJOR_VERSION}${NX_MINOR_VERSION}
+NSF_VERSION=${NSF_MAJOR_VERSION}.${NSF_MINOR_VERSION}
+NODOT_VERSION=${NSF_MAJOR_VERSION}${NSF_MINOR_VERSION}
 
 
 
@@ -7061,7 +7061,7 @@
 
 
     vars="xotcl.c xotclError.c xotclMetaData.c xotclObjectData.c xotclProfile.c \
-	xotclTrace.c xotclUtil.c xotclShadow.c xotclCompile.c aolstub.c nxStubInit.c"
+	xotclTrace.c xotclUtil.c xotclShadow.c xotclCompile.c aolstub.c nsfStubInit.c"
     for i in $vars; do
 	case $i in
 	    \$*)
@@ -7098,7 +7098,7 @@
 
 
 
-    vars="generic/xotcl.h generic/xotclInt.h generic/nxDecls.h generic/nxIntDecls.h"
+    vars="generic/xotcl.h generic/xotclInt.h generic/nsfDecls.h generic/nsfIntDecls.h"
     for i in $vars; do
 	# check for existence, be strict because it is installed
 	if test ! -f "${srcdir}/$i" ; then
@@ -7129,12 +7129,12 @@
 
 
 
-    PKG_CFLAGS="$PKG_CFLAGS -DNXVERSION=\\\"$NX_VERSION\\\" -DNXPATCHLEVEL=\\\"$NX_RELEASE_LEVEL\\\" \
+    PKG_CFLAGS="$PKG_CFLAGS -DNSF_VERSION=\\\"$NSF_VERSION\\\" -DNSF_PATCHLEVEL=\\\"$NSF_RELEASE_LEVEL\\\" \
 	$AOL_DEFINES $HAVE_TCL_COMPILE_H"
 
 
 
-    vars="nxStubLib.c"
+    vars="nsfStubLib.c"
     for i in $vars; do
 	# check for existence - allows for generic/win/unix VPATH
 	if test ! -f "${srcdir}/$i" -a ! -f "${srcdir}/generic/$i" \
@@ -10632,17 +10632,17 @@
 
 
 
-# Without the following two eval statements, NX_SHARED_LIB_SUFFIX
+# Without the following two eval statements, NSF_SHARED_LIB_SUFFIX
 # in xotclConfig.sh has $PACKAGE_VERSION unresolved. When another
 # app links against xotcl, the PACKAGE_VERSIONs are confused.
 #
 # Without the first eval, we get
-#   NX_SHARED_LIB_SUFFIX=${PACKAGE_VERSION}\$\{DBGX\}${SHLIB_SUFFIX}
-#   NX_UNSHARED_LIB_SUFFIX=${PACKAGE_VERSION}\$\{DBGX\}.a
+#   NSF_SHARED_LIB_SUFFIX=${PACKAGE_VERSION}\$\{DBGX\}${SHLIB_SUFFIX}
+#   NSF_UNSHARED_LIB_SUFFIX=${PACKAGE_VERSION}\$\{DBGX\}.a
 #
 # after the first eval, we get
-#   NX_SHARED_LIB_SUFFIX=1.2.1${DBGX}.so
-#   NX_UNSHARED_LIB_SUFFIX=1.2.1${DBGX}.a
+#   NSF_SHARED_LIB_SUFFIX=1.2.1${DBGX}.so
+#   NSF_UNSHARED_LIB_SUFFIX=1.2.1${DBGX}.a
 # after the second eval, all variables are resolved.
 
 
@@ -10849,7 +10849,7 @@
 
 
 # make this available, for such as xotclConfig.sh
-NX_COMPATIBLE_TCLSH=${TCLSH_PROG}
+NSF_COMPATIBLE_TCLSH=${TCLSH_PROG}
 
 
 # resolve the variables
@@ -10874,34 +10874,34 @@
 
 if test "${TEA_PLATFORM}" != "windows" ; then
 
-NX_BUILD_LIB_SPEC="-L`pwd` -lnext${PACKAGE_VERSION}"
-NX_LIB_SPEC="-L${pkglibdir} -lnext${PACKAGE_VERSION}"
+NSF_BUILD_LIB_SPEC="-L`pwd` -lnsf${PACKAGE_VERSION}"
+NSF_LIB_SPEC="-L${pkglibdir} -lnsf${PACKAGE_VERSION}"
 
 # stub libs are not build for 8.0
 if test "${TCL_MAJOR_VERSION}" = "8" -a "${TCL_MINOR_VERSION}" = "0"; then
-	NX_BUILD_STUB_LIB_PATH=""
-	NX_STUB_LIB_PATH=""
-	NX_BUILD_STUB_LIB_SPEC=""
-	NX_STUB_LIB_SPEC=""
+	NSF_BUILD_STUB_LIB_PATH=""
+	NSF_STUB_LIB_PATH=""
+	NSF_BUILD_STUB_LIB_SPEC=""
+	NSF_STUB_LIB_SPEC=""
 else
-	NX_BUILD_STUB_LIB_PATH="`pwd`/${PKG_STUB_LIB_FILE}"
-	NX_STUB_LIB_PATH="${pkglibdir}/${PKG_STUB_LIB_FILE}"
-	NX_BUILD_STUB_LIB_SPEC="-L`pwd` -lnextstub${PACKAGE_VERSION}"
-	NX_STUB_LIB_SPEC="-L${pkglibdir} -lnextstub${PACKAGE_VERSION}"
+	NSF_BUILD_STUB_LIB_PATH="`pwd`/${PKG_STUB_LIB_FILE}"
+	NSF_STUB_LIB_PATH="${pkglibdir}/${PKG_STUB_LIB_FILE}"
+	NSF_BUILD_STUB_LIB_SPEC="-L`pwd` -lnsfstub${PACKAGE_VERSION}"
+	NSF_STUB_LIB_SPEC="-L${pkglibdir} -lnsfstub${PACKAGE_VERSION}"
 	cat >>confdefs.h <<\_ACEOF
-#define COMPILE_NX_STUBS 1
+#define COMPILE_NSF_STUBS 1
 _ACEOF
 
 fi
 
 else
 
-NX_BUILD_LIB_SPEC="`pwd`/${PKG_LIB_FILE}"
-NX_LIB_SPEC="${pkglibdir}/${PKG_LIB_FILE}"
-NX_BUILD_STUB_LIB_PATH="`pwd`/${PKG_STUB_LIB_FILE}"
-NX_STUB_LIB_PATH="${pkglibdir}/${PKG_STUB_LIB_FILE}"
-NX_BUILD_STUB_LIB_SPEC="`pwd`/${PKG_STUB_LIB_FILE}"
-NX_STUB_LIB_SPEC="${pkglibdir}/${PKG_STUB_LIB_FILE}"
+NSF_BUILD_LIB_SPEC="`pwd`/${PKG_LIB_FILE}"
+NSF_LIB_SPEC="${pkglibdir}/${PKG_LIB_FILE}"
+NSF_BUILD_STUB_LIB_PATH="`pwd`/${PKG_STUB_LIB_FILE}"
+NSF_STUB_LIB_PATH="${pkglibdir}/${PKG_STUB_LIB_FILE}"
+NSF_BUILD_STUB_LIB_SPEC="`pwd`/${PKG_STUB_LIB_FILE}"
+NSF_STUB_LIB_SPEC="${pkglibdir}/${PKG_STUB_LIB_FILE}"
 
 fi
 
@@ -10913,14 +10913,14 @@
 
 
 
-NX_SRC_DIR=$srcdir
+NSF_SRC_DIR=$srcdir
 
 
 
 
 # include dir of xotcl during build process (i.e., does not assume installed)
-NX_BUILD_INCLUDE_DIR="${NX_SRC_DIR}/generic"
-NX_BUILD_INCLUDE_SPEC="-I${NX_BUILD_INCLUDE_DIR}"
+NSF_BUILD_INCLUDE_DIR="${NSF_SRC_DIR}/generic"
+NSF_BUILD_INCLUDE_SPEC="-I${NSF_BUILD_INCLUDE_DIR}"
 
 
 
@@ -11382,7 +11382,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by nx $as_me 2.0.0, which was
+This file was extended by nsf $as_me 2.0.0, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -11425,7 +11425,7 @@
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-nx config.status 2.0.0
+nsf config.status 2.0.0
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -11639,10 +11639,10 @@
 PKG_LIBS!$PKG_LIBS$ac_delim
 PKG_CFLAGS!$PKG_CFLAGS$ac_delim
 subdirs!$subdirs$ac_delim
-NX_VERSION!$NX_VERSION$ac_delim
-NX_MAJOR_VERSION!$NX_MAJOR_VERSION$ac_delim
-NX_MINOR_VERSION!$NX_MINOR_VERSION$ac_delim
-NX_RELEASE_LEVEL!$NX_RELEASE_LEVEL$ac_delim
+NSF_VERSION!$NSF_VERSION$ac_delim
+NSF_MAJOR_VERSION!$NSF_MAJOR_VERSION$ac_delim
+NSF_MINOR_VERSION!$NSF_MINOR_VERSION$ac_delim
+NSF_RELEASE_LEVEL!$NSF_RELEASE_LEVEL$ac_delim
 TCL_VERSION!$TCL_VERSION$ac_delim
 TCL_PATCH_LEVEL!$TCL_PATCH_LEVEL$ac_delim
 TCL_BIN_DIR!$TCL_BIN_DIR$ac_delim
@@ -11752,24 +11752,24 @@
 MAKE_STUB_LIB!$MAKE_STUB_LIB$ac_delim
 RANLIB_STUB!$RANLIB_STUB$ac_delim
 TCLSH_PROG!$TCLSH_PROG$ac_delim
-NX_COMPATIBLE_TCLSH!$NX_COMPATIBLE_TCLSH$ac_delim
+NSF_COMPATIBLE_TCLSH!$NSF_COMPATIBLE_TCLSH$ac_delim
 PKG_DIR!$PKG_DIR$ac_delim
 pkgdatadir!$pkgdatadir$ac_delim
 pkglibdir!$pkglibdir$ac_delim
 pkgincludedir!$pkgincludedir$ac_delim
 SHARED_LIB_SUFFIX!$SHARED_LIB_SUFFIX$ac_delim
 UNSHARED_LIB_SUFFIX!$UNSHARED_LIB_SUFFIX$ac_delim
-NX_BUILD_LIB_SPEC!$NX_BUILD_LIB_SPEC$ac_delim
-NX_LIB_SPEC!$NX_LIB_SPEC$ac_delim
-NX_BUILD_STUB_LIB_SPEC!$NX_BUILD_STUB_LIB_SPEC$ac_delim
-NX_STUB_LIB_SPEC!$NX_STUB_LIB_SPEC$ac_delim
-NX_BUILD_STUB_LIB_PATH!$NX_BUILD_STUB_LIB_PATH$ac_delim
-NX_STUB_LIB_PATH!$NX_STUB_LIB_PATH$ac_delim
-NX_SRC_DIR!$NX_SRC_DIR$ac_delim
+NSF_BUILD_LIB_SPEC!$NSF_BUILD_LIB_SPEC$ac_delim
+NSF_LIB_SPEC!$NSF_LIB_SPEC$ac_delim
+NSF_BUILD_STUB_LIB_SPEC!$NSF_BUILD_STUB_LIB_SPEC$ac_delim
+NSF_STUB_LIB_SPEC!$NSF_STUB_LIB_SPEC$ac_delim
+NSF_BUILD_STUB_LIB_PATH!$NSF_BUILD_STUB_LIB_PATH$ac_delim
+NSF_STUB_LIB_PATH!$NSF_STUB_LIB_PATH$ac_delim
+NSF_SRC_DIR!$NSF_SRC_DIR$ac_delim
 NXSH!$NXSH$ac_delim
 XOWISH!$XOWISH$ac_delim
-NX_BUILD_INCLUDE_DIR!$NX_BUILD_INCLUDE_DIR$ac_delim
-NX_BUILD_INCLUDE_SPEC!$NX_BUILD_INCLUDE_SPEC$ac_delim
+NSF_BUILD_INCLUDE_DIR!$NSF_BUILD_INCLUDE_DIR$ac_delim
+NSF_BUILD_INCLUDE_SPEC!$NSF_BUILD_INCLUDE_SPEC$ac_delim
 test_actiweb!$test_actiweb$ac_delim
 libdirs_actiweb!$libdirs_actiweb$ac_delim
 apps_actiweb!$apps_actiweb$ac_delim