diff options
Diffstat (limited to 'binutils')
| -rw-r--r-- | binutils/ChangeLog | 10 | ||||
| -rw-r--r-- | binutils/Makefile.am | 6 | ||||
| -rw-r--r-- | binutils/Makefile.in | 10 | ||||
| -rwxr-xr-x | binutils/configure | 41 | ||||
| -rw-r--r-- | binutils/configure.in | 8 | ||||
| -rw-r--r-- | binutils/doc/Makefile.in | 3 |
6 files changed, 42 insertions, 36 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog index c5a5c20..076ecc9 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,13 @@ +2014-07-04 Alan Modra <amodra@gmail.com> + + * configure.in: Include bfd/version.m4. + (AC_INIT, AM_INIT_AUTOMAKE): Use modern form. + (BFD_VERSION): Delete. + * Makefile.am (CONFIG_STATUS_DEPENDENCIES): Remove bfd/configure.in. + * configure: Regenerate. + * Makefile.in: Regenerate. + * doc/Makefile.in: Regenerate. + 2014-07-03 Tristan Gingold <gingold@adacore.com> * doc/binutils.texi: Clarify addr2line output. diff --git a/binutils/Makefile.am b/binutils/Makefile.am index aca2610..7f5f0c4 100644 --- a/binutils/Makefile.am +++ b/binutils/Makefile.am @@ -512,10 +512,8 @@ EXTRA_DIST = arparse.c arparse.h arlex.c nlmheader.c sysinfo.c sysinfo.h \ diststuff: $(EXTRA_DIST) info all: info -# We extract version from bfd/configure.in, make sure to rerun configure -# when BFD's version changes. -CONFIG_STATUS_DEPENDENCIES = $(BFDDIR)/configure.in \ - $(BFDDIR)/development.sh +# development.sh is used to determine -Werror default. +CONFIG_STATUS_DEPENDENCIES = $(BFDDIR)/development.sh DISTCLEANFILES = sysroff.c sysroff.h site.exp site.bak embedspu diff --git a/binutils/Makefile.in b/binutils/Makefile.in index c9e9e38..456c69e 100644 --- a/binutils/Makefile.in +++ b/binutils/Makefile.in @@ -91,7 +91,8 @@ am__aclocal_m4_deps = $(top_srcdir)/../bfd/acinclude.m4 \ $(top_srcdir)/../config/progtest.m4 \ $(top_srcdir)/../libtool.m4 $(top_srcdir)/../ltoptions.m4 \ $(top_srcdir)/../ltsugar.m4 $(top_srcdir)/../ltversion.m4 \ - $(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/configure.in + $(top_srcdir)/../lt~obsolete.m4 \ + $(top_srcdir)/../bfd/version.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ @@ -614,11 +615,8 @@ EXTRA_DIST = arparse.c arparse.h arlex.c nlmheader.c sysinfo.c sysinfo.h \ mcparse.h mcparse.c embedspu.sh -# We extract version from bfd/configure.in, make sure to rerun configure -# when BFD's version changes. -CONFIG_STATUS_DEPENDENCIES = $(BFDDIR)/configure.in \ - $(BFDDIR)/development.sh - +# development.sh is used to determine -Werror default. +CONFIG_STATUS_DEPENDENCIES = $(BFDDIR)/development.sh DISTCLEANFILES = sysroff.c sysroff.h site.exp site.bak embedspu MOSTLYCLEANFILES = sysinfo$(EXEEXT_FOR_BUILD) bin2c$(EXEEXT_FOR_BUILD) \ binutils.log binutils.sum abcdefgh* diff --git a/binutils/configure b/binutils/configure index 1272e53..6e26e52 100755 --- a/binutils/configure +++ b/binutils/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.64. +# Generated by GNU Autoconf 2.64 for binutils 2.24.51. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software @@ -554,12 +554,12 @@ MFLAGS= MAKEFLAGS= # Identity of this package. -PACKAGE_NAME= -PACKAGE_TARNAME= -PACKAGE_VERSION= -PACKAGE_STRING= -PACKAGE_BUGREPORT= -PACKAGE_URL= +PACKAGE_NAME='binutils' +PACKAGE_TARNAME='binutils' +PACKAGE_VERSION='2.24.51' +PACKAGE_STRING='binutils 2.24.51' +PACKAGE_BUGREPORT='' +PACKAGE_URL='' ac_unique_file="ar.c" # Factoring default headers for most tests. @@ -831,7 +831,7 @@ sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' includedir='${prefix}/include' oldincludedir='/usr/include' -docdir='${datarootdir}/doc/${PACKAGE}' +docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' infodir='${datarootdir}/info' htmldir='${docdir}' dvidir='${docdir}' @@ -1332,7 +1332,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures this package to adapt to many kinds of systems. +\`configure' configures binutils 2.24.51 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1380,7 +1380,7 @@ Fine tuning of the installation directories: --infodir=DIR info documentation [DATAROOTDIR/info] --localedir=DIR locale-dependent data [DATAROOTDIR/locale] --mandir=DIR man documentation [DATAROOTDIR/man] - --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE] + --docdir=DIR documentation root [DATAROOTDIR/doc/binutils] --htmldir=DIR html documentation [DOCDIR] --dvidir=DIR dvi documentation [DOCDIR] --pdfdir=DIR pdf documentation [DOCDIR] @@ -1402,7 +1402,9 @@ _ACEOF fi if test -n "$ac_init_help"; then - + case $ac_init_help in + short | recursive ) echo "Configuration of binutils 2.24.51:";; + esac cat <<\_ACEOF Optional Features: @@ -1520,7 +1522,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -configure +binutils configure 2.24.51 generated by GNU Autoconf 2.64 Copyright (C) 2009 Free Software Foundation, Inc. @@ -1930,7 +1932,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by $as_me, which was +It was created by binutils $as_me 2.24.51, which was generated by GNU Autoconf 2.64. Invocation command line was $ $0 $@ @@ -3238,7 +3240,6 @@ if test "$ac_res" != no; then : fi -BFD_VERSION=`${srcdir}/../bfd/configure --version | sed -n -e '1s,.* ,,p'` am__api_version='1.11' # Find a good install program. We prefer a C program (faster), @@ -3738,8 +3739,8 @@ fi # Define the identity of the package. - PACKAGE=binutils - VERSION=${BFD_VERSION} + PACKAGE='binutils' + VERSION='2.24.51' cat >>confdefs.h <<_ACEOF @@ -11218,7 +11219,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11221 "configure" +#line 11222 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11324,7 +11325,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11327 "configure" +#line 11328 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -14738,7 +14739,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by $as_me, which was +This file was extended by binutils $as_me 2.24.51, which was generated by GNU Autoconf 2.64. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -14802,7 +14803,7 @@ Report bugs to the package provider." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -config.status +binutils config.status 2.24.51 configured by $0, generated by GNU Autoconf 2.64, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/binutils/configure.in b/binutils/configure.in index f3e6130..ff0d4dc 100644 --- a/binutils/configure.in +++ b/binutils/configure.in @@ -18,16 +18,14 @@ dnl <http://www.gnu.org/licenses/>. dnl AC_PREREQ(2.59) -AC_INIT +m4_include([../bfd/version.m4]) +AC_INIT([binutils], BFD_VERSION) AC_CONFIG_SRCDIR(ar.c) AC_CANONICAL_TARGET AC_ISC_POSIX -changequote(,)dnl -BFD_VERSION=`${srcdir}/../bfd/configure --version | sed -n -e '1s,.* ,,p'` -changequote([,])dnl -AM_INIT_AUTOMAKE(binutils, ${BFD_VERSION}) +AM_INIT_AUTOMAKE AC_PROG_CC AC_GNU_SOURCE diff --git a/binutils/doc/Makefile.in b/binutils/doc/Makefile.in index 9e22548..542a559 100644 --- a/binutils/doc/Makefile.in +++ b/binutils/doc/Makefile.in @@ -74,7 +74,8 @@ am__aclocal_m4_deps = $(top_srcdir)/../bfd/acinclude.m4 \ $(top_srcdir)/../config/progtest.m4 \ $(top_srcdir)/../libtool.m4 $(top_srcdir)/../ltoptions.m4 \ $(top_srcdir)/../ltsugar.m4 $(top_srcdir)/../ltversion.m4 \ - $(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/configure.in + $(top_srcdir)/../lt~obsolete.m4 \ + $(top_srcdir)/../bfd/version.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs |