$NetBSD$

--- configure.in.tk.orig	Thu May 16 04:06:05 1996
+++ configure.in.tk	Wed Jan 26 16:03:04 2000
@@ -2,6 +2,8 @@
 dnl $Header: /cvsroot/kame/kame/netbsd/pkgsrc/mbone/vat6/patches/patch-ah,v 1.1.1.1 2000/04/12 04:26:29 itojun Exp $ (LBL)
 
 AC_ARG_WITH(tcl,	--with-tcl=path	specify a pathname for tcl, d=$withval, d="")
+tcldir=tcl8.0
+tcllib=tcl80
 if test "$d" != "" ; then 
 	if test ! -d $d ; then 
 		echo "'$d' is not a directory"
@@ -12,8 +14,8 @@
 		echo "can't find tcl.h in $d/include"
 		exit 1
 	fi
-	places="$d/lib/libtcl7.5.so \
-		$d/lib/libtcl7.5.a \
+	places="$d/lib/lib${tcllib}.so \
+		$d/lib/lib${tcllib}.a \
 		$d/lib/libtcl.so \
 		$d/lib/libtcl.a"
 	V_LIB_TCL=FAIL
@@ -27,7 +29,7 @@
 		echo "can't find libtcl.a in $d/lib"
 		exit 1
 	fi
-	places="$d/lib/tcl7.5 \
+	places="$d/lib/${tcldir} \
 		$d/lib/tcl"
 	V_LIBRARY_TCL=FAIL
 	for dir in $places; do
@@ -44,10 +46,11 @@
 	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/../${tcldir} \
+			/usr/src/local/${tcldir} \
+			/import/tcl/include/${tcldir} \
 			$prefix/include \
+			$prefix/include/${tcldir} \
 			$x_includes/tk \
 			$x_includes \
 			/usr/local/include \
@@ -64,47 +67,43 @@
 			exit 1
 		fi
 	fi
-	AC_CHECK_LIB(tcl7.5, main, V_LIB_TCL="-ltcl7.5", V_LIB_TCL="FAIL")
-	if test "$V_LIB_TCL" = FAIL; then
-		echo "checking for libtcl.a"
-		places="\
-			$prefix/lib \
-			$x_libraries \
-			/usr/contrib/lib \
-			/usr/local/lib \
-			/usr/lib \
-			$PWD/../tcl7.5 \
-			/usr/src/local/tcl7.5 \
-			/import/tcl/lib/tcl7.5 \
-			"
-		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"
-				break
-			fi
-		done
-		if test "$V_LIB_TCL" = FAIL; then
-			echo "can't find libtcl.a"
-			exit 1
-		else
-			if test $solaris ; then
-				V_LIB_TCL="-R$dir $V_LIB_TCL"
-			fi
+	V_TCL_CONFIG=FAIL
+	echo "checking for tclConfig.sh"
+	places="/usr/local/lib/${tcldir} \
+		/usr/contrib/lib/${tcldir} \
+		/usr/lib/${tcldir} \
+		/usr/lib/tk/${tcldir} \
+		/import/tcl/lib/${tcldir} \
+		$prefix/lib/${tcldir} \
+		$x_libraries/${tcldir} \
+		/usr/local/lib/tcl \
+		/usr/lib/tcl \
+		/usr/lib/tk/tcl \
+		/import/tcl/lib/tcl \
+		$prefix/lib/tcl \
+		$x_libraries/tcl \
+		$x_libraries/tcl"
+	for dir in $places; do
+		if test -r $dir/tclConfig.sh ; then
+			V_TCL_CONFIG=$dir/tclConfig.sh
+		        break
 		fi
+	done
+	if test "$V_TCL_CONFIG" = FAIL; then
+		echo "can't find tclConfig.sh"
+		exit 1
 	fi
+	. ${V_TCL_CONFIG}
+	V_LIB_TCL="${TCL_LIB_FLAG}"
 	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/${tcldir} \
+		/usr/contrib/lib/${tcldir} \
+		/usr/lib/${tcldir} \
+		/usr/lib/tk/${tcldir} \
+		/import/tcl/lib/${tcldir} \
+		$prefix/lib/${tcldir} \
+		$x_libraries/${tcldir} \
 		/usr/local/lib/tcl \
 		/usr/lib/tcl \
 		/usr/lib/tk/tcl \
@@ -128,6 +127,8 @@
 AC_SUBST(V_LIBRARY_TCL)
 
 AC_ARG_WITH(tk,	--with-tk=path	specify a pathname for tk, d=$withval, d="")
+tkdir=tk8.0
+tklib=tk80
 if test "$d" != "" ; then 
 	if test ! -d $d ; then 
 		echo "'$d' is not a directory"
@@ -138,8 +139,8 @@
 		echo "can't find tk.h in $d/include"
 		exit 1
 	fi
-	places="$d/lib/libtk4.1.so \
-		$d/lib/libtk4.1.a \
+	places="$d/lib/lib${tklib}.so \
+		$d/lib/lib${tklib}.a \
 		$d/lib/libtk.so \
 		$d/lib/libtk.a"
 	V_LIB_TK=FAIL
@@ -153,7 +154,7 @@
 		echo "can't find libtk.a in $d/lib"
 		exit 1
 	fi
-	places="$d/lib/tk4.1 \
+	places="$d/lib/${tkdir} \
 		$d/lib/tk"
 	V_LIBRARY_TK=FAIL
 	for dir in $places; do
@@ -173,15 +174,16 @@
 		V_INCLUDE_TK=""
 		places="\
 			$prefix/include \
+			$prefix/include/${tkdir} \
 			/usr/local/include \
 			/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/../${tkdir} \
+			/usr/src/local/${tkdir} \
+			/import/tcl/include/${tkdir} \
 			"
 		for dir in $places; do
 			if test -r $dir/tk.h ; then
@@ -194,48 +196,47 @@
 			exit 1
 		fi
 	fi
-	AC_CHECK_LIB(tk4.1, 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 \
-			/usr/contrib/lib \
-			/usr/lib \
-			/usr/lib/tk \
-			/import/tcl/lib \
-			$PWD/../tk4.1 \
-			/usr/src/local/tk4.1 \
-			$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"
-				break
-			fi
-		done
-		if test "$V_LIB_TK" = FAIL; then
-			echo "can't find libtk.a"
-			exit 1
-		else
-			if test $solaris ; then
-				V_LIB_TK="-R$dir $V_LIB_TK"
-			fi
+	V_TK_CONFIG=FAIL
+	echo "checking for tkConfig.sh"
+	places="/usr/local/lib/${tkdir} \
+		/usr/contrib/lib/${tkdir} \
+		/usr/lib/${tkdir} \
+		/usr/lib/tk/${tkdir} \
+		/import/tcl/lib/${tkdir} \
+		$prefix/lib/${tkdir} \
+		$x_libraries/${tkdir} \
+		$PWD/../${tkdir}/library \
+		/usr/src/local/${tkdir}/library \
+		/usr/local/lib/tk \
+		/usr/lib/tk \
+		/usr/lib/tk/tk \
+		/import/tcl/lib/tk \
+		$prefix/lib/tk \
+		$x_libraries/tk \
+		$x_libraries/tk"
+	for dir in $places; do
+		if test -r $dir/tkConfig.sh ; then
+			V_TK_CONFIG=$dir/tkConfig.sh
+		        break
 		fi
+	done
+	if test "$V_TK_CONFIG" = FAIL; then
+		echo "can't find tkConfig.sh"
+		exit 1
 	fi
+	. ${V_TK_CONFIG}
+	V_LIB_TK="${TK_LIB_FLAG}"
 	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/${tkdir} \
+		/usr/contrib/lib/${tkdir} \
+		/usr/lib/${tkdir} \
+		/usr/lib/tk/${tkdir} \
+		/import/tcl/lib/${tkdir} \
+		$prefix/lib/${tkdir} \
+		$x_libraries/${tkdir} \
+		$PWD/../${tkdir}/library \
+		/usr/src/local/${tkdir}/library \
 		/usr/local/lib/tk \
 		/usr/lib/tk \
 		/usr/lib/tk/tk \