Index: xotcl.m4
===================================================================
diff -u -raf4326a00a0f2d0b2f1e0369af71637f48c2d56a -r0e8b567e2a1808c514f6340430920ad4d59953bc
--- xotcl.m4	(.../xotcl.m4)	(revision af4326a00a0f2d0b2f1e0369af71637f48c2d56a)
+++ xotcl.m4	(.../xotcl.m4)	(revision 0e8b567e2a1808c514f6340430920ad4d59953bc)
@@ -10,9 +10,9 @@
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 #------------------------------------------------------------------------
-# SC_PATH_XOTCLCONFIG --
+# SC_PATH_NSFCONFIG --
 #
-#	Locate the xotclConfig.sh file and perform a sanity check on
+#	Locate the nsfConfig.sh file and perform a sanity check on
 #	the Tcl compile flags
 #
 # Arguments:
@@ -25,10 +25,10 @@
 #
 #	Defines the following vars:
 #		NX_BIN_DIR	Full path to the directory containing
-#				the xotclConfig.sh file
+#				the nsfConfig.sh file
 #------------------------------------------------------------------------
 
-AC_DEFUN(SC_PATH_XOTCLCONFIG, [
+AC_DEFUN(SC_PATH_NSFCONFIG, [
     #
     # Ok, lets find the tcl configuration
     # First, look for one uninstalled.
@@ -37,21 +37,21 @@
     if test x"${no_xotcl}" = x ; then
 	# we reset no_xotcl in case something fails here
 	no_xotcl=true
-	AC_ARG_WITH(xotcl, [  --with-xotcl              directory containing xotcl configuration (xotclConfig.sh)], with_xotclconfig=${withval})
+	AC_ARG_WITH(xotcl, [  --with-xotcl              directory containing xotcl configuration (nsfConfig.sh)], with_nsfconfig=${withval})
 	AC_MSG_CHECKING([for XOTcl configuration])
-	AC_CACHE_VAL(ac_cv_c_xotclconfig,[
+	AC_CACHE_VAL(ac_cv_c_nsfconfig,[
 
 	    # First check to see if --with-xotcl was specified.
-	    if test x"${with_xotclconfig}" != x ; then
-		if test -f "${with_xotclconfig}/xotclConfig.sh" ; then
-		    ac_cv_c_xotclconfig=`(cd ${with_xotclconfig}; pwd)`
+	    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_xotclconfig} directory doesn't contain xotclConfig.sh])
+		    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_xotclconfig}" = x ; then
+	    if test x"${ac_cv_c_nsfconfig}" = x ; then
 		for i in \
 			${srcdir}/../xotcl \
 			`ls -dr ${srcdir}/../xotcl-* 2>/dev/null` \
@@ -63,40 +63,40 @@
 			`ls -dr ${srcdir}/../../../../xotcl-* 2>/dev/null` \
 			${srcdir}/../../../../../xotcl \
 			`ls -dr ${srcdir}/../../../../../xotcl-* 2>/dev/null` ; do
-		    if test -f "$i/xotclConfig.sh" ; then
-			ac_cv_c_xotclconfig=`(cd $i; pwd)`
+		    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_xotclconfig}" = x ; then
+	    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/xotclConfig.sh" ; then
-			ac_cv_c_xotclconfig=`(cd $i; pwd)`
+		    if test -f "$i/nsfConfig.sh" ; then
+			ac_cv_c_nsfconfig=`(cd $i; pwd)`
 			break
 		    fi
 		done
 	    fi
 
 	])
 
-	if test x"${ac_cv_c_xotclconfig}" = x ; then
+	if test x"${ac_cv_c_nsfconfig}" = x ; then
 	    NX_BIN_DIR="# no XOTcl configs found"
 	    AC_MSG_WARN(Can't find XOTcl configuration definitions)
 	    exit 0
 	else
 	    no_xotcl=
-	    NX_BIN_DIR=${ac_cv_c_xotclconfig}
-	    AC_MSG_RESULT(found $NX_BIN_DIR/xotclConfig.sh)
+	    NX_BIN_DIR=${ac_cv_c_nsfconfig}
+	    AC_MSG_RESULT(found $NX_BIN_DIR/nsfConfig.sh)
 	fi
     fi
 ])
 
 #------------------------------------------------------------------------
-# SC_LOAD_XOTCLCONFIG --
+# SC_LOAD_NSFCONFIG --
 #
 #	Load the tclConfig.sh file
 #
@@ -111,12 +111,12 @@
 #
 #------------------------------------------------------------------------
 
-AC_DEFUN(SC_LOAD_XOTCLCONFIG, [
-    AC_MSG_CHECKING([for existence of $NX_BIN_DIR/xotclConfig.sh])
+AC_DEFUN(SC_LOAD_NSFCONFIG, [
+    AC_MSG_CHECKING([for existence of $NX_BIN_DIR/nsfConfig.sh])
 
-    if test -f "$NX_BIN_DIR/xotclConfig.sh" ; then
+    if test -f "$NX_BIN_DIR/nsfConfig.sh" ; then
         AC_MSG_RESULT([loading])
-	. $NX_BIN_DIR/xotclConfig.sh
+	. $NX_BIN_DIR/nsfConfig.sh
     else
         AC_MSG_RESULT([file not found])
     fi