Mon Jun 16 12:49:36 1997 H.J. Lu <hjl@gnu.ai.mit.edu>

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

diff --git a/ld/configure b/ld/configure
index 2d367efe6db0e250bceb082cb9fe3d23dfe06196..e0855ab4f6ea9f15883a25b63d818f956aced62b 100755 (executable)
--- a/ld/configure
+++ b/ld/configure
@@ -675,8 +675,6 @@ test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 
 # host-specific stuff:
 
-. ${srcdir}/configure.host
-
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -753,6 +751,10 @@ else
 fi
 
 
+. ${srcdir}/configure.host
+
+
+
 
 
 
@@ -789,7 +791,7 @@ else
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 793 "configure"
+#line 795 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
@@ -803,7 +805,7 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 807 "configure"
+#line 809 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
@@ -836,7 +838,7 @@ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 840 "configure"
+#line 842 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
@@ -871,7 +873,7 @@ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 875 "configure"
+#line 877 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -924,7 +926,7 @@ if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 928 "configure"
+#line 930 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -964,7 +966,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldir  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 968 "configure"
+#line 970 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -999,7 +1001,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lx  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1003 "configure"
+#line 1005 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -1042,7 +1044,7 @@ if eval "test \"`echo '$''{'bfd_cv_decl_needed_free'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1046 "configure"
+#line 1048 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -1080,57 +1082,53 @@ fi
 
 # target-specific stuff:
 
-# Canonicalize the secondary target names.
-if test -n "$enable_targets"; then
-    for targ in `echo $enable_targets | sed 's/,/ /g'`
-    do
-       result=`$ac_config_sub $targ 2>/dev/null`
-       if test -n "$result"; then
-           canon_targets="$canon_targets $result"
-       else
-           # Allow targets that config.sub doesn't recognize, like "all".
-           canon_targets="$canon_targets $targ"
-       fi
-    done
-fi
-
-all_targets=false
+all_targets=
 EMUL=
 all_emuls=
+TDIRS=
 
-for targ in $target $canon_targets
+for targ_alias in `echo $target_alias $enable_targets | sed 's/,/ /g'`
 do
-    if test "x$targ" = "xall"; then
-        all_targets=true
+  if test "$targ_alias" = "all"; then
+    all_targets=true
+  else
+    # Canonicalize the secondary target names.
+    result=`$ac_config_sub $targ_alias 2>/dev/null`
+    if test -n "$result"; then
+       targ=$result
     else
-       . ${srcdir}/configure.tgt
-
-       if test "x$targ" = "x$target"; then
-           EMUL=${targ_emul}
-       fi
-
-       all_emuls="${all_emuls} ${targ_emul} ${targ_extra_emuls}"
+       targ=$targ_alias
     fi
-done
 
+    . ${srcdir}/configure.tgt
 
+    if test "$targ" = "$target"; then
+      EMUL=$targ_emul
+    fi
 
-if test x${all_targets} = xfalse; then
-    # uniq the list.
-    f=""
-    for i in $all_emuls ; do
-       case " $f " in
-       *" e$i.o "*) ;;
-       *) f="$f e$i.o" ;;
+    for i in $targ_emul $targ_extra_emuls; do
+       case " $all_emuls " in
+       *" e${i}.o "*) ;;
+       *)
+         all_emuls="$all_emuls e${i}.o"
+         eval result=\$tdir_$i
+         test -z "$result" && result=$targ_alias
+         TDIRS="$TDIRS\\
+tdir_$i=$result"
+         ;;
        esac
     done
+  fi
+done
+
 
-    EMULATION_OFILES="$f"
 
-else   # all_targets is true
-    EMULATION_OFILES='$(ALL_EMULATIONS)'
-fi     # all_targets is true
 
+if test x${all_targets} = xtrue; then
+  EMULATION_OFILES='$(ALL_EMULATIONS)'
+else
+  EMULATION_OFILES=$all_emuls
+fi
 
 
 trap '' 1 2 15
@@ -1266,6 +1264,7 @@ s%@build_vendor@%$build_vendor%g
 s%@build_os@%$build_os%g
 s%@CC@%$CC%g
 s%@HLDFLAGS@%$HLDFLAGS%g
+s%@RPATH_ENVVAR@%$RPATH_ENVVAR%g
 s%@HDEFINES@%$HDEFINES%g
 s%@HOSTING_CRT0@%$HOSTING_CRT0%g
 s%@HOSTING_LIBS@%$HOSTING_LIBS%g
@@ -1273,6 +1272,7 @@ s%@NATIVE_LIB_DIRS@%$NATIVE_LIB_DIRS%g
 s%@BFDLIB@%$BFDLIB%g
 s%@CPP@%$CPP%g
 s%@EMUL@%$EMUL%g
+s%@TDIRS@%$TDIRS%g
 s%@EMULATION_OFILES@%$EMULATION_OFILES%g
 
 CEOF