--- configure.in.tk.orig	Fri Apr 23 10:42:57 1999
+++ configure.in.tk	Tue Nov 30 16:56:44 1999
@@ -22,8 +22,8 @@
 		echo "can't find tcl.h in $d/include"
 		exit 1
 	fi
-	places="$d/lib/libtcl8.0.so \
-		$d/lib/libtcl8.0.a \
+	places="$d/lib/libtcl80.so \
+		$d/lib/libtcl80.a \
 		$d/lib/libtcl.so \
 		$d/lib/libtcl.a"
 	V_LIB_TCL=FAIL
@@ -78,7 +78,7 @@
 			exit 1
 		fi
 	fi
-	AC_CHECK_LIB(tcl8.0, main, V_LIB_TCL="-ltcl8.0", V_LIB_TCL="FAIL")
+	AC_CHECK_LIB(tcl80, main, V_LIB_TCL="-ltcl80", V_LIB_TCL="FAIL")
 	if test "$V_LIB_TCL" = FAIL; then
 		echo "checking for libtcl.a"
 		places="$PWD/../tcl8.0/unix \
@@ -96,8 +96,8 @@
 			/import/tcl/lib/tcl8.0 \
 			"
 		for dir in $places; do
-			if test -r $dir/libtcl8.0.so -o -r $dir/libtcl8.0.a; then
-				V_LIB_TCL="-L$dir -ltcl8.0"
+			if test -r $dir/libtcl80.so -o -r $dir/libtcl80.a; then
+				V_LIB_TCL="-L$dir -ltcl80"
 				break
 			fi
 			if test -r $dir/libtcl.so -o -r $dir/libtcl.a; then
@@ -160,8 +160,8 @@
 		echo "can't find tk.h in $d/include"
 		exit 1
 	fi
-	places="$d/lib/libtk8.0.so \
-		$d/lib/libtk8.0.a \
+	places="$d/lib/libtk80.so \
+		$d/lib/libtk80.a \
 		$d/lib/libtk.so \
 		$d/lib/libtk.a"
 	V_LIB_TK=FAIL
@@ -197,6 +197,7 @@
 	                $PWD/../tk-8.0/generic \
        		        $PWD/../tk/generic \
        		        /cs/research/mice/starship/common/$OPSYS/include \
+			/usr/local/include/tk8.0 \
 			/usr/local/include \
 			$prefix/include \
 			/usr/contrib/include \
@@ -219,7 +220,7 @@
 			exit 1
 		fi
 	fi
-	AC_CHECK_LIB(tk8.0, main, V_LIB_TK="-ltk8.0", V_LIB_TK="FAIL")
+	AC_CHECK_LIB(tk80, main, V_LIB_TK="-ltk80", V_LIB_TK="FAIL")
 	if test "$V_LIB_TK" = FAIL; then
 		echo "checking for libtk.a"
 		places="$PWD/../tk8.0/unix \
@@ -236,8 +237,8 @@
 			$prefix/lib \
 			$x_libraries"
 		for dir in $places; do
-			if test -r $dir/libtk8.0.so -o -r $dir/libtk8.0.a; then
-				V_LIB_TK="-L$dir -ltk8.0"
+			if test -r $dir/libtk80.so -o -r $dir/libtk80.a; then
+				V_LIB_TK="-L$dir -ltk80"
 				break
 			fi
 			if test -r $dir/libtk.so -o -r $dir/libtk.a; then