ld/ChangeLog:

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

diff --git a/ld/configure.in b/ld/configure.in
index 9158d2b5cccd0f6e913fd714316c0511d44d1492..c4655f5cdeb08017b53bb8d6276051464ec374fa 100644 (file)
--- a/ld/configure.in
+++ b/ld/configure.in
@@ -1,21 +1,23 @@
 dnl Process this file with autoconf to produce a configure script
 dnl
-AC_PREREQ(2.57)
-AC_INIT(ldmain.c)
+AC_PREREQ(2.59)
+AC_INIT
+AC_CONFIG_SRCDIR(ldmain.c)
 
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_TARGET
 AC_ISC_POSIX
 
 changequote(,)dnl
 BFD_VERSION=`sed -n -e 's/^.._INIT_AUTOMAKE.*,[        ]*\([^  ]*\)[   ]*).*/\1/p' < ${srcdir}/../bfd/configure.in`
 changequote([,])dnl
 AM_INIT_AUTOMAKE(ld, ${BFD_VERSION})
+AM_MAINTAINER_MODE
 
 AC_ARG_WITH(lib-path, [  --with-lib-path=dir1:dir2...  set default LIB_PATH],LIB_PATH=$withval)
 AC_ARG_ENABLE(targets,
 [  --enable-targets        alternative target configurations],
 [case "${enableval}" in
-  yes | "") AC_ERROR(enable-targets option must specify target names or 'all')
+  yes | "") AC_MSG_ERROR(enable-targets option must specify target names or 'all')
             ;;
   no)       enable_targets= ;;
   *)        enable_targets=$enableval ;;
@@ -72,7 +74,7 @@ AS_HELP_STRING([--enable-got=<type>],
                [GOT handling scheme (target, single, negative, multigot)]),
 [case "${enableval}" in
   target | single | negative | multigot)  got_handling=$enableval ;;
-  *)  AC_ERROR(bad value ${enableval} for --enable-got option) ;;
+  *)  AC_MSG_ERROR(bad value ${enableval} for --enable-got option) ;;
 esac],
 [got_handling=target])
 
@@ -89,12 +91,12 @@ case "${got_handling}" in
   multigot)
     AC_DEFINE([GOT_HANDLING_DEFAULT], [GOT_HANDLING_MULTIGOT],
               [Define to choose default GOT handling scheme]) ;;
-  *)  AC_ERROR(bad value ${got_handling} for --enable-got option) ;;
+  *)  AC_MSG_ERROR(bad value ${got_handling} for --enable-got option) ;;
 esac
 
 AM_BINUTILS_WARNINGS
 
-AM_CONFIG_HEADER(config.h:config.in)
+AC_CONFIG_HEADERS([config.h:config.in])
 
 if test -z "$target" ; then
     AC_MSG_ERROR(Unrecognized target system type; please check config.sub.)
@@ -107,11 +109,13 @@ fi
 
 AC_PROG_CC
 AC_GNU_SOURCE
+AC_USE_SYSTEM_EXTENSIONS
+AC_SYS_LARGEFILE
 AC_PROG_INSTALL
 
-AM_PROG_LIBTOOL
+LT_INIT
 
-ALL_LINGUAS="fr sv tr es da vi zh_CN zh_TW ga fi"
+ALL_LINGUAS="fr sv tr es da vi zh_CN zh_TW ga fi id"
 ZW_GNU_GETTEXT_SISTER_DIR
 AM_PO_SUBDIRS
 
@@ -122,6 +126,7 @@ AM_PROG_LEX
 
 AM_MAINTAINER_MODE
 AM_CONDITIONAL(GENINSRC_NEVER, false)
+ACX_PROG_CMP_IGNORE_INITIAL
 
 . ${srcdir}/configure.host
 
@@ -136,7 +141,7 @@ AC_HEADER_DIRENT
 
 AC_MSG_CHECKING(for a known getopt prototype in unistd.h)
 AC_CACHE_VAL(ld_cv_decl_getopt_unistd_h,
-[AC_TRY_COMPILE([#include <unistd.h>], [extern int getopt (int, char *const*, const char *);],
+[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <unistd.h>], [extern int getopt (int, char *const*, const char *);])],
 ld_cv_decl_getopt_unistd_h=yes, ld_cv_decl_getopt_unistd_h=no)])
 AC_MSG_RESULT($ld_cv_decl_getopt_unistd_h)
 if test $ld_cv_decl_getopt_unistd_h = yes; then
@@ -148,6 +153,10 @@ 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)])
+
 # When converting linker scripts into strings for use in emulation
 # files, use astring.sed if the compiler supports ANSI string
 # concatenation, or ostring.sed otherwise.  This is to support the
@@ -156,9 +165,9 @@ AC_CHECK_DECLS([strstr, free, sbrk, getenv, environ])
 # support string concatenation.
 AC_MSG_CHECKING([whether ANSI C string concatenation works])
 AC_CACHE_VAL(ld_cv_string_concatenation,
-[AC_TRY_COMPILE(,[char *a = "a" "a";],
-  [ld_cv_string_concatenation=yes],
-  [ld_cv_string_concatenation=no])])
+[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [char *a = "a" "a";])],
+  ld_cv_string_concatenation=yes,
+  ld_cv_string_concatenation=no)])
 AC_MSG_RESULT($ld_cv_string_concatenation)
 if test "$ld_cv_string_concatenation" = "yes"; then
   STRINGIFY=astring.sed
@@ -296,9 +305,11 @@ if test x${EXTRA_SHLIB_EXTENSION} != x ; then
    [Additional extension a shared object might have.])
 fi
 
-dnl Required by html and install-html
+dnl Required by html, pdf, install-pdf and install-html
 AC_SUBST(datarootdir)
 AC_SUBST(docdir)
 AC_SUBST(htmldir)
+AC_SUBST(pdfdir)
 
-AC_OUTPUT(Makefile po/Makefile.in:po/Make-in)
+AC_CONFIG_FILES(Makefile po/Makefile.in:po/Make-in)
+AC_OUTPUT