sim: fix sim-hardware configure option
Commit Message
The current default handling for the --enable-sim-hardware option ends up
forcing the value to whatever is set as the first argument when calling
the macro (by virtue of how autoconf works). Relocate the setup code to
the 4th parameter of the AC_ARG_ENABLE macro to fix it.
This was caused by the simplification work in 1517bd274290e06af498ef7e49.
Reported-by: Hans-Peter Nilsson <hans-peter.nilsson@axis.com>
Committed.
---
sim/bfin/ChangeLog | 4 ++++
sim/bfin/configure | 8 ++------
sim/common/ChangeLog | 5 +++++
sim/common/acinclude.m4 | 9 ++-------
sim/cris/ChangeLog | 4 ++++
sim/cris/configure | 8 ++------
sim/frv/ChangeLog | 4 ++++
sim/frv/configure | 8 ++------
sim/iq2000/ChangeLog | 4 ++++
sim/iq2000/configure | 8 ++------
sim/lm32/ChangeLog | 4 ++++
sim/lm32/configure | 8 ++------
sim/m32r/ChangeLog | 4 ++++
sim/m32r/configure | 8 ++------
sim/m68hc11/ChangeLog | 4 ++++
sim/m68hc11/configure | 8 ++------
sim/mips/ChangeLog | 4 ++++
sim/mips/configure | 8 ++------
sim/mn10300/ChangeLog | 4 ++++
sim/mn10300/configure | 8 ++------
sim/sh64/ChangeLog | 4 ++++
sim/sh64/configure | 8 ++------
22 files changed, 67 insertions(+), 67 deletions(-)
diff --git a/sim/sh64/configure b/sim/sh64/configure
index efd5484..6851755 100755
@@ -1,3 +1,7 @@
+2015-03-24 Mike Frysinger <vapier@gentoo.org>
+
+ * configure: Regenerate.
+
2015-03-23 Mike Frysinger <vapier@gentoo.org>
* configure: Regenerate.
@@ -1,3 +1,8 @@
+2015-03-24 Mike Frysinger <vapier@gentoo.org>
+
+ * acinclude.m4 (SIM_AC_OPTION_HARDWARE): Move default option setting
+ of enable_sim_hardware to AC_ARG_ENABLE.
+
2015-03-23 Mike Frysinger <vapier@gentoo.org>
* acinclude.m4 (SIM_AC_OPTION_HARDWARE): Delete SIM_DV_SOCKSER_O.
@@ -590,12 +590,6 @@ dnl arg[2] is a space separated list of devices that override the defaults
dnl arg[3] is a space separated list of extra target specific devices.
AC_DEFUN([SIM_AC_OPTION_HARDWARE],
[
-if test x"[$1]" != x"no"; then
- enable_sim_hardware=yes
-else
- enable_sim_hardware=no
-fi
-
if test "[$2]"; then
hardware="[$2]"
else
@@ -609,7 +603,8 @@ sim_hw_objs="\$(SIM_COMMON_HW_OBJS) `echo $sim_hw | sed -e 's/\([[^ ]][[^ ]]*\)/
AC_ARG_ENABLE(sim-hardware,
[AS_HELP_STRING([--enable-sim-hardware=LIST],
- [Specify the hardware to be included in the build.])])
+ [Specify the hardware to be included in the build.])],
+ ,[enable_sim_hardware="[$1]"])
case ${enable_sim_hardware} in
yes|no) ;;
,*) hardware="${hardware} `echo ${enableval} | sed -e 's/,/ /'`";;
@@ -1,3 +1,7 @@
+2015-03-24 Mike Frysinger <vapier@gentoo.org>
+
+ * configure: Regenerate.
+
2015-03-23 Mike Frysinger <vapier@gentoo.org>
* Makefile.in (CONFIG_DEVICES): Delete.
@@ -1,3 +1,7 @@
+2015-03-24 Mike Frysinger <vapier@gentoo.org>
+
+ * configure: Regenerate.
+
2015-03-23 Mike Frysinger <vapier@gentoo.org>
* configure: Regenerate.
@@ -1,3 +1,7 @@
+2015-03-24 Mike Frysinger <vapier@gentoo.org>
+
+ * configure: Regenerate.
+
2015-03-23 Mike Frysinger <vapier@gentoo.org>
* Makefile.in (CONFIG_DEVICES): Delete.
@@ -1,3 +1,7 @@
+2015-03-24 Mike Frysinger <vapier@gentoo.org>
+
+ * configure: Regenerate.
+
2015-03-23 Mike Frysinger <vapier@gentoo.org>
* configure: Regenerate.
@@ -1,3 +1,7 @@
+2015-03-24 Mike Frysinger <vapier@gentoo.org>
+
+ * configure: Regenerate.
+
2015-03-23 Mike Frysinger <vapier@gentoo.org>
* configure: Regenerate.
@@ -1,3 +1,7 @@
+2015-03-24 Mike Frysinger <vapier@gentoo.org>
+
+ * configure: Regenerate.
+
2015-03-23 Mike Frysinger <vapier@gentoo.org>
* configure: Regenerate.
@@ -1,3 +1,7 @@
+2015-03-24 Mike Frysinger <vapier@gentoo.org>
+
+ * configure: Regenerate.
+
2015-03-23 Mike Frysinger <vapier@gentoo.org>
* configure: Regenerate.
@@ -1,3 +1,7 @@
+2015-03-24 Mike Frysinger <vapier@gentoo.org>
+
+ * configure: Regenerate.
+
2015-03-23 Mike Frysinger <vapier@gentoo.org>
* Makefile.in (MN10300_OBJS): Delete dv-sockser.o.
@@ -1,3 +1,7 @@
+2015-03-24 Mike Frysinger <vapier@gentoo.org>
+
+ * configure: Regenerate.
+
2015-03-23 Mike Frysinger <vapier@gentoo.org>
* configure: Regenerate.