sim: common: split up acinclude.m4 into individual m4 files

This file is quite large and is getting unmanageable.  Split it apart
to follow aclocal best practices by putting one-macro-per-file.  There
shouldn't be any real functional changes here as can be seen in the
configure script regens.

4 files changed, 35 insertions, 14 deletions

diff --git a/sim/rl78/ChangeLog b/sim/rl78/ChangeLog
index a2a1974..895ff61 100644
--- a/sim/rl78/ChangeLog
+++ b/sim/rl78/ChangeLog
@@ -1,3 +1,8 @@
+2021-02-21  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.ac (AC_CONFIG_MACRO_DIRS): Replace common with m4.
+	* aclocal.m4, configure: Regenerate.
+
 2021-02-13  Mike Frysinger  <vapier@gentoo.org>
 
 	* configure.ac: Replace sinclude with AC_CONFIG_MACRO_DIRS.
diff --git a/sim/rl78/aclocal.m4 b/sim/rl78/aclocal.m4
index 1c83b20..a29db71 100644
--- a/sim/rl78/aclocal.m4
+++ b/sim/rl78/aclocal.m4
@@ -98,6 +98,12 @@ AC_DEFUN([_AM_SUBST_NOTMAKE])
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
+m4_include([../m4/sim_ac_common.m4])
+m4_include([../m4/sim_ac_option_assert.m4])
+m4_include([../m4/sim_ac_option_environment.m4])
+m4_include([../m4/sim_ac_option_inline.m4])
+m4_include([../m4/sim_ac_option_warnings.m4])
+m4_include([../m4/sim_ac_output.m4])
 m4_include([../../config/acx.m4])
 m4_include([../../config/depstand.m4])
 m4_include([../../config/gettext-sister.m4])
@@ -110,4 +116,3 @@ m4_include([../../ltoptions.m4])
 m4_include([../../ltsugar.m4])
 m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
-m4_include([../common/acinclude.m4])
diff --git a/sim/rl78/configure b/sim/rl78/configure
index 1ecbeed..6f350ed 100755
--- a/sim/rl78/configure
+++ b/sim/rl78/configure
@@ -631,6 +631,16 @@ ac_includes_default="\
 
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
+sim_reserved_bits
+sim_hw
+sim_hw_objs
+sim_hw_cflags
+sim_default_model
+sim_scache
+sim_float
+sim_endian
+sim_bitsize
+sim_alignment
 cgen_breaks
 REPORT_BUGS_TEXI
 REPORT_BUGS_TO
@@ -747,17 +757,7 @@ PATH_SEPARATOR
 SHELL
 WERROR_CFLAGS
 WARN_CFLAGS
-sim_reserved_bits
-sim_inline
-sim_hw
-sim_hw_objs
-sim_hw_cflags
-sim_default_model
-sim_scache
-sim_float
-sim_endian
-sim_bitsize
-sim_alignment'
+sim_inline'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
@@ -11783,7 +11783,6 @@ _ACEOF
 
 
 
-
 # Check whether --enable-werror was given.
 if test "${enable_werror+set}" = set; then :
   enableval=$enable_werror; case "${enableval}" in
@@ -11910,6 +11909,18 @@ ac_config_commands="$ac_config_commands Makefile"
 
 ac_config_commands="$ac_config_commands stamp-h"
 
+
+
+
+
+
+
+
+
+
+
+
+
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
diff --git a/sim/rl78/configure.ac b/sim/rl78/configure.ac
index decb7e6..1314b98 100644
--- a/sim/rl78/configure.ac
+++ b/sim/rl78/configure.ac
@@ -19,7 +19,7 @@ dnl You should have received a copy of the GNU General Public License
 dnl along with this program.  If not, see <http://www.gnu.org/licenses/>.
 dnl
 AC_INIT(Makefile.in)
-AC_CONFIG_MACRO_DIRS([../common ../.. ../../config])
+AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])
 
 SIM_AC_COMMON
 SIM_AC_OPTION_WARNINGS(no)