fix setting of target_alias when using config.guess (fixes PR config/2422)

[binutils.git] / configure.in

diff --git a/configure.in b/configure.in
index 0d9397ab979426be5c37f9a4d8b8da8c6ae7ed0e..92ffae3e720ec19f96e4a24a28283278da05064f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -24,14 +24,15 @@
 
 # these libraries are used by various programs built for the host environment
 #
-host_libs="mmalloc libiberty opcodes bfd readline glob tcl tk"
+host_libs="mmalloc libiberty opcodes bfd readline glob tcl tk tclX"
 
 # these tools are built for the host environment
 #
 host_tools="texinfo byacc flex bison binutils ld gas gcc gdb make patch
-           send_pr gprof gdbtest tgas etc expect deja-gnu z8ksim
+           send-pr gprof gdbtest tgas etc expect deja-gnu dejagnu sim
             m4 autoconf ispell grep diff rcs cvs fileutils shellutils
-           textutils wdiff find emacs"
+           textutils wdiff find emacs uudecode hello tar gzip indent
+           recode package2 package"
 
 
 # these libraries are built for the target environment, and are built after
@@ -39,9 +40,9 @@ host_tools="texinfo byacc flex bison binutils ld gas gcc gdb make patch
 #
 target_libs="libm xiberty newlib libg++"
 
-### start-sanitize-chill
-target-libs="${target_libs} chillrt"
-### end-sanitize-chill
+## start-sanitize-chill
+target_libs="${target_libs} chill chillrt"
+## end-sanitize-chill
 
 # these tools are built using the target libs, and are intended to run only
 # in the target environment.  we currently have none.
@@ -86,19 +87,22 @@ case "${host}" in
   m88k-motorola-m88kbcs)  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 ;;
-  mips-sgi-irix3)         host_makefile_frag=config/mh-sysv ;;
+  mips-sgi-irix4*)        host_makefile_frag=config/mh-irix4 ;;
+  mips-sgi-irix3*)        host_makefile_frag=config/mh-sysv ;;
   i[34]86-ncr-sysv4*)     host_makefile_frag=config/mh-ncr3000 ;;
   i[34]86-*-sco*)         host_makefile_frag=config/mh-sco ;;
   i[34]86-*-isc*)        host_makefile_frag=config/mh-sysv ;;
   i[34]86-*-linux)        host_makefile_frag=config/mh-linux ;;
   i[34]86-*-solaris2*)    host_makefile_frag=config/mh-sysv4 ;;
+  i[34]86-*-aix*)        host_makefile_frag=config/mh-aix386 ;;
+  vax-*-ultrix2*)         host_makefile_frag=config/mh-vaxult2 ;;
   *-ibm-aix*)             host_makefile_frag=config/mh-aix ;;
-  *-sun-solaris*)         host_makefile_frag=config/mh-solaris ;;
+  *-bull-bosx*)           host_makefile_frag=config/mh-aix ;;
+  *-sun-solaris2*)        host_makefile_frag=config/mh-solaris ;;
   *-sun-*)               host_makefile_frag=config/mh-sun ;;
   *-hp-hpux)              host_makefile_frag=config/mh-hpux ;;
-  *-*-sysv4*)              host_makefile_frag=config/mh-sysv4 ;;
-  *-*-sysv*)               host_makefile_frag=config/mh-sysv ;;
+  *-*-sysv4*)             host_makefile_frag=config/mh-sysv4 ;;
+  *-*-sysv*)              host_makefile_frag=config/mh-sysv ;;
 esac
 
 # per-target:
@@ -114,6 +118,21 @@ case "${target}" in
 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 | "")
+       configdirs=`echo ${configdirs} | sed -e 's/tk//'`
+       ;;
+  *)
+       echo "*** bad value \"${with_x}\" for -with-x flag; ignored" 1>&2
+       ;;
+esac
+
+
+
 # some tools are only suitable for building in a "native" situation.
 # Those are added when we have a host==target configuration.  For cross
 # toolchains, we add some directories that should only be useful in a
@@ -138,25 +157,46 @@ fi
 # target this usually means that a port of the program doesn't
 # exist yet.
 
-#case "${host}" in
-#  hppa*-*-*)
-#    configdirs=`echo ${configdirs} | sed -e 's/emacs//'`
-#    ;;
-#esac
+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//'`
+    ;;
+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/ld//;s/binutils//;s/gas//'`
+    configdirs=`echo ${configdirs} | sed -e 's/gas//'`
     ;;
   rs6000-*-*)
-    configdirs=`echo ${configdirs} | sed -e 's/ld//;s/binutils//;s/gas//;s/tk//'`
+    configdirs=`echo ${configdirs} | sed -e 's/ld//;s/binutils//;s/gas//'`
     ;;
   hppa*-*-*)
     configdirs=`echo ${configdirs} | sed -e 's/ld//;s/binutils//;s/gas//'`
     ;;
-  *-*-solaris2)
+  *-*-solaris2*)
     configdirs=`echo ${configdirs} | sed -e 's/ld//;s/gas//'`
     ;;
+  *-*-vms)
+    configdirs=`echo ${configdirs} | sed -e 's/bfd//;s/ld//;s/binutils//'`
+    ;;
+  h8300-*-*)
+    configdirs=`echo ${configdirs} | sed -e 's/libg++//'`
+## start-sanitize-chill
+    configdirs=`echo ${configdirs} | sed -e 's/chillrt//'`
+## end-sanitize-chill
+    ;;
+  h8500-*-*)
+    configdirs=`echo ${configdirs} | sed -e 's/libg++//'`
+## start-sanitize-chill
+    configdirs=`echo ${configdirs} | sed -e 's/chillrt//'`
+## end-sanitize-chill
+    ;;
 esac