--- a/gdb/configure
+++ b/gdb/configure
-@@ -988,7 +988,7 @@ CPP
+@@ -834,8 +834,7 @@ MAKEINFOFLAGS
YACC
YFLAGS
XMKMF'
--ac_subdirs_all='doc testsuite
-+ac_subdirs_all='doc
- gdbtk
+-ac_subdirs_all='testsuite
+-gdbtk
++ac_subdirs_all='gdbtk
multi-ice
gdbserver'
-@@ -7881,7 +7881,7 @@ fi
+@@ -5033,7 +5032,7 @@ $as_echo "$with_auto_load_safe_path" >&6
--subdirs="$subdirs doc testsuite"
-+subdirs="$subdirs doc"
+
+-subdirs="$subdirs testsuite"
++subdirs="$subdirs"
# Check whether to support alternative target configurations
--- a/gdb/gdbserver/configure
+++ b/gdb/gdbserver/configure
-@@ -2152,7 +2152,7 @@ $as_echo "$as_me: error: \`$ac_var' was
+@@ -2181,7 +2181,7 @@ $as_echo "$as_me: error: \`$ac_var' was
ac_cache_corrupted=: ;;
,);;
*)