diff --git a/sim/ChangeLog b/sim/ChangeLog
index 0c0dcd6..f3ad5ec 100644
--- a/sim/ChangeLog
+++ b/sim/ChangeLog
@@ -1,3 +1,7 @@
+2015-06-12  Mike Frysinger  <vapier@gentoo.org>
+
+	* README-HACKING: Change configure.in to configure.ac.
+
 2015-04-02  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* arm/configure: Regenerated.
diff --git a/sim/README-HACKING b/sim/README-HACKING
index 0a6bbe2..188ca3c 100644
--- a/sim/README-HACKING
+++ b/sim/README-HACKING
@@ -31,11 +31,11 @@ Common Makefile Support
 
 A common configuration framework is available for simulators that want
 to use it.  The common framework exists to remove a lot of duplication
-in configure.in and Makefile.in, and it also provides a foundation for
+in configure.ac and Makefile.in, and it also provides a foundation for
 enhancing the simulators uniformly (e.g. the more they share in common
 the easier a feature added to one is added to all).
 
-The configure.in of a simulator using the common framework should look like:
+The configure.ac of a simulator using the common framework should look like:
 
 --- snip ---
 dnl Process this file with autoconf to produce a configure script.
diff --git a/sim/arm/ChangeLog b/sim/arm/ChangeLog
index e1dae5d..4cc45a0 100644
--- a/sim/arm/ChangeLog
+++ b/sim/arm/ChangeLog
@@ -2,6 +2,10 @@
 
 	* configure: Regenerate.
 
+2015-06-12  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure: Regenerate.
+
 2015-04-18  Mike Frysinger  <vapier@gentoo.org>
 
 	* sim-main.h (SIM_CPU): Delete.
diff --git a/sim/arm/configure b/sim/arm/configure
index 27a9010..d608a7f 100755
--- a/sim/arm/configure
+++ b/sim/arm/configure
@@ -2227,7 +2227,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 # SIM_AC_OUTPUT is a cover function to AC_OUTPUT to generate the Makefile.
 # It is intended to be invoked last.
 #
-# The simulator's configure.in should look like:
+# The simulator's configure.ac should look like:
 #
 # dnl Process this file with autoconf to produce a configure script.
 # AC_PREREQ(2.64)dnl
diff --git a/sim/avr/ChangeLog b/sim/avr/ChangeLog
index 5d66262..ea224f9 100644
--- a/sim/avr/ChangeLog
+++ b/sim/avr/ChangeLog
@@ -2,6 +2,10 @@
 
 	* configure: Regenerate.
 
+2015-06-12  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure: Regenerate.
+
 2015-04-27  Senthil Kumar Selvaraj  <senthil_kumar.selvaraj@atmel.com>
 
 	* Makefile.in (SIM_OBJS): Move interp.o
diff --git a/sim/avr/configure b/sim/avr/configure
index 793e4ab..860ee4e 100755
--- a/sim/avr/configure
+++ b/sim/avr/configure
@@ -2227,7 +2227,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 # SIM_AC_OUTPUT is a cover function to AC_OUTPUT to generate the Makefile.
 # It is intended to be invoked last.
 #
-# The simulator's configure.in should look like:
+# The simulator's configure.ac should look like:
 #
 # dnl Process this file with autoconf to produce a configure script.
 # AC_PREREQ(2.64)dnl
diff --git a/sim/bfin/ChangeLog b/sim/bfin/ChangeLog
index e62e38e..1967251 100644
--- a/sim/bfin/ChangeLog
+++ b/sim/bfin/ChangeLog
@@ -4,6 +4,10 @@
 
 2015-06-12  Mike Frysinger  <vapier@gentoo.org>
 
+	* configure: Regenerate.
+
+2015-06-12  Mike Frysinger  <vapier@gentoo.org>
+
 	* bfin-sim.c (hwloop_get_next_pc): Change TRACE_BRANCH to
 	BFIN_TRACE_BRANCH.
 	(decode_ProgCtrl_0, decode_BRCC_0, decode_UJUMP_0, decode_CALLa_0):
diff --git a/sim/bfin/configure b/sim/bfin/configure
index 46fe0c0..7eb164f 100755
--- a/sim/bfin/configure
+++ b/sim/bfin/configure
@@ -2249,7 +2249,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 # SIM_AC_OUTPUT is a cover function to AC_OUTPUT to generate the Makefile.
 # It is intended to be invoked last.
 #
-# The simulator's configure.in should look like:
+# The simulator's configure.ac should look like:
 #
 # dnl Process this file with autoconf to produce a configure script.
 # AC_PREREQ(2.64)dnl
diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index 24e266d..a8be420 100644
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,5 +1,10 @@
 2015-06-12  Mike Frysinger  <vapier@gentoo.org>
 
+	* acinclude.m4: Change configure.in to configure.ac.
+	* sim-config.h: Likewise.
+
+2015-06-12  Mike Frysinger  <vapier@gentoo.org>
+
 	* acinclude.m4 (sim-trace): Delete -DTRACE flags.
 	* configure: Regenerate.
 
diff --git a/sim/common/acinclude.m4 b/sim/common/acinclude.m4
index 3564474..bed2366 100644
--- a/sim/common/acinclude.m4
+++ b/sim/common/acinclude.m4
@@ -5,7 +5,7 @@
 # SIM_AC_OUTPUT is a cover function to AC_OUTPUT to generate the Makefile.
 # It is intended to be invoked last.
 #
-# The simulator's configure.in should look like:
+# The simulator's configure.ac should look like:
 #
 # dnl Process this file with autoconf to produce a configure script.
 # AC_PREREQ(2.64)dnl
@@ -263,12 +263,12 @@ sim_link_links="${sim_link_links} targ-vals.def"
 dnl Additional SIM options that can (optionally) be configured
 dnl For optional simulator options, a macro SIM_AC_OPTION_* is defined.
 dnl Simulators that wish to use the relevant option specify the macro
-dnl in the simulator specific configure.in file between the SIM_AC_COMMON
+dnl in the simulator specific configure.ac file between the SIM_AC_COMMON
 dnl and SIM_AC_OUTPUT lines.
 
 
 dnl Specify the running environment.
-dnl If the simulator invokes this in its configure.in then without this option
+dnl If the simulator invokes this in its configure.ac then without this option
 dnl the default is the user environment and all are runtime selectable.
 dnl If the simulator doesn't invoke this, only the user environment is
 dnl supported.
diff --git a/sim/common/sim-config.h b/sim/common/sim-config.h
index 9391994..bf7428c 100644
--- a/sim/common/sim-config.h
+++ b/sim/common/sim-config.h
@@ -360,7 +360,7 @@ enum sim_environment {
 #endif
 
 /* If the simulator doesn't specify SIM_AC_OPTION_ENVIRONMENT in its
-   configure.in, the only supported environment is the user environment.  */
+   configure.ac, the only supported environment is the user environment.  */
 #ifndef WITH_ENVIRONMENT
 #define WITH_ENVIRONMENT USER_ENVIRONMENT
 #endif
diff --git a/sim/cr16/ChangeLog b/sim/cr16/ChangeLog
index 18c50a2..7647d1c 100644
--- a/sim/cr16/ChangeLog
+++ b/sim/cr16/ChangeLog
@@ -2,6 +2,10 @@
 
 	* configure: Regenerate.
 
+2015-06-12  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure: Regenerate.
+
 2015-04-18  Mike Frysinger  <vapier@gentoo.org>
 
 	* sim-main.h (SIM_CPU): Delete.
diff --git a/sim/cr16/configure b/sim/cr16/configure
index 27a9010..d608a7f 100755
--- a/sim/cr16/configure
+++ b/sim/cr16/configure
@@ -2227,7 +2227,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 # SIM_AC_OUTPUT is a cover function to AC_OUTPUT to generate the Makefile.
 # It is intended to be invoked last.
 #
-# The simulator's configure.in should look like:
+# The simulator's configure.ac should look like:
 #
 # dnl Process this file with autoconf to produce a configure script.
 # AC_PREREQ(2.64)dnl
diff --git a/sim/cris/ChangeLog b/sim/cris/ChangeLog
index 57c8fe1..d4133f0 100644
--- a/sim/cris/ChangeLog
+++ b/sim/cris/ChangeLog
@@ -4,6 +4,10 @@
 
 2015-06-12  Mike Frysinger  <vapier@gentoo.org>
 
+	* configure: Regenerate.
+
+2015-06-12  Mike Frysinger  <vapier@gentoo.org>
+
 	* decodev10.c (crisv10f_decode): Change TRACE_EXTRACT to
 	CGEN_TRACE_EXTRACT.
 	* decodev32.c (crisv32f_decode): Likewise.
diff --git a/sim/cris/configure b/sim/cris/configure
index addde9e..8dfc3da 100755
--- a/sim/cris/configure
+++ b/sim/cris/configure
@@ -2237,7 +2237,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 # SIM_AC_OUTPUT is a cover function to AC_OUTPUT to generate the Makefile.
 # It is intended to be invoked last.
 #
-# The simulator's configure.in should look like:
+# The simulator's configure.ac should look like:
 #
 # dnl Process this file with autoconf to produce a configure script.
 # AC_PREREQ(2.64)dnl
diff --git a/sim/d10v/ChangeLog b/sim/d10v/ChangeLog
index 4064880..74cda7a 100644
--- a/sim/d10v/ChangeLog
+++ b/sim/d10v/ChangeLog
@@ -2,6 +2,10 @@
 
 	* configure: Regenerate.
 
+2015-06-12  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure: Regenerate.
+
 2015-04-18  Mike Frysinger  <vapier@gentoo.org>
 
 	* sim-main.h (SIM_CPU): Delete.
diff --git a/sim/d10v/configure b/sim/d10v/configure
index 27a9010..d608a7f 100755
--- a/sim/d10v/configure
+++ b/sim/d10v/configure
@@ -2227,7 +2227,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 # SIM_AC_OUTPUT is a cover function to AC_OUTPUT to generate the Makefile.
 # It is intended to be invoked last.
 #
-# The simulator's configure.in should look like:
+# The simulator's configure.ac should look like:
 #
 # dnl Process this file with autoconf to produce a configure script.
 # AC_PREREQ(2.64)dnl
diff --git a/sim/erc32/ChangeLog b/sim/erc32/ChangeLog
index 937d991..9dfc625 100644
--- a/sim/erc32/ChangeLog
+++ b/sim/erc32/ChangeLog
@@ -2,6 +2,10 @@
 
 	* configure: Regenerate.
 
+2015-06-12  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure: Regenerate.
+
 2015-05-17  Mike Frysinger  <vapier@gentoo.org>
 
 	* erc32.c: Re-add file overview & author info.
diff --git a/sim/erc32/configure b/sim/erc32/configure
index 38c4513..17d2e6b 100755
--- a/sim/erc32/configure
+++ b/sim/erc32/configure
@@ -2213,7 +2213,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 # SIM_AC_OUTPUT is a cover function to AC_OUTPUT to generate the Makefile.
 # It is intended to be invoked last.
 #
-# The simulator's configure.in should look like:
+# The simulator's configure.ac should look like:
 #
 # dnl Process this file with autoconf to produce a configure script.
 # AC_PREREQ(2.64)dnl
diff --git a/sim/frv/ChangeLog b/sim/frv/ChangeLog
index 56d7547..a0eaa36 100644
--- a/sim/frv/ChangeLog
+++ b/sim/frv/ChangeLog
@@ -4,6 +4,10 @@
 
 2015-06-12  Mike Frysinger  <vapier@gentoo.org>
 
+	* configure: Regenerate.
+
+2015-06-12  Mike Frysinger  <vapier@gentoo.org>
+
 	* decode.c (frvbf_decode): Change TRACE_EXTRACT to CGEN_TRACE_EXTRACT.
 	* mloop.in (execute): Change TRACE_INSN_INIT to CGEN_TRACE_INSN_INIT,
 	TRACE_INSN to CGEN_TRACE_INSN, and TRACE_INSN_FINI to CGEN_TRACE_INSN_FINI.
diff --git a/sim/frv/configure b/sim/frv/configure
index 53fbf48..a3529af 100755
--- a/sim/frv/configure
+++ b/sim/frv/configure
@@ -2232,7 +2232,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 # SIM_AC_OUTPUT is a cover function to AC_OUTPUT to generate the Makefile.
 # It is intended to be invoked last.
 #
-# The simulator's configure.in should look like:
+# The simulator's configure.ac should look like:
 #
 # dnl Process this file with autoconf to produce a configure script.
 # AC_PREREQ(2.64)dnl
diff --git a/sim/ft32/ChangeLog b/sim/ft32/ChangeLog
index 22d2bbe..819e1de 100644
--- a/sim/ft32/ChangeLog
+++ b/sim/ft32/ChangeLog
@@ -2,6 +2,10 @@
 
 	* configure: Regenerate.
 
+2015-06-12  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure: Regenerate.
+
 2015-04-18  Mike Frysinger  <vapier@gentoo.org>
 
 	* sim-main.h (SIM_CPU): Delete.
diff --git a/sim/ft32/configure b/sim/ft32/configure
index 1db7ad4..d3a8cfc 100755
--- a/sim/ft32/configure
+++ b/sim/ft32/configure
@@ -2227,7 +2227,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 # SIM_AC_OUTPUT is a cover function to AC_OUTPUT to generate the Makefile.
 # It is intended to be invoked last.
 #
-# The simulator's configure.in should look like:
+# The simulator's configure.ac should look like:
 #
 # dnl Process this file with autoconf to produce a configure script.
 # AC_PREREQ(2.64)dnl
diff --git a/sim/h8300/ChangeLog b/sim/h8300/ChangeLog
index 2340554..ad36c75 100644
--- a/sim/h8300/ChangeLog
+++ b/sim/h8300/ChangeLog
@@ -2,6 +2,10 @@
 
 	* configure: Regenerate.
 
+2015-06-12  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure: Regenerate.
+
 2015-04-18  Mike Frysinger  <vapier@gentoo.org>
 
 	* sim-main.h (SIM_CPU): Delete.
diff --git a/sim/h8300/configure b/sim/h8300/configure
index 1d69d22..f8c3da5 100755
--- a/sim/h8300/configure
+++ b/sim/h8300/configure
@@ -2209,7 +2209,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 # SIM_AC_OUTPUT is a cover function to AC_OUTPUT to generate the Makefile.
 # It is intended to be invoked last.
 #
-# The simulator's configure.in should look like:
+# The simulator's configure.ac should look like:
 #
 # dnl Process this file with autoconf to produce a configure script.
 # AC_PREREQ(2.64)dnl
diff --git a/sim/igen/ChangeLog b/sim/igen/ChangeLog
index 9007920..c611a40 100644
--- a/sim/igen/ChangeLog
+++ b/sim/igen/ChangeLog
@@ -1,3 +1,7 @@
+2015-06-12  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure: Regenerate.
+
 2015-04-24  David Binderman  <dcb314@hotmail.com>
 	    Nick Clifton  <nickc@redhat.com>
 
diff --git a/sim/igen/configure b/sim/igen/configure
index b910afc..9529c58 100755
--- a/sim/igen/configure
+++ b/sim/igen/configure
@@ -2050,7 +2050,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 # SIM_AC_OUTPUT is a cover function to AC_OUTPUT to generate the Makefile.
 # It is intended to be invoked last.
 #
-# The simulator's configure.in should look like:
+# The simulator's configure.ac should look like:
 #
 # dnl Process this file with autoconf to produce a configure script.
 # AC_PREREQ(2.64)dnl
diff --git a/sim/iq2000/ChangeLog b/sim/iq2000/ChangeLog
index 031aa52..da78da2 100644
--- a/sim/iq2000/ChangeLog
+++ b/sim/iq2000/ChangeLog
@@ -4,6 +4,10 @@
 
 2015-06-12  Mike Frysinger  <vapier@gentoo.org>
 
+	* configure: Regenerate.
+
+2015-06-12  Mike Frysinger  <vapier@gentoo.org>
+
 	* decode.c (frvbf_decode): Change TRACE_EXTRACT to CGEN_TRACE_EXTRACT.
 	* mloop.in (execute): Change TRACE_INSN_INIT to CGEN_TRACE_INSN_INIT,
 	TRACE_INSN to CGEN_TRACE_INSN, and TRACE_INSN_FINI to CGEN_TRACE_INSN_FINI.
diff --git a/sim/iq2000/configure b/sim/iq2000/configure
index 5646987..ab80a9a 100755
--- a/sim/iq2000/configure
+++ b/sim/iq2000/configure
@@ -2231,7 +2231,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 # SIM_AC_OUTPUT is a cover function to AC_OUTPUT to generate the Makefile.
 # It is intended to be invoked last.
 #
-# The simulator's configure.in should look like:
+# The simulator's configure.ac should look like:
 #
 # dnl Process this file with autoconf to produce a configure script.
 # AC_PREREQ(2.64)dnl
diff --git a/sim/lm32/ChangeLog b/sim/lm32/ChangeLog
index 06e1e09..dd95d6a 100644
--- a/sim/lm32/ChangeLog
+++ b/sim/lm32/ChangeLog
@@ -4,6 +4,10 @@
 
 2015-06-12  Mike Frysinger  <vapier@gentoo.org>
 
+	* configure: Regenerate.
+
+2015-06-12  Mike Frysinger  <vapier@gentoo.org>
+
 	* decode.c (lm32bf_decode): Change TRACE_EXTRACT to CGEN_TRACE_EXTRACT.
 	* mloop.in (execute): Change TRACE_INSN_INIT to CGEN_TRACE_INSN_INIT,
 	TRACE_INSN to CGEN_TRACE_INSN, and TRACE_INSN_FINI to CGEN_TRACE_INSN_FINI.
diff --git a/sim/lm32/configure b/sim/lm32/configure
index b2492b1..9474000 100755
--- a/sim/lm32/configure
+++ b/sim/lm32/configure
@@ -2229,7 +2229,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 # SIM_AC_OUTPUT is a cover function to AC_OUTPUT to generate the Makefile.
 # It is intended to be invoked last.
 #
-# The simulator's configure.in should look like:
+# The simulator's configure.ac should look like:
 #
 # dnl Process this file with autoconf to produce a configure script.
 # AC_PREREQ(2.64)dnl
diff --git a/sim/m32c/ChangeLog b/sim/m32c/ChangeLog
index d0fbc7d..19850c3 100644
--- a/sim/m32c/ChangeLog
+++ b/sim/m32c/ChangeLog
@@ -2,6 +2,10 @@
 
 	* configure: Regenerate.
 
+2015-06-12  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure: Regenerate.
+
 2015-04-13  Mike Frysinger  <vapier@gentoo.org>
 
 	* configure: Regenerate.
diff --git a/sim/m32c/configure b/sim/m32c/configure
index bf7ca6c..65e8b21 100755
--- a/sim/m32c/configure
+++ b/sim/m32c/configure
@@ -2217,7 +2217,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 # SIM_AC_OUTPUT is a cover function to AC_OUTPUT to generate the Makefile.
 # It is intended to be invoked last.
 #
-# The simulator's configure.in should look like:
+# The simulator's configure.ac should look like:
 #
 # dnl Process this file with autoconf to produce a configure script.
 # AC_PREREQ(2.64)dnl
diff --git a/sim/m32r/ChangeLog b/sim/m32r/ChangeLog
index 3a2981d..12e5741 100644
--- a/sim/m32r/ChangeLog
+++ b/sim/m32r/ChangeLog
@@ -4,6 +4,10 @@
 
 2015-06-12  Mike Frysinger  <vapier@gentoo.org>
 
+	* configure: Regenerate.
+
+2015-06-12  Mike Frysinger  <vapier@gentoo.org>
+
 	* decode.c (m32rbf_decode): Change TRACE_EXTRACT to CGEN_TRACE_EXTRACT.
 	* decode2.c (m32r2f_decode): Likewise.
 	* decodex.c (m32rxf_decode): Likewise.
diff --git a/sim/m32r/configure b/sim/m32r/configure
index 7d24019..35dd792 100755
--- a/sim/m32r/configure
+++ b/sim/m32r/configure
@@ -2233,7 +2233,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 # SIM_AC_OUTPUT is a cover function to AC_OUTPUT to generate the Makefile.
 # It is intended to be invoked last.
 #
-# The simulator's configure.in should look like:
+# The simulator's configure.ac should look like:
 #
 # dnl Process this file with autoconf to produce a configure script.
 # AC_PREREQ(2.64)dnl
diff --git a/sim/m68hc11/ChangeLog b/sim/m68hc11/ChangeLog
index 9c39156..5c933c1 100644
--- a/sim/m68hc11/ChangeLog
+++ b/sim/m68hc11/ChangeLog
@@ -2,6 +2,10 @@
 
 	* configure: Regenerate.
 
+2015-06-12  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure: Regenerate.
+
 2015-06-11  Mike Frysinger  <vapier@gentoo.org>
 
 	* interp.c (interrupt_names): Delete.
diff --git a/sim/m68hc11/configure b/sim/m68hc11/configure
index e53dacc..38a815e 100755
--- a/sim/m68hc11/configure
+++ b/sim/m68hc11/configure
@@ -2226,7 +2226,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 # SIM_AC_OUTPUT is a cover function to AC_OUTPUT to generate the Makefile.
 # It is intended to be invoked last.
 #
-# The simulator's configure.in should look like:
+# The simulator's configure.ac should look like:
 #
 # dnl Process this file with autoconf to produce a configure script.
 # AC_PREREQ(2.64)dnl
diff --git a/sim/mcore/ChangeLog b/sim/mcore/ChangeLog
index 10dfdc0..1b47b5e 100644
--- a/sim/mcore/ChangeLog
+++ b/sim/mcore/ChangeLog
@@ -2,6 +2,10 @@
 
 	* configure: Regenerate.
 
+2015-06-12  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure: Regenerate.
+
 2015-04-21  Mike Frysinger  <vapier@gentoo.org>
 
 	* interp.c (sim_resume): Change %x to %lx for all cpu registers.
diff --git a/sim/mcore/configure b/sim/mcore/configure
index 27a9010..d608a7f 100755
--- a/sim/mcore/configure
+++ b/sim/mcore/configure
@@ -2227,7 +2227,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 # SIM_AC_OUTPUT is a cover function to AC_OUTPUT to generate the Makefile.
 # It is intended to be invoked last.
 #
-# The simulator's configure.in should look like:
+# The simulator's configure.ac should look like:
 #
 # dnl Process this file with autoconf to produce a configure script.
 # AC_PREREQ(2.64)dnl
diff --git a/sim/microblaze/ChangeLog b/sim/microblaze/ChangeLog
index 50c573b..c4716a5 100644
--- a/sim/microblaze/ChangeLog
+++ b/sim/microblaze/ChangeLog
@@ -2,6 +2,10 @@
 
 	* configure: Regenerate.
 
+2015-06-12  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure: Regenerate.
+
 2015-06-11  Mike Frysinger  <vapier@gentoo.org>
 
 	* Makefile.in (SIM_OBJS): Add sim-resume.o.
diff --git a/sim/microblaze/configure b/sim/microblaze/configure
index 27a9010..d608a7f 100755
--- a/sim/microblaze/configure
+++ b/sim/microblaze/configure
@@ -2227,7 +2227,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 # SIM_AC_OUTPUT is a cover function to AC_OUTPUT to generate the Makefile.
 # It is intended to be invoked last.
 #
-# The simulator's configure.in should look like:
+# The simulator's configure.ac should look like:
 #
 # dnl Process this file with autoconf to produce a configure script.
 # AC_PREREQ(2.64)dnl
diff --git a/sim/mips/ChangeLog b/sim/mips/ChangeLog
index 909a409..a8ea4b5 100644
--- a/sim/mips/ChangeLog
+++ b/sim/mips/ChangeLog
@@ -1,5 +1,10 @@
 2015-06-12  Mike Frysinger  <vapier@gentoo.org>
 
+	* configure.ac: Change configure.in to configure.ac.
+	* configure: Regenerate.
+
+2015-06-12  Mike Frysinger  <vapier@gentoo.org>
+
 	* configure: Regenerate.
 
 2015-06-12  Mike Frysinger  <vapier@gentoo.org>
diff --git a/sim/mips/configure b/sim/mips/configure
index 7165da3..9ea9ea5 100755
--- a/sim/mips/configure
+++ b/sim/mips/configure
@@ -2255,7 +2255,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 # SIM_AC_OUTPUT is a cover function to AC_OUTPUT to generate the Makefile.
 # It is intended to be invoked last.
 #
-# The simulator's configure.in should look like:
+# The simulator's configure.ac should look like:
 #
 # dnl Process this file with autoconf to produce a configure script.
 # AC_PREREQ(2.64)dnl
@@ -13743,7 +13743,7 @@ if test ${sim_gen} = MULTI; then
 
   # Simple sanity check.
   if test -z "${sim_multi_configs}" || test -z "${sim_multi_default}"; then
-    as_fn_error "Error in configure.in: MULTI simulator not set up correctly" "$LINENO" 5
+    as_fn_error "Error in configure.ac: MULTI simulator not set up correctly" "$LINENO" 5
   fi
 
   # Start in a known state.
@@ -13868,7 +13868,7 @@ __EOF__
 
   # Check whether we added a 'default:' label.
   if test ${sim_seen_default} = no; then
-    as_fn_error "Error in configure.in: \${sim_multi_configs} doesn't have an entry for \${sim_multi_default}" "$LINENO" 5
+    as_fn_error "Error in configure.ac: \${sim_multi_configs} doesn't have an entry for \${sim_multi_default}" "$LINENO" 5
   fi
 
   cat << __EOF__ >> multi-run.c
@@ -13912,7 +13912,7 @@ else
   sim_multi_src=doesnt-exist.c
 
   if test x"${sim_mach_default}" = x""; then
-    as_fn_error "Error in configure.in: \${sim_mach_default} not defined" "$LINENO" 5
+    as_fn_error "Error in configure.ac: \${sim_mach_default} not defined" "$LINENO" 5
   fi
   SIM_SUBTARGET="$SIM_SUBTARGET -DMIPS_MACH_DEFAULT=bfd_mach_${sim_mach_default}"
 fi
diff --git a/sim/mips/configure.ac b/sim/mips/configure.ac
index 4dee7d4..d786351 100644
--- a/sim/mips/configure.ac
+++ b/sim/mips/configure.ac
@@ -221,7 +221,7 @@ if test ${sim_gen} = MULTI; then
 
   # Simple sanity check.
   if test -z "${sim_multi_configs}" || test -z "${sim_multi_default}"; then
-    AC_MSG_ERROR(Error in configure.in: MULTI simulator not set up correctly)
+    AC_MSG_ERROR(Error in configure.ac: MULTI simulator not set up correctly)
   fi
 
   # Start in a known state.
@@ -346,7 +346,7 @@ __EOF__
 
   # Check whether we added a 'default:' label.
   if test ${sim_seen_default} = no; then
-    AC_MSG_ERROR(Error in configure.in: \${sim_multi_configs} doesn't have an entry for \${sim_multi_default})
+    AC_MSG_ERROR(Error in configure.ac: \${sim_multi_configs} doesn't have an entry for \${sim_multi_default})
   fi
 
   cat << __EOF__ >> multi-run.c
@@ -390,7 +390,7 @@ else
   sim_multi_src=doesnt-exist.c
 
   if test x"${sim_mach_default}" = x""; then
-    AC_MSG_ERROR(Error in configure.in: \${sim_mach_default} not defined)
+    AC_MSG_ERROR(Error in configure.ac: \${sim_mach_default} not defined)
   fi
   SIM_SUBTARGET="$SIM_SUBTARGET -DMIPS_MACH_DEFAULT=bfd_mach_${sim_mach_default}"
 fi
diff --git a/sim/mn10300/ChangeLog b/sim/mn10300/ChangeLog
index c7f7182..a59869b 100644
--- a/sim/mn10300/ChangeLog
+++ b/sim/mn10300/ChangeLog
@@ -2,6 +2,10 @@
 
 	* configure: Regenerate.
 
+2015-06-12  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure: Regenerate.
+
 2015-06-11  Mike Frysinger  <vapier@gentoo.org>
 
 	* interp.c (get_byte, get_half, get_word, put_byte, put_half,
diff --git a/sim/mn10300/configure b/sim/mn10300/configure
index 5ad5da6..3cddf22 100755
--- a/sim/mn10300/configure
+++ b/sim/mn10300/configure
@@ -2232,7 +2232,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 # SIM_AC_OUTPUT is a cover function to AC_OUTPUT to generate the Makefile.
 # It is intended to be invoked last.
 #
-# The simulator's configure.in should look like:
+# The simulator's configure.ac should look like:
 #
 # dnl Process this file with autoconf to produce a configure script.
 # AC_PREREQ(2.64)dnl
diff --git a/sim/moxie/ChangeLog b/sim/moxie/ChangeLog
index 3bb10fb..3c887de 100644
--- a/sim/moxie/ChangeLog
+++ b/sim/moxie/ChangeLog
@@ -4,6 +4,10 @@
 
 2015-06-12  Mike Frysinger  <vapier@gentoo.org>
 
+	* configure: Regenerate.
+
+2015-06-12  Mike Frysinger  <vapier@gentoo.org>
+
 	* interp.c (tracefile, tracing): Delete.
 	(MOXIE_TRACE_INSN): Call TRACE_INSN directly.
 
diff --git a/sim/moxie/configure b/sim/moxie/configure
index 688f2e3..f9fd726 100755
--- a/sim/moxie/configure
+++ b/sim/moxie/configure
@@ -2228,7 +2228,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 # SIM_AC_OUTPUT is a cover function to AC_OUTPUT to generate the Makefile.
 # It is intended to be invoked last.
 #
-# The simulator's configure.in should look like:
+# The simulator's configure.ac should look like:
 #
 # dnl Process this file with autoconf to produce a configure script.
 # AC_PREREQ(2.64)dnl
diff --git a/sim/msp430/ChangeLog b/sim/msp430/ChangeLog
index 023e64d..7f8fed6 100644
--- a/sim/msp430/ChangeLog
+++ b/sim/msp430/ChangeLog
@@ -4,6 +4,10 @@
 
 2015-06-12  Mike Frysinger  <vapier@gentoo.org>
 
+	* configure: Regenerate.
+
+2015-06-12  Mike Frysinger  <vapier@gentoo.org>
+
 	* msp430-sim.c (trace_reg_put): Replace TRACE_VPU_P/trace_generic
 	with TRACE_VPU.
 	(trace_reg_get): Likewise.
diff --git a/sim/msp430/configure b/sim/msp430/configure
index f147807..7d342c9 100755
--- a/sim/msp430/configure
+++ b/sim/msp430/configure
@@ -2223,7 +2223,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 # SIM_AC_OUTPUT is a cover function to AC_OUTPUT to generate the Makefile.
 # It is intended to be invoked last.
 #
-# The simulator's configure.in should look like:
+# The simulator's configure.ac should look like:
 #
 # dnl Process this file with autoconf to produce a configure script.
 # AC_PREREQ(2.64)dnl
diff --git a/sim/ppc/ChangeLog b/sim/ppc/ChangeLog
index 1297df1..1f87bd8 100644
--- a/sim/ppc/ChangeLog
+++ b/sim/ppc/ChangeLog
@@ -1,3 +1,7 @@
+2015-06-12  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure: Regenerate.
+
 2015-04-29  Nick Clifton  <nickc@redhat.com>
 
 	PR 18273
diff --git a/sim/ppc/configure b/sim/ppc/configure
index 8cd3313..1298d38 100755
--- a/sim/ppc/configure
+++ b/sim/ppc/configure
@@ -2393,7 +2393,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 # SIM_AC_OUTPUT is a cover function to AC_OUTPUT to generate the Makefile.
 # It is intended to be invoked last.
 #
-# The simulator's configure.in should look like:
+# The simulator's configure.ac should look like:
 #
 # dnl Process this file with autoconf to produce a configure script.
 # AC_PREREQ(2.64)dnl
diff --git a/sim/rl78/ChangeLog b/sim/rl78/ChangeLog
index 8819fa2..0bf880e 100644
--- a/sim/rl78/ChangeLog
+++ b/sim/rl78/ChangeLog
@@ -2,6 +2,10 @@
 
 	* configure: Regenerate.
 
+2015-06-12  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure: Regenerate.
+
 2015-04-30  DJ Delorie  <dj@redhat.com>
 
 	* cpu.c (g14_multiply): New.
diff --git a/sim/rl78/configure b/sim/rl78/configure
index da46fad..d6d20fe 100755
--- a/sim/rl78/configure
+++ b/sim/rl78/configure
@@ -2209,7 +2209,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 # SIM_AC_OUTPUT is a cover function to AC_OUTPUT to generate the Makefile.
 # It is intended to be invoked last.
 #
-# The simulator's configure.in should look like:
+# The simulator's configure.ac should look like:
 #
 # dnl Process this file with autoconf to produce a configure script.
 # AC_PREREQ(2.64)dnl
diff --git a/sim/rx/ChangeLog b/sim/rx/ChangeLog
index a5638c9..507046f 100644
--- a/sim/rx/ChangeLog
+++ b/sim/rx/ChangeLog
@@ -2,6 +2,10 @@
 
 	* configure: Regenerate.
 
+2015-06-12  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure: Regenerate.
+
 2015-04-24  Nick Clifton  <nickc@redhat.com>
 
 	PR sim/18273
diff --git a/sim/rx/configure b/sim/rx/configure
index 2755905..4dcbbfd 100755
--- a/sim/rx/configure
+++ b/sim/rx/configure
@@ -2213,7 +2213,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 # SIM_AC_OUTPUT is a cover function to AC_OUTPUT to generate the Makefile.
 # It is intended to be invoked last.
 #
-# The simulator's configure.in should look like:
+# The simulator's configure.ac should look like:
 #
 # dnl Process this file with autoconf to produce a configure script.
 # AC_PREREQ(2.64)dnl
diff --git a/sim/sh/ChangeLog b/sim/sh/ChangeLog
index 3fcd660..5eae156 100644
--- a/sim/sh/ChangeLog
+++ b/sim/sh/ChangeLog
@@ -2,6 +2,10 @@
 
 	* configure: Regenerate.
 
+2015-06-12  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure: Regenerate.
+
 2015-04-18  Mike Frysinger  <vapier@gentoo.org>
 
 	* sim-main.h (SIM_CPU): Delete.
diff --git a/sim/sh/configure b/sim/sh/configure
index 27a9010..d608a7f 100755
--- a/sim/sh/configure
+++ b/sim/sh/configure
@@ -2227,7 +2227,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 # SIM_AC_OUTPUT is a cover function to AC_OUTPUT to generate the Makefile.
 # It is intended to be invoked last.
 #
-# The simulator's configure.in should look like:
+# The simulator's configure.ac should look like:
 #
 # dnl Process this file with autoconf to produce a configure script.
 # AC_PREREQ(2.64)dnl
diff --git a/sim/sh64/ChangeLog b/sim/sh64/ChangeLog
index 519c040..b780235 100644
--- a/sim/sh64/ChangeLog
+++ b/sim/sh64/ChangeLog
@@ -4,6 +4,10 @@
 
 2015-06-12  Mike Frysinger  <vapier@gentoo.org>
 
+	* configure: Regenerate.
+
+2015-06-12  Mike Frysinger  <vapier@gentoo.org>
+
 	* decode-compact.c (sh64_compact_decode): Change TRACE_EXTRACT to
 	CGEN_TRACE_EXTRACT.
 	* decode-media.c: Likewise.
diff --git a/sim/sh64/configure b/sim/sh64/configure
index 9b95245..0344167 100755
--- a/sim/sh64/configure
+++ b/sim/sh64/configure
@@ -2231,7 +2231,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 # SIM_AC_OUTPUT is a cover function to AC_OUTPUT to generate the Makefile.
 # It is intended to be invoked last.
 #
-# The simulator's configure.in should look like:
+# The simulator's configure.ac should look like:
 #
 # dnl Process this file with autoconf to produce a configure script.
 # AC_PREREQ(2.64)dnl
diff --git a/sim/v850/ChangeLog b/sim/v850/ChangeLog
index 6559718..a69992a 100644
--- a/sim/v850/ChangeLog
+++ b/sim/v850/ChangeLog
@@ -2,6 +2,10 @@
 
 	* configure: Regenerate.
 
+2015-06-12  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure: Regenerate.
+
 2015-06-11  Mike Frysinger  <vapier@gentoo.org>
 
 	* interp.c (INLINE): Delete define.
diff --git a/sim/v850/configure b/sim/v850/configure
index 8d8d251..72f6c3f 100755
--- a/sim/v850/configure
+++ b/sim/v850/configure
@@ -2227,7 +2227,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 # SIM_AC_OUTPUT is a cover function to AC_OUTPUT to generate the Makefile.
 # It is intended to be invoked last.
 #
-# The simulator's configure.in should look like:
+# The simulator's configure.ac should look like:
 #
 # dnl Process this file with autoconf to produce a configure script.
 # AC_PREREQ(2.64)dnl
