bfd: update to AC_INIT

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

diff --git a/binutils/configure.in b/binutils/configure.in
index 4a03c75d1359b7ac08857509077ed3325c8907f5..c766f90a1ef81bb0d0ef7ca96fd90fb0d774e476 100644 (file)
--- a/binutils/configure.in
+++ b/binutils/configure.in
@@ -8,7 +8,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(binutils, ${BFD_VERSION})
 
@@ -28,10 +28,29 @@ AC_ARG_ENABLE(targets,
   *)        enable_targets=$enableval ;;
 esac])dnl
 
+AC_ARG_ENABLE(deterministic-archives,
+[AS_HELP_STRING([--enable-deterministic-archives],
+               [ar and ranlib default to -D behavior])], [
+if test "${enableval}" = no; then
+  default_ar_deterministic=0
+else
+  default_ar_deterministic=1
+fi], [default_ar_deterministic=0])
+
+AC_DEFINE_UNQUOTED(DEFAULT_AR_DETERMINISTIC, $default_ar_deterministic,
+                  [Should ar and ranlib use -D behavior by default?])
+
 AM_BINUTILS_WARNINGS
-                  
+
 AC_CONFIG_HEADERS(config.h:config.in)
 
+AH_VERBATIM([00_CONFIG_H_CHECK],
+[/* Check that config.h is #included before system headers
+   (this works only for glibc, but that should be enough).  */
+#if defined(__GLIBC__)
+#  error config.h must be #included before system headers
+#endif])
+
 if test -z "$target" ; then
     AC_MSG_ERROR(Unrecognized target system type; please check config.sub.)
 fi
@@ -42,7 +61,7 @@ fi
 AC_PROG_YACC
 AM_PROG_LEX
 
-ALL_LINGUAS="da es fi fr id ja ro ru rw sk sv tr uk vi zh_CN zh_TW bg"
+ALL_LINGUAS="bg da es fi fr id it ja ro ru rw sk sv tr uk vi zh_CN zh_TW"
 ZW_GNU_GETTEXT_SISTER_DIR
 AM_PO_SUBDIRS
 
@@ -77,10 +96,11 @@ case "${host}" in
 esac
 AC_SUBST(DEMANGLER_NAME)
 
-AC_CHECK_HEADERS(string.h strings.h stdlib.h unistd.h fcntl.h sys/file.h limits.h sys/param.h)
+AC_CHECK_HEADERS(string.h strings.h stdlib.h unistd.h fcntl.h sys/file.h limits.h locale.h sys/param.h)
 AC_HEADER_SYS_WAIT
+ACX_HEADER_STRING
 AC_FUNC_ALLOCA
-AC_CHECK_FUNCS(sbrk utimes setmode getc_unlocked strcoll)
+AC_CHECK_FUNCS(sbrk utimes setmode getc_unlocked strcoll setlocale)
 AC_CHECK_FUNC([mkstemp],
              AC_DEFINE([HAVE_MKSTEMP], 1,
              [Define to 1 if you have the `mkstemp' function.]))
@@ -91,6 +111,8 @@ AC_CHECK_FUNC([mkdtemp],
 # Some systems have frexp only in -lm, not in -lc.
 AC_SEARCH_LIBS(frexp, m)
 
+AM_LC_MESSAGES
+
 AC_MSG_CHECKING(for time_t in time.h)
 AC_CACHE_VAL(bu_cv_decl_time_t_time_h,
 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <time.h>], [time_t i;])],
@@ -143,7 +165,7 @@ AC_CHECK_DECLS([fprintf, stpcpy, strstr, sbrk, getenv, environ, getc_unlocked,
 # Link in zlib if we can.  This allows us to read compressed debug
 # sections.  This is used only by readelf.c (objdump uses bfd for
 # reading compressed sections).
-AC_SEARCH_LIBS(zlibVersion, z, [AC_CHECK_HEADERS(zlib.h)])
+AM_ZLIB
 
 BFD_BINARY_FOPEN
 
@@ -203,7 +225,7 @@ do
     else
        case $targ in
 changequote(,)dnl
-       i[3-7]86*-*-netware*) 
+       i[3-7]86*-*-netware*)
 changequote([,])dnl
          BUILD_NLMCONV='$(NLMCONV_PROG)$(EXEEXT)'
          NLMCONV_DEFS="$NLMCONV_DEFS -DNLMCONV_I386"
@@ -304,7 +326,10 @@ changequote([,])dnl
          BUILD_WINDMC='$(WINDMC_PROG)$(EXEEXT)'
          ;;
        powerpc*-*-linux* | powerpc*-*-elf* | powerpc*-*-eabi*)
-         BUILD_INSTALL_MISC="${BUILD_INSTALL_MISC} embedspu"
+         case "$BUILD_INSTALL_MISC" in
+           *embedspu*) ;;
+           *) BUILD_INSTALL_MISC="${BUILD_INSTALL_MISC} embedspu"
+         esac
          ;;
        sh*-*-pe)
          BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
@@ -351,7 +376,10 @@ changequote([,])dnl
        # Add objdump private vectors.
        case $targ in
        powerpc-*-aix*)
-       od_vectors="$od_vectors objdump_private_desc_xcoff"
+         od_vectors="$od_vectors objdump_private_desc_xcoff"
+         ;;
+        *-*-darwin*)
+         od_vectors="$od_vectors objdump_private_desc_mach_o"
          ;;
        esac
     fi
@@ -369,6 +397,8 @@ for i in $od_vectors ; do
        case $i in
        objdump_private_desc_xcoff)
            od_files="$od_files od-xcoff" ;;
+       objdump_private_desc_mach_o)
+           od_files="$od_files od-macho" ;;
        *) AC_MSG_ERROR(*** unknown private vector $i) ;;
        esac
        ;;
@@ -424,11 +454,11 @@ fi
 AC_DEFINE_UNQUOTED(TARGET_PREPENDS_UNDERSCORE, $UNDERSCORE,
  [Define to 1 if user symbol names have a leading underscore, 0 if not.])
 
-# Emulation 
+# Emulation
 targ=$target
 . ${srcdir}/configure.tgt
 EMULATION=$targ_emul
-EMULATION_VECTOR=$targ_emul_vector     
+EMULATION_VECTOR=$targ_emul_vector
 
 AC_SUBST(EMULATION)
 AC_SUBST(EMULATION_VECTOR)