X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=ld%2Fconfigure.in;h=0cdef93c4d4df60471d863195200a781d83adf79;hb=569283d40e3546979fd7c222c61408dd107de32b;hp=bd5040ebcf875f92bdd33bba541642a394c3aee4;hpb=f31d24a0a1236c774e77b9bdb69eab870dddb8e9;p=deliverable%2Fbinutils-gdb.git

diff --git a/ld/configure.in b/ld/configure.in
index bd5040ebcf..0cdef93c4d 100644
--- a/ld/configure.in
+++ b/ld/configure.in
@@ -1,5 +1,22 @@
 dnl Process this file with autoconf to produce a configure script
 dnl
+dnl   Copyright 2012 Free Software Foundation
+dnl
+dnl This file is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 3 of the License, or
+dnl (at your option) any later version.
+dnl 
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl 
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; see the file COPYING3.  If not see
+dnl <http://www.gnu.org/licenses/>.
+dnl
+
 AC_PREREQ(2.59)
 AC_INIT
 AC_CONFIG_SRCDIR(ldmain.c)
@@ -9,7 +26,7 @@ AC_CANONICAL_BUILD
 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(ld, ${BFD_VERSION})
 AM_MAINTAINER_MODE
@@ -75,7 +92,7 @@ dnl "install_as_default" is set to false if gold is the default linker.
 dnl "installed_linker" is the installed BFD linker name.
 AC_ARG_ENABLE(gold,
 [[  --enable-gold[=ARG]     build gold [ARG={default,yes,no}]]],
-[case "${enableval}" in 
+[case "${enableval}" in
  default)
    install_as_default=no
    installed_linker=ld.bfd
@@ -120,8 +137,19 @@ esac
 
 AM_BINUTILS_WARNINGS
 
+AM_LC_MESSAGES
+
 AC_CONFIG_HEADERS([config.h:config.in])
 
+# PR 14072
+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__) && !defined(__FreeBSD_kernel__) && !defined(__CONFIG_H__)
+#  error config.h must be #included before system headers
+#endif
+#define __CONFIG_H__ 1])
+
 if test -z "$target" ; then
     AC_MSG_ERROR(Unrecognized target system type; please check config.sub.)
 fi
@@ -140,7 +168,7 @@ AC_PROG_INSTALL
 
 LT_INIT
 
-ALL_LINGUAS="fr sv tr es da vi zh_CN zh_TW ga fi id bg"
+ALL_LINGUAS="fr sv tr es da vi zh_CN zh_TW ga fi id bg it uk"
 ZW_GNU_GETTEXT_SISTER_DIR
 AM_PO_SUBDIRS
 
@@ -160,9 +188,10 @@ AC_SUBST(HOSTING_CRT0)
 AC_SUBST(HOSTING_LIBS)
 AC_SUBST(NATIVE_LIB_DIRS)
 
-AC_CHECK_HEADERS(string.h strings.h stdlib.h unistd.h elf-hints.h limits.h sys/param.h)
+AC_CHECK_HEADERS(string.h strings.h stdlib.h unistd.h elf-hints.h limits.h locale.h sys/param.h)
 AC_CHECK_HEADERS(fcntl.h sys/file.h sys/time.h sys/stat.h)
-AC_CHECK_FUNCS(glob mkstemp realpath sbrk waitpid)
+ACX_HEADER_STRING
+AC_CHECK_FUNCS(glob mkstemp realpath sbrk setlocale waitpid)
 AC_CHECK_FUNCS(open lseek close)
 AC_HEADER_DIRENT
 
@@ -210,14 +239,14 @@ if test $ld_cv_decl_getopt_unistd_h = yes; then
   AC_DEFINE([HAVE_DECL_GETOPT], 1,
 	    [Is the prototype for getopt in <unistd.h> in the expected format?])
 fi
-	
+
 BFD_BINARY_FOPEN
 
 AC_CHECK_DECLS([strstr, free, sbrk, getenv, environ])
 
 # Link in zlib if we can.  This is needed only for the bootstrap tests
 # right now, since those tests use libbfd, which depends on zlib.
-AC_SEARCH_LIBS(zlibVersion, z, [AC_CHECK_HEADERS(zlib.h)])
+AM_ZLIB
 
 # When converting linker scripts into strings for use in emulation
 # files, use astring.sed if the compiler supports ANSI string
@@ -252,6 +281,15 @@ dnl not permit literal newlines in an AC_SUBST variables.  So we use a
 dnl file.
 rm -f tdirs
 
+# If the host is 64-bit, then we enable 64-bit targets by default.
+# This is consistent with what ../bfd/configure.in does.
+if test x${want64} = xfalse; then
+  AC_CHECK_SIZEOF(void *)
+  if test "x${ac_cv_sizeof_void_p}" = "x8"; then
+    want64=true
+  fi
+fi
+
 for targ_alias in `echo $target_alias $enable_targets | sed 's/,/ /g'`
 do
   if test "$targ_alias" = "all"; then
@@ -322,12 +360,6 @@ TDIRS=tdirs
 AC_SUBST_FILE(TDIRS)
 
 if test x${all_targets} = xtrue; then
-  if test x${want64} = xfalse; then
-    AC_CHECK_SIZEOF(long)
-    if test "x${ac_cv_sizeof_long}" = "x8"; then
-      want64=true
-    fi
-  fi
   if test x${want64} = xtrue; then
     EMULATION_OFILES='$(ALL_EMULATIONS) $(ALL_64_EMULATIONS)'
   else