* configure.in: Build gas for mips-*-*. If configuring gas and/or

	ld, and the source directories exist, assume -with-gnu-as and/or
	-with-gnu-ld.

diff --git a/ChangeLog b/ChangeLog
index 95bd370c50ad14708b7f75c18619e6c210695dfd..14c83489d0cde7dbbf04f3505024b0ff5b410d2e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Apr  1 08:25:42 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+       * configure.in: Build gas for mips-*-*.  If configuring gas and/or
+       ld, and the source directories exist, assume -with-gnu-as and/or
+       -with-gnu-ld.
+
 Wed Mar 31 21:20:58 1993  K. Richard Pixley  (rich@rtl.cygnus.com)
 
        * Makefile.in (all.normal): insert missing backslash.

diff --git a/configure.in b/configure.in
index 92ffae3e720ec19f96e4a24a28283278da05064f..e74dd272d7e24f14d0b92137253cb81ae837493a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -166,13 +166,6 @@ case "${host}" in
 esac
 
 case "${target}" in
-  mips-dec-bsd*)
-# We do want to build gas in this case.  So don't use the mips-*-* case
-# for this target.
-    ;;
-  mips-*-*)
-    configdirs=`echo ${configdirs} | sed -e 's/gas//'`
-    ;;
   rs6000-*-*)
     configdirs=`echo ${configdirs} | sed -e 's/ld//;s/binutils//;s/gas//'`
     ;;
@@ -199,6 +192,15 @@ case "${target}" in
     ;;
 esac
 
+# Set with_gnu_as and with_gnu_ld as appropriate.
+if [ x${with_gnu_as} != xyes ] && echo ${configdirs} | grep gas > /dev/null && [ -d ${srcdir}/gas ]; then
+  with_gnu_as=yes
+  withoptions="$withoptions -with-gnu-as"
+fi
+if [ x${with_gnu_ld} != xyes ] && echo ${configdirs} | grep ld > /dev/null && [ -d ${srcdir}/ld ]; then
+  with_gnu_ld=yes
+  withoptions="$withoptions -with-gnu-ld"
+fi
 
 target_makefile_frag=config/mt-${bfd_target}
 
@@ -207,4 +209,3 @@ target_makefile_frag=config/mt-${bfd_target}
 # fill-column: 131
 # End:
 #
-