aboutsummaryrefslogtreecommitdiff
path: root/gas
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2012-07-27 16:30:57 +0000
committerMike Frysinger <vapier@gentoo.org>2012-07-27 16:30:57 +0000
commitc4dd807e7bd468289a05d8af2d6cde45d727893b (patch)
tree997cd50308dde6d61fabc28e9c5ae4e5523b66d7 /gas
parenta8a64aa848820a3143319ad3bce00d1a2f815cc5 (diff)
downloadgdb-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 'gas')
-rw-r--r--gas/ChangeLog6
-rwxr-xr-xgas/configure2
-rw-r--r--gas/configure.in2
3 files changed, 8 insertions, 2 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 2da4d6b..be6c907 100644
--- a/gas/ChangeLog
+++ b/gas/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/gas/configure b/gas/configure
index 2e67449..4f976f6 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 1c0206d..20a64d5 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})