This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[PATCH v2 resend] sim: move from common.m4 to SIM_AC_COMMON
- From: Mike Frysinger <vapier at gentoo dot org>
- To: gdb-patches at sourceware dot org
- Cc: toolchain-devel at blackfin dot uclinux dot org, Joel Brobecker <brobecker at adacore dot com>
- Date: Mon, 17 Oct 2011 13:16:55 -0400
- Subject: [PATCH v2 resend] sim: move from common.m4 to SIM_AC_COMMON
- References: <1310436112-8596-1-git-send-email-vapier@gentoo.org>
Now that the sourceware tree generally requires autoconf-2.64, update
the sim tree to require that too.
This allows us to drop the long standing SIM_AC_COMMON/common.m4
workaround as autoconf 2.64+ seems to work for me.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
sim/arm/:
sim/avr/:
sim/bfin/:
sim/cr16/:
sim/cris/:
sim/d10v/:
sim/erc32/:
sim/frv/:
sim/h8300/:
sim/iq2000/:
sim/lm32/:
sim/m32c/:
sim/m32r/:
sim/m68hc11/:
sim/mcore/:
sim/microblaze/:
sim/mips/:
sim/mn10300/:
sim/moxie/:
sim/rx/:
sim/sh/:
sim/sh64/:
sim/v850/:
2011-07-11 Mike Frysinger <vapier@gentoo.org>
* configure.ac: Change AC_PREREQ to 2.64. Delete AC_CONFIG_HEADER
call. Replace common.m4 include with SIM_AC_COMMON.
sim/common/:
2011-07-11 Mike Frysinger <vapier@gentoo.org>
* aclocal.m4: Change AC_PREREQ comment to 2.64.
* common.m4: Delete.
* configure.ac: Change AC_PREREQ to 2.64. Replace AC_CONFIG_HEADER
call and common.m4 include with SIM_AC_COMMON(cconfig.h).
---
sim/arm/configure.ac | 8 +-
sim/avr/configure.ac | 8 +-
sim/bfin/configure.ac | 8 +-
sim/common/aclocal.m4 | 2 +-
sim/common/common.m4 | 232 -------------------------------------------
sim/common/configure.ac | 7 +-
sim/cr16/configure.ac | 8 +-
sim/cris/configure.ac | 8 +-
sim/d10v/configure.ac | 8 +-
sim/erc32/configure.ac | 8 +-
sim/frv/configure.ac | 8 +-
sim/h8300/configure.ac | 8 +-
sim/igen/configure.ac | 2 +-
sim/iq2000/configure.ac | 8 +-
sim/lm32/configure.ac | 8 +-
sim/m32c/configure.ac | 8 +-
sim/m32r/configure.ac | 8 +-
sim/m68hc11/configure.ac | 8 +-
sim/mcore/configure.ac | 8 +-
sim/microblaze/configure.ac | 8 +-
sim/mips/configure.ac | 8 +-
sim/mn10300/configure.ac | 8 +-
sim/moxie/configure.ac | 12 +--
sim/ppc/configure.ac | 2 +-
sim/rx/configure.ac | 14 +--
sim/sh/configure.ac | 8 +-
sim/sh64/configure.ac | 6 +-
sim/v850/configure.ac | 8 +-
28 files changed, 56 insertions(+), 381 deletions(-)
delete mode 100644 sim/common/common.m4
diff --git a/sim/arm/configure.ac b/sim/arm/configure.ac
index 8682c25..9ed3ea5 100644
--- a/sim/arm/configure.ac
+++ b/sim/arm/configure.ac
@@ -1,13 +1,9 @@
dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.59)dnl
+AC_PREREQ(2.64)dnl
AC_INIT(Makefile.in)
-AC_CONFIG_HEADER(config.h:config.in)
-
sinclude(../common/aclocal.m4)
-# Bugs in autoconf 2.59 break the call to SIM_AC_COMMON, hack around
-# it by inlining the macro's contents.
-sinclude(../common/common.m4)
+SIM_AC_COMMON
AC_CHECK_HEADERS(unistd.h stdint.h)
diff --git a/sim/avr/configure.ac b/sim/avr/configure.ac
index 59ce35c..8fefa07 100644
--- a/sim/avr/configure.ac
+++ b/sim/avr/configure.ac
@@ -1,12 +1,8 @@
dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.59)dnl
+AC_PREREQ(2.64)dnl
AC_INIT(Makefile.in)
-AC_CONFIG_HEADER(config.h:config.in)
-
sinclude(../common/aclocal.m4)
-# Bugs in autoconf 2.59 break the call to SIM_AC_COMMON, hack around
-# it by inlining the macro's contents.
-sinclude(../common/common.m4)
+SIM_AC_COMMON
SIM_AC_OUTPUT
diff --git a/sim/bfin/configure.ac b/sim/bfin/configure.ac
index 5520ee4..e3de01e 100644
--- a/sim/bfin/configure.ac
+++ b/sim/bfin/configure.ac
@@ -1,13 +1,9 @@
dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.59)dnl
+AC_PREREQ(2.64)dnl
AC_INIT(Makefile.in)
-AC_CONFIG_HEADER(config.h:config.in)
-
sinclude(../common/aclocal.m4)
-# Bugs in autoconf 2.59 break the call to SIM_AC_COMMON, hack around
-# it by inlining the macro's contents.
-sinclude(../common/common.m4)
+SIM_AC_COMMON
SIM_AC_OPTION_ENDIAN(LITTLE_ENDIAN)
SIM_AC_OPTION_ALIGNMENT(STRICT_ALIGNMENT,STRICT_ALIGNMENT)
diff --git a/sim/common/aclocal.m4 b/sim/common/aclocal.m4
index 37aed32..11398f5 100644
--- a/sim/common/aclocal.m4
+++ b/sim/common/aclocal.m4
@@ -8,7 +8,7 @@
# The simulator's configure.in should look like:
#
# dnl Process this file with autoconf to produce a configure script.
-# AC_PREREQ(2.5)dnl
+# AC_PREREQ(2.64)dnl
# AC_INIT(Makefile.in)
# sinclude(../common/aclocal.m4)
#
diff --git a/sim/common/common.m4 b/sim/common/common.m4
deleted file mode 100644
index 97a2c61..0000000
--- a/sim/common/common.m4
+++ /dev/null
@@ -1,232 +0,0 @@
-# This file contains common code used by all simulators.
-#
-# common.m4 invokes AC macros used by all simulators and by the common
-# directory. It is intended to be included before any target specific
-# stuff. 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:
-#
-# dnl Process this file with autoconf to produce a configure script.
-# AC_PREREQ(2.5)dnl
-# AC_INIT(Makefile.in)
-# AC_CONFIG_HEADER(config.h:config.in)
-#
-# sinclude(../common/aclocal.m4)
-# sinclude(../common/common.m4)
-#
-# ... target specific stuff ...
-
-AC_CANONICAL_SYSTEM
-AC_ARG_PROGRAM
-AC_PROG_CC
-AC_PROG_INSTALL
-
-# Put a plausible default for CC_FOR_BUILD in Makefile.
-if test "x$cross_compiling" = "xno"; then
- CC_FOR_BUILD='$(CC)'
-else
- CC_FOR_BUILD=gcc
-fi
-AC_SUBST(CC_FOR_BUILD)
-
-AC_SUBST(CFLAGS)
-AC_SUBST(HDEFINES)
-AR=${AR-ar}
-AC_SUBST(AR)
-AC_PROG_RANLIB
-
-dnl We don't use gettext, but bfd does. So we do the appropriate checks
-dnl to see if there are intl libraries we should link against.
-ALL_LINGUAS=
-ZW_GNU_GETTEXT_SISTER_DIR(../../intl)
-
-# Check for common headers.
-# FIXME: Seems to me this can cause problems for i386-windows hosts.
-# At one point there were hardcoded AC_DEFINE's if ${host} = i386-*-windows*.
-AC_CHECK_HEADERS(stdlib.h string.h strings.h unistd.h time.h)
-AC_CHECK_HEADERS(sys/time.h sys/resource.h)
-AC_CHECK_HEADERS(fcntl.h fpu_control.h)
-AC_CHECK_HEADERS(dlfcn.h errno.h sys/stat.h)
-AC_CHECK_FUNCS(getrusage time sigaction __setfpucw)
-
-# Check for socket libraries
-AC_CHECK_LIB(socket, bind)
-AC_CHECK_LIB(nsl, gethostbyname)
-
-# BFD conditionally uses zlib, so we must link it in if libbfd does, by
-# using the same condition.
-AM_ZLIB
-
-. ${srcdir}/../../bfd/configure.host
-
-dnl Standard (and optional) simulator options.
-dnl Eventually all simulators will support these.
-dnl Do not add any here that cannot be supported by all simulators.
-dnl Do not add similar but different options to a particular simulator,
-dnl all shall eventually behave the same way.
-
-
-dnl We don't use automake, but we still want to support
-dnl --enable-maintainer-mode.
-USE_MAINTAINER_MODE=no
-AC_ARG_ENABLE(maintainer-mode,
-[ --enable-maintainer-mode Enable developer functionality.],
-[case "${enableval}" in
- yes) MAINT="" USE_MAINTAINER_MODE=yes ;;
- no) MAINT="#" ;;
- *) AC_MSG_ERROR("--enable-maintainer-mode does not take a value"); MAINT="#" ;;
-esac
-if test x"$silent" != x"yes" && test x"$MAINT" = x""; then
- echo "Setting maintainer mode" 6>&1
-fi],[MAINT="#"])dnl
-AC_SUBST(MAINT)
-
-
-dnl This is a generic option to enable special byte swapping
-dnl insns on *any* cpu.
-AC_ARG_ENABLE(sim-bswap,
-[ --enable-sim-bswap Use Host specific BSWAP instruction.],
-[case "${enableval}" in
- yes) sim_bswap="-DWITH_BSWAP=1 -DUSE_BSWAP=1";;
- no) sim_bswap="-DWITH_BSWAP=0";;
- *) AC_MSG_ERROR("--enable-sim-bswap does not take a value"); sim_bswap="";;
-esac
-if test x"$silent" != x"yes" && test x"$sim_bswap" != x""; then
- echo "Setting bswap flags = $sim_bswap" 6>&1
-fi],[sim_bswap=""])dnl
-AC_SUBST(sim_bswap)
-
-
-AC_ARG_ENABLE(sim-cflags,
-[ --enable-sim-cflags=opts Extra CFLAGS for use in building simulator],
-[case "${enableval}" in
- yes) sim_cflags="-O2 -fomit-frame-pointer";;
- trace) AC_MSG_ERROR("Please use --enable-sim-debug instead."); sim_cflags="";;
- no) sim_cflags="";;
- *) sim_cflags=`echo "${enableval}" | sed -e "s/,/ /g"`;;
-esac
-if test x"$silent" != x"yes" && test x"$sim_cflags" != x""; then
- echo "Setting sim cflags = $sim_cflags" 6>&1
-fi],[sim_cflags=""])dnl
-AC_SUBST(sim_cflags)
-
-
-dnl --enable-sim-debug is for developers of the simulator
-dnl the allowable values are work-in-progress
-AC_ARG_ENABLE(sim-debug,
-[ --enable-sim-debug=opts Enable debugging flags],
-[case "${enableval}" in
- yes) sim_debug="-DDEBUG=7 -DWITH_DEBUG=7";;
- no) sim_debug="-DDEBUG=0 -DWITH_DEBUG=0";;
- *) sim_debug="-DDEBUG='(${enableval})' -DWITH_DEBUG='(${enableval})'";;
-esac
-if test x"$silent" != x"yes" && test x"$sim_debug" != x""; then
- echo "Setting sim debug = $sim_debug" 6>&1
-fi],[sim_debug=""])dnl
-AC_SUBST(sim_debug)
-
-
-dnl --enable-sim-stdio is for users of the simulator
-dnl It determines if IO from the program is routed through STDIO (buffered)
-AC_ARG_ENABLE(sim-stdio,
-[ --enable-sim-stdio Specify whether to use stdio for console input/output.],
-[case "${enableval}" in
- yes) sim_stdio="-DWITH_STDIO=DO_USE_STDIO";;
- no) sim_stdio="-DWITH_STDIO=DONT_USE_STDIO";;
- *) AC_MSG_ERROR("Unknown value $enableval passed to --enable-sim-stdio"); sim_stdio="";;
-esac
-if test x"$silent" != x"yes" && test x"$sim_stdio" != x""; then
- echo "Setting stdio flags = $sim_stdio" 6>&1
-fi],[sim_stdio=""])dnl
-AC_SUBST(sim_stdio)
-
-
-dnl --enable-sim-trace is for users of the simulator
-dnl The argument is either a bitmask of things to enable [exactly what is
-dnl up to the simulator], or is a comma separated list of names of tracing
-dnl elements to enable. The latter is only supported on simulators that
-dnl use WITH_TRACE.
-AC_ARG_ENABLE(sim-trace,
-[ --enable-sim-trace=opts Enable tracing flags],
-[case "${enableval}" in
- yes) sim_trace="-DTRACE=1 -DWITH_TRACE=-1";;
- no) sim_trace="-DTRACE=0 -DWITH_TRACE=0";;
- [[-0-9]]*)
- sim_trace="-DTRACE='(${enableval})' -DWITH_TRACE='(${enableval})'";;
- [[a-z]]*)
- sim_trace=""
- for x in `echo "$enableval" | sed -e "s/,/ /g"`; do
- if test x"$sim_trace" = x; then
- sim_trace="-DWITH_TRACE='(TRACE_$x"
- else
- sim_trace="${sim_trace}|TRACE_$x"
- fi
- done
- sim_trace="$sim_trace)'" ;;
-esac
-if test x"$silent" != x"yes" && test x"$sim_trace" != x""; then
- echo "Setting sim trace = $sim_trace" 6>&1
-fi],[sim_trace=""])dnl
-AC_SUBST(sim_trace)
-
-
-dnl --enable-sim-profile
-dnl The argument is either a bitmask of things to enable [exactly what is
-dnl up to the simulator], or is a comma separated list of names of profiling
-dnl elements to enable. The latter is only supported on simulators that
-dnl use WITH_PROFILE.
-AC_ARG_ENABLE(sim-profile,
-[ --enable-sim-profile=opts Enable profiling flags],
-[case "${enableval}" in
- yes) sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1";;
- no) sim_profile="-DPROFILE=0 -DWITH_PROFILE=0";;
- [[-0-9]]*)
- sim_profile="-DPROFILE='(${enableval})' -DWITH_PROFILE='(${enableval})'";;
- [[a-z]]*)
- sim_profile=""
- for x in `echo "$enableval" | sed -e "s/,/ /g"`; do
- if test x"$sim_profile" = x; then
- sim_profile="-DWITH_PROFILE='(PROFILE_$x"
- else
- sim_profile="${sim_profile}|PROFILE_$x"
- fi
- done
- sim_profile="$sim_profile)'" ;;
-esac
-if test x"$silent" != x"yes" && test x"$sim_profile" != x""; then
- echo "Setting sim profile = $sim_profile" 6>&1
-fi],[sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1"])dnl
-AC_SUBST(sim_profile)
-
-ACX_PKGVERSION([GDB])
-ACX_BUGURL([http://www.gnu.org/software/gdb/bugs/])
-AC_DEFINE_UNQUOTED([PKGVERSION], ["$PKGVERSION"], [Additional package description])
-AC_DEFINE_UNQUOTED([REPORT_BUGS_TO], ["$REPORT_BUGS_TO"], [Bug reporting address])
-
-dnl Types used by common code
-AC_TYPE_SIGNAL
-
-dnl Detect exe extension
-AC_EXEEXT
-
-dnl These are available to append to as desired.
-sim_link_files=
-sim_link_links=
-
-dnl Create tconfig.h either from simulator's tconfig.in or default one
-dnl in common.
-sim_link_links=tconfig.h
-if test -f ${srcdir}/tconfig.in
-then
- sim_link_files=tconfig.in
-else
- sim_link_files=../common/tconfig.in
-fi
-
-# targ-vals.def points to the libc macro description file.
-case "${target}" in
-*-*-*) TARG_VALS_DEF=../common/nltvals.def ;;
-esac
-sim_link_files="${sim_link_files} ${TARG_VALS_DEF}"
-sim_link_links="${sim_link_links} targ-vals.def"
diff --git a/sim/common/configure.ac b/sim/common/configure.ac
index 39302c8..a683f37 100644
--- a/sim/common/configure.ac
+++ b/sim/common/configure.ac
@@ -1,11 +1,8 @@
dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.59)dnl
+AC_PREREQ(2.64)dnl
AC_INIT(Makefile.in)
-AC_CONFIG_HEADER(cconfig.h:config.in)
-# Bugs in autoconf 2.59 break the call to SIM_AC_COMMON, hack around
-# it by inlining the macro's contents.
-sinclude(../common/common.m4)
+SIM_AC_COMMON(cconfig.h)
# Put a useful copy of CPP_FOR_TARGET in Makefile.
# This is only used to build the target values header files. These files are
diff --git a/sim/cr16/configure.ac b/sim/cr16/configure.ac
index 3acd7a1..f39788d 100644
--- a/sim/cr16/configure.ac
+++ b/sim/cr16/configure.ac
@@ -1,13 +1,9 @@
dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.59)dnl
+AC_PREREQ(2.64)dnl
AC_INIT(Makefile.in)
-AC_CONFIG_HEADER(config.h:config.in)
-
sinclude(../common/aclocal.m4)
-# Bugs in autoconf 2.59 break the call to SIM_AC_COMMON, hack around
-# it by inlining the macro's contents.
-sinclude(../common/common.m4)
+SIM_AC_COMMON
SIM_AC_OPTION_WARNINGS
diff --git a/sim/cris/configure.ac b/sim/cris/configure.ac
index 6ff1c0e..1ec7659 100644
--- a/sim/cris/configure.ac
+++ b/sim/cris/configure.ac
@@ -1,13 +1,9 @@
dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.59)dnl
+AC_PREREQ(2.64)dnl
AC_INIT(Makefile.in)
-AC_CONFIG_HEADER(config.h:config.in)
-
sinclude(../common/aclocal.m4)
-# Bugs in autoconf 2.59 break the call to SIM_AC_COMMON, hack around
-# it by inlining the macro's contents.
-sinclude(../common/common.m4)
+SIM_AC_COMMON
# For dv-rv and rvdummy.
AC_CHECK_HEADERS(sys/socket.h sys/select.h limits.h sys/param.h)
diff --git a/sim/d10v/configure.ac b/sim/d10v/configure.ac
index 3acd7a1..f39788d 100644
--- a/sim/d10v/configure.ac
+++ b/sim/d10v/configure.ac
@@ -1,13 +1,9 @@
dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.59)dnl
+AC_PREREQ(2.64)dnl
AC_INIT(Makefile.in)
-AC_CONFIG_HEADER(config.h:config.in)
-
sinclude(../common/aclocal.m4)
-# Bugs in autoconf 2.59 break the call to SIM_AC_COMMON, hack around
-# it by inlining the macro's contents.
-sinclude(../common/common.m4)
+SIM_AC_COMMON
SIM_AC_OPTION_WARNINGS
diff --git a/sim/erc32/configure.ac b/sim/erc32/configure.ac
index 7637a77..c33ce78 100644
--- a/sim/erc32/configure.ac
+++ b/sim/erc32/configure.ac
@@ -1,13 +1,9 @@
dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.59)dnl
+AC_PREREQ(2.64)dnl
AC_INIT(Makefile.in)
-AC_CONFIG_HEADER(config.h:config.in)
-
sinclude(../common/aclocal.m4)
-# Bugs in autoconf 2.59 break the call to SIM_AC_COMMON, hack around
-# it by inlining the macro's contents.
-sinclude(../common/common.m4)
+SIM_AC_COMMON
AC_CHECK_HEADERS(stdlib.h)
diff --git a/sim/frv/configure.ac b/sim/frv/configure.ac
index b06b455..177ff9d 100644
--- a/sim/frv/configure.ac
+++ b/sim/frv/configure.ac
@@ -1,13 +1,9 @@
dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.59)dnl
+AC_PREREQ(2.64)dnl
AC_INIT(Makefile.in)
-AC_CONFIG_HEADER(config.h:config.in)
-
sinclude(../common/aclocal.m4)
-# Bugs in autoconf 2.59 break the call to SIM_AC_COMMON, hack around
-# it by inlining the macro's contents.
-sinclude(../common/common.m4)
+SIM_AC_COMMON
SIM_AC_OPTION_ENDIAN(BIG_ENDIAN)
SIM_AC_OPTION_ALIGNMENT(STRICT_ALIGNMENT)
diff --git a/sim/h8300/configure.ac b/sim/h8300/configure.ac
index 071b0af..1e6a7db 100644
--- a/sim/h8300/configure.ac
+++ b/sim/h8300/configure.ac
@@ -1,13 +1,9 @@
dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.59)dnl
+AC_PREREQ(2.64)dnl
AC_INIT(Makefile.in)
-AC_CONFIG_HEADER(config.h:config.in)
-
sinclude(../common/aclocal.m4)
-# Bugs in autoconf 2.59 break the call to SIM_AC_COMMON, hack around
-# it by inlining the macro's contents.
-sinclude(../common/common.m4)
+SIM_AC_COMMON
AC_CHECK_HEADERS(stdlib.h time.h sys/param.h)
diff --git a/sim/igen/configure.ac b/sim/igen/configure.ac
index 9538f7b..adad41c 100644
--- a/sim/igen/configure.ac
+++ b/sim/igen/configure.ac
@@ -1,7 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
-sinclude(../common/aclocal.m4)
AC_PREREQ(2.59)dnl
AC_INIT(table.h)
+sinclude(../common/aclocal.m4)
AC_PROG_INSTALL
AC_PROG_CC
diff --git a/sim/iq2000/configure.ac b/sim/iq2000/configure.ac
index fb4e9bd..4eb1d9e 100644
--- a/sim/iq2000/configure.ac
+++ b/sim/iq2000/configure.ac
@@ -1,13 +1,9 @@
dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.59)dnl
+AC_PREREQ(2.64)dnl
AC_INIT(Makefile.in)
-AC_CONFIG_HEADER(config.h:config.in)
-
sinclude(../common/aclocal.m4)
-# Bugs in autoconf 2.59 break the call to SIM_AC_COMMON, hack around
-# it by inlining the macro's contents.
-sinclude(../common/common.m4)
+SIM_AC_COMMON
SIM_AC_OPTION_ENDIAN(BIG_ENDIAN)
SIM_AC_OPTION_ALIGNMENT(STRICT_ALIGNMENT)
diff --git a/sim/lm32/configure.ac b/sim/lm32/configure.ac
index 49c0ac6..22c8e0c 100644
--- a/sim/lm32/configure.ac
+++ b/sim/lm32/configure.ac
@@ -1,13 +1,9 @@
dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.59)dnl
+AC_PREREQ(2.64)dnl
AC_INIT(Makefile.in)
-AC_CONFIG_HEADER(config.h:config.in)
-
sinclude(../common/aclocal.m4)
-# Bugs in autoconf 2.59 break the call to SIM_AC_COMMON, hack around
-# it by inlining the macro's contents.
-sinclude(../common/common.m4)
+SIM_AC_COMMON
SIM_AC_OPTION_ENDIAN(BIG_ENDIAN)
SIM_AC_OPTION_ALIGNMENT(STRICT_ALIGNMENT,STRICT_ALIGNMENT)
diff --git a/sim/m32c/configure.ac b/sim/m32c/configure.ac
index 7bfa893..e696e9b 100644
--- a/sim/m32c/configure.ac
+++ b/sim/m32c/configure.ac
@@ -19,15 +19,11 @@ dnl
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_PREREQ(2.5)dnl
+AC_PREREQ(2.64)dnl
AC_INIT(Makefile.in)
-AC_CONFIG_HEADER(config.h:config.in)
-
sinclude(../common/aclocal.m4)
-# Bugs in autoconf 2.59 break the call to SIM_AC_COMMON, hack around
-# it by inlining the macro's contents.
-sinclude(../common/common.m4)
+SIM_AC_COMMON
AC_CHECK_HEADERS(sys/select.h termios.h sys/socket.h netinet/in.h netinet/tcp.h)
diff --git a/sim/m32r/configure.ac b/sim/m32r/configure.ac
index 1a4307d..b28abf0 100644
--- a/sim/m32r/configure.ac
+++ b/sim/m32r/configure.ac
@@ -1,13 +1,9 @@
dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.59)dnl
+AC_PREREQ(2.64)dnl
AC_INIT(Makefile.in)
-AC_CONFIG_HEADER(config.h:config.in)
-
sinclude(../common/aclocal.m4)
-# Bugs in autoconf 2.59 break the call to SIM_AC_COMMON, hack around
-# it by inlining the macro's contents.
-sinclude(../common/common.m4)
+SIM_AC_COMMON
SIM_AC_OPTION_ENDIAN(BIG_ENDIAN)
SIM_AC_OPTION_ALIGNMENT(STRICT_ALIGNMENT)
diff --git a/sim/m68hc11/configure.ac b/sim/m68hc11/configure.ac
index 59add9d..6f042b2 100644
--- a/sim/m68hc11/configure.ac
+++ b/sim/m68hc11/configure.ac
@@ -1,13 +1,9 @@
dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.59)dnl
+AC_PREREQ(2.64)dnl
AC_INIT(Makefile.in)
-AC_CONFIG_HEADER(config.h:config.in)
-
sinclude(../common/aclocal.m4)
-# Bugs in autoconf 2.59 break the call to SIM_AC_COMMON, hack around
-# it by inlining the macro's contents.
-sinclude(../common/common.m4)
+SIM_AC_COMMON
dnl Options available in this module
SIM_AC_OPTION_INLINE()
diff --git a/sim/mcore/configure.ac b/sim/mcore/configure.ac
index 78ef414..6e6850c 100644
--- a/sim/mcore/configure.ac
+++ b/sim/mcore/configure.ac
@@ -1,13 +1,9 @@
dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.59)dnl
+AC_PREREQ(2.64)dnl
AC_INIT(Makefile.in)
-AC_CONFIG_HEADER(config.h:config.in)
-
sinclude(../common/aclocal.m4)
-# Bugs in autoconf 2.59 break the call to SIM_AC_COMMON, hack around
-# it by inlining the macro's contents.
-sinclude(../common/common.m4)
+SIM_AC_COMMON
AC_CHECK_HEADERS(unistd.h)
diff --git a/sim/microblaze/configure.ac b/sim/microblaze/configure.ac
index 78ef414..6e6850c 100644
--- a/sim/microblaze/configure.ac
+++ b/sim/microblaze/configure.ac
@@ -1,13 +1,9 @@
dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.59)dnl
+AC_PREREQ(2.64)dnl
AC_INIT(Makefile.in)
-AC_CONFIG_HEADER(config.h:config.in)
-
sinclude(../common/aclocal.m4)
-# Bugs in autoconf 2.59 break the call to SIM_AC_COMMON, hack around
-# it by inlining the macro's contents.
-sinclude(../common/common.m4)
+SIM_AC_COMMON
AC_CHECK_HEADERS(unistd.h)
diff --git a/sim/mips/configure.ac b/sim/mips/configure.ac
index 0fbc39c..b83eab9 100644
--- a/sim/mips/configure.ac
+++ b/sim/mips/configure.ac
@@ -1,13 +1,9 @@
dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.59)dnl
+AC_PREREQ(2.64)dnl
AC_INIT(Makefile.in)
-AC_CONFIG_HEADER(config.h:config.in)
-
sinclude(../common/aclocal.m4)
-# Bugs in autoconf 2.59 break the call to SIM_AC_COMMON, hack around
-# it by inlining the macro's contents.
-sinclude(../common/common.m4)
+SIM_AC_COMMON
dnl Options available in this module
SIM_AC_OPTION_INLINE()
diff --git a/sim/mn10300/configure.ac b/sim/mn10300/configure.ac
index e3f95b1..f30c60a 100644
--- a/sim/mn10300/configure.ac
+++ b/sim/mn10300/configure.ac
@@ -1,13 +1,9 @@
dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.59)dnl
+AC_PREREQ(2.64)dnl
AC_INIT(Makefile.in)
-AC_CONFIG_HEADER(config.h:config.in)
-
sinclude(../common/aclocal.m4)
-# Bugs in autoconf 2.59 break the call to SIM_AC_COMMON, hack around
-# it by inlining the macro's contents.
-sinclude(../common/common.m4)
+SIM_AC_COMMON
SIM_AC_OPTION_ENDIAN(LITTLE_ENDIAN)
SIM_AC_OPTION_ALIGNMENT(NONSTRICT_ALIGNMENT)
diff --git a/sim/moxie/configure.ac b/sim/moxie/configure.ac
index 4617349..1667c7a 100644
--- a/sim/moxie/configure.ac
+++ b/sim/moxie/configure.ac
@@ -1,15 +1,11 @@
dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.59)dnl
+AC_PREREQ(2.64)dnl
AC_INIT(Makefile.in)
-AC_CONFIG_HEADER(config.h:config.in)
-
-AC_CHECK_TOOL(DTC, dtc)
-
sinclude(../common/aclocal.m4)
-# Bugs in autoconf 2.59 break the call to SIM_AC_COMMON, hack around
-# it by inlining the macro's contents.
-sinclude(../common/common.m4)
+SIM_AC_COMMON
+
+AC_CHECK_TOOL(DTC, dtc)
SIM_AC_OPTION_ENDIAN(BIG_ENDIAN)
SIM_AC_OPTION_ALIGNMENT(STRICT_ALIGNMENT)
diff --git a/sim/ppc/configure.ac b/sim/ppc/configure.ac
index 1970291..7758ab1 100644
--- a/sim/ppc/configure.ac
+++ b/sim/ppc/configure.ac
@@ -1,7 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
-sinclude(../common/aclocal.m4)
AC_PREREQ(2.59)dnl
AC_INIT(Makefile.in)
+sinclude(../common/aclocal.m4)
AC_PROG_INSTALL
AC_PROG_CC
diff --git a/sim/rx/configure.ac b/sim/rx/configure.ac
index d80a09f..19657c5 100644
--- a/sim/rx/configure.ac
+++ b/sim/rx/configure.ac
@@ -19,13 +19,14 @@ dnl
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_PREREQ(2.5)dnl
+AC_PREREQ(2.64)dnl
AC_INIT(Makefile.in)
-AC_CONFIG_HEADER(config.h:config.in)
-AC_CHECK_HEADERS(getopt.h)
-
sinclude(../common/aclocal.m4)
+SIM_AC_COMMON
+
+AC_CHECK_HEADERS(getopt.h)
+
AC_ARG_ENABLE(cycle-accurate,
[ --disable-cycle-accurate ],
[case "${enableval}" in
@@ -55,9 +56,4 @@ else
fi
fi
-
-# Bugs in autoconf 2.59 break the call to SIM_AC_COMMON, hack around
-# it by inlining the macro's contents.
-sinclude(../common/common.m4)
-
SIM_AC_OUTPUT
diff --git a/sim/sh/configure.ac b/sim/sh/configure.ac
index 78ef414..6e6850c 100644
--- a/sim/sh/configure.ac
+++ b/sim/sh/configure.ac
@@ -1,13 +1,9 @@
dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.59)dnl
+AC_PREREQ(2.64)dnl
AC_INIT(Makefile.in)
-AC_CONFIG_HEADER(config.h:config.in)
-
sinclude(../common/aclocal.m4)
-# Bugs in autoconf 2.59 break the call to SIM_AC_COMMON, hack around
-# it by inlining the macro's contents.
-sinclude(../common/common.m4)
+SIM_AC_COMMON
AC_CHECK_HEADERS(unistd.h)
diff --git a/sim/sh64/configure.ac b/sim/sh64/configure.ac
index 9110208..122df96 100644
--- a/sim/sh64/configure.ac
+++ b/sim/sh64/configure.ac
@@ -1,11 +1,9 @@
dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.59)dnl
+AC_PREREQ(2.64)dnl
AC_INIT(Makefile.in)
-AC_CONFIG_HEADER(config.h:config.in)
-
sinclude(../common/aclocal.m4)
-sinclude(../common/common.m4)
+SIM_AC_COMMON
SIM_AC_OPTION_ENDIAN([], BIG_ENDIAN)
SIM_AC_OPTION_ALIGNMENT(STRICT_ALIGNMENT)
diff --git a/sim/v850/configure.ac b/sim/v850/configure.ac
index a3e2c9c..f05f85c 100644
--- a/sim/v850/configure.ac
+++ b/sim/v850/configure.ac
@@ -1,13 +1,9 @@
dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.59)dnl
+AC_PREREQ(2.64)dnl
AC_INIT(Makefile.in)
-AC_CONFIG_HEADER(config.h:config.in)
-
sinclude(../common/aclocal.m4)
-# Bugs in autoconf 2.59 break the call to SIM_AC_COMMON, hack around
-# it by inlining the macro's contents.
-sinclude(../common/common.m4)
+SIM_AC_COMMON
SIM_AC_OPTION_ENDIAN(LITTLE_ENDIAN)
SIM_AC_OPTION_ALIGNMENT(,NONSTRICT_ALIGNMENT)
--
1.7.6.1