sim/
2014-02-13  Jan Kratochvil  <jan.kratochvil@redhat.com>

	* configure: Regenerate.
	* configure.ac (enable_sim): Use AS_HELP_STRING, set auto by defaultr.
	* configure.tgt (sim_default): New.
	(powerpc*-*-*): Disable it.

diff --git a/sim/configure b/sim/configure
index ab98231b..33df8f9 100755
--- a/sim/configure
+++ b/sim/configure
@@ -1280,7 +1280,8 @@ Optional Features:
   --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-sim
+  --enable-sim            Include simulated target (default=yes for most
+                          targets)
 
 Some influential environment variables:
   CC          C compiler command
@@ -3605,11 +3606,14 @@ if test "${enable_sim+set}" = set; then :
 yes | no) ;;
 *)	as_fn_error "bad value ${enableval} given for --enable-sim option" "$LINENO" 5 ;;
 esac
+else
+  enable_sim=auto
 fi
 
 
 
-if test "${enable_sim}" != no; then
+if test "${enable_sim}" = yes \
+	-o '(' "${enable_sim}" != no -a $sim_default = yes ')'; then
 
 # WHEN ADDING ENTRIES TO THIS MATRIX:
 
@@ -3624,6 +3628,7 @@ sim_testsuite=no
 sim_common=yes
 sim_igen=no
 sim_arch=
+sim_default=yes
 case "${target}" in
    arm*-*-*)
 
@@ -3820,6 +3825,7 @@ subdirs="$subdirs arm"
   subdirs="$subdirs ppc"
 
 
+       sim_default=no
        ;;
    v850*-*-*)
 
diff --git a/sim/configure.ac b/sim/configure.ac
index 8c1d914..6a76712 100644
--- a/sim/configure.ac
+++ b/sim/configure.ac
@@ -30,17 +30,20 @@ AC_SUBST(CFLAGS_FOR_BUILD)
 # If a cpu ever has more than one simulator to choose from, use
 # --enable-sim=... to choose.
 AC_ARG_ENABLE(sim,
-[  --enable-sim ],
+AS_HELP_STRING([--enable-sim],
+	       [Include simulated target (default=yes for most targets)]),
 [case "${enableval}" in
 yes | no) ;;
 *)	AC_MSG_ERROR(bad value ${enableval} given for --enable-sim option) ;;
-esac])
+esac],
+[enable_sim=auto])
 
 m4_define([SIM_ARCH], [
   sim_arch=$1
   AC_CONFIG_SUBDIRS($1)
 ])
-if test "${enable_sim}" != no; then
+if test "${enable_sim}" = yes \
+	-o '(' "${enable_sim}" != no -a $sim_default = yes ')'; then
    sinclude(configure.tgt)
    if test "$sim_testsuite" = yes; then
       AC_CONFIG_SUBDIRS(testsuite)
diff --git a/sim/configure.tgt b/sim/configure.tgt
index 39f92b6..b5cd02a 100644
--- a/sim/configure.tgt
+++ b/sim/configure.tgt
@@ -15,6 +15,7 @@ sim_testsuite=no
 sim_common=yes
 sim_igen=no
 sim_arch=
+sim_default=yes
 case "${target}" in
    arm*-*-*)
        SIM_ARCH(arm)
@@ -109,6 +110,7 @@ case "${target}" in
        ;;
    powerpc*-*-*)
        SIM_ARCH(ppc)
+       sim_default=no
        ;;
    v850*-*-*)
        SIM_ARCH(v850)