Mon Jan 31 16:07:58 1994 Stan Shebs (shebs@andros.cygnus.com)

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

diff --git a/configure.in b/configure.in
index b6e70cff01ddb02b14bbe631fab6163c1e42e488..783d1a633cbc495112423dd11168fa62d08ebfca 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -119,10 +119,6 @@ gasdir=gas
 use_gnu_ld=
 use_gnu_as=
 
-case "${target}" in
-  hppa*-hp-hpux*)        target_makefile_frag=config/mt-hppa ;;
-esac
-
 # some tools are so dependent upon X11 that if we're not building with X, 
 # it's not even worth trying to configure, much less build, that tool.
 
@@ -168,6 +164,9 @@ case "${host}" in
   i[34]86-*-netbsd*)
     noconfigdirs="tk fileutils"
     ;;
+  i[34]86-*-vsta)
+    noconfigdirs="tcl expect dejagnu make texinfo bison patch flex byacc send-pr gprof uudecode dejagnu diff"
+    ;;
   i[34]86-*-go32)
     noconfigdirs="tcl expect deja-gnu make texinfo bison patch flex byacc send-pr gprof uudecode dejagnu diff"
     ;;
@@ -175,7 +174,7 @@ esac
 
 case "${target}" in
   alpha-dec-osf1*)
-    noconfigdirs="$noconfigdirs emacs fileutils grep libg++ libio newlib"
+    noconfigdirs="$noconfigdirs emacs fileutils grep gas libg++ libio newlib"
     ;; 
   alpha*-*-*)
     noconfigdirs="$noconfigdirs gas libg++ libio newlib"
@@ -199,13 +198,6 @@ case "${target}" in
         *) ;;
     esac
     noconfigdirs="$noconfigdirs ld binutils shellutils"
-    if [ -f ${srcdir}/pagas/configure.in ]; then
-      configdirs=`echo ${configdirs} | sed -e 's/gas /pagas /'`
-    else
-      # It'll still DTRT if "gas" directory isn't here either.
-      noconfigdirs="$noconfigdirs gas"
-    fi
-    gasdir=pagas
     ;;
   i[34]86-*-go32)
     # add the go32 support tools to the list
@@ -248,6 +240,8 @@ case "${target}" in
     ;;
   sh-*-*)
     case "${host}" in
+      i[34]86-*-vsta) ;; # don't add gprof back in
+      *) configdirs=`echo gprof ${configdirs}` ;;
       i[34]86-*-go32) ;; # don't add gprof back in
       *) configdirs=`echo gprof ${configdirs}` ;;
     esac
@@ -285,7 +279,7 @@ done
 # FSF releases, it's important to let people know when their machine isn't
 # supported by the one or two programs in a package.
 
-if [ x"${notsupp}" != x ]; then
+if [ -n "${notsupp}" ] && [ -z "${norecursion}" ]; then
   echo "*** This configuration is not supported in the following subdirectories:" 1>&2
   echo "    ${notsupp}" 1>&2
   echo "    (Any other directories should still work fine.)" 1>&2
@@ -305,14 +299,14 @@ fi
 # --without-gnu-ld options for the configure script.
 
 if [ x${use_gnu_as} = x ] ; then
-  if [ x${with_gnu_as} != xno ] && echo ${configdirs} | grep "${gasdir} " > /dev/null 2>&1 && [ -d ${srcdir}/${gasdir} ] ; then
+  if [ x${with_gnu_as} != xno ] && echo " ${configdirs} " | grep " ${gasdir} " > /dev/null 2>&1 && [ -d ${srcdir}/${gasdir} ] ; then
     with_gnu_as=yes
     withoptions="$withoptions --with-gnu-as"
   fi
 fi
 
 if [ x${use_gnu_ld} = x ] ; then
-  if [ x${with_gnu_ld} != xno ] && echo ${configdirs} | grep ld > /dev/null 2>&1 && [ -d ${srcdir}/ld ] ; then
+  if [ x${with_gnu_ld} != xno ] && echo " ${configdirs} " | grep " ld " > /dev/null 2>&1 && [ -d ${srcdir}/ld ] ; then
     with_gnu_ld=yes
     withoptions="$withoptions --with-gnu-ld"
   fi