missed part of renaming update

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

diff --git a/configure.in b/configure.in
index 12ad22071624957878838e4578921a3ee9a8cd3b..5af792d0a3acdb62dca8765b8a689c4883f31808 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -32,7 +32,7 @@ host_tools="texinfo byacc flex bison binutils ld gas gcc gdb make patch
            send-pr gprof gdbtest tgas etc expect deja-gnu dejagnu sim
             m4 autoconf ispell grep diff rcs cvs fileutils shellutils
            textutils wdiff find emacs uudecode hello tar gzip indent
-           recode"
+           recode package2 package"
 
 
 # these libraries are built for the target environment, and are built after
@@ -84,7 +84,7 @@ srcname="gnu development package"
 case "${host}" in
   m68k-apollo-sysv*)      host_makefile_frag=config/mh-apollo68 ;;
   m68k-apollo-bsd*)       host_makefile_frag=config/mh-a68bsd ;;
-  m88k-motorola-m88kbcs)  host_makefile_frag=config/mh-delta88;;
+  m88k-motorola-sysv*)    host_makefile_frag=config/mh-delta88;;
   m88k-dg-dgux*)         host_makefile_frag=config/mh-dgux ;;
   mips-dec-ultrix*)       host_makefile_frag=config/mh-decstation ;;
   mips-sgi-irix4*)        host_makefile_frag=config/mh-irix4 ;;
@@ -107,23 +107,13 @@ esac
 
 # per-target:
 
-bfd_target=
-
-case "${target}" in
-  a29k-amd-ebmon) bfd_target="ebmon29k"  ;;
-  a29k-amd-udi)   bfd_target="udi29k" ;;
-  a29k-amd-*)     echo "bad target_os for amd" 1>&2
-                 exit 1
-                 ;;
-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.
 
 case ${with_x} in
-  yes)  ;;
-  no | "")
+  yes | "")  # the default value for this tree is that X11 is available
+       ;;
+  no)
        configdirs=`echo ${configdirs} | sed -e 's/tk//'`
        ;;
   *)
@@ -161,21 +151,19 @@ case "${host}" in
   i[34]86-*-go32)
     configdirs=`echo ${configdirs} | sed -e 's/tcl//;s/expect//;s/deja-gnu//'`
     configdirs=`echo ${configdirs} | sed -e 's/make//;s/texinfo//'`
-    configdirs=`echo ${configdirs} | sed -e 's/patch//;s/flex//;s/byacc//;s/send_pr//'`
+    configdirs=`echo ${configdirs} | sed -e 's/patch//;s/flex//;s/byacc//'`
+    configdirs=`echo ${configdirs} | sed -e 's/send-pr//;s/gprof//'`
+    configdirs=`echo ${configdirs} | sed -e 's/uudecode//'`
     ;;
 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//'`
     ;;
+  hppa*-*-osf)
+# Do configure ld/binutils/gas for this case.
+    ;;
   hppa*-*-*)
     configdirs=`echo ${configdirs} | sed -e 's/ld//;s/binutils//;s/gas//'`
     ;;
@@ -199,12 +187,19 @@ case "${target}" in
     ;;
 esac
 
-
-target_makefile_frag=config/mt-${bfd_target}
+# Set with_gnu_as and with_gnu_ld as appropriate.
+# This is commented out for now.
+#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
 
 #
 # Local Variables:
 # fill-column: 131
 # End:
 #
-