Index: library/xotcl/library/store/XOTclSdbm/xotcl.m4
===================================================================
diff -u -rf3b7952aabc9e4f9079febd1f5b7f5fb833fd50c -r0e8b567e2a1808c514f6340430920ad4d59953bc
--- library/xotcl/library/store/XOTclSdbm/xotcl.m4	(.../xotcl.m4)	(revision f3b7952aabc9e4f9079febd1f5b7f5fb833fd50c)
+++ library/xotcl/library/store/XOTclSdbm/xotcl.m4	(.../xotcl.m4)	(revision 0e8b567e2a1808c514f6340430920ad4d59953bc)
@@ -4,14 +4,15 @@
 #	a Tcl extension.
 #
 # Copyright (c) 1999 Scriptics Corporation.
+# Copyright (c) 1999-2008 Gustaf Neumann, Uwe Zdun
 #
-# See the file "license.terms" for information on usage and redistribution
+# See the file "tcl-license.terms" for information on usage and redistribution
 # 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:
@@ -23,11 +24,11 @@
 #		--with-xotcl=...
 #
 #	Defines the following vars:
-#		XOTCL_BIN_DIR	Full path to the directory containing
-#				the xotclConfig.sh file
+#		NX_BIN_DIR	Full path to the directory containing
+#				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.
@@ -36,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` \
@@ -62,60 +63,60 @@
 			`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
-	    XOTCL_BIN_DIR="# no XOTcl configs found"
+	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=
-	    XOTCL_BIN_DIR=${ac_cv_c_xotclconfig}
-	    AC_MSG_RESULT(found $XOTCL_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
 #
 # Arguments:
 #	
 #	Requires the following vars to be set:
-#		XOTCL_BIN_DIR
+#		NX_BIN_DIR
 #
 # Results:
 #
 #	Subst the vars:
 #
 #------------------------------------------------------------------------
 
-AC_DEFUN(SC_LOAD_XOTCLCONFIG, [
-    AC_MSG_CHECKING([for existence of $XOTCL_BIN_DIR/xotclConfig.sh])
+AC_DEFUN(SC_LOAD_NSFCONFIG, [
+    AC_MSG_CHECKING([for existence of $NX_BIN_DIR/nsfConfig.sh])
 
-    if test -f "$XOTCL_BIN_DIR/xotclConfig.sh" ; then
+    if test -f "$NX_BIN_DIR/nsfConfig.sh" ; then
         AC_MSG_RESULT([loading])
-	. $XOTCL_BIN_DIR/xotclConfig.sh
+	. $NX_BIN_DIR/nsfConfig.sh
     else
         AC_MSG_RESULT([file not found])
     fi
@@ -124,16 +125,16 @@
     # The eval is required to do the TCL_DBGX substitution in the
     # TCL_LIB_FILE variable
     #
-    AC_SUBST(XOTCL_VERSION)
-    AC_SUBST(XOTCL_MAJOR_VERSION)
-    AC_SUBST(XOTCL_MINOR_VERSION)
-    AC_SUBST(XOTCL_RELEASE_LEVEL)
-    AC_SUBST(XOTCL_LIB_FILE)
-    AC_SUBST(XOTCL_BUILD_LIB_SPEC)
-    AC_SUBST(XOTCL_LIB_SPEC)
-    AC_SUBST(XOTCL_STUB_LIB_FILE)
-    AC_SUBST(XOTCL_BUILD_STUB_LIB_SPEC)
-    AC_SUBST(XOTCL_STUB_LIB_SPEC)
-    AC_SUBST(XOTCL_SRC_DIR)
+    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)
 ])