diff options
Diffstat (limited to 'gas')
| -rw-r--r-- | gas/ChangeLog | 6 | ||||
| -rwxr-xr-x | gas/configure | 2 | ||||
| -rw-r--r-- | gas/configure.in | 2 |
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}) |