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 8d5f6bb65630139432a48c8f1aaf9387f6778153..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)
 
@@ -23,6 +24,8 @@ else
   CC_FOR_BUILD=gcc
 fi
 AC_SUBST(CC_FOR_BUILD)
+CFLAGS_FOR_BUILD=${CFLAGS_FOR_BUILD-${CFLAGS}}
+AC_SUBST(CFLAGS_FOR_BUILD)
 
 # If a cpu ever has more than one simulator to choose from, use
 # --enable-sim=... to choose.
@@ -42,13 +45,23 @@ esac])
 
 if test "${enable_sim}" != no; then
    testsuite=no
-   common=no
+   common=yes
    igen=no
    case "${target}" in
        arm*-*-* | thumb*-*-* | strongarm*-*-* | xscale-*-*)
            AC_CONFIG_SUBDIRS(arm)
           testsuite=yes
-          common=yes
+          ;;
+       avr*-*-*)
+           AC_CONFIG_SUBDIRS(avr)
+          ;;
+       cr16*-*-*)
+          AC_CONFIG_SUBDIRS(cr16)
+          testsuite=yes
+          ;;
+       cris-*-* | crisv32-*-*)
+          AC_CONFIG_SUBDIRS(cris)
+          testsuite=yes
           ;;
        d10v-*-*)
            AC_CONFIG_SUBDIRS(d10v)
@@ -56,27 +69,33 @@ if test "${enable_sim}" != no; then
        frv-*-*)
            AC_CONFIG_SUBDIRS(frv)
           testsuite=yes
-          common=yes
           ;;
        h8300*-*-*)
            AC_CONFIG_SUBDIRS(h8300)
           testsuite=yes
-          common=yes
           ;;
+       iq2000-*-*)
+           AC_CONFIG_SUBDIRS(iq2000)
+          testsuite=yes
+          ;;
+       lm32-*-*)
+           AC_CONFIG_SUBDIRS(lm32)
+          testsuite=yes
+           ;;
+       m32c-*-*)
+           AC_CONFIG_SUBDIRS(m32c)
+           ;;
        m32r-*-*)
            AC_CONFIG_SUBDIRS(m32r)
           testsuite=yes
-          common=yes
           ;;
        m68hc11-*-*|m6811-*-*)
            AC_CONFIG_SUBDIRS(m68hc11)
           testsuite=yes
-          common=yes
           ;;
        mcore-*-*)
            AC_CONFIG_SUBDIRS(mcore)
           testsuite=yes
-          common=yes
           ;;
        mips*-*-*)
            AC_CONFIG_SUBDIRS(mips)
@@ -87,21 +106,33 @@ if test "${enable_sim}" != no; then
            AC_CONFIG_SUBDIRS(mn10300)
           igen=yes
           ;;
+       moxie-*-*)
+          AC_CONFIG_SUBDIRS(moxie)
+          testsuite=yes
+          ;;
+       sh64*-*-*)
+           AC_CONFIG_SUBDIRS(sh64)
+          testsuite=yes
+          ;;
        sh*-*-*)
            AC_CONFIG_SUBDIRS(sh)
           testsuite=yes
-          common=yes
+          ;;
+       sparc-*-rtems*|sparc-*-elf*)
+          AC_CONFIG_SUBDIRS(erc32)
+          testsuite=yes
           ;;
        powerpc*-*-* )
            AC_CONFIG_SUBDIRS(ppc)
-          common=yes
           ;;
        v850*-*-* )
            AC_CONFIG_SUBDIRS(v850)
-          common=yes
+          igen=yes
+          testsuite=yes
           ;;
-       sparc*-*-*)
-           AC_CONFIG_SUBDIRS(erc32)
+       *)
+          # No simulator subdir, so the subdir "common" isn't needed.
+          common=no
           ;;
    esac
    if test "$testsuite" = yes; then