diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2012-07-27 16:30:57 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2012-07-27 16:30:57 +0000 |
| commit | c4dd807e7bd468289a05d8af2d6cde45d727893b (patch) | |
| tree | 997cd50308dde6d61fabc28e9c5ae4e5523b66d7 /ld | |
| parent | a8a64aa848820a3143319ad3bce00d1a2f815cc5 (diff) | |
| download | gdb-c4dd807e7bd468289a05d8af2d6cde45d727893b.zip gdb-c4dd807e7bd468289a05d8af2d6cde45d727893b.tar.gz gdb-c4dd807e7bd468289a05d8af2d6cde45d727893b.tar.bz2 | |
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>
Diffstat (limited to 'ld')
| -rw-r--r-- | ld/ChangeLog | 6 | ||||
| -rwxr-xr-x | ld/configure | 2 | ||||
| -rw-r--r-- | ld/configure.in | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index f36587a..d0a6744 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,9 @@ +2012-07-27 Mike Frysinger <vapier@gentoo.org> + + * configure.in (BFD_VERSION): Run bfd/configure --version and + parse the output of that. + * configure: Regenerate. + 2012-07-27 Tristan Gingold <gingold@adacore.com> * NEWS: Add marker for 2.23. 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 |