X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=binutils%2Fconfigure.in;h=23d517b4b9cd261b89f36c7d5428e6b4575d6523;hb=3c62831e20dc51f9d86aa471570e8451dd253bf6;hp=d175d8527dea5089ad47a6fb2c6a74f0bcc44382;hpb=8b1e6df337acf62900dda4e8aad874b999563510;p=deliverable%2Fbinutils-gdb.git

diff --git a/binutils/configure.in b/binutils/configure.in
index d175d8527d..23d517b4b9 100644
--- 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
 
@@ -26,7 +29,7 @@ AC_ARG_ENABLE(commonbfdlib,
   *)   AC_MSG_ERROR([bad value ${enableval} for BFD commonbfdlib option]) ;;
 esac])dnl
 
-build_warnings="-W -Wall"
+build_warnings="-W -Wall -Wstrict-prototypes -Wmissing-prototypes"
 AC_ARG_ENABLE(build-warnings,
 [  --enable-build-warnings Enable build-time compiler warnings if gcc is used],
 [case "${enableval}" in
@@ -61,7 +64,7 @@ AC_PROG_CC
 AC_PROG_YACC
 AM_PROG_LEX
 
-ALL_LINGUAS=
+ALL_LINGUAS="fr tr"
 CY_GNU_GETTEXT
 
 AM_MAINTAINER_MODE
@@ -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
@@ -263,6 +266,10 @@ changequote([,])dnl
     fi
 done
 
+if test "${with_windres+set}" = set; then
+	  BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
+fi
+
 AC_SUBST(NLMCONV_DEFS)
 AC_SUBST(BUILD_NLMCONV)
 AC_SUBST(BUILD_SRCONV)
@@ -284,7 +291,7 @@ else
 fi
 AC_SUBST(UNDERSCORE)
 
-AC_OUTPUT(Makefile po/Makefile.in:po/Make-in,
+AC_OUTPUT(Makefile doc/Makefile po/Makefile.in:po/Make-in,
 [
 case "x$CONFIG_FILES" in
 *) sed -e '/POTFILES =/r po/POTFILES' po/Makefile.in > po/Makefile ;;