* aclocal.m4, configure: Rebuilt.

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

diff --git a/ld/configure.in b/ld/configure.in
index 6d5d8960778ea0aea1b61bf0a87871d77d17a6d1..8a27a724bc2300920ccf26e89526d53b83ed29a2 100644 (file)
--- a/ld/configure.in
+++ b/ld/configure.in
@@ -5,7 +5,7 @@ AC_INIT(ldmain.c)
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(ld, 2.8.2)
+AM_INIT_AUTOMAKE(ld, 2.9.1)
 
 AM_PROG_LIBTOOL
 
@@ -70,7 +70,12 @@ BFD_NEED_DECLARATION(getenv)
 all_targets=
 EMUL=
 all_emuls=
-TDIRS=
+
+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
+dnl not permit literal newlines in an AC_SUBST variables.  So we use a
+dnl file.
+rm -f tdirs
 
 for targ_alias in `echo $target_alias $enable_targets | sed 's/,/ /g'`
 do
@@ -98,8 +103,7 @@ do
          all_emuls="$all_emuls e${i}.o"
          eval result=\$tdir_$i
          test -z "$result" && result=$targ_alias
-         TDIRS="$TDIRS\\
-tdir_$i=$result"
+         echo tdir_$i=$result >> tdirs
          ;;
        esac
     done
@@ -107,7 +111,9 @@ tdir_$i=$result"
 done
 
 AC_SUBST(EMUL)
-AC_SUBST(TDIRS)
+
+TDIRS=tdirs
+AC_SUBST_FILE(TDIRS)
 
 dnl FIXME: We will build a 64 bit BFD for a 64 bit host or a 64 bit
 dnl target, and in those cases we should also build the 64 bit