Better identify tcl and tk.

src/configure

@@ -5426,7 +5426,7 @@ else
   echo "$ac_t""no" 1>&6
 fi
 
-for f in /usr/include /usr/include/tcl8.0 /usr/local/include /usr/local/include/tcl8.0; do
+for f in /usr/include /usr/include/tcl /usr/include/tcl8.0 /usr/local/include /usr/local/include/tcl /usr/local/include/tcl8.0; do
 if test "$TCL_INCDIR" = "no"; then
 ac_safe=`echo "$f/tcl.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $f/tcl.h""... $ac_c" 1>&6
@@ -5473,7 +5473,7 @@ fi
 if test "$USE_TCL" = "true"
 then
 TCL_LIB=
-for f in tcl8.0 tcl80; do
+for f in tcl tcl8.0 tcl80; do
 if test -z "$TCL_LIB"; then
 echo $ac_n "checking for main in -l$f""... $ac_c" 1>&6
 echo "configure:5480: checking for main in -l$f" >&5
@@ -5567,7 +5567,7 @@ else
   echo "$ac_t""no" 1>&6
 fi
 
-for f in /usr/include /usr/include/tk8.0 /usr/local/include /usr/local/include/tk8.0; do
+for f in /usr/include /usr/include/tk /usr/include/tk8.0 /usr/local/include /usr/local/include/tk /usr/local/include/tk8.0; do
 if test "$TK_INCDIR" = "no"; then
 ac_safe=`echo "$f/tk.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $f/tk.h""... $ac_c" 1>&6
@@ -5619,7 +5619,7 @@ fi
 if test "$USE_TCL" = "true"
 then
 TK_LIB=
-for f in tk8.0 tk80; do
+for f in tk tk8.0 tk80; do
 if test -z "$TK_LIB"; then
 echo $ac_n "checking for main in -l$f""... $ac_c" 1>&6
 echo "configure:5626: checking for main in -l$f" >&5

src/configure.in

@@ -564,7 +564,7 @@ if test "$USE_TCL" = "true"
 then
 TCL_INCDIR=no
 AC_CHECK_HEADER(tcl.h, TCL_INCDIR=)
-for f in /usr/include /usr/include/tcl8.0 /usr/local/include /usr/local/include/tcl8.0; do
+for f in /usr/include /usr/include/tcl /usr/include/tcl8.0 /usr/local/include /usr/local/include/tcl /usr/local/include/tcl8.0; do
 if test "$TCL_INCDIR" = "no"; then
 AC_CHECK_HEADER($f/tcl.h, TCL_INCDIR=$f)
 fi
@@ -580,7 +580,7 @@ dnl Check for Tcl archive
 if test "$USE_TCL" = "true"
 then
 TCL_LIB=
-for f in tcl8.0 tcl80; do
+for f in tcl tcl8.0 tcl80; do
 if test -z "$TCL_LIB"; then
 AC_CHECK_LIB($f, main, TCL_LIB=$f)
 fi
@@ -610,7 +610,7 @@ CPPFLAGS="$CPPFLAGS $X_CFLAGS -I$TCL_INCDIR"
 
 TK_INCDIR=no
 AC_CHECK_HEADER(tk.h, TK_INCDIR=)
-for f in /usr/include /usr/include/tk8.0 /usr/local/include /usr/local/include/tk8.0; do
+for f in /usr/include /usr/include/tk /usr/include/tk8.0 /usr/local/include /usr/local/include/tk /usr/local/include/tk8.0; do
 if test "$TK_INCDIR" = "no"; then
 AC_CHECK_HEADER($f/tk.h, TK_INCDIR=$f)
 fi
@@ -631,7 +631,7 @@ dnl Check for Tk archive
 if test "$USE_TCL" = "true"
 then
 TK_LIB=
-for f in tk8.0 tk80; do
+for f in tk tk8.0 tk80; do
 if test -z "$TK_LIB"; then
 AC_CHECK_LIB($f, main, TK_LIB=$f)
 fi