diff options
author | Alan Modra <amodra@gmail.com> | 2014-07-04 11:35:16 +0930 |
---|---|---|
committer | Alan Modra <amodra@gmail.com> | 2014-07-04 12:41:26 +0930 |
commit | 2e98a7bd882356a23076ad4a51a251d9ab1ce070 (patch) | |
tree | b0e787fa49abae0e2dfd55d37c66d6be4d59444a /gprof | |
parent | 2900af2d0ad6f939640bbc497ea15f9fb6f3ff52 (diff) | |
download | binutils-2e98a7bd882356a23076ad4a51a251d9ab1ce070.tar.gz binutils-2e98a7bd882356a23076ad4a51a251d9ab1ce070.tar.bz2 binutils-2e98a7bd882356a23076ad4a51a251d9ab1ce070.zip |
Use modern AC_INIT in configure.in
This removes usage of the obsolete AC_INIT and AM_INIT_AUTOMAKE in all
binutils configure.in files. The BFD version is now in bfd/version.m4
rather than bfd/configure.in, which allows automake to automatically
track this dependency.
bfd/
* version.m4: New file.
* configure.in: Include version.m4.
(AC_INIT): Update.
* Makefile.am (RELEASE): Delete.
(bfdver.h): Depend on development.sh, use instead of RELEASE.
* Makefile.in: Regenerate.
* doc/Makefile.in: Regenerate.
opcodes/
* 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.
binutils/
* 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.
gas/
* configure.in: Include bfd/version.m4.
(AC_INIT, AM_INIT_AUTOMAKE): Use modern form.
(BFD_VERSION): Delete.
* configure.com: Get bfd version from bfd/version.m4.
* Makefile.am (CONFIG_STATUS_DEPENDENCIES): Remove bfd/configure.in.
* configure: Regenerate.
* Makefile.in: Regenerate.
* doc/Makefile.in: Regenerate.
gprof/
* 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.
ld/
* 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.
Diffstat (limited to 'gprof')
-rw-r--r-- | gprof/ChangeLog | 9 | ||||
-rw-r--r-- | gprof/Makefile.am | 6 | ||||
-rw-r--r-- | gprof/Makefile.in | 10 | ||||
-rwxr-xr-x | gprof/configure | 41 | ||||
-rw-r--r-- | gprof/configure.in | 8 |
5 files changed, 39 insertions, 35 deletions
diff --git a/gprof/ChangeLog b/gprof/ChangeLog index bfb9edfc42b..f4128c89603 100644 --- a/gprof/ChangeLog +++ b/gprof/ChangeLog @@ -1,3 +1,12 @@ +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. + 2014-06-05 Joel Brobecker <brobecker@adacore.com> * Makefile.am (CONFIG_STATUS_DEPENDENCIES): Add dependency on diff --git a/gprof/Makefile.am b/gprof/Makefile.am index 2daefac2c85..ef54c3858f6 100644 --- a/gprof/Makefile.am +++ b/gprof/Makefile.am @@ -58,10 +58,8 @@ EXTRA_DIST = $(BUILT_SOURCES) bbconv.pl $(man_MANS) diststuff: $(BUILT_SOURCES) info $(man_MANS) -# 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 # This empty rule is a hack against gmake patched by Apple. %.o:%.m diff --git a/gprof/Makefile.in b/gprof/Makefile.in index 1706ba70357..7aada8f0f4a 100644 --- a/gprof/Makefile.in +++ b/gprof/Makefile.in @@ -74,7 +74,8 @@ am__aclocal_m4_deps = $(top_srcdir)/../bfd/warning.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 \ @@ -323,11 +324,8 @@ noinst_HEADERS = \ BUILT_SOURCES = flat_bl.c bsd_callg_bl.c fsf_callg_bl.c EXTRA_DIST = $(BUILT_SOURCES) bbconv.pl $(man_MANS) -# 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 POTFILES = $(sources) $(noinst_HEADERS) MANCONF = -Dman TEXI2POD = perl $(srcdir)/../etc/texi2pod.pl $(AM_MAKEINFOFLAGS) diff --git a/gprof/configure b/gprof/configure index 3d6b415931f..45e6941825c 100755 --- a/gprof/configure +++ b/gprof/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 gprof 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='gprof' +PACKAGE_TARNAME='gprof' +PACKAGE_VERSION='2.24.51' +PACKAGE_STRING='gprof 2.24.51' +PACKAGE_BUGREPORT='' +PACKAGE_URL='' ac_unique_file="gprof.c" # Factoring default headers for most tests. @@ -798,7 +798,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}' @@ -1299,7 +1299,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 gprof 2.24.51 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1347,7 +1347,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/gprof] --htmldir=DIR html documentation [DOCDIR] --dvidir=DIR dvi documentation [DOCDIR] --pdfdir=DIR pdf documentation [DOCDIR] @@ -1369,7 +1369,9 @@ _ACEOF fi if test -n "$ac_init_help"; then - + case $ac_init_help in + short | recursive ) echo "Configuration of gprof 2.24.51:";; + esac cat <<\_ACEOF Optional Features: @@ -1474,7 +1476,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -configure +gprof configure 2.24.51 generated by GNU Autoconf 2.64 Copyright (C) 2009 Free Software Foundation, Inc. @@ -1839,7 +1841,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 gprof $as_me 2.24.51, which was generated by GNU Autoconf 2.64. Invocation command line was $ $0 $@ @@ -3147,7 +3149,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), @@ -3647,8 +3648,8 @@ fi # Define the identity of the package. - PACKAGE=gprof - VERSION=${BFD_VERSION} + PACKAGE='gprof' + VERSION='2.24.51' cat >>confdefs.h <<_ACEOF @@ -11131,7 +11132,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11134 "configure" +#line 11135 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11237,7 +11238,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11240 "configure" +#line 11241 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12616,7 +12617,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 gprof $as_me 2.24.51, which was generated by GNU Autoconf 2.64. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12680,7 +12681,7 @@ Report bugs to the package provider." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -config.status +gprof 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/gprof/configure.in b/gprof/configure.in index 20c2a575344..583ad244cc6 100644 --- a/gprof/configure.in +++ b/gprof/configure.in @@ -17,16 +17,14 @@ 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 +m4_include([../bfd/version.m4]) +AC_INIT([gprof], BFD_VERSION) AC_CONFIG_SRCDIR([gprof.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(gprof, ${BFD_VERSION}) +AM_INIT_AUTOMAKE dnl For simplicity, we use the BFD configuration file for most dnl things. However, we also need our own configuration file for |