Fix autoconf breakage + commit target.c, omitted in previous delta

[deliverable/binutils-gdb.git] / binutils / configure.in

diff --git a/binutils/configure.in b/binutils/configure.in
index d175d8527dea5089ad47a6fb2c6a74f0bcc44382..e2fed827d22b60923e7ce19a6a2bde6de0e1a9a4 100644 (file)
--- a/binutils/configure.in
+++ b/binutils/configure.in
@@ -6,7 +6,10 @@ AC_INIT(ar.c)
 AC_CANONICAL_SYSTEM
 AC_ISC_POSIX
 
-AM_INIT_AUTOMAKE(binutils, 2.10.91)
+changequote(,)dnl
+BFD_VERSION=`sed -n -e 's/^.._INIT_AUTOMAKE.*,[        ]*\([^  ]*\)[   ]*).*/\1/p' < ${srcdir}/../bfd/configure.in`
+changequote([,])dnl
+AM_INIT_AUTOMAKE(binutils, ${BFD_VERSION})
 
 AM_PROG_LIBTOOL
 
@@ -220,7 +223,7 @@ changequote([,])dnl
          DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_ARM"
          BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
          ;;
-       arm-* | xscale-* | strongarm-* | d10v-*)
+       arm*-* | xscale-* | strongarm-* | d10v-*)
          OBJDUMP_DEFS="-DDISASSEMBLER_NEEDS_RELOCS"
          ;;
 changequote(,)dnl