From 2e98a7bd882356a23076ad4a51a251d9ab1ce070 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Fri, 4 Jul 2014 11:35:16 +0930 Subject: 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. --- gas/ChangeLog | 17 +++++++++++++++-- gas/Makefile.am | 6 +++--- gas/Makefile.in | 8 ++++---- gas/configure | 41 +++++++++++++++++++++-------------------- gas/configure.com | 8 ++++---- gas/configure.in | 8 +++----- gas/doc/Makefile.in | 2 +- 7 files changed, 51 insertions(+), 39 deletions(-) (limited to 'gas') diff --git a/gas/ChangeLog b/gas/ChangeLog index e65aa83..c9adf37 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,14 @@ +2014-07-04 Alan Modra + + * 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. + 2014-07-01 Barney Stratford Senthil Kumar Selvaraj Pitchumani Sivanupandi @@ -7,9 +18,11 @@ Add avrtiny arch devices attiny4, attiny5, attiny9, attiny10, attiny20 and attiny40. (md_show_usage): Add avrtiny arch in usage message. - (avr_operand): validate and issue error for invalid register for avrtiny. + (avr_operand): validate and issue error for invalid register for + avrtiny. add new reloc exp for 16 bit lds/sts instruction. - (md_apply_fix): check 16 bit lds/sts operand for out of range and encode. + (md_apply_fix): check 16 bit lds/sts operand for out of range and + encode. (md_assemble): check ISA for arch and issue diagnostic. * NEWS: Mention new support. * doc/c-avr.texi: Document support for avrtiny architecture. diff --git a/gas/Makefile.am b/gas/Makefile.am index 669ab19..5727c75 100644 --- a/gas/Makefile.am +++ b/gas/Makefile.am @@ -693,6 +693,6 @@ de-stage3: - (cd stage3 ; rm -f as$(EXEEXT) ; mv -f * ..) - rmdir stage3 -CONFIG_STATUS_DEPENDENCIES = $(BFDDIR)/configure.in \ - $(srcdir)/configure.tgt \ - $(BFDDIR)/development.sh +# Reconfigure if configure.tgt changes. +# development.sh is used to determine -Werror default. +CONFIG_STATUS_DEPENDENCIES = $(srcdir)/configure.tgt $(BFDDIR)/development.sh diff --git a/gas/Makefile.in b/gas/Makefile.in index 2ca56df..93d01ce 100644 --- a/gas/Makefile.in +++ b/gas/Makefile.in @@ -81,7 +81,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../bfd/acinclude.m4 \ $(top_srcdir)/../libtool.m4 $(top_srcdir)/../ltoptions.m4 \ $(top_srcdir)/../ltsugar.m4 $(top_srcdir)/../ltversion.m4 \ $(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in + $(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 \ @@ -677,10 +677,10 @@ MOSTLYCLEANFILES = $(STAGESTUFF) core \ testsuite/site.exp site.bak site.exp stage stage1 stage2 against = stage2 -CONFIG_STATUS_DEPENDENCIES = $(BFDDIR)/configure.in \ - $(srcdir)/configure.tgt \ - $(BFDDIR)/development.sh +# Reconfigure if configure.tgt changes. +# development.sh is used to determine -Werror default. +CONFIG_STATUS_DEPENDENCIES = $(srcdir)/configure.tgt $(BFDDIR)/development.sh all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive diff --git a/gas/configure b/gas/configure index 1e1086f..3dee8f1 100755 --- a/gas/configure +++ b/gas/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 gas 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='gas' +PACKAGE_TARNAME='gas' +PACKAGE_VERSION='2.24.51' +PACKAGE_STRING='gas 2.24.51' +PACKAGE_BUGREPORT='' +PACKAGE_URL='' ac_unique_file="as.h" # Factoring default headers for most tests. @@ -819,7 +819,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}' @@ -1320,7 +1320,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 gas 2.24.51 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1368,7 +1368,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/gas] --htmldir=DIR html documentation [DOCDIR] --dvidir=DIR dvi documentation [DOCDIR] --pdfdir=DIR pdf documentation [DOCDIR] @@ -1390,7 +1390,9 @@ _ACEOF fi if test -n "$ac_init_help"; then - + case $ac_init_help in + short | recursive ) echo "Configuration of gas 2.24.51:";; + esac cat <<\_ACEOF Optional Features: @@ -1503,7 +1505,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -configure +gas configure 2.24.51 generated by GNU Autoconf 2.64 Copyright (C) 2009 Free Software Foundation, Inc. @@ -1913,7 +1915,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 gas $as_me 2.24.51, which was generated by GNU Autoconf 2.64. Invocation command line was $ $0 $@ @@ -3221,7 +3223,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), @@ -3721,8 +3722,8 @@ fi # Define the identity of the package. - PACKAGE=gas - VERSION=${BFD_VERSION} + PACKAGE='gas' + VERSION='2.24.51' cat >>confdefs.h <<_ACEOF @@ -11201,7 +11202,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11204 "configure" +#line 11205 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11307,7 +11308,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11310 "configure" +#line 11311 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -14962,7 +14963,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 gas $as_me 2.24.51, which was generated by GNU Autoconf 2.64. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15026,7 +15027,7 @@ Report bugs to the package provider." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -config.status +gas 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/gas/configure.com b/gas/configure.com index 982d331..ceb50c2 100644 --- a/gas/configure.com +++ b/gas/configure.com @@ -185,17 +185,17 @@ $ create config-vms.in /* Version number of package */ $! -$! Get VERSION from ../bfd/configure.in +$! Get VERSION from ../bfd/version.m4 $! $ edit/tpu/nojournal/nosection/nodisplay/command=sys$input $DECK set (success, off); - mfile := CREATE_BUFFER("mfile", "[-.bfd]configure.in"); - match_pos := SEARCH_QUIETLY('AM_INIT_AUTOMAKE(bfd, ', FORWARD, EXACT, mfile); + mfile := CREATE_BUFFER("mfile", "[-.bfd]version.m4"); + match_pos := SEARCH_QUIETLY('m4_define([BFD_VERSION], [', FORWARD, EXACT, mfile); IF match_pos <> 0 THEN; POSITION(BEGINNING_OF(match_pos)); ERASE(match_pos); - vers := CURRENT_LINE-")"; + vers := CURRENT_LINE-"])"; ELSE; vers := "unknown"; ENDIF; diff --git a/gas/configure.in b/gas/configure.in index b9f9a98..cc4fc54 100644 --- a/gas/configure.in +++ b/gas/configure.in @@ -21,7 +21,8 @@ dnl . dnl dnl v2.5 needed for --bindir et al AC_PREREQ(2.59) -AC_INIT +m4_include([../bfd/version.m4]) +AC_INIT([gas], BFD_VERSION) AC_CONFIG_SRCDIR(as.h) dnl Autoconf 2.57 will find the aux dir without this. However, unless @@ -31,10 +32,7 @@ AC_CONFIG_AUX_DIR(..) AC_CANONICAL_TARGET AC_ISC_POSIX -changequote(,)dnl -BFD_VERSION=`${srcdir}/../bfd/configure --version | sed -n -e '1s,.* ,,p'` -changequote([,])dnl -AM_INIT_AUTOMAKE(gas, ${BFD_VERSION}) +AM_INIT_AUTOMAKE AC_PROG_CC AC_GNU_SOURCE diff --git a/gas/doc/Makefile.in b/gas/doc/Makefile.in index c51f99c..a67a558 100644 --- a/gas/doc/Makefile.in +++ b/gas/doc/Makefile.in @@ -72,7 +72,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../bfd/acinclude.m4 \ $(top_srcdir)/../libtool.m4 $(top_srcdir)/../ltoptions.m4 \ $(top_srcdir)/../ltsugar.m4 $(top_srcdir)/../ltversion.m4 \ $(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in + $(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 -- cgit v1.1