* Makefile.am (ALL_EMULATIONS): Remove ehppaelf.o.

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

diff --git a/ld/configure.in b/ld/configure.in
index 290560901df16769ae939db766b4b8cd69535b9d..32fc5f65ad16a91b847585264d08e65ee46b6a8f 100644 (file)
--- a/ld/configure.in
+++ b/ld/configure.in
@@ -1,11 +1,11 @@
 dnl Process this file with autoconf to produce a configure script
 dnl
-AC_PREREG(2.5)
+AC_PREREG(2.13)
 AC_INIT(ldmain.c)
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(ld, 2.9.4)
+AM_INIT_AUTOMAKE(ld, 2.9.5)
 
 AM_PROG_LIBTOOL
 
@@ -37,13 +37,12 @@ fi
 # host-specific stuff:
 
 AC_PROG_CC
-AM_PROG_INSTALL
+AC_PROG_INSTALL
 
 ALL_LINGUAS=
 CY_GNU_GETTEXT
 
-AM_CYGWIN32
-AM_EXEEXT
+AC_EXEEXT
 
 AC_PROG_YACC
 AM_PROG_LEX
@@ -67,6 +66,26 @@ BFD_NEED_DECLARATION(strstr)
 BFD_NEED_DECLARATION(free)
 BFD_NEED_DECLARATION(sbrk)
 BFD_NEED_DECLARATION(getenv)
+BFD_NEED_DECLARATION(environ)
+
+# 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
+# broken Microsoft MSVC compiler, which limits the length of string
+# constants, while still supporting pre-ANSI compilers which do not
+# 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_MSG_RESULT($ld_cv_string_concatenation)
+if test "$ld_cv_string_concatenation" = "yes"; then
+  STRINGIFY=astring.sed
+else
+  STRINGIFY=ostring.sed
+fi
+AC_SUBST(STRINGIFY)
 
 # target-specific stuff:
 
@@ -74,6 +93,7 @@ all_targets=
 EMUL=
 all_emuls=
 all_emul_extras=
+all_libpath=
 
 dnl We need to get an arbitrary number of tdir definitions into
 dnl Makefile.  We can't do it using AC_SUBST, because autoconf does
@@ -87,7 +107,7 @@ do
     all_targets=true
   else
     # Canonicalize the secondary target names.
-    result=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $targ_alias 2>/dev/null`
+    result=`$ac_config_sub $targ_alias 2>/dev/null`
     if test -n "$result"; then
        targ=$result
     else
@@ -100,7 +120,7 @@ do
       EMUL=$targ_emul
     fi
 
-    for i in $targ_emul $targ_extra_emuls; do
+    for i in $targ_emul $targ_extra_emuls $targ_extra_libpath; do
        case " $all_emuls " in
        *" e${i}.o "*) ;;
        *)
@@ -112,6 +132,19 @@ do
        esac
     done
 
+    for i in $targ_emul $targ_extra_libpath; do
+       case " $all_libpath " in
+       *" ${i} "*) ;;
+       *)
+         if test -z "$all_libpath"; then
+           all_libpath=${i}
+         else
+           all_libpath="$all_libpath ${i}"
+         fi
+         ;;
+       esac
+    done
+
     for i in $targ_extra_ofiles; do
        case " $all_emul_extras " in
        *" ${i} "*) ;;
@@ -137,7 +170,7 @@ if test x${all_targets} = xtrue; then
   else
     EMULATION_OFILES='$(ALL_EMULATIONS)'
   fi
-  EMUL_EXTRA_OFILES=''
+  EMUL_EXTRA_OFILES='$(ALL_EMUL_EXTRA_OFILES)'
 else
   EMULATION_OFILES=$all_emuls
   EMUL_EXTRA_OFILES=$all_emul_extras
@@ -145,6 +178,9 @@ fi
 AC_SUBST(EMULATION_OFILES)
 AC_SUBST(EMUL_EXTRA_OFILES)
 
+EMULATION_LIBPATH=$all_libpath
+AC_SUBST(EMULATION_LIBPATH)
+
 if test x${enable_static} = xno; then
   TESTBFDLIB="--rpath ../bfd/.libs ../bfd/.libs/libbfd.so"
 else
@@ -152,5 +188,15 @@ else
 fi
 AC_SUBST(TESTBFDLIB)
 
+target_vendor=${target_vendor=$host_vendor}
+case "$target_vendor" in
+  hp) EXTRA_SHLIB_EXTENSION=".sl" ;;
+  *)  EXTRA_SHLIB_EXTENSION= ;;
+esac
+if test x${EXTRA_SHLIB_EXTENSION} != x ; then
+  AC_DEFINE_UNQUOTED(EXTRA_SHLIB_EXTENSION, "$EXTRA_SHLIB_EXTENSION",
+   [Additional extension a shared object might have.])
+fi
+
 AC_OUTPUT(Makefile po/Makefile.in:po/Make-in,
 [sed -e '/POTFILES =/r po/POTFILES' po/Makefile.in > po/Makefile])