aboutsummaryrefslogtreecommitdiff
path: root/sim
diff options
context:
space:
mode:
authorSimon Marchi <simon.marchi@ericsson.com>2018-05-10 11:47:34 -0400
committerSimon Marchi <simon.marchi@ericsson.com>2018-06-18 12:00:58 -0400
commit633f513999f36b6b059588a296cef6e715c3b91b (patch)
treead2aa0b207c545c3bead55b5c69a60e31994ca4f /sim
parent038842797bbd161906362278f9e8eaf0bbfc0f07 (diff)
downloadgdb-633f513999f36b6b059588a296cef6e715c3b91b.zip
gdb-633f513999f36b6b059588a296cef6e715c3b91b.tar.gz
gdb-633f513999f36b6b059588a296cef6e715c3b91b.tar.bz2
Bump to autoconf 2.69 and automake 1.15.1
~~~ New in v2: - Remove version checks from AUTOMAKE_OPTIONS and AC_PREREQ from configure.ac's (see rationale below). - Add AC_USE_SYSTEM_EXTENSIONS to intl/configure.ac (see problem #10). - Add missing AC_LANG_SOURCE usage in root configure.ac. - Update README-maintainer-mode - Re-generated all (hopefully) that needs to be generated. I built using --enable-maintainer-mode, and grepped around to find references to prior versions of autoconf/automake. I forced pushed to users/simark/autotools-bump on sourceware. ~~~ When trying to run the update-gnulib.sh script in gdb, I get this: Error: Wrong automake version (Unescaped left brace in regex is deprecated, passed through in regex; marked by <-- HERE in m/\${ <-- HERE ([^ =:+{}]+)}/ at /opt/automake/1.11.1/bin/automake line 4113.), we need 1.11.1. Aborting. Apparently, it's an issue with a regex in automake that triggers a warning starting with Perl 5.22. It has been fixed in automake 1.15.1. So I think it's a good excuse to bump the versions of autoconf and automake used in the gnulib import. And to avoid requiring multiple builds of autoconf/automake, it was suggested that we bump the required version of those tools for all binutils-gdb. For autoconf, the 2.69 version is universally available, so it's an easy choice. For automake, different distros and distro versions have different automake versions. But 1.15.1 seems to be the most readily available as a package. In any case, it's easy to build it from source. I removed the version checks from AUTOMAKE_OPTIONS and AC_PREREQ, because I don't think they are useful in our case. They only specify a lower bound for the acceptable version of automake/autoconf. That's useful if you let the user choose the version of the tool they want to use, but want to set a minimum version (because you use a feature that was introduced in that version). In our case, we force people to use a specific version anyway. For the autoconf version, we have the check in config/override.m4 that enforces the version we want. It will be one less thing to update next time we change autotools version. This patch only includes the manually edited file. The changes to generated files are included in the following patch. I have included the generated changes in the ChangeLog entries below, and would amend them just before pushing. To help with testing, I pushed the changes to the users/simark/autotools-bump on sourceware's git. I hit a few categories of problems that required some changes. They are described below along with the chosen solutions. Problem 1: configure.ac:17: warning: AM_INIT_AUTOMAKE: two- and three-arguments forms are deprecated. For more info, see: configure.ac:17: http://www.gnu.org/software/automake/manual/automake.html#Modernize-AM_005fINIT_005fAUTOMAKE-invocation Solution 1: Adjust the code based on the example at that URL. Problem 2 (in zlib/): Makefile.am: error: required file './INSTALL' not found Makefile.am: 'automake --add-missing' can install 'INSTALL' Makefile.am: error: required file './NEWS' not found Makefile.am: error: required file './AUTHORS' not found Makefile.am: error: required file './COPYING' not found Makefile.am: 'automake --add-missing' can install 'COPYING' Solution 2: Add the foreign option to AUTOMAKE_OPTIONS. Problem 3: doc/Makefile.am:20: error: support for Cygnus-style trees has been removed Solution 3: Remove the cygnus options. Problem 4: Makefile.am:656: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS') Solution 4: Rename "INCLUDES = " to "AM_CPPFLAGS += " (because AM_CPPFLAGS is already defined earlier). Problem 5: doc/Makefile.am:71: warning: suffix '.texinfo' for Texinfo files is discouraged; use '.texi' instead doc/Makefile.am: warning: Oops! doc/Makefile.am: It appears this file (or files included by it) are triggering doc/Makefile.am: an undocumented, soon-to-be-removed automake hack. doc/Makefile.am: Future automake versions will no longer place in the builddir doc/Makefile.am: (rather than in the srcdir) the generated '.info' files that doc/Makefile.am: appear to be cleaned, by e.g. being listed in CLEANFILES or doc/Makefile.am: DISTCLEANFILES. doc/Makefile.am: If you want your '.info' files to be placed in the builddir doc/Makefile.am: rather than in the srcdir, you have to use the shiny new doc/Makefile.am: 'info-in-builddir' automake option. Solution 5: Rename .texinfo files to .texi. Problem 6: doc/Makefile.am: warning: Oops! doc/Makefile.am: It appears this file (or files included by it) are triggering doc/Makefile.am: an undocumented, soon-to-be-removed automake hack. doc/Makefile.am: Future automake versions will no longer place in the builddir doc/Makefile.am: (rather than in the srcdir) the generated '.info' files that doc/Makefile.am: appear to be cleaned, by e.g. being listed in CLEANFILES or doc/Makefile.am: DISTCLEANFILES. doc/Makefile.am: If you want your '.info' files to be placed in the builddir doc/Makefile.am: rather than in the srcdir, you have to use the shiny new doc/Makefile.am: 'info-in-builddir' automake option. Solution 6: Remove the hack at the bottom of doc/Makefile.am and use the info-in-builddir automake option. Problem 7: doc/Makefile.am:35: error: required file '../texinfo.tex' not found doc/Makefile.am:35: 'automake --add-missing' can install 'texinfo.tex' Solution 7: Use the no-texinfo.tex automake option. We also have one in texinfo/texinfo.tex, not sure if we should point to that, or move it (or a newer version of it added with automake --add-missing) to top-level. Problem 8: Makefile.am:131: warning: source file 'config/tc-aarch64.c' is in a subdirectory, Makefile.am:131: but option 'subdir-objects' is disabled automake: warning: possible forward-incompatibility. automake: At least a source file is in a subdirectory, but the 'subdir-objects' automake: automake option hasn't been enabled. For now, the corresponding output automake: object file(s) will be placed in the top-level directory. However, automake: this behaviour will change in future Automake versions: they will automake: unconditionally cause object files to be placed in the same subdirectory automake: of the corresponding sources. automake: You are advised to start using 'subdir-objects' option throughout your automake: project, to avoid future incompatibilities. Solution 8: Use subdir-objects, that means adjusting references to some .o that will now be in config/. Problem 9: configure.ac:375: warning: AC_LANG_CONFTEST: no AC_LANG_SOURCE call detected in body ../../lib/autoconf/lang.m4:193: AC_LANG_CONFTEST is expanded from... ../../lib/autoconf/general.m4:2601: _AC_COMPILE_IFELSE is expanded from... ../../lib/autoconf/general.m4:2617: AC_COMPILE_IFELSE is expanded from... ../../lib/m4sugar/m4sh.m4:639: AS_IF is expanded from... ../../lib/autoconf/general.m4:2042: AC_CACHE_VAL is expanded from... ../../lib/autoconf/general.m4:2063: AC_CACHE_CHECK is expanded from... configure.ac:375: the top level Solution 9: Use AC_LANG_SOURCE, or use proper quoting. Problem 10 (in intl/): configure.ac:7: warning: AC_COMPILE_IFELSE was called before AC_USE_SYSTEM_EXTENSIONS /usr/share/aclocal/threadlib.m4:36: gl_THREADLIB_EARLY_BODY is expanded from... /usr/share/aclocal/threadlib.m4:29: gl_THREADLIB_EARLY is expanded from... /usr/share/aclocal/threadlib.m4:318: gl_THREADLIB is expanded from... /usr/share/aclocal/lock.m4:9: gl_LOCK is expanded from... /usr/share/aclocal/intl.m4:211: gt_INTL_SUBDIR_CORE is expanded from... /usr/share/aclocal/intl.m4:25: AM_INTL_SUBDIR is expanded from... /usr/share/aclocal/gettext.m4:57: AM_GNU_GETTEXT is expanded from... configure.ac:7: the top level Solution 10: Add AC_USE_SYSTEM_EXTENSIONS in configure.ac. ChangeLog: * libtool.m4: Use AC_LANG_SOURCE. * configure.ac: Remove AC_PREREQ, use AC_LANG_SOURCE. * README-maintainer-mode: Update version requirements. * ar-lib: New file. * test-driver: New file. * configure: Re-generate. bfd/ChangeLog: * Makefile.am (AUTOMAKE_OPTIONS): Remove 1.11. (INCLUDES): Rename to ... (AM_CPPFLAGS): ... this. * configure.ac: Remove AC_PREREQ. * doc/Makefile.am (AUTOMAKE_OPTIONS): Remove 1.9, cygnus, add info-in-builddir no-texinfo.tex. (info_TEXINFOS): Rename bfd.texinfo to bfd.texi. * doc/bfd.texinfo: Rename to ... * doc/bfd.texi: ... this. * Makefile.in: Re-generate. * aclocal.m4: Re-generate. * config.in: Re-generate. * configure: Re-generate. * doc/Makefile.in: Re-generate. binutils/ChangeLog: * configure.ac: Remove AC_PREREQ. * doc/Makefile.am (AUTOMAKE_OPTIONS): Remove cygnus, add info-in-builddir no-texinfo.tex. * Makefile.in: Re-generate. * aclocal.m4: Re-generate. * config.in: Re-generate. * configure: Re-generate. * doc/Makefile.in: Re-generate. config/ChangeLog: * override.m4 (_GCC_AUTOCONF_VERSION): Bump from 2.64 to 2.69. etc/ChangeLog: * configure.in: Remove AC_PREREQ. * configure: Re-generate. gas/ChangeLog: * Makefile.am (AUTOMAKE_OPTIONS): Remove 1.11, add subdir-objects. (TARG_CPU_O, OBJ_FORMAT_O, ATOF_TARG_O): Add config/ prefix. * configure.ac (TARG_CPU_O, OBJ_FORMAT_O, ATOF_TARG_O, emfiles, extra_objects): Add config/ prefix. * doc/as.texinfo: Rename to... * doc/as.texi: ... this. * doc/Makefile.am: Rename as.texinfo to as.texi throughout. Remove DISTCLEANFILES hack. (AUTOMAKE_OPTIONS): Remove 1.8, cygnus, add no-texinfo.tex and info-in-builddir. * Makefile.in: Re-generate. * aclocal.m4: Re-generate. * config.in: Re-generate. * configure: Re-generate. * doc/Makefile.in: Re-generate. gdb/ChangeLog: * common/common-defs.h (PACKAGE_NAME, PACKAGE_VERSION, PACKAGE_STRING, PACKAGE_TARNAME): Undefine. * configure.ac: Remove AC_PREREQ, add missing quoting. * gnulib/configure.ac: Modernize usage of AC_INIT/AM_INIT_AUTOMAKE. Remove AC_PREREQ. * gnulib/update-gnulib.sh (AUTOCONF_VERSION): Bump to 2.69. (AUTOMAKE_VERSION): Bump to 1.15.1. * configure: Re-generate. * config.in: Re-generate. * aclocal.m4: Re-generate. * gnulib/aclocal.m4: Re-generate. * gnulib/config.in: Re-generate. * gnulib/configure: Re-generate. * gnulib/import/Makefile.in: Re-generate. gdb/gdbserver/ChangeLog: * configure.ac: Remove AC_PREREQ, add missing quoting. * configure: Re-generate. * config.in: Re-generate. * aclocal.m4: Re-generate. gdb/testsuite/ChangeLog: * configure.ac: Remove AC_PREREQ. * configure: Re-generate. gold/ChangeLog: * configure.ac: Remove AC_PREREQ, add missing quoting and usage of AC_LANG_SOURCE. * Makefile.in: Re-generate. * aclocal.m4: Re-generate. * configure: Re-generate. * testsuite/Makefile.in: Re-generate. gprof/ChangeLog: * configure.ac: Remove AC_PREREQ. * Makefile.am: Remove DISTCLEANFILES hack. (AUTOMAKE_OPTIONS): Remove 1.11, add info-in-builddir. * Makefile.in: Re-generate. * aclocal.m4: Re-generate. * configure: Re-generate. * gconfig.in: Re-generate. intl/ChangeLog: * configure.ac: Add AC_USE_SYSTEM_EXTENSIONS, remove AC_PREREQ. * configure: Re-generate. * config.h.in: Re-generate. * aclocal.m4: Re-generate. ld/ChangeLog: * configure.ac: Remove AC_PREREQ. * Makefile.am: Remove DISTCLEANFILES hack, rename ld.texinfo to ld.texi, ldint.texinfo to ldint.texi throughout. (AUTOMAKE_OPTIONS): Add info-in-builddir. * README: Rename ld.texinfo to ld.texi, ldint.texinfo to ldint.texi throughout. * gen-doc.texi: Likewise. * h8-doc.texi: Likewise. * ld.texinfo: Rename to ... * ld.texi: ... this. * ldint.texinfo: Rename to ... * ldint.texi: ... this. * Makefile.in: Re-generate. * aclocal.m4: Re-generate. * config.in: Re-generate. * configure: Re-generate. libdecnumber/ChangeLog: * configure.ac: Remove AC_PREREQ. * configure: Re-generate. * aclocal.m4. libiberty/ChangeLog: * configure.ac: Remove AC_PREREQ. * configure: Re-generate. * config.in: Re-generate. opcodes/ChangeLog: * Makefile.am (AUTOMAKE_OPTIONS): Remove 1.11. * configure.ac: Remove AC_PREREQ. * Makefile.in: Re-generate. * aclocal.m4: Re-generate. * configure: Re-generate. readline/ChangeLog.gdb: * configure: Re-generate. * examples/rlfe/configure: Re-generate. sim/ChangeLog: * All configure.ac: Remove AC_PREREQ. * All configure: Re-generate. zlib/ChangeLog.bin-gdb: * configure.ac: Modernize AC_INIT call, remove AC_PREREQ. * Makefile.am (AUTOMAKE_OPTIONS): Remove 1.8, cygnus, add foreign. * Makefile.in: Re-generate. * aclocal.m4: Re-generate. * configure: Re-generate.
Diffstat (limited to 'sim')
-rw-r--r--sim/aarch64/configure.ac1
-rw-r--r--sim/arm/configure.ac1
-rw-r--r--sim/avr/configure.ac1
-rw-r--r--sim/bfin/configure.ac1
-rw-r--r--sim/common/configure.ac1
-rw-r--r--sim/configure.ac1
-rw-r--r--sim/cr16/configure.ac1
-rw-r--r--sim/cris/configure.ac1
-rw-r--r--sim/d10v/configure.ac1
-rw-r--r--sim/erc32/configure.ac1
-rw-r--r--sim/frv/configure.ac1
-rw-r--r--sim/ft32/configure.ac1
-rw-r--r--sim/h8300/configure.ac1
-rw-r--r--sim/igen/configure.ac1
-rw-r--r--sim/iq2000/configure.ac1
-rw-r--r--sim/lm32/configure.ac1
-rw-r--r--sim/m32c/configure.ac1
-rw-r--r--sim/m32r/configure.ac1
-rw-r--r--sim/m68hc11/configure.ac1
-rw-r--r--sim/mcore/configure.ac1
-rw-r--r--sim/microblaze/configure.ac1
-rw-r--r--sim/mips/configure.ac1
-rw-r--r--sim/mn10300/configure.ac1
-rw-r--r--sim/moxie/configure.ac1
-rw-r--r--sim/msp430/configure.ac1
-rw-r--r--sim/or1k/configure.ac1
-rw-r--r--sim/ppc/configure.ac1
-rw-r--r--sim/rl78/configure.ac1
-rw-r--r--sim/rx/configure.ac1
-rw-r--r--sim/sh/configure.ac1
-rw-r--r--sim/sh64/configure.ac1
-rw-r--r--sim/testsuite/configure.ac1
-rw-r--r--sim/testsuite/d10v-elf/configure.ac1
-rw-r--r--sim/testsuite/frv-elf/configure.ac1
-rw-r--r--sim/testsuite/m32r-elf/configure.ac1
-rw-r--r--sim/testsuite/mips64el-elf/configure.ac1
-rw-r--r--sim/v850/configure.ac1
37 files changed, 0 insertions, 37 deletions
diff --git a/sim/aarch64/configure.ac b/sim/aarch64/configure.ac
index 92e74ad..decdca3 100644
--- a/sim/aarch64/configure.ac
+++ b/sim/aarch64/configure.ac
@@ -19,7 +19,6 @@ 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/>. */
-AC_PREREQ(2.64)dnl
AC_INIT(Makefile.in)
sinclude(../common/acinclude.m4)
diff --git a/sim/arm/configure.ac b/sim/arm/configure.ac
index a93418f..5dffa14 100644
--- a/sim/arm/configure.ac
+++ b/sim/arm/configure.ac
@@ -1,5 +1,4 @@
dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.64)dnl
AC_INIT(Makefile.in)
sinclude(../common/acinclude.m4)
diff --git a/sim/avr/configure.ac b/sim/avr/configure.ac
index 54ac06f..0c45861 100644
--- a/sim/avr/configure.ac
+++ b/sim/avr/configure.ac
@@ -1,5 +1,4 @@
dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.64)dnl
AC_INIT(Makefile.in)
sinclude(../common/acinclude.m4)
diff --git a/sim/bfin/configure.ac b/sim/bfin/configure.ac
index 5b8a4c2..44b9952 100644
--- a/sim/bfin/configure.ac
+++ b/sim/bfin/configure.ac
@@ -1,5 +1,4 @@
dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.64)dnl
AC_INIT(Makefile.in)
sinclude(../common/acinclude.m4)
diff --git a/sim/common/configure.ac b/sim/common/configure.ac
index 473e911..ec4ee20 100644
--- a/sim/common/configure.ac
+++ b/sim/common/configure.ac
@@ -1,5 +1,4 @@
dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.64)dnl
AC_INIT(Makefile.in)
AC_PROG_CC
diff --git a/sim/configure.ac b/sim/configure.ac
index 0781151..896791e 100644
--- a/sim/configure.ac
+++ b/sim/configure.ac
@@ -1,6 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
m4_include([../config/override.m4])
-AC_PREREQ(2.59)dnl
AC_INIT(Makefile.in)
AC_PROG_CC
diff --git a/sim/cr16/configure.ac b/sim/cr16/configure.ac
index b85b17d..4f416b9 100644
--- a/sim/cr16/configure.ac
+++ b/sim/cr16/configure.ac
@@ -1,5 +1,4 @@
dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.64)dnl
AC_INIT(Makefile.in)
sinclude(../common/acinclude.m4)
diff --git a/sim/cris/configure.ac b/sim/cris/configure.ac
index beae702..2ac3266 100644
--- a/sim/cris/configure.ac
+++ b/sim/cris/configure.ac
@@ -1,5 +1,4 @@
dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.64)dnl
AC_INIT(Makefile.in)
sinclude(../common/acinclude.m4)
diff --git a/sim/d10v/configure.ac b/sim/d10v/configure.ac
index a93418f..5dffa14 100644
--- a/sim/d10v/configure.ac
+++ b/sim/d10v/configure.ac
@@ -1,5 +1,4 @@
dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.64)dnl
AC_INIT(Makefile.in)
sinclude(../common/acinclude.m4)
diff --git a/sim/erc32/configure.ac b/sim/erc32/configure.ac
index 97cea11..3135dc5 100644
--- a/sim/erc32/configure.ac
+++ b/sim/erc32/configure.ac
@@ -14,7 +14,6 @@ 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 Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.64)dnl
AC_INIT(Makefile.in)
sinclude(../common/acinclude.m4)
diff --git a/sim/frv/configure.ac b/sim/frv/configure.ac
index cfbe29a..cb3cc14 100644
--- a/sim/frv/configure.ac
+++ b/sim/frv/configure.ac
@@ -1,5 +1,4 @@
dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.64)dnl
AC_INIT(Makefile.in)
sinclude(../common/acinclude.m4)
diff --git a/sim/ft32/configure.ac b/sim/ft32/configure.ac
index 279b661..8fe15c6 100644
--- a/sim/ft32/configure.ac
+++ b/sim/ft32/configure.ac
@@ -1,5 +1,4 @@
dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.64)dnl
AC_INIT(Makefile.in)
sinclude(../common/acinclude.m4)
diff --git a/sim/h8300/configure.ac b/sim/h8300/configure.ac
index 3966160..d2ee926 100644
--- a/sim/h8300/configure.ac
+++ b/sim/h8300/configure.ac
@@ -1,5 +1,4 @@
dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.64)dnl
AC_INIT(Makefile.in)
sinclude(../common/acinclude.m4)
diff --git a/sim/igen/configure.ac b/sim/igen/configure.ac
index 4457962..f03d8b7 100644
--- a/sim/igen/configure.ac
+++ b/sim/igen/configure.ac
@@ -1,5 +1,4 @@
dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.59)dnl
AC_INIT(table.h)
sinclude(../common/acinclude.m4)
diff --git a/sim/iq2000/configure.ac b/sim/iq2000/configure.ac
index 7424e4d..6b9f363 100644
--- a/sim/iq2000/configure.ac
+++ b/sim/iq2000/configure.ac
@@ -1,5 +1,4 @@
dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.64)dnl
AC_INIT(Makefile.in)
sinclude(../common/acinclude.m4)
diff --git a/sim/lm32/configure.ac b/sim/lm32/configure.ac
index e928885..82240ff 100644
--- a/sim/lm32/configure.ac
+++ b/sim/lm32/configure.ac
@@ -1,5 +1,4 @@
dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.64)dnl
AC_INIT(Makefile.in)
sinclude(../common/acinclude.m4)
diff --git a/sim/m32c/configure.ac b/sim/m32c/configure.ac
index 087bc42..8ea7762 100644
--- a/sim/m32c/configure.ac
+++ b/sim/m32c/configure.ac
@@ -18,7 +18,6 @@ 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.64)dnl
AC_INIT(Makefile.in)
sinclude(../common/acinclude.m4)
diff --git a/sim/m32r/configure.ac b/sim/m32r/configure.ac
index d9c7d62..6020a5c 100644
--- a/sim/m32r/configure.ac
+++ b/sim/m32r/configure.ac
@@ -1,5 +1,4 @@
dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.64)dnl
AC_INIT(Makefile.in)
sinclude(../common/acinclude.m4)
diff --git a/sim/m68hc11/configure.ac b/sim/m68hc11/configure.ac
index 8913933..34760de 100644
--- a/sim/m68hc11/configure.ac
+++ b/sim/m68hc11/configure.ac
@@ -1,5 +1,4 @@
dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.64)dnl
AC_INIT(Makefile.in)
sinclude(../common/acinclude.m4)
diff --git a/sim/mcore/configure.ac b/sim/mcore/configure.ac
index a93418f..5dffa14 100644
--- a/sim/mcore/configure.ac
+++ b/sim/mcore/configure.ac
@@ -1,5 +1,4 @@
dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.64)dnl
AC_INIT(Makefile.in)
sinclude(../common/acinclude.m4)
diff --git a/sim/microblaze/configure.ac b/sim/microblaze/configure.ac
index a93418f..5dffa14 100644
--- a/sim/microblaze/configure.ac
+++ b/sim/microblaze/configure.ac
@@ -1,5 +1,4 @@
dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.64)dnl
AC_INIT(Makefile.in)
sinclude(../common/acinclude.m4)
diff --git a/sim/mips/configure.ac b/sim/mips/configure.ac
index 7cd3162..19094de 100644
--- a/sim/mips/configure.ac
+++ b/sim/mips/configure.ac
@@ -1,5 +1,4 @@
dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.64)dnl
AC_INIT(Makefile.in)
sinclude(../common/acinclude.m4)
diff --git a/sim/mn10300/configure.ac b/sim/mn10300/configure.ac
index 53e0cdd..33ca50f 100644
--- a/sim/mn10300/configure.ac
+++ b/sim/mn10300/configure.ac
@@ -1,5 +1,4 @@
dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.64)dnl
AC_INIT(Makefile.in)
sinclude(../common/acinclude.m4)
diff --git a/sim/moxie/configure.ac b/sim/moxie/configure.ac
index afbeef9..3f2e553 100644
--- a/sim/moxie/configure.ac
+++ b/sim/moxie/configure.ac
@@ -1,5 +1,4 @@
dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.64)dnl
AC_INIT(Makefile.in)
sinclude(../common/acinclude.m4)
diff --git a/sim/msp430/configure.ac b/sim/msp430/configure.ac
index 9265c3b..6e4d40f 100644
--- a/sim/msp430/configure.ac
+++ b/sim/msp430/configure.ac
@@ -18,7 +18,6 @@ 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.64)dnl
AC_INIT(Makefile.in)
sinclude(../common/acinclude.m4)
diff --git a/sim/or1k/configure.ac b/sim/or1k/configure.ac
index 8873a1d..aa7c400 100644
--- a/sim/or1k/configure.ac
+++ b/sim/or1k/configure.ac
@@ -1,5 +1,4 @@
dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.64)dnl
AC_INIT(Makefile.in)
sinclude(../common/acinclude.m4)
diff --git a/sim/ppc/configure.ac b/sim/ppc/configure.ac
index 8635d8f..97030ed 100644
--- a/sim/ppc/configure.ac
+++ b/sim/ppc/configure.ac
@@ -1,5 +1,4 @@
dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.59)dnl
AC_INIT(Makefile.in)
sinclude(../common/acinclude.m4)
diff --git a/sim/rl78/configure.ac b/sim/rl78/configure.ac
index 3cd13d8..cfefa9f 100644
--- a/sim/rl78/configure.ac
+++ b/sim/rl78/configure.ac
@@ -18,7 +18,6 @@ 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.64)dnl
AC_INIT(Makefile.in)
sinclude(../common/acinclude.m4)
diff --git a/sim/rx/configure.ac b/sim/rx/configure.ac
index ac170e7..a5859db 100644
--- a/sim/rx/configure.ac
+++ b/sim/rx/configure.ac
@@ -18,7 +18,6 @@ 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.64)dnl
AC_INIT(Makefile.in)
sinclude(../common/acinclude.m4)
diff --git a/sim/sh/configure.ac b/sim/sh/configure.ac
index a93418f..5dffa14 100644
--- a/sim/sh/configure.ac
+++ b/sim/sh/configure.ac
@@ -1,5 +1,4 @@
dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.64)dnl
AC_INIT(Makefile.in)
sinclude(../common/acinclude.m4)
diff --git a/sim/sh64/configure.ac b/sim/sh64/configure.ac
index 04bcd56..ae62bb4 100644
--- a/sim/sh64/configure.ac
+++ b/sim/sh64/configure.ac
@@ -1,5 +1,4 @@
dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.64)dnl
AC_INIT(Makefile.in)
sinclude(../common/acinclude.m4)
diff --git a/sim/testsuite/configure.ac b/sim/testsuite/configure.ac
index b61fce0..5d75387 100644
--- a/sim/testsuite/configure.ac
+++ b/sim/testsuite/configure.ac
@@ -4,7 +4,6 @@ dnl necessary to tailor a template configure script into the configure
dnl script appropriate for this directory. For more information, check
dnl any existing configure script.
-AC_PREREQ(2.59)
AC_INIT(common/bits-tst.c)
CC=${CC-cc}
diff --git a/sim/testsuite/d10v-elf/configure.ac b/sim/testsuite/d10v-elf/configure.ac
index 08fe90f..40e1c12 100644
--- a/sim/testsuite/d10v-elf/configure.ac
+++ b/sim/testsuite/d10v-elf/configure.ac
@@ -4,7 +4,6 @@ dnl necessary to tailor a template configure script into the configure
dnl script appropriate for this directory. For more information, check
dnl any existing configure script.
-AC_PREREQ(2.59)
dnl FIXME - think of a truly uniq file to this directory
AC_INIT(Makefile.in)
diff --git a/sim/testsuite/frv-elf/configure.ac b/sim/testsuite/frv-elf/configure.ac
index 08fe90f..40e1c12 100644
--- a/sim/testsuite/frv-elf/configure.ac
+++ b/sim/testsuite/frv-elf/configure.ac
@@ -4,7 +4,6 @@ dnl necessary to tailor a template configure script into the configure
dnl script appropriate for this directory. For more information, check
dnl any existing configure script.
-AC_PREREQ(2.59)
dnl FIXME - think of a truly uniq file to this directory
AC_INIT(Makefile.in)
diff --git a/sim/testsuite/m32r-elf/configure.ac b/sim/testsuite/m32r-elf/configure.ac
index 08fe90f..40e1c12 100644
--- a/sim/testsuite/m32r-elf/configure.ac
+++ b/sim/testsuite/m32r-elf/configure.ac
@@ -4,7 +4,6 @@ dnl necessary to tailor a template configure script into the configure
dnl script appropriate for this directory. For more information, check
dnl any existing configure script.
-AC_PREREQ(2.59)
dnl FIXME - think of a truly uniq file to this directory
AC_INIT(Makefile.in)
diff --git a/sim/testsuite/mips64el-elf/configure.ac b/sim/testsuite/mips64el-elf/configure.ac
index 08fe90f..40e1c12 100644
--- a/sim/testsuite/mips64el-elf/configure.ac
+++ b/sim/testsuite/mips64el-elf/configure.ac
@@ -4,7 +4,6 @@ dnl necessary to tailor a template configure script into the configure
dnl script appropriate for this directory. For more information, check
dnl any existing configure script.
-AC_PREREQ(2.59)
dnl FIXME - think of a truly uniq file to this directory
AC_INIT(Makefile.in)
diff --git a/sim/v850/configure.ac b/sim/v850/configure.ac
index 314b073..73f9e53 100644
--- a/sim/v850/configure.ac
+++ b/sim/v850/configure.ac
@@ -1,5 +1,4 @@
dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.64)dnl
AC_INIT(Makefile.in)
sinclude(../common/acinclude.m4)