This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
[PATCH] bfd: update to AC_INIT
- From: Mike Frysinger <vapier at gentoo dot org>
- To: binutils at sourceware dot org
- Cc: toolchain-devel at blackfin dot uclinux dot org
- Date: Fri, 1 Jun 2012 00:56:59 -0400
- Subject: [PATCH] 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 <vapier@gentoo.org>
bfd/:
2012-06-01 Mike Frysinger <vapier@gentoo.org>
* configure.in (AC_INIT): Call with the args bfd and 2.22.52.
(AM_INIT_AUTOMAKE): Remove args.
* configure: Regenerate.
binutils/
2012-06-01 Mike Frysinger <vapier@gentoo.org>
* configure.in (BFD_VERSION): Run bfd/configure --version and
parse the output of that.
* configure: Regenerate.
gas/
2012-06-01 Mike Frysinger <vapier@gentoo.org>
* configure.in (BFD_VERSION): Run bfd/configure --version and
parse the output of that.
* configure: Regenerate.
gprof/
2012-06-01 Mike Frysinger <vapier@gentoo.org>
* configure.in (BFD_VERSION): Run bfd/configure --version and
parse the output of that.
* configure: Regenerate.
ld/
2012-06-01 Mike Frysinger <vapier@gentoo.org>
* configure.in (BFD_VERSION): Run bfd/configure --version and
parse the output of that.
* configure: Regenerate.
opcodes/
2012-06-01 Mike Frysinger <vapier@gentoo.org>
* configure.in (BFD_VERSION): Run bfd/configure --version and
parse the output of that.
* configure: Regenerate.
---
bfd/configure | 40 +++++++++++++++++++++-------------------
bfd/configure.in | 4 ++--
binutils/configure | 2 +-
binutils/configure.in | 2 +-
gas/configure | 2 +-
gas/configure.in | 2 +-
gprof/configure | 2 +-
gprof/configure.in | 2 +-
ld/configure | 2 +-
ld/configure.in | 2 +-
opcodes/configure | 2 +-
opcodes/configure.in | 2 +-
12 files changed, 33 insertions(+), 31 deletions(-)
diff --git a/bfd/configure b/bfd/configure
index fe51170..1207016 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.22.52.
#
# 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.22.52'
+PACKAGE_STRING='bfd 2.22.52'
+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.22.52 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.22.52:";;
+ 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.22.52
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.22.52, 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.22.52
+ PACKAGE='bfd'
+ VERSION='2.22.52'
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.22.52, 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.22.52
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 9e72c7a..65ecf13 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.22.52])
AC_CONFIG_SRCDIR([libbfd.c])
AC_CANONICAL_TARGET
AC_ISC_POSIX
-AM_INIT_AUTOMAKE(bfd, 2.22.52)
+AM_INIT_AUTOMAKE
dnl These must be called before LT_INIT, because it may want
dnl to call AC_CHECK_PROG.
diff --git a/binutils/configure b/binutils/configure
index 98e26d0..a9ef21d 100755
--- a/binutils/configure
+++ b/binutils/configure
@@ -3238,7 +3238,7 @@ if test "$ac_res" != no; then :
fi
-BFD_VERSION=`sed -n -e 's/^.._INIT_AUTOMAKE.*,[ ]*\([^ ]*\)[ ]*).*/\1/p' < ${srcdir}/../bfd/configure.in`
+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),
diff --git a/binutils/configure.in b/binutils/configure.in
index 978fb81..c766f90 100644
--- a/binutils/configure.in
+++ b/binutils/configure.in
@@ -8,7 +8,7 @@ AC_CANONICAL_TARGET
AC_ISC_POSIX
changequote(,)dnl
-BFD_VERSION=`sed -n -e 's/^.._INIT_AUTOMAKE.*,[ ]*\([^ ]*\)[ ]*).*/\1/p' < ${srcdir}/../bfd/configure.in`
+BFD_VERSION=`${srcdir}/../bfd/configure --version | sed -n -e '1s,.* ,,p'`
changequote([,])dnl
AM_INIT_AUTOMAKE(binutils, ${BFD_VERSION})
diff --git a/gas/configure b/gas/configure
index c3586f0..2790b57 100755
--- a/gas/configure
+++ b/gas/configure
@@ -3221,7 +3221,7 @@ if test "$ac_res" != no; then :
fi
-BFD_VERSION=`sed -n -e 's/^.._INIT_AUTOMAKE.*,[ ]*\([^ ]*\)[ ]*).*/\1/p' < ${srcdir}/../bfd/configure.in`
+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),
diff --git a/gas/configure.in b/gas/configure.in
index 1f16e70..8a2906d 100644
--- a/gas/configure.in
+++ b/gas/configure.in
@@ -17,7 +17,7 @@ AC_CANONICAL_TARGET
AC_ISC_POSIX
changequote(,)dnl
-BFD_VERSION=`sed -n -e 's/^.._INIT_AUTOMAKE.*,[ ]*\([^ ]*\)[ ]*).*/\1/p' < ${srcdir}/../bfd/configure.in`
+BFD_VERSION=`${srcdir}/../bfd/configure --version | sed -n -e '1s,.* ,,p'`
changequote([,])dnl
AM_INIT_AUTOMAKE(gas, ${BFD_VERSION})
diff --git a/gprof/configure b/gprof/configure
index 6ffdbe3..9f3be18 100755
--- a/gprof/configure
+++ b/gprof/configure
@@ -3147,7 +3147,7 @@ if test "$ac_res" != no; then :
fi
-BFD_VERSION=`sed -n -e 's/^.._INIT_AUTOMAKE.*,[ ]*\([^ ]*\)[ ]*).*/\1/p' < ${srcdir}/../bfd/configure.in`
+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),
diff --git a/gprof/configure.in b/gprof/configure.in
index 631e3e4..5481fd4 100644
--- a/gprof/configure.in
+++ b/gprof/configure.in
@@ -7,7 +7,7 @@ AC_CANONICAL_TARGET([])
AC_ISC_POSIX
changequote(,)dnl
-BFD_VERSION=`sed -n -e 's/^.._INIT_AUTOMAKE.*,[ ]*\([^ ]*\)[ ]*).*/\1/p' < ${srcdir}/../bfd/configure.in`
+BFD_VERSION=`${srcdir}/../bfd/configure --version | sed -n -e '1s,.* ,,p'`
changequote([,])dnl
AM_INIT_AUTOMAKE(gprof, ${BFD_VERSION})
diff --git a/ld/configure b/ld/configure
index f4e4bb6..621fbb1 100755
--- a/ld/configure
+++ b/ld/configure
@@ -3555,7 +3555,7 @@ if test "$ac_res" != no; then :
fi
-BFD_VERSION=`sed -n -e 's/^.._INIT_AUTOMAKE.*,[ ]*\([^ ]*\)[ ]*).*/\1/p' < ${srcdir}/../bfd/configure.in`
+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),
diff --git a/ld/configure.in b/ld/configure.in
index b844927..9663399 100644
--- a/ld/configure.in
+++ b/ld/configure.in
@@ -9,7 +9,7 @@ AC_CANONICAL_BUILD
AC_ISC_POSIX
changequote(,)dnl
-BFD_VERSION=`sed -n -e 's/^.._INIT_AUTOMAKE.*,[ ]*\([^ ]*\)[ ]*).*/\1/p' < ${srcdir}/../bfd/configure.in`
+BFD_VERSION=`${srcdir}/../bfd/configure --version | sed -n -e '1s,.* ,,p'`
changequote([,])dnl
AM_INIT_AUTOMAKE(ld, ${BFD_VERSION})
AM_MAINTAINER_MODE
diff --git a/opcodes/configure b/opcodes/configure
index dbfca48..7e94615 100755
--- a/opcodes/configure
+++ b/opcodes/configure
@@ -3215,7 +3215,7 @@ fi
# We currently only use the version number for the name of any shared
# library. For user convenience, we always use the same version
# number that BFD is using.
-BFD_VERSION=`sed -n -e 's/^.._INIT_AUTOMAKE.*,[ ]*\([^ ]*\)[ ]*).*/\1/p' < ${srcdir}/../bfd/configure.in`
+BFD_VERSION=`${srcdir}/../bfd/configure --version | sed -n -e '1s,.* ,,p'`
am__api_version='1.11'
diff --git a/opcodes/configure.in b/opcodes/configure.in
index dadfe4a..8927960 100644
--- a/opcodes/configure.in
+++ b/opcodes/configure.in
@@ -12,7 +12,7 @@ AC_ISC_POSIX
# library. For user convenience, we always use the same version
# number that BFD is using.
changequote(,)dnl
-BFD_VERSION=`sed -n -e 's/^.._INIT_AUTOMAKE.*,[ ]*\([^ ]*\)[ ]*).*/\1/p' < ${srcdir}/../bfd/configure.in`
+BFD_VERSION=`${srcdir}/../bfd/configure --version | sed -n -e '1s,.* ,,p'`
changequote([,])dnl
AM_INIT_AUTOMAKE(opcodes, ${BFD_VERSION})
--
1.7.8.6