diff options
75 files changed, 88 insertions, 159 deletions
diff --git a/README-maintainer-mode b/README-maintainer-mode index a350974..54c370d 100644 --- a/README-maintainer-mode +++ b/README-maintainer-mode @@ -11,8 +11,8 @@ find the sources for these in the respective upstream directories: ftp://ftp.gnu.org/gnu/gettext The required versions of the tools for this tree are - autoconf 2.64 - automake 1.11 + autoconf 2.69 + automake 1.15.1 libtool 2.2.6 gettext 0.14.5 diff --git a/bfd/Makefile.am b/bfd/Makefile.am index 8374bbd..d7f9ed7 100644 --- a/bfd/Makefile.am +++ b/bfd/Makefile.am @@ -17,7 +17,7 @@ # <http://www.gnu.org/licenses/>. # -AUTOMAKE_OPTIONS = 1.11 no-dist foreign +AUTOMAKE_OPTIONS = no-dist foreign ACLOCAL_AMFLAGS = -I . -I .. -I ../config INCDIR = $(srcdir)/../include @@ -657,7 +657,7 @@ BFD_MACHINES = @bfd_machines@ TDEFAULTS = @tdefaults@ HAVEVECS = @havevecs@ -INCLUDES = @HDEFINES@ @COREFLAG@ @TDEFINES@ $(CSEARCH) $(CSWITCHES) \ +AM_CPPFLAGS += @HDEFINES@ @COREFLAG@ @TDEFINES@ $(CSEARCH) $(CSWITCHES) \ $(HAVEVECS) @INCINTL@ # C source files that correspond to .o's. diff --git a/bfd/configure.ac b/bfd/configure.ac index bb5c168..8315297 100644 --- a/bfd/configure.ac +++ b/bfd/configure.ac @@ -17,7 +17,6 @@ dnl along with this program; see the file COPYING3. If not see dnl <http://www.gnu.org/licenses/>. dnl -AC_PREREQ(2.59) m4_include([version.m4]) AC_INIT([bfd], BFD_VERSION) AC_CONFIG_SRCDIR([libbfd.c]) diff --git a/bfd/doc/Makefile.am b/bfd/doc/Makefile.am index 8e9d831..9b3a0ff 100644 --- a/bfd/doc/Makefile.am +++ b/bfd/doc/Makefile.am @@ -17,7 +17,7 @@ # <http://www.gnu.org/licenses/>. # -AUTOMAKE_OPTIONS = 1.9 cygnus +AUTOMAKE_OPTIONS = info-in-builddir no-texinfo.tex DOCFILES = aoutx.texi archive.texi archures.texi \ bfdt.texi cache.texi coffcode.texi \ @@ -68,7 +68,7 @@ SRCIPROT = $(srcdir)/../cache.c $(srcdir)/../libbfd.c \ TEXIDIR = $(srcdir)/../../texinfo/fsf -info_TEXINFOS = bfd.texinfo +info_TEXINFOS = bfd.texi bfd_TEXINFOS = $(DOCFILES) bfdsumm.texi MKDOC = chew$(EXEEXT_FOR_BUILD) @@ -116,7 +116,7 @@ archures.stamp: $(srcdir)/../archures.c $(srcdir)/doc.str $(MKDOC) touch $@ # We use bfdt.texi, rather than bfd.texi, to avoid conflicting with -# bfd.texinfo on an 8.3 filesystem. +# bfd.texi on an 8.3 filesystem. bfdt.texi: bfdt.stamp ; @true bfdt.stamp: $(srcdir)/../bfd.c $(srcdir)/doc.str $(MKDOC) ./$(MKDOC) -f $(srcdir)/doc.str < $(srcdir)/../bfd.c >bfd.tmp @@ -368,10 +368,3 @@ MAINTAINERCLEANFILES = $(DOCFILES) install: install-info MAINTAINERCLEANFILES += bfd.info - -# Automake 1.9 will only build info files in the objdir if they are -# mentioned in DISTCLEANFILES. It doesn't have to be unconditional, -# though, so we use a bogus condition. -if GENINSRC_NEVER -DISTCLEANFILES += bfd.info -endif diff --git a/bfd/doc/bfd.texinfo b/bfd/doc/bfd.texi index 143cb5e..143cb5e 100644 --- a/bfd/doc/bfd.texinfo +++ b/bfd/doc/bfd.texi diff --git a/binutils/configure.ac b/binutils/configure.ac index 0d3e732..68318eb 100644 --- a/binutils/configure.ac +++ b/binutils/configure.ac @@ -17,7 +17,6 @@ dnl along with this program; see the file COPYING3. If not see dnl <http://www.gnu.org/licenses/>. dnl -AC_PREREQ(2.59) m4_include([../bfd/version.m4]) AC_INIT([binutils], BFD_VERSION) AC_CONFIG_SRCDIR(ar.c) diff --git a/binutils/doc/Makefile.am b/binutils/doc/Makefile.am index 0c108db..c164c6b 100644 --- a/binutils/doc/Makefile.am +++ b/binutils/doc/Makefile.am @@ -17,7 +17,7 @@ # <http://www.gnu.org/licenses/>. # -AUTOMAKE_OPTIONS = cygnus +AUTOMAKE_OPTIONS = info-in-builddir no-texinfo.tex # What version of the manual you want; "all" includes everything CONFIG=all diff --git a/config/override.m4 b/config/override.m4 index b5ce654..d3e815b 100644 --- a/config/override.m4 +++ b/config/override.m4 @@ -29,7 +29,7 @@ m4_copy_force([_AC_PREREQ], [AC_PREREQ]) dnl Ensure exactly this Autoconf version is used m4_ifndef([_GCC_AUTOCONF_VERSION], - [m4_define([_GCC_AUTOCONF_VERSION], [2.64])]) + [m4_define([_GCC_AUTOCONF_VERSION], [2.69])]) dnl Test for the exact version when AC_INIT is expanded. dnl This allows to update the tree in steps (for testing) diff --git a/configure.ac b/configure.ac index 28155a0..a638f69 100644 --- a/configure.ac +++ b/configure.ac @@ -31,7 +31,6 @@ m4_include([lt~obsolete.m4]) m4_include([config/isl.m4]) AC_INIT(move-if-change) -AC_PREREQ(2.64) AC_DISABLE_OPTION_CHECKING progname=$0 @@ -1286,11 +1285,11 @@ if test "$GCC" = yes; then LDFLAGS="$LDFLAGS -static-libstdc++ -static-libgcc" AC_MSG_CHECKING([whether g++ accepts -static-libstdc++ -static-libgcc]) AC_LANG_PUSH(C++) - AC_LINK_IFELSE([ + AC_LINK_IFELSE([AC_LANG_SOURCE([ #if (__GNUC__ < 4) || (__GNUC__ == 4 && __GNUC_MINOR__ < 5) #error -static-libstdc++ not implemented #endif -int main() {}], +int main() {}])], [AC_MSG_RESULT([yes]); have_static_libs=yes], [AC_MSG_RESULT([no])]) AC_LANG_POP(C++) diff --git a/etc/configure.in b/etc/configure.in index 6b94aac..0e39559 100644 --- a/etc/configure.in +++ b/etc/configure.in @@ -1,5 +1,4 @@ dnl Process this file with autoconf to produce a configure script. -AC_PREREQ(2.5) AC_INIT(Makefile.in) AC_PROG_INSTALL diff --git a/gas/Makefile.am b/gas/Makefile.am index ff46b0d..959e9e9 100644 --- a/gas/Makefile.am +++ b/gas/Makefile.am @@ -17,7 +17,7 @@ # <http://www.gnu.org/licenses/>. # -AUTOMAKE_OPTIONS = 1.11 dejagnu foreign no-dist +AUTOMAKE_OPTIONS = dejagnu foreign no-dist subdir-objects ACLOCAL_AMFLAGS = -I .. -I ../config -I ../bfd SUBDIRS = doc po @@ -43,14 +43,14 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ZLIBINC) TARG_CPU = @target_cpu_type@ TARG_CPU_C = $(srcdir)/config/tc-@target_cpu_type@.c -TARG_CPU_O = tc-@target_cpu_type@.@OBJEXT@ +TARG_CPU_O = config/tc-@target_cpu_type@.@OBJEXT@ TARG_CPU_H = $(srcdir)/config/tc-@target_cpu_type@.h OBJ_FORMAT_C = $(srcdir)/config/obj-@obj_format@.c -OBJ_FORMAT_O = obj-@obj_format@.@OBJEXT@ +OBJ_FORMAT_O = config/obj-@obj_format@.@OBJEXT@ OBJ_FORMAT_H = $(srcdir)/config/obj-@obj_format@.h TARG_ENV_H = $(srcdir)/config/te-@te_file@.h ATOF_TARG_C = $(srcdir)/config/atof-@atof@.c -ATOF_TARG_O = atof-@atof@.@OBJEXT@ +ATOF_TARG_O = config/atof-@atof@.@OBJEXT@ # use @target_cpu_type@ for refering to configured target name IT_HDRS=itbl-parse.h $(srcdir)/itbl-ops.h diff --git a/gas/configure.ac b/gas/configure.ac index a639422..0f81e6b 100644 --- a/gas/configure.ac +++ b/gas/configure.ac @@ -20,7 +20,6 @@ dnl along with this program; see the file COPYING3. If not see dnl <http://www.gnu.org/licenses/>. dnl dnl v2.5 needed for --bindir et al -AC_PREREQ(2.59) m4_include([../bfd/version.m4]) AC_INIT([gas], BFD_VERSION) AC_CONFIG_SRCDIR(as.h) @@ -731,7 +730,7 @@ for em in . $emulations ; do fmt=elf file=$em ;; esac formats="$formats $fmt" - emfiles="$emfiles e-$file.o" + emfiles="$emfiles config/e-$file.o" EMULATIONS="$EMULATIONS &$em," done GAS_UNIQ(formats) @@ -746,7 +745,7 @@ if test `set . $formats ; shift ; echo $#` -gt 1 ; then generic) AC_DEFINE(OBJ_MAYBE_GENERIC, 1, [generic support?]) ;; som) AC_DEFINE(OBJ_MAYBE_SOM, 1, [SOM support?]) ;; esac - extra_objects="$extra_objects obj-$fmt.o" + extra_objects="$extra_objects config/obj-$fmt.o" done obj_format=multi fi diff --git a/gas/doc/Makefile.am b/gas/doc/Makefile.am index c9c3405..594226a 100644 --- a/gas/doc/Makefile.am +++ b/gas/doc/Makefile.am @@ -17,12 +17,12 @@ # <http://www.gnu.org/licenses/>. # -AUTOMAKE_OPTIONS = 1.8 cygnus +AUTOMAKE_OPTIONS = info-in-builddir no-texinfo.tex # What version of the manual you want; "all" includes everything CONFIG=all -# Options to extract the man page from as.texinfo +# Options to extract the man page from as.texi MANCONF = -Dman TEXI2POD = perl $(BASEDIR)/etc/texi2pod.pl $(AM_MAKEINFOFLAGS) @@ -32,7 +32,7 @@ POD2MAN = pod2man --center="GNU Development Tools" \ man_MANS = as.1 -info_TEXINFOS = as.texinfo +info_TEXINFOS = as.texi as_TEXINFOS = asconfig.texi $(CPU_DOCS) AM_MAKEINFOFLAGS = -I "$(srcdir)" -I "$(top_srcdir)/../libiberty" \ @@ -120,9 +120,9 @@ info-local: $(MANS) # Build the man page from the texinfo file # The sed command removes the no-adjust Nroff command so that # the man output looks standard. -as.1: $(srcdir)/as.texinfo asconfig.texi $(CPU_DOCS) +as.1: $(srcdir)/as.texi asconfig.texi $(CPU_DOCS) touch $@ - -$(TEXI2POD) $(MANCONF) < $(srcdir)/as.texinfo > as.pod + -$(TEXI2POD) $(MANCONF) < $(srcdir)/as.texi > as.pod -($(POD2MAN) as.pod | \ sed -e '/^.if n .na/d' > $@.T$$$$ && \ mv -f $@.T$$$$ $@) || \ @@ -130,10 +130,3 @@ as.1: $(srcdir)/as.texinfo asconfig.texi $(CPU_DOCS) rm -f as.pod MAINTAINERCLEANFILES += as.info - -# Automake 1.9 will only build info files in the objdir if they are -# mentioned in DISTCLEANFILES. It doesn't have to be unconditional, -# though, so we use a bogus condition. -if GENINSRC_NEVER -DISTCLEANFILES = as.info -endif diff --git a/gas/doc/as.texinfo b/gas/doc/as.texi index 493049c..493049c 100644 --- a/gas/doc/as.texinfo +++ b/gas/doc/as.texi diff --git a/gdb/common/common-defs.h b/gdb/common/common-defs.h index 881a4ea..eb0ec21 100644 --- a/gdb/common/common-defs.h +++ b/gdb/common/common-defs.h @@ -21,12 +21,23 @@ #define COMMON_DEFS_H #include "config.h" + +#undef PACKAGE_NAME +#undef PACKAGE_VERSION +#undef PACKAGE_STRING +#undef PACKAGE_TARNAME + #ifdef GDBSERVER #include "build-gnulib-gdbserver/config.h" #else #include "build-gnulib/config.h" #endif +#undef PACKAGE_NAME +#undef PACKAGE_VERSION +#undef PACKAGE_STRING +#undef PACKAGE_TARNAME + /* From: https://www.gnu.org/software/gnulib/manual/html_node/stdint_002eh.html diff --git a/gdb/configure.ac b/gdb/configure.ac index e1f630c..aa22d1d 100644 --- a/gdb/configure.ac +++ b/gdb/configure.ac @@ -18,7 +18,6 @@ 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.59)dnl AC_INIT(main.c) AC_CONFIG_HEADER(config.h:config.in) AM_MAINTAINER_MODE @@ -734,8 +733,8 @@ AC_DEFUN([AC_TRY_LIBPYTHON], CPPFLAGS="$CPPFLAGS $new_CPPFLAGS" LIBS="$new_LIBS $LIBS" found_usable_python=no - AC_LINK_IFELSE(AC_LANG_PROGRAM([[#include "Python.h"]], - [[Py_Initialize ();]]), + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include "Python.h"]], + [[Py_Initialize ();]])], [have_libpython_var=${version} found_usable_python=yes PYTHON_CPPFLAGS=$new_CPPFLAGS @@ -1021,12 +1020,12 @@ if test "${have_libpython}" != no; then CPPFLAGS="${PYTHON_CPPFLAGS}" # Note that the test is reversed so that python_has_threads=yes on # unexpected failures. - AC_PREPROC_IFELSE(AC_LANG_SOURCE([[ + AC_PREPROC_IFELSE([AC_LANG_SOURCE([[ #include <Python.h> #ifdef WITH_THREAD # error #endif - ]]), [python_has_threads=no], [python_has_threads=yes]) + ]])], [python_has_threads=no], [python_has_threads=yes]) AC_MSG_RESULT(${python_has_threads}) CPPFLAGS="${saved_CPPFLAGS}" else @@ -1100,8 +1099,8 @@ AC_DEFUN([AC_TRY_LIBGUILE], save_LIBS=$LIBS CPPFLAGS="$CPPFLAGS $new_CPPFLAGS" LIBS="$LIBS $new_LIBS" - AC_LINK_IFELSE(AC_LANG_PROGRAM([[#include "libguile.h"]], - [[scm_init_guile ();]]), + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include "libguile.h"]], + [[scm_init_guile ();]])], [have_libguile_var=yes GUILE_CPPFLAGS=$new_CPPFLAGS GUILE_LIBS=$new_LIBS], @@ -1271,12 +1270,12 @@ if test "${with_intel_pt}" = no; then AC_MSG_WARN([Intel Processor Trace support disabled; some features may be unavailable.]) HAVE_LIBIPT=no else - AC_PREPROC_IFELSE(AC_LANG_SOURCE([[ + AC_PREPROC_IFELSE([AC_LANG_SOURCE([[ #include <linux/perf_event.h> #ifndef PERF_ATTR_SIZE_VER5 # error #endif - ]]), [perf_event=yes], [perf_event=no]) + ]])], [perf_event=yes], [perf_event=no]) if test "$perf_event" != yes; then if test "$with_intel_pt" = yes; then AC_MSG_ERROR([linux/perf_event.h missing or too old]) @@ -1720,13 +1719,13 @@ if test "${gdb_native}" = yes; then old_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $PYTHON_CPPFLAGS" AC_RUN_IFELSE( - AC_LANG_PROGRAM( + [AC_LANG_PROGRAM( [#include "Python.h"], [int err; Py_Initialize (); err = PyRun_SimpleString ("import itertools\n"); Py_Finalize (); - return err == 0 ? 0 : 1;]), + return err == 0 ? 0 : 1;])], [dynamic_list=true], [], [true]) LIBS="$old_LIBS" CFLAGS="$old_CFLAGS" diff --git a/gdb/gdbserver/configure.ac b/gdb/gdbserver/configure.ac index 9980168..99bc462 100644 --- a/gdb/gdbserver/configure.ac +++ b/gdb/gdbserver/configure.ac @@ -18,8 +18,6 @@ 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.59)dnl - AC_INIT(server.c) AC_CONFIG_HEADER(config.h:config.in) @@ -429,7 +427,7 @@ fi dnl Check for -fvisibility=hidden support in the compiler. saved_cflags="$CFLAGS" CFLAGS="$CFLAGS -fvisibility=hidden" -AC_COMPILE_IFELSE(AC_LANG_PROGRAM([]), +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], [gdbsrv_cv_have_visibility_hidden=yes], [gdbsrv_cv_have_visibility_hidden=no]) CFLAGS="$saved_cflags" diff --git a/gdb/gnulib/configure.ac b/gdb/gnulib/configure.ac index 3d70b23..b42f21f 100644 --- a/gdb/gnulib/configure.ac +++ b/gdb/gnulib/configure.ac @@ -18,8 +18,8 @@ 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(import/memmem.c) +AC_INIT([libgnu], [UNUSED-VERSION]) +AC_CONFIG_SRCDIR([import/memmem.c]) AC_CONFIG_HEADER(config.h:config.in) AM_MAINTAINER_MODE @@ -35,7 +35,7 @@ gl_INIT # We don't use automake, but gnulib does. This line lets us generate # its Makefile.in. -AM_INIT_AUTOMAKE(libgnu, UNUSED-VERSION, [no-define]) +AM_INIT_AUTOMAKE([no-define]) AM_SILENT_RULES([yes]) diff --git a/gdb/gnulib/update-gnulib.sh b/gdb/gnulib/update-gnulib.sh index 70c23e8..bef4937 100755 --- a/gdb/gnulib/update-gnulib.sh +++ b/gdb/gnulib/update-gnulib.sh @@ -67,8 +67,8 @@ GNULIB_COMMIT_SHA1="38237baf99386101934cd93278023aa4ae523ec0" # The expected version number for the various auto tools we will # use after the import. -AUTOCONF_VERSION="2.64" -AUTOMAKE_VERSION="1.11.1" +AUTOCONF_VERSION="2.69" +AUTOMAKE_VERSION="1.15.1" ACLOCAL_VERSION="$AUTOMAKE_VERSION" if [ $# -ne 1 ]; then diff --git a/gdb/testsuite/configure.ac b/gdb/testsuite/configure.ac index 96de1b3..034c48f 100644 --- a/gdb/testsuite/configure.ac +++ b/gdb/testsuite/configure.ac @@ -16,7 +16,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -AC_PREREQ(2.59) AC_INIT(gdb.base) AC_CANONICAL_BUILD diff --git a/gold/configure.ac b/gold/configure.ac index 1ed6c0d..7a0b371 100644 --- a/gold/configure.ac +++ b/gold/configure.ac @@ -17,8 +17,6 @@ dnl along with this program; see the file COPYING3. If not see dnl <http://www.gnu.org/licenses/>. dnl -AC_PREREQ(2.59) - AC_INIT(gold, 0.1) AC_CONFIG_SRCDIR(gold.cc) @@ -373,17 +371,17 @@ AM_CONDITIONAL(FN_PTRS_IN_SO_WITHOUT_PIC, [ dnl Test for gcc 4.1 or later. Full support for -mcmodel=medium is dnl only available in gcc 4.1. AC_CACHE_CHECK([for gcc >= 4.1], [gold_cv_prog_gcc41], -[AC_COMPILE_IFELSE([ +[AC_COMPILE_IFELSE([AC_LANG_SOURCE([ #if !defined __GNUC__ error #elif __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 1) error #endif -], [gold_cv_prog_gcc41=yes], [gold_cv_prog_gcc41=no])]) +])], [gold_cv_prog_gcc41=yes], [gold_cv_prog_gcc41=no])]) save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -mcmodel=medium" -AC_COMPILE_IFELSE([int i;], [have_mcmodel_medium=yes], [have_mcmodel_medium=no]) +AC_COMPILE_IFELSE([AC_LANG_SOURCE([int i;])], [have_mcmodel_medium=yes], [have_mcmodel_medium=no]) CFLAGS="$save_CFLAGS" dnl Whether we can test -mcmodel=medium. AM_CONDITIONAL(MCMODEL_MEDIUM, @@ -393,7 +391,7 @@ AC_CACHE_CHECK([whether $CC supports -fmerge-constants], [gold_cv_merge_constants], [ save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -fmerge-constants" -AC_COMPILE_IFELSE([const char *s = "foo";], +AC_COMPILE_IFELSE([AC_LANG_SOURCE([const char *s = "foo";])], [gold_cv_merge_constants=yes], [gold_cv_merge_constants=no]) CFLAGS="$save_CFLAGS"]) @@ -404,7 +402,7 @@ AS_IF([test "$gold_cv_merge_constants" = yes], dnl Test for __thread support. AC_CACHE_CHECK([for thread support], [gold_cv_c_thread], -[AC_COMPILE_IFELSE([__thread int i = 1;], +[AC_COMPILE_IFELSE([AC_LANG_SOURCE([__thread int i = 1;])], [gold_cv_c_thread=yes], [gold_cv_c_thread=no])]) AM_CONDITIONAL(TLS, test "$gold_cv_c_thread" = "yes") @@ -412,14 +410,14 @@ AM_CONDITIONAL(TLS, test "$gold_cv_c_thread" = "yes") dnl On GNU/Linux TLS in static programs only works when using glibc dnl 2.4 or later. AC_CACHE_CHECK([for glibc >= 2.4], [gold_cv_lib_glibc24], -[AC_COMPILE_IFELSE([ +[AC_COMPILE_IFELSE([AC_LANG_SOURCE([ #include <features.h> #if !defined __GLIBC__ error #elif __GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 4) error #endif -], [gold_cv_lib_glibc24=yes], [gold_cv_lib_glibc24=no])]) +])], [gold_cv_lib_glibc24=yes], [gold_cv_lib_glibc24=no])]) AM_CONDITIONAL(STATIC_TLS, test "$gold_cv_lib_glibc24" = "yes") @@ -427,11 +425,11 @@ dnl Test for #pragma omp threadprivate AC_CACHE_CHECK([for omp support], [gold_cv_c_threadprivate], [save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -fopenmp" -AC_COMPILE_IFELSE([ +AC_COMPILE_IFELSE([AC_LANG_SOURCE([ #include <omp.h> int i; #pragma omp threadprivate (i) -], [gold_cv_c_threadprivate=yes], [gold_cv_c_threadprivate=no]) +])], [gold_cv_c_threadprivate=yes], [gold_cv_c_threadprivate=no]) CFLAGS="$save_CFLAGS"]) if test "$gold_cv_c_threadprivate" = "yes"; then AC_DEFINE(HAVE_OMP_SUPPORT, 1, @@ -447,27 +445,27 @@ dnl assuming here that there is no compiler that groks -mtls-dialect=gnu2 dnl but does not grok -Werror.) save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -Werror -fpic -mtls-dialect=gnu2" -AC_COMPILE_IFELSE([ +AC_COMPILE_IFELSE([AC_LANG_SOURCE([ __thread int i; void foo (void) { i = 10; } -], [have_tls_gnu2=yes], [have_tls_gnu2=no]) +])], [have_tls_gnu2=yes], [have_tls_gnu2=no]) CFLAGS="$save_CFLAGS" AM_CONDITIONAL(TLS_GNU2_DIALECT, test "$have_tls_gnu2" = "yes") dnl On GNU/Linux TLS descriptors are supported by the dynamic loader dnl only with glibc 2.9 or later. AC_CACHE_CHECK([for glibc >= 2.9], [gold_cv_lib_glibc29], -[AC_COMPILE_IFELSE([ +[AC_COMPILE_IFELSE([AC_LANG_SOURCE([ #include <features.h> #if !defined __GLIBC__ error #elif __GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 9) error #endif -], [gold_cv_lib_glibc29=yes], [gold_cv_lib_glibc29=no])]) +])], [gold_cv_lib_glibc29=yes], [gold_cv_lib_glibc29=no])]) AM_CONDITIONAL(TLS_DESCRIPTORS, test "$gold_cv_lib_glibc29" = "yes") @@ -475,7 +473,7 @@ dnl Test for the -frandom-seed option. AC_CACHE_CHECK([for -frandom-seed support], [gold_cv_c_random_seed], [save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -frandom-seed=foo" -AC_COMPILE_IFELSE([int i;], [gold_cv_c_random_seed=yes], +AC_COMPILE_IFELSE([AC_LANG_SOURCE([int i;])], [gold_cv_c_random_seed=yes], [gold_cv_c_random_seed=no]) CFLAGS="$save_CFLAGS"]) if test "$gold_cv_c_random_seed" = "yes"; then @@ -579,14 +577,14 @@ dnl assuming here that there is no compiler that groks -gpubnames dnl but does not grok -Werror.) save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -Werror -gpubnames" -AC_COMPILE_IFELSE([int i;], [have_pubnames=yes], [have_pubnames=no]) +AC_COMPILE_IFELSE([AC_LANG_SOURCE([int i;])], [have_pubnames=yes], [have_pubnames=no]) CFLAGS="$save_CFLAGS" AM_CONDITIONAL(HAVE_PUBNAMES, test "$have_pubnames" = "yes") dnl Check if gcc supports the -fno-use-linker-plugin option. save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -Werror -fno-use-linker-plugin" -AC_COMPILE_IFELSE([int i;], [have_no_use_linker_plugin=yes], [have_no_use_linker_plugin=no]) +AC_COMPILE_IFELSE([AC_LANG_SOURCE([int i;])], [have_no_use_linker_plugin=yes], [have_no_use_linker_plugin=no]) CFLAGS="$save_CFLAGS" AM_CONDITIONAL(HAVE_NO_USE_LINKER_PLUGIN, test "$have_no_use_linker_plugin" = "yes") @@ -630,11 +628,11 @@ AC_CACHE_CHECK([whether std::tr1::hash<off_t> is defined], [gold_cv_hash_off_t], [CXXFLAGS_hold=$CXXFLAGS CXXFLAGS="$CXXFLAGS $LFS_CFLAGS" -AC_COMPILE_IFELSE([ +AC_COMPILE_IFELSE([AC_LANG_SOURCE([ #include <sys/types.h> #include <tr1/unordered_map> std::tr1::hash<off_t> h; -], +])], [gold_cv_hash_off_t=yes], [gold_cv_hash_off_t=no]) CXXFLAGS=$CXXFLAGS_hold]) @@ -648,12 +646,12 @@ fi # probably be removed after the bug has been fixed for a while. AC_CACHE_CHECK([whether we can use attributes with template functions], [gold_cv_template_attribute], -[AC_COMPILE_IFELSE([ +[AC_COMPILE_IFELSE([AC_LANG_SOURCE([ template<typename T> extern void foo(const char*, ...) __attribute__ ((__format__ (__printf__, 1, 2))); template<typename T> void foo(const char* format, ...) {} void bar() { foo<int>("%s\n", "foo"); } -], [gold_cv_template_attribute=yes], [gold_cv_template_attribute=no])]) +])], [gold_cv_template_attribute=yes], [gold_cv_template_attribute=no])]) if test "$gold_cv_template_attribute" = "yes"; then AC_DEFINE(HAVE_TEMPLATE_ATTRIBUTES, 1, [Define if attributes work on C++ templates]) diff --git a/gprof/Makefile.am b/gprof/Makefile.am index 84837ab..b44e5b3 100644 --- a/gprof/Makefile.am +++ b/gprof/Makefile.am @@ -17,7 +17,7 @@ # <http://www.gnu.org/licenses/>. # -AUTOMAKE_OPTIONS = 1.11 foreign no-dist no-texinfo.tex +AUTOMAKE_OPTIONS = foreign no-dist no-texinfo.tex info-in-builddir ACLOCAL_AMFLAGS = -I .. -I ../config -I ../bfd TEXINFO_TEX = ../texinfo/texinfo.tex @@ -103,10 +103,3 @@ gprof.1: $(srcdir)/gprof.texi config.texi rm -f gprof.pod MAINTAINERCLEANFILES = gprof.info - -# Automake 1.9 will only build info files in the objdir if they are -# mentioned in DISTCLEANFILES. It doesn't have to be unconditional, -# though, so we use a bogus condition. -if GENINSRC_NEVER -DISTCLEANFILES = gprof.info -endif diff --git a/gprof/configure.ac b/gprof/configure.ac index 97c73bc..0c93b9d 100644 --- a/gprof/configure.ac +++ b/gprof/configure.ac @@ -16,7 +16,6 @@ dnl You should have received a copy of the GNU General Public License dnl along with this program; see the file COPYING3. If not see dnl <http://www.gnu.org/licenses/>. dnl -AC_PREREQ(2.59) m4_include([../bfd/version.m4]) AC_INIT([gprof], BFD_VERSION) AC_CONFIG_SRCDIR([gprof.c]) diff --git a/intl/configure.ac b/intl/configure.ac index 36cf97f..48832b9 100644 --- a/intl/configure.ac +++ b/intl/configure.ac @@ -1,5 +1,5 @@ -AC_PREREQ(2.64) AC_INIT +AC_USE_SYSTEM_EXTENSIONS AC_CONFIG_SRCDIR(gettext.c) AC_CONFIG_HEADER(config.h) AC_CONFIG_MACRO_DIR(../config) diff --git a/ld/Makefile.am b/ld/Makefile.am index fcd9083..d86ad09 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am @@ -17,7 +17,7 @@ # <http://www.gnu.org/licenses/>. # -AUTOMAKE_OPTIONS = dejagnu no-texinfo.tex no-dist foreign +AUTOMAKE_OPTIONS = dejagnu no-texinfo.tex no-dist foreign info-in-builddir ACLOCAL_AMFLAGS = -I .. -I ../config -I ../bfd TEXINFO_TEX = ../texinfo/texinfo.tex @@ -80,7 +80,7 @@ INCDIR = $(BASEDIR)/include # What version of the manual to build DOCVER = gen -# Options to extract the man page from ld.texinfo +# Options to extract the man page from ld.texi MANCONF = -Dman TEXI2POD = perl $(BASEDIR)/etc/texi2pod.pl $(AM_MAKEINFOFLAGS) @@ -135,9 +135,9 @@ CXXFLAGS_FOR_TARGET = `echo $(CXXFLAGS) | sed -e 's/-fsanitize=address//g' -e 's transform = s/^ld-new$$/$(installed_linker)/;@program_transform_name@ bin_PROGRAMS = ld-new -info_TEXINFOS = ld.texinfo +info_TEXINFOS = ld.texi ld_TEXINFOS = configdoc.texi -noinst_TEXINFOS = ldint.texinfo +noinst_TEXINFOS = ldint.texi man_MANS = ld.1 AM_MAKEINFOFLAGS = -I $(srcdir) -I $(BFDDIR)/doc -I ../bfd/doc \ @@ -1928,9 +1928,9 @@ configdoc.texi: ${DOCVER}-doc.texi # Build the man page from the texinfo file # The sed command removes the no-adjust Nroff command so that # the man output looks standard. -ld.1: $(srcdir)/ld.texinfo configdoc.texi +ld.1: $(srcdir)/ld.texi configdoc.texi touch $@ - -$(TEXI2POD) $(MANCONF) < $(srcdir)/ld.texinfo > ld.pod + -$(TEXI2POD) $(MANCONF) < $(srcdir)/ld.texi > ld.pod -($(POD2MAN) ld.pod | \ sed -e '/^.if n .na/d' > $@.T$$$$ && \ mv -f $@.T$$$$ $@) || \ @@ -1994,10 +1994,3 @@ distclean-local: rm -rf ldscripts MAINTAINERCLEANFILES += ld.info - -# Automake 1.9 will only build info files in the objdir if they are -# mentioned in DISTCLEANFILES. It doesn't have to be unconditional, -# though, so we use a bogus condition. -if GENINSRC_NEVER -DISTCLEANFILES += ld.info -endif @@ -18,8 +18,8 @@ There are many features of the linker: * The linker supports a control language. -* There is a user manual (ld.texinfo), as well as the - beginnings of an internals manual (ldint.texinfo). +* There is a user manual (ld.texi), as well as the + beginnings of an internals manual (ldint.texi). Installation ============ @@ -37,7 +37,7 @@ directory (one directory above this one). Porting to a new target ======================= -See the ldint.texinfo manual. +See the ldint.texi manual. Reporting bugs etc =========================== diff --git a/ld/configure.ac b/ld/configure.ac index b14411e..d10c553 100644 --- a/ld/configure.ac +++ b/ld/configure.ac @@ -17,7 +17,6 @@ dnl along with this program; see the file COPYING3. If not see dnl <http://www.gnu.org/licenses/>. dnl -AC_PREREQ(2.59) m4_include([../bfd/version.m4]) AC_INIT([ld], BFD_VERSION) AC_CONFIG_SRCDIR(ldmain.c) diff --git a/ld/gen-doc.texi b/ld/gen-doc.texi index 28acc93..1b80ee6 100644 --- a/ld/gen-doc.texi +++ b/ld/gen-doc.texi @@ -1,5 +1,5 @@ @c Copyright (C) 2012-2018 Free Software Foundation, Inc. -@c For copying conditions, see the file ld.texinfo. +@c For copying conditions, see the file ld.texi. @c ------------------------------ CONFIGURATION VARS: @c 1. Inclusiveness of this manual diff --git a/ld/h8-doc.texi b/ld/h8-doc.texi index ee3fe6a..503eace 100644 --- a/ld/h8-doc.texi +++ b/ld/h8-doc.texi @@ -1,5 +1,5 @@ @c Copyright (C) 2012-2018 Free Software Foundation, Inc. -@c For copying conditions, see the file ld.texinfo. +@c For copying conditions, see the file ld.texi. @c ------------------------------ CONFIGURATION VARS: @c 1. Inclusiveness of this manual diff --git a/ld/ld.texinfo b/ld/ld.texi index 40d79dd..40d79dd 100644 --- a/ld/ld.texinfo +++ b/ld/ld.texi diff --git a/ld/ldint.texinfo b/ld/ldint.texi index 6df7c88..6df7c88 100644 --- a/ld/ldint.texinfo +++ b/ld/ldint.texi diff --git a/libdecnumber/configure.ac b/libdecnumber/configure.ac index 108df62..16c7465 100644 --- a/libdecnumber/configure.ac +++ b/libdecnumber/configure.ac @@ -19,7 +19,6 @@ # along with GCC; see the file COPYING3. If not see # <http://www.gnu.org/licenses/>. -AC_PREREQ(2.64) AC_INIT(libdecnumber, [ ], gcc-bugs@gcc.gnu.org, libdecnumber) AC_CONFIG_SRCDIR(decNumber.h) AC_CONFIG_MACRO_DIR(../config) diff --git a/libiberty/configure.ac b/libiberty/configure.ac index 6917cfa..54f7fb4 100644 --- a/libiberty/configure.ac +++ b/libiberty/configure.ac @@ -1,6 +1,5 @@ dnl Process this file with autoconf to produce a configure script -AC_PREREQ(2.64) AC_INIT AC_CONFIG_SRCDIR([xmalloc.c]) @@ -1079,7 +1079,7 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES], # to the aix ld manual. m4_defun([_LT_SYS_MODULE_PATH_AIX], [m4_require([_LT_DECL_SED])dnl -AC_LINK_IFELSE(AC_LANG_PROGRAM,[ +AC_LINK_IFELSE([AC_LANG_SOURCE([AC_LANG_PROGRAM])],[ lt_aix_libpath_sed=' /Import File Strings/,/^$/ { /^0/ { @@ -4932,7 +4932,7 @@ _LT_EOF # implicitly export all symbols. save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" - AC_LINK_IFELSE(int foo(void) {}, + AC_LINK_IFELSE([AC_LANG_SOURCE([int foo(void) {}])], _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' ) LDFLAGS="$save_LDFLAGS" diff --git a/opcodes/Makefile.am b/opcodes/Makefile.am index 98fd7f3..11d3f76 100644 --- a/opcodes/Makefile.am +++ b/opcodes/Makefile.am @@ -17,7 +17,7 @@ # <http://www.gnu.org/licenses/>. # -AUTOMAKE_OPTIONS = 1.11 foreign no-dist +AUTOMAKE_OPTIONS = foreign no-dist ACLOCAL_AMFLAGS = -I .. -I ../config -I ../bfd # Build '.' first so all generated files exist. diff --git a/opcodes/configure.ac b/opcodes/configure.ac index 86a0ca0..d820dc9 100644 --- a/opcodes/configure.ac +++ b/opcodes/configure.ac @@ -17,7 +17,6 @@ dnl along with this program; see the file COPYING3. If not see dnl <http://www.gnu.org/licenses/>. dnl -AC_PREREQ(2.59) m4_include([../bfd/version.m4]) AC_INIT([opcodes], BFD_VERSION) AC_CONFIG_SRCDIR([z8k-dis.c]) 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) diff --git a/zlib/Makefile.am b/zlib/Makefile.am index 82f709d..eeda1b2 100644 --- a/zlib/Makefile.am +++ b/zlib/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to create Makefile.in. -AUTOMAKE_OPTIONS = 1.8 cygnus +AUTOMAKE_OPTIONS = foreign ACLOCAL_AMFLAGS = -I .. -I ../config diff --git a/zlib/configure.ac b/zlib/configure.ac index 57d6fa5..e9ebd64 100644 --- a/zlib/configure.ac +++ b/zlib/configure.ac @@ -1,7 +1,6 @@ dnl Process this with autoconf to create configure -AC_PREREQ(2.64) -AC_INIT +AC_INIT([zlib], [1.1.4]) AC_CONFIG_SRCDIR([zlib.h]) if test -n "${with_target_subdir}"; then @@ -14,7 +13,7 @@ AC_CANONICAL_SYSTEM mkinstalldirs="`cd $ac_aux_dir && ${PWDCMD-pwd}`/mkinstalldirs" AC_SUBST(mkinstalldirs) -AM_INIT_AUTOMAKE(zlib, 1.1.4) +AM_INIT_AUTOMAKE AM_MAINTAINER_MODE |