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 d0bd44bb5c8bfe32e1e798de32962da2afa3cbcd..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
 
@@ -171,6 +174,7 @@ DLLTOOL_DEFS=
 BUILD_WINDRES=
 BUILD_DLLWRAP=
 BUILD_MISC=
+OBJDUMP_DEFS=
 
 for targ in $target $canon_targets
 do
@@ -204,6 +208,11 @@ changequote([,])dnl
        *-*-hms*) BUILD_SRCONV='$(SRCONV_PROG)' ;;
        esac
        case $targ in
+       arm-epoc-pe*)
+         BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
+         DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_ARM_EPOC -DDLLTOOL_ARM"
+         BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
+         ;;
        arm-*pe* | arm-*-wince)
          BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
          DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_ARM"
@@ -214,6 +223,9 @@ changequote([,])dnl
          DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_ARM"
          BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
          ;;
+       arm*-* | xscale-* | strongarm-* | d10v-*)
+         OBJDUMP_DEFS="-DDISASSEMBLER_NEEDS_RELOCS"
+         ;;
 changequote(,)dnl
        i[3-6]86-*pe* | i[3-6]86-*-cygwin* | i[3-6]86-*-mingw32*)
 changequote([,])dnl
@@ -262,6 +274,7 @@ AC_SUBST(DLLTOOL_DEFS)
 AC_SUBST(BUILD_WINDRES)
 AC_SUBST(BUILD_DLLWRAP)
 AC_SUBST(BUILD_MISC)
+AC_SUBST(OBJDUMP_DEFS)
 
 AC_DEFINE_UNQUOTED(TARGET, "${target}", [Configured target name.])