X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=ld%2Fconfigure.in;h=01b802eeaeea7b63850795067480a8a91239ed7a;hb=feb129926a8d12656f1ca4b7a8bb10268d3af4fb;hp=b87943d3c96a0502c12703d88647df0d1f6d6828;hpb=8bc8f4bc007b581031e155d4f68e39327e241d9b;p=deliverable%2Fbinutils-gdb.git

diff --git a/ld/configure.in b/ld/configure.in
index b87943d3c9..01b802eeae 100644
--- 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.1)
+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,12 +66,15 @@ BFD_NEED_DECLARATION(strstr)
 BFD_NEED_DECLARATION(free)
 BFD_NEED_DECLARATION(sbrk)
 BFD_NEED_DECLARATION(getenv)
+BFD_NEED_DECLARATION(environ)
 
 # target-specific stuff:
 
 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
@@ -99,7 +101,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 "*) ;;
 	*)
@@ -110,6 +112,28 @@ 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} "*) ;;
+	*)
+	  all_emul_extras="$all_emul_extras ${i}"
+	  ;;
+	esac
+    done
   fi
 done
 
@@ -127,10 +151,16 @@ if test x${all_targets} = xtrue; then
   else
     EMULATION_OFILES='$(ALL_EMULATIONS)'
   fi
+  EMUL_EXTRA_OFILES='$(ALL_EMUL_EXTRA_OFILES)'
 else
   EMULATION_OFILES=$all_emuls
+  EMUL_EXTRA_OFILES=$all_emul_extras
 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"