--- configure.in.tk.orig	Thu May 16 01:06:05 1996
+++ configure.in.tk	Tue Sep  9 11:35:45 1997
@@ -2,6 +2,7 @@
 dnl $Header: /home/cvs/ports/mbone/vat/patches/Attic/patch-aa,v 1.1.1.1 1999/08/05 00:45:50 niklas Exp $ (LBL)
 
 AC_ARG_WITH(tcl,	--with-tcl=path	specify a pathname for tcl, d=$withval, d="")
+tclposs="tcl8.0 tcl80 tcl"
 if test "$d" != "" ; then 
 	if test ! -d $d ; then 
 		echo "'$d' is not a directory"
@@ -12,22 +13,22 @@
 		echo "can't find tcl.h in $d/include"
 		exit 1
 	fi
-	places="$d/lib/libtcl7.5.so \
-		$d/lib/libtcl7.5.a \
-		$d/lib/libtcl.so \
-		$d/lib/libtcl.a"
 	V_LIB_TCL=FAIL
-	for dir in $places; do
-		if test -r $dir ; then
-			V_LIB_TCL=$dir
+	for p in $tclposs; do
+		if test "`echo $d/lib/lib$p.so*`" != "$d/lib/lib$p.so*" ; then
+			V_LIB_TCL="-L$d/lib -l$p"
+			break
+		fi
+		if test -r $d/lib/lib$p.a ; then
+			V_LIB_TCL="-L$d/lib -l$p"
 			break
 		fi
 	done
-	if test $V_LIB_TCL = FAIL ; then
+	if test "$V_LIB_TCL" = FAIL ; then
 		echo "can't find libtcl.a in $d/lib"
 		exit 1
 	fi
-	places="$d/lib/tcl7.5 \
+	places="$d/lib/tcl8.0 \
 		$d/lib/tcl"
 	V_LIBRARY_TCL=FAIL
 	for dir in $places; do
@@ -44,13 +45,14 @@
 	AC_TEST_CPP([#include <tcl.h>], V_INCLUDE_TCL="", V_INCLUDE_TCL=FAIL)
 	if test "$V_INCLUDE_TCL" = FAIL; then
 		echo "checking for tcl.h"
-		places="$PWD/../tcl7.5 \
-			/usr/src/local/tcl7.5 \
-			/import/tcl/include/tcl7.5 \
+		places="$PWD/../tcl8.0 \
+			/usr/src/local/tcl8.0 \
+			/import/tcl/include/tcl8.0 \
 			$prefix/include \
 			$x_includes/tk \
 			$x_includes \
 			/usr/local/include \
+			/usr/local/include/tcl8.0 \
 			/usr/contrib/include \
 			/usr/include"
 		for dir in $places; do
@@ -64,7 +66,7 @@
 			exit 1
 		fi
 	fi
-	AC_CHECK_LIB(tcl7.5, main, V_LIB_TCL="-ltcl7.5", V_LIB_TCL="FAIL")
+	AC_CHECK_LIB(tcl8.0, main, V_LIB_TCL="-ltcl8.0", V_LIB_TCL="FAIL")
 	if test "$V_LIB_TCL" = FAIL; then
 		echo "checking for libtcl.a"
 		places="\
@@ -73,17 +75,22 @@
 			/usr/contrib/lib \
 			/usr/local/lib \
 			/usr/lib \
-			$PWD/../tcl7.5 \
-			/usr/src/local/tcl7.5 \
-			/import/tcl/lib/tcl7.5 \
+			$PWD/../tcl8.0 \
+			/usr/src/local/tcl8.0 \
+			/import/tcl/lib/tcl8.0 \
 			"
 		for dir in $places; do
-			if test -r $dir/libtcl7.5.so -o -r $dir/libtcl7.5.a; then
-				V_LIB_TCL="-L$dir -ltcl7.5"
-				break
-			fi
-			if test -r $dir/libtcl.so -o -r $dir/libtcl.a; then
-				V_LIB_TCL="-L$dir -ltcl"
+			for p in $tclposs; do
+				if test "`echo $dir/lib$p.so*`" != "$dir/lib$p.so*" ; then
+					V_LIB_TCL="-L$dir -l$p"
+					break
+				fi
+				if test -r $dir/lib$p.a ; then
+					V_LIB_TCL="-L$dir -l$p"
+					break
+				fi
+			done
+			if test "$V_LIB_TCL" != FAIL; then
 				break
 			fi
 		done
@@ -98,15 +105,16 @@
 	fi
 	echo "checking for tcl/init.tcl"
 	V_LIBRARY_TCL=FAIL
-	places="/usr/local/lib/tcl7.5 \
-		/usr/contrib/lib/tcl7.5 \
-		/usr/lib/tcl7.5 \
-		/usr/lib/tk/tcl7.5 \
-		/import/tcl/lib/tcl7.5 \
-		$prefix/lib/tcl7.5 \
-		$x_libraries/tcl7.5 \
+	places="/usr/local/lib/tcl8.0 \
+		/usr/contrib/lib/tcl8.0 \
+		/usr/lib/tcl8.0 \
+		/usr/lib/tk/tcl8.0 \
+		/import/tcl/lib/tcl8.0 \
+		$prefix/lib/tcl8.0 \
+		$x_libraries/tcl8.0 \
 		/usr/local/lib/tcl \
 		/usr/lib/tcl \
+		/usr/libdata/tcl \
 		/usr/lib/tk/tcl \
 		/import/tcl/lib/tcl \
 		$prefix/lib/tcl \
@@ -128,6 +136,7 @@
 AC_SUBST(V_LIBRARY_TCL)
 
 AC_ARG_WITH(tk,	--with-tk=path	specify a pathname for tk, d=$withval, d="")
+tkposs="tk8.0 tk80 tk"
 if test "$d" != "" ; then 
 	if test ! -d $d ; then 
 		echo "'$d' is not a directory"
@@ -138,22 +147,22 @@
 		echo "can't find tk.h in $d/include"
 		exit 1
 	fi
-	places="$d/lib/libtk4.1.so \
-		$d/lib/libtk4.1.a \
-		$d/lib/libtk.so \
-		$d/lib/libtk.a"
 	V_LIB_TK=FAIL
-	for dir in $places; do
-		if test -r $dir ; then
-			V_LIB_TK=$dir
+	for p in $tkposs; do
+		if test "`echo $d/lib/lib$p.so*`" != "$d/lib/lib$p.so*" ; then
+			V_LIB_TK="-L$d/lib -l$p"
+			break
+		fi
+		if test -r $d/lib/lib$p.a ; then
+			V_LIB_TK="-L$d/lib -l$p"
 			break
 		fi
 	done
-	if test $V_LIB_TK = FAIL ; then
+	if test "$V_LIB_TK" = FAIL ; then
 		echo "can't find libtk.a in $d/lib"
 		exit 1
 	fi
-	places="$d/lib/tk4.1 \
+	places="$d/lib/tk8.0 \
 		$d/lib/tk"
 	V_LIBRARY_TK=FAIL
 	for dir in $places; do
@@ -174,14 +183,15 @@
 		places="\
 			$prefix/include \
 			/usr/local/include \
+			/usr/local/include/tk8.0 \
 			/usr/contrib/include \
 			/usr/include/tcl \
 			/usr/include\
 			$x_includes/tk \
 			$x_includes \
-			$PWD/../tk4.1 \
-			/usr/src/local/tk4.1 \
-			/import/tcl/include/tk4.1 \
+			$PWD/../tk8.0 \
+			/usr/src/local/tk8.0 \
+			/import/tcl/include/tk8.0 \
 			"
 		for dir in $places; do
 			if test -r $dir/tk.h ; then
@@ -194,7 +204,7 @@
 			exit 1
 		fi
 	fi
-	AC_CHECK_LIB(tk4.1, main, V_LIB_TK="-ltk4.1", V_LIB_TK="FAIL")
+	AC_CHECK_LIB(tk8.0, main, V_LIB_TK="-ltk4.1", V_LIB_TK="FAIL")
 	if test "$V_LIB_TK" = FAIL; then
 		echo "checking for libtk.a"
 		places="/usr/local/lib \
@@ -202,17 +212,22 @@
 			/usr/lib \
 			/usr/lib/tk \
 			/import/tcl/lib \
-			$PWD/../tk4.1 \
-			/usr/src/local/tk4.1 \
+			$PWD/../tk8.0 \
+			/usr/src/local/tk8.0 \
 			$prefix/lib \
 			$x_libraries"
 		for dir in $places; do
-			if test -r $dir/libtk4.1.so -o -r $dir/libtk4.1.a; then
-				V_LIB_TK="-L$dir -ltk4.1"
-				break
-			fi
-			if test -r $dir/libtk.so -o -r $dir/libtk.a; then
-				V_LIB_TK="-L$dir -ltk"
+			for p in $tkposs; do
+				if test "`echo $dir/lib$p.so*`" != "$dir/lib$p.so*" ; then
+					V_LIB_TK="-L$dir -l$p"
+					break
+				fi
+				if test -r $dir/lib$p.a ; then
+					V_LIB_TK="-L$dir -l$p"
+					break
+				fi
+			done
+			if test "$V_LIB_TK" != FAIL; then
 				break
 			fi
 		done
@@ -227,15 +242,15 @@
 	fi
 	echo "checking for tk/tk.tcl"
 	V_LIBRARY_TK=FAIL
-	places="/usr/local/lib/tk4.1 \
-		/usr/contrib/lib/tk4.1 \
-		/usr/lib/tk4.1 \
-		/usr/lib/tk/tk4.1 \
-		/import/tcl/lib/tk4.1 \
-		$prefix/lib/tk4.1 \
-		$x_libraries/tk4.1 \
-		$PWD/../tk4.1/library \
-		/usr/src/local/tk4.1/library \
+	places="/usr/local/lib/tk8.0 \
+		/usr/contrib/lib/tk8.0 \
+		/usr/lib/tk8.0 \
+		/usr/lib/tk/tk8.0 \
+		/import/tcl/lib/tk8.0 \
+		$prefix/lib/tk8.0 \
+		$x_libraries/tk8.0 \
+		$PWD/../tk8.0/library \
+		/usr/src/local/tk8.0/library \
 		/usr/local/lib/tk \
 		/usr/lib/tk \
 		/usr/lib/tk/tk \