Index: ChangeLog

2005-01-07  Andrew Cagney  <cagney@gnu.org>

	* configure.in: Replace configdirs with multiple references to
	AC_CONFIG_SUBDIRS.
	* configure: Re-generate.

Index: doc/ChangeLog
2005-01-07  Andrew Cagney  <cagney@gnu.org>

	* configure.in: Replace configdirs with multiple references to
	AC_CONFIG_SUBDIRS.
	* configure: Re-generate.

2 files changed, 11 insertions, 17 deletions

diff --git a/gdb/testsuite/configure b/gdb/testsuite/configure
index 43a843f3d8f..f42046f2e67 100755
--- a/gdb/testsuite/configure
+++ b/gdb/testsuite/configure
@@ -622,13 +622,11 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$target" 1>&6
 
 
-# Directories that need to be configured in all configurations.
-configdirs=
-
 # Add HP-specific tests when appropriate.
 case $target in
   hppa*-*-hpux*)
-    configdirs="$configdirs gdb.hp" ;;
+    subdirs="gdb.hp"
+ ;;
 esac
 
 # With stabs.
@@ -658,7 +656,8 @@ fi
 
 # Add stabs tests when appropriate.
 if test $with_stabs = yes; then
-  configdirs="$configdirs gdb.stabs"
+   subdirs="gdb.hp gdb.stabs"
+
 fi
 
 # Enable gdbtk.
@@ -682,7 +681,8 @@ esac
 
 # Add gdbtk tests when appropriate.
 if test $enable_gdbtk = yes; then
-  configdirs="$configdirs gdb.gdbtk"
+   subdirs="gdb.hp gdb.stabs gdb.gdbtk"
+
 fi
 
 # Enable shared libraries.
@@ -935,8 +935,6 @@ echo "$ac_t""${ac_cv_exeext}" 1>&6
 ac_exeext=$EXEEXT
 
 
-subdirs="$configdirs"
-
 trap '' 1 2 15
 cat > confcache <<\EOF
 # This file is a shell script that caches the results of configure
@@ -1101,10 +1099,10 @@ s%@target_alias@%$target_alias%g
 s%@target_cpu@%$target_cpu%g
 s%@target_vendor@%$target_vendor%g
 s%@target_os@%$target_os%g
+s%@subdirs@%$subdirs%g
 s%@RPATH_ENVVAR@%$RPATH_ENVVAR%g
 s%@CPP@%$CPP%g
 s%@EXEEXT@%$EXEEXT%g
-s%@subdirs@%$subdirs%g
 
 CEOF
 EOF
@@ -1242,7 +1240,7 @@ if test "$no_recursion" != yes; then
     esac
   done
 
-  for ac_config_dir in $configdirs; do
+  for ac_config_dir in gdb.hp gdb.stabs gdb.gdbtk; do
 
     # Do not complain, so a configure script can configure whichever
     # parts of a large source tree are present.
diff --git a/gdb/testsuite/configure.in b/gdb/testsuite/configure.in
index 02c0a04e9e0..f654de5e32e 100644
--- a/gdb/testsuite/configure.in
+++ b/gdb/testsuite/configure.in
@@ -32,13 +32,10 @@ AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
 
-# Directories that need to be configured in all configurations.
-configdirs=
-
 # Add HP-specific tests when appropriate.
 case $target in
   hppa*-*-hpux*)
-    configdirs="$configdirs gdb.hp" ;;
+    AC_CONFIG_SUBDIRS(gdb.hp) ;;
 esac
 
 # With stabs.
@@ -63,7 +60,7 @@ esac])
 
 # Add stabs tests when appropriate.
 if test $with_stabs = yes; then
-  configdirs="$configdirs gdb.stabs"
+   AC_CONFIG_SUBDIRS(gdb.stabs)
 fi
 
 # Enable gdbtk.
@@ -82,7 +79,7 @@ esac
 
 # Add gdbtk tests when appropriate.
 if test $enable_gdbtk = yes; then
-  configdirs="$configdirs gdb.gdbtk"
+   AC_CONFIG_SUBDIRS(gdb.gdbtk)
 fi
 
 # Enable shared libraries.
@@ -117,7 +114,6 @@ AC_CHECK_HEADERS(pthread.h)
 
 AC_EXEEXT
 
-AC_CONFIG_SUBDIRS($configdirs)
 AC_OUTPUT([Makefile \
   gdb.ada/Makefile gdb.ada/gnat_ada.gpr:gdb.ada/gnat_ada.gin \
   gdb.arch/Makefile gdb.asm/Makefile gdb.base/Makefile \