From ff557cac634a7675676cb84a573ceadd8b4dbbcb Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Fri, 27 Jul 2012 16:30:46 +0000 Subject: bfd: update to AC_INIT Move the package name/version from AM_INIT_AUTOMAKE to AC_INIT per recent autotools guidelines. We use recent versions of both, so it shouldn't be a problem. This sets PACKAGE_xxx variables correctly, and makes the output of: ./configure --version actually useful: bfd configure 2.22.52 Changing the other dirs to use AC_INIT would require a bit of m4 trickery that I don't feel like getting into, and they all use BFD_VERSION anyways, so there isn't much point. Signed-off-by: Mike Frysinger --- bfd/ChangeLog | 6 ++++++ bfd/configure | 40 +++++++++++++++++++++------------------- bfd/configure.in | 4 ++-- 3 files changed, 29 insertions(+), 21 deletions(-) (limited to 'bfd') diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 232b9e1122..9842e91029 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2012-07-27 Mike Frysinger + + * configure.in (AC_INIT): Call with the args bfd and 2.22.52. + (AM_INIT_AUTOMAKE): Remove args. + * configure: Regenerate. + 2012-07-27 Andreas Krebbel * cpu-s390.c (bfd_s390_64_arch, bfd_s390_arch): Pick the default diff --git a/bfd/configure b/bfd/configure index 793b774552..63f34ab924 100755 --- a/bfd/configure +++ b/bfd/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 bfd 2.23.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='bfd' +PACKAGE_TARNAME='bfd' +PACKAGE_VERSION='2.23.51' +PACKAGE_STRING='bfd 2.23.51' +PACKAGE_BUGREPORT='' +PACKAGE_URL='' ac_unique_file="libbfd.c" # Factoring default headers for most tests. @@ -847,7 +847,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}' @@ -1348,7 +1348,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 bfd 2.23.51 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1396,7 +1396,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/bfd] --htmldir=DIR html documentation [DOCDIR] --dvidir=DIR dvi documentation [DOCDIR] --pdfdir=DIR pdf documentation [DOCDIR] @@ -1418,7 +1418,9 @@ _ACEOF fi if test -n "$ac_init_help"; then - + case $ac_init_help in + short | recursive ) echo "Configuration of bfd 2.23.51:";; + esac cat <<\_ACEOF Optional Features: @@ -1538,7 +1540,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -configure +bfd configure 2.23.51 generated by GNU Autoconf 2.64 Copyright (C) 2009 Free Software Foundation, Inc. @@ -2180,7 +2182,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 bfd $as_me 2.23.51, which was generated by GNU Autoconf 2.64. Invocation command line was $ $0 $@ @@ -3987,8 +3989,8 @@ fi # Define the identity of the package. - PACKAGE=bfd - VERSION=2.23.51 + PACKAGE='bfd' + VERSION='2.23.51' cat >>confdefs.h <<_ACEOF @@ -11404,7 +11406,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11407 "configure" +#line 11409 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11510,7 +11512,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11513 "configure" +#line 11515 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -16446,7 +16448,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 bfd $as_me 2.23.51, which was generated by GNU Autoconf 2.64. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16510,7 +16512,7 @@ Report bugs to the package provider." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -config.status +bfd config.status 2.23.51 configured by $0, generated by GNU Autoconf 2.64, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/bfd/configure.in b/bfd/configure.in index e8e83eca50..97fff61929 100644 --- a/bfd/configure.in +++ b/bfd/configure.in @@ -2,13 +2,13 @@ dnl Process this file with autoconf to produce a configure script. dnl AC_PREREQ(2.59) -AC_INIT +AC_INIT([bfd], [2.23.51]) AC_CONFIG_SRCDIR([libbfd.c]) AC_CANONICAL_TARGET AC_ISC_POSIX -AM_INIT_AUTOMAKE(bfd, 2.23.51) +AM_INIT_AUTOMAKE dnl These must be called before LT_INIT, because it may want dnl to call AC_CHECK_PROG. -- cgit v1.2.1