diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 09046f1d15..3de0cbe7ed 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+start-sanitize-gdbtk	
+Fri Aug  8 15:19:14 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in (tixdir): Update for cygwin32 case for Tcl 8.0.
+	* configure: Rebuild.
+
+end-sanitize-gdbtk
 Fri Aug  8 13:11:01 1997  Mike Meissner  <meissner@cygnus.com>
 
 	* config/powerpc/ppc{,le}-{eabi,sim}.mt (TDEPFILES): Make sure
@@ -36,8 +43,8 @@ Thu Aug  7 14:08:23 1997  Martin M. Hunt  <hunt@cygnus.com>
 
 	* configure.in: Change required Tix version to 4.1.8.0 .
 	* configure: Rebuilt.
+
 end-sanitize-gdbtk
-	
 Thu Aug  7 13:39:31 1997  Geoffrey Noer  <noer@cygnus.com>
 
 	* ocd.h: add OCD_SET_CONNECTION
diff --git a/gdb/configure b/gdb/configure
index 75418f7a44..3c2b5b8e4f 100755
--- a/gdb/configure
+++ b/gdb/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 # Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.12 
+# Generated automatically using autoconf version 2.12.1 
 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
 #
 # This configure script is free software; the Free Software Foundation
@@ -350,7 +350,7 @@ EOF
     verbose=yes ;;
 
   -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.12"
+    echo "configure generated by autoconf version 2.12.1"
     exit 0 ;;
 
   -with-* | --with-*)
@@ -909,7 +909,7 @@ esac
 
 
 # Make sure we can run config.sub.
-if $ac_config_sub sun4 >/dev/null 2>&1; then :
+if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
 else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
@@ -921,14 +921,14 @@ case "$host_alias" in
 NONE)
   case $nonopt in
   NONE)
-    if host_alias=`$ac_config_guess`; then :
+    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
     else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
     fi ;;
   *) host_alias=$nonopt ;;
   esac ;;
 esac
 
-host=`$ac_config_sub $host_alias`
+host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
 host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
 host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
@@ -946,7 +946,7 @@ NONE)
   esac ;;
 esac
 
-target=`$ac_config_sub $target_alias`
+target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
 target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
 target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
@@ -964,7 +964,7 @@ NONE)
   esac ;;
 esac
 
-build=`$ac_config_sub $build_alias`
+build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
 build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
 build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
@@ -3050,7 +3050,7 @@ fi
 	   . ${ac_cv_c_tclconfig}/tclConfig.sh
 	   case "${host}" in
 	   *-*-cygwin32*)
-		tixdir=../tix/win/tcl7.6
+		tixdir=../tix/win/tcl8.0
 		;;
 	   *)
 		tixdir=../tix/unix/tk8.0
@@ -3358,7 +3358,7 @@ do
     echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
     exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
   -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.12"
+    echo "$CONFIG_STATUS generated by autoconf version 2.12.1"
     exit 0 ;;
   -help | --help | --hel | --he | --h)
     echo "\$ac_cs_usage"; exit 0 ;;
diff --git a/gdb/configure.in b/gdb/configure.in
index 8de07b7f48..3c166a5fcd 100644
--- a/gdb/configure.in
+++ b/gdb/configure.in
@@ -324,7 +324,7 @@ if test "${enable_gdbtk}" = "yes"; then
 	   . ${ac_cv_c_tclconfig}/tclConfig.sh
 	   case "${host}" in
 	   *-*-cygwin32*)
-		tixdir=../tix/win/tcl7.6
+		tixdir=../tix/win/tcl8.0
 		;;
 	   *)
 		tixdir=../tix/unix/tk8.0