Fixup readline and sim including of override.m4

[deliverable/binutils-gdb.git] / sim / configure.ac

diff --git a/sim/configure.ac b/sim/configure.ac
index c20d847c591055c3525cc5c723e8a5a4e8ac5831..9a55a0cc4ec5650b1bf9d1c8f5c18101d232aa92 100644 (file)
--- a/sim/configure.ac
+++ b/sim/configure.ac
@@ -1,4 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
+m4_include([../config/override.m4])
 AC_PREREQ(2.59)dnl
 AC_INIT(Makefile.in)
 
@@ -51,6 +52,13 @@ if test "${enable_sim}" != no; then
            AC_CONFIG_SUBDIRS(arm)
           testsuite=yes
           ;;
+       avr*-*-*)
+           AC_CONFIG_SUBDIRS(avr)
+          ;;
+       cr16*-*-*)
+          AC_CONFIG_SUBDIRS(cr16)
+          testsuite=yes
+          ;;
        cris-*-* | crisv32-*-*)
           AC_CONFIG_SUBDIRS(cris)
           testsuite=yes
@@ -70,6 +78,10 @@ if test "${enable_sim}" != no; then
            AC_CONFIG_SUBDIRS(iq2000)
           testsuite=yes
           ;;
+       lm32-*-*)
+           AC_CONFIG_SUBDIRS(lm32)
+          testsuite=yes
+           ;;
        m32c-*-*)
            AC_CONFIG_SUBDIRS(m32c)
            ;;
@@ -94,11 +106,15 @@ if test "${enable_sim}" != no; then
            AC_CONFIG_SUBDIRS(mn10300)
           igen=yes
           ;;
-       sh64-*-*)
+       moxie-*-*)
+          AC_CONFIG_SUBDIRS(moxie)
+          testsuite=yes
+          ;;
+       sh64*-*-*)
            AC_CONFIG_SUBDIRS(sh64)
           testsuite=yes
           ;;
-       sh-*-*)
+       sh*-*-*)
            AC_CONFIG_SUBDIRS(sh)
           testsuite=yes
           ;;
@@ -112,6 +128,7 @@ if test "${enable_sim}" != no; then
        v850*-*-* )
            AC_CONFIG_SUBDIRS(v850)
           igen=yes
+          testsuite=yes
           ;;
        *)
           # No simulator subdir, so the subdir "common" isn't needed.