From 760b3e8bc9ab6e292debab7758a403fe611d302b Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 6 Feb 2021 22:51:30 -0500 Subject: 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. --- sim/pru/ChangeLog | 5 +++++ sim/pru/aclocal.m4 | 9 ++++++++- sim/pru/configure | 29 ++++++++++++++++++++--------- sim/pru/configure.ac | 2 +- 4 files changed, 34 insertions(+), 11 deletions(-) (limited to 'sim/pru') diff --git a/sim/pru/ChangeLog b/sim/pru/ChangeLog index dd291b5..afe4c15 100644 --- a/sim/pru/ChangeLog +++ b/sim/pru/ChangeLog @@ -1,3 +1,8 @@ +2021-02-21 Mike Frysinger + + * configure.ac (AC_CONFIG_MACRO_DIRS): Replace common with m4. + * aclocal.m4, configure: Regenerate. + 2021-02-13 Mike Frysinger * configure.ac: Replace sinclude with AC_CONFIG_MACRO_DIRS. diff --git a/sim/pru/aclocal.m4 b/sim/pru/aclocal.m4 index 1c83b20..3326ca9 100644 --- a/sim/pru/aclocal.m4 +++ b/sim/pru/aclocal.m4 @@ -98,6 +98,14 @@ 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_alignment.m4]) +m4_include([../m4/sim_ac_option_assert.m4]) +m4_include([../m4/sim_ac_option_endian.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 +118,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/pru/configure b/sim/pru/configure index 84107ef..13fe965 100755 --- a/sim/pru/configure +++ b/sim/pru/configure @@ -631,6 +631,14 @@ 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_bitsize cgen_breaks REPORT_BUGS_TEXI REPORT_BUGS_TO @@ -747,16 +755,8 @@ 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' ac_subst_files='' ac_user_opts=' @@ -11791,7 +11791,6 @@ _ACEOF - wire_endian="LITTLE" default_endian="" # Check whether --enable-sim-endian was given. @@ -11999,6 +11998,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/pru/configure.ac b/sim/pru/configure.ac index dcc2cba..a4db77b 100644 --- a/sim/pru/configure.ac +++ b/sim/pru/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 . dnl AC_INIT(Makefile.in) -AC_CONFIG_MACRO_DIRS([../common ../.. ../../config]) +AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config]) SIM_AC_COMMON -- cgit v1.1