Properly handle common symbol and weak function

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

diff --git a/ld/configure.in b/ld/configure.in
index 160a060e6dbf807f6cd651eed24ee3ec5c272a2e..97a513360fccb473959929f078dfef51afb494d1 100644 (file)
--- a/ld/configure.in
+++ b/ld/configure.in
@@ -9,7 +9,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
@@ -124,6 +124,15 @@ 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(__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
@@ -142,7 +151,7 @@ AC_PROG_INSTALL
 
 LT_INIT
 
-ALL_LINGUAS="fr sv tr es da vi zh_CN zh_TW ga fi id bg it"
+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