diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 8aa1c7523a..54c0837eff 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jul 14 15:37:13 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+	* configure.in: If configured -with-stabs on any target, add
+	stabsdirs to configdirs.
+
 Wed Jul 14 09:36:42 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
 
 	* printcmds.exp: Change printf "%f\n" to printf "%f is fun" so
diff --git a/gdb/testsuite/configure.in b/gdb/testsuite/configure.in
index 9213572a54..8b52f26b97 100644
--- a/gdb/testsuite/configure.in
+++ b/gdb/testsuite/configure.in
@@ -60,6 +60,10 @@ rs6000-*-aix*)		configdirs="${configdirs} ${stabsdirs}" ;;
 *-*-linux*)		configdirs="${configdirs} ${stabsdirs}" ;;
 *-sun-*)		configdirs="${configdirs} ${stabsdirs}" ;;
 
+*)			if [ x${with_stabs} = xyes ]; then
+			  configdirs="${configdirs} ${stabsdirs}"
+			fi
+			;;
 esac
 
 	# link in the lib directory if needed