Index: configure
===================================================================
diff -u -N -r74d3e18a8ce3eedc4cbf6b8900d0f262d59ea708 -ra1f1c17c221b7f92384107a7acea8197dba957fb
--- configure	(.../configure)	(revision 74d3e18a8ce3eedc4cbf6b8900d0f262d59ea708)
+++ configure	(.../configure)	(revision a1f1c17c221b7f92384107a7acea8197dba957fb)
@@ -641,6 +641,7 @@
 NSF_BUILD_LIB_SPEC
 UNSHARED_LIB_SUFFIX
 SHARED_LIB_SUFFIX
+TCL_EXEC_PREFIX
 NSF_COMPATIBLE_TCLSH
 TCLSH_PROG
 VC_MANIFEST_EMBED_EXE
@@ -8940,6 +8941,7 @@
 NSF_COMPATIBLE_TCLSH=${TCLSH_PROG}
 
 
+
 #
 # Next Scripting specific configs
 #
Index: configure.ac
===================================================================
diff -u -N -r74d3e18a8ce3eedc4cbf6b8900d0f262d59ea708 -ra1f1c17c221b7f92384107a7acea8197dba957fb
--- configure.ac	(.../configure.ac)	(revision 74d3e18a8ce3eedc4cbf6b8900d0f262d59ea708)
+++ configure.ac	(.../configure.ac)	(revision a1f1c17c221b7f92384107a7acea8197dba957fb)
@@ -352,6 +352,7 @@
 # make this available, for such as nsfConfig.sh
 NSF_COMPATIBLE_TCLSH=${TCLSH_PROG}
 AC_SUBST([NSF_COMPATIBLE_TCLSH])
+AC_SUBST([TCL_EXEC_PREFIX])
 
 #
 # Next Scripting specific configs
Index: nxsh.in
===================================================================
diff -u -N -r736b06608b216ed66da19d68c5126177264085d8 -ra1f1c17c221b7f92384107a7acea8197dba957fb
--- nxsh.in	(.../nxsh.in)	(revision 736b06608b216ed66da19d68c5126177264085d8)
+++ nxsh.in	(.../nxsh.in)	(revision a1f1c17c221b7f92384107a7acea8197dba957fb)
@@ -1,7 +1,15 @@
-#! /usr/bin/env tclsh
-#! @NSF_COMPATIBLE_TCLSH@
+#! /bin/sh
+# Lookup a Tcl interpreter \
+    INTERP="tclsh@TCL_VERSION@"; \
+    INTERPS="@NSF_COMPATIBLE_TCLSH@ @TCL_EXEC_PREFIX@/bin/$INTERP"; \
+    for interp in $INTERPS; \
+    do if [ -x $interp ]; then INTERP=$interp; break; \
+    fi;  done; \
+    exec $INTERP "$0" ${1+"$@"}
+
 # -*- tcl -*-
 puts  [info nameofexecutable]
+
 #
 # Tiny scripted replacement of a binary nxsh. This script can be used
 # as interactive shell for testing or like a regular shell with the !#