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

	* configure.ac: For mips*-*-* and mn10300*-*-* configure the
	common directory.  Remove sparc*-*-* from list.

3 files changed, 9 insertions, 35 deletions

diff --git a/sim/ChangeLog b/sim/ChangeLog
index f92d1e53d9c..7c55754a37a 100644
--- a/sim/ChangeLog
+++ b/sim/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-17  Andrew Cagney  <cagney@gnu.org>
+
+	* configure.ac: For mips*-*-* and mn10300*-*-* configure the
+	common directory.  Remove sparc*-*-* from list.
+	
 2005-01-11  Andrew Cagney  <cagney@gnu.org>
 
 	* Makefile.in (autoconf-common autoheader-common): Add --force to
diff --git a/sim/configure b/sim/configure
index e78c1c42113..0f4a8c9b60d 100755
--- a/sim/configure
+++ b/sim/configure
@@ -284,7 +284,6 @@ ac_subdirs_all="$ac_subdirs_all mn10300"
 ac_subdirs_all="$ac_subdirs_all sh"
 ac_subdirs_all="$ac_subdirs_all ppc"
 ac_subdirs_all="$ac_subdirs_all v850"
-ac_subdirs_all="$ac_subdirs_all erc32"
 ac_subdirs_all="$ac_subdirs_all testsuite"
 ac_subdirs_all="$ac_subdirs_all common"
 ac_subdirs_all="$ac_subdirs_all igen"
@@ -2468,31 +2467,6 @@ else
 fi
 
 
-ac_aux_dir=
-for ac_dir in `cd $srcdir;pwd`/.. $srcdir/`cd $srcdir;pwd`/..; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f $ac_dir/shtool; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \`cd $srcdir;pwd\`/.. $srcdir/\`cd $srcdir;pwd\`/.." >&5
-echo "$as_me: error: cannot find install-sh or install.sh in \`cd $srcdir;pwd\`/.. $srcdir/\`cd $srcdir;pwd\`/.." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"
-ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
-
 # Make sure we can run config.sub.
 $ac_config_sub sun4 >/dev/null 2>&1 ||
   { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
@@ -3495,6 +3469,7 @@ subdirs="$subdirs mcore"
 subdirs="$subdirs mips"
 
 	   testsuite=yes
+	   common=yes
 	   igen=yes
 	   ;;
        mn10300*-*-*)
@@ -3502,6 +3477,7 @@ subdirs="$subdirs mips"
 
 subdirs="$subdirs mn10300"
 
+	   common=yes
 	   igen=yes
 	   ;;
        sh*-*-*)
@@ -3526,12 +3502,6 @@ subdirs="$subdirs v850"
 
 	   common=yes
 	   ;;
-       sparc*-*-*)
-
-
-subdirs="$subdirs erc32"
-
-	   ;;
    esac
    if test "$testsuite" = yes; then
 
diff --git a/sim/configure.ac b/sim/configure.ac
index 8d5f6bb6563..dae2687cd8b 100644
--- a/sim/configure.ac
+++ b/sim/configure.ac
@@ -81,10 +81,12 @@ if test "${enable_sim}" != no; then
        mips*-*-*)
            AC_CONFIG_SUBDIRS(mips)
 	   testsuite=yes
+	   common=yes
 	   igen=yes
 	   ;;
        mn10300*-*-*)
            AC_CONFIG_SUBDIRS(mn10300)
+	   common=yes
 	   igen=yes
 	   ;;
        sh*-*-*)
@@ -100,9 +102,6 @@ if test "${enable_sim}" != no; then
            AC_CONFIG_SUBDIRS(v850)
 	   common=yes
 	   ;;
-       sparc*-*-*)
-           AC_CONFIG_SUBDIRS(erc32)
-	   ;;
    esac
    if test "$testsuite" = yes; then
       AC_CONFIG_SUBDIRS(testsuite)