X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=configure.in;h=93701e8b0ef6ba9f8243f4eb0f015bc3f8948fef;hb=fb5bec49502135656e6622a38784190963d146b6;hp=8cad8e8e4f88e941c87037f11f02c8c2d4cf2d8c;hpb=719cb03ff57a5974cb0169e462ce423a81caaa91;p=deliverable%2Fbinutils-gdb.git

diff --git a/configure.in b/configure.in
index 8cad8e8e4f..93701e8b0e 100644
--- a/configure.in
+++ b/configure.in
@@ -30,9 +30,9 @@ host_libs="mmalloc libiberty opcodes bfd readline glob gash tcl tk tclX"
 #
 host_tools="texinfo byacc flex bison binutils ld gas gcc gdb make patch
 	    prms send-pr gprof gdbtest tgas etc expect dejagnu sim
-            m4 autoconf ispell grep diff rcs cvs dosutils fileutils shellutils
+            m4 autoconf ispell grep diff rcs cvs fileutils shellutils
 	    textutils wdiff find emacs uudecode hello tar gzip indent
-	    recode release"
+	    recode release sed utils"
 
 
 # these libraries are built for the target environment, and are built after
@@ -83,20 +83,20 @@ srcname="gnu development package"
 # per-host:
 
 case "${host}" in
-  alpha-dec-osf*)         host_makefile_frag=config/mh-alphaosf ;;
-  m68k-hp-hpux)		  host_makefile_frag=config/mh-hp300 ;;
+  m68k-hp-hpux*)	  host_makefile_frag=config/mh-hp300 ;;
   m68k-apollo-sysv*)      host_makefile_frag=config/mh-apollo68 ;;
   m68k-apollo-bsd*)       host_makefile_frag=config/mh-a68bsd ;;
   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 ;;
-  mips-sgi-irix3*)        host_makefile_frag=config/mh-sysv ;;
-  mips-*-sysv*)		  host_makefile_frag=config/mh-riscos ;;
+  mips*-dec-ultrix*)      host_makefile_frag=config/mh-decstation ;;
+  mips*-sgi-irix5*)       host_makefile_frag=config/mh-irix5 ;;
+  mips*-sgi-irix4*)       host_makefile_frag=config/mh-irix4 ;;
+  mips*-sgi-irix3*)       host_makefile_frag=config/mh-sysv ;;
+  mips*-*-sysv*)	  host_makefile_frag=config/mh-riscos ;;
   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-*-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 ;;
@@ -105,8 +105,12 @@ case "${host}" in
   *-*-solaris2*)          host_makefile_frag=config/mh-solaris ;;
   m68k-sun-*)		  host_makefile_frag=config/mh-sun3 ;;
   *-sun-*)		  host_makefile_frag=config/mh-sun ;;
-  *-hp-hpux)              host_makefile_frag=config/mh-hpux ;;
-  *-*-lynxos*)	  	  host_makefile_frag=config/mh-lynxos ;;
+  *-hp-hpux*)             host_makefile_frag=config/mh-hpux ;;
+  *-*-hiux*)              host_makefile_frag=config/mh-hpux ;;
+  rs6000-*-lynxos*)	  host_makefile_frag=config/mh-lynxosrs6k
+				cross_only="xiberty" ;;
+  *-*-lynxos*)	  	  host_makefile_frag=config/mh-lynxos
+				cross_only="xiberty" ;;
   *-*-sysv4*)             host_makefile_frag=config/mh-sysv4 ;;
   *-*-sysv*)              host_makefile_frag=config/mh-sysv ;;
 esac
@@ -117,10 +121,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.
 
@@ -137,7 +137,7 @@ esac
 
 
 
-# some tools are only suitable for building in a "native" situation.
+# 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
 # cross-compiler.
@@ -156,80 +156,137 @@ else
 	done
 fi	
 
-
-# remove more programs from consideration, based on the host or 
+# Remove more programs from consideration, based on the host or 
 # target this usually means that a port of the program doesn't
 # exist yet.
 
+noconfigdirs=""
+
 case "${host}" in
-  alpha-dec-osf1)
-    configdirs=`echo ${configdirs} | sed -e 's/gdb//'`
+  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)
-    configdirs=`echo ${configdirs} | sed -e 's/tcl//;s/expect//;s/deja-gnu//'`
-    configdirs=`echo ${configdirs} | sed -e 's/make//;s/texinfo//;s/bison//'`
-    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//;s/dejagnu//'`
-    configdirs=`echo ${configdirs} | sed -e 's/diff//'`
+    noconfigdirs="tcl expect deja-gnu make texinfo bison patch flex byacc send-pr gprof uudecode dejagnu diff"
     ;;
 esac
 
 case "${target}" in
-  alpha-dec-osf1)
-    configdirs=`echo ${configdirs} | sed -e 's/ld//;s/binutils//;s/gas //'`
-    configdirs=`echo ${configdirs} | sed -e 's/gdb//;s/emacs//;s/fileutils//'`
-    configdirs=`echo ${configdirs} | sed -e 's/grep//;s/libg++//;s/libio//'`
+  alpha-dec-osf1*)
+    noconfigdirs="$noconfigdirs emacs fileutils grep gas libg++ libio newlib"
     ;;	
-  h8300*-*-*)
-    configdirs=`echo ${configdirs} | sed -e 's/libg++//;s/libio//'`
-## start-sanitize-chill
-    configdirs=`echo ${configdirs} | sed -e 's/chillrt//'`
-## end-sanitize-chill
-    ;;
+  alpha*-*-*)
+    noconfigdirs="$noconfigdirs gas libg++ libio newlib"
+    ;;    
+  h8300*-*-* | \
   h8500-*-*)
-    configdirs=`echo ${configdirs} | sed -e 's/libg++//;s/libio//'`
+    noconfigdirs="$noconfigdirs libg++ libio"
 ## start-sanitize-chill
-    configdirs=`echo ${configdirs} | sed -e 's/chillrt//'`
+    noconfigdirs="$noconfigdirs chillrt"
 ## end-sanitize-chill
     ;;
   hppa*-*-osf)
     # Do configure ld/binutils/gas for this case.
     ;;
   hppa*-*-*)
-    configdirs=`echo ${configdirs} | sed -e 's/ld//;s/binutils//;s/gas /pagas /;s/shellutils//'`
-    gasdir=pagas
+    # HP's C compiler doesn't handle Emacs correctly (but on BSD and Mach
+    # cc is gcc, and on any system a user should be able to link cc to
+    # whatever they want.  FIXME, emacs).
+    case "${CC}" in
+	"" | cc*) noconfigdirs="$noconfigdirs emacs" ;;
+        *) ;;
+    esac
+    noconfigdirs="$noconfigdirs ld binutils shellutils"
     ;;
   i[34]86-*-go32)
     # add the go32 support tools to the list
     configdirs=`echo go32 ${configdirs}`
     ;;
+  i[34]86-*-solaris2*)
+    # The linker does static linking correctly, but the Solaris C library
+    # has bugs such that some important functions won't work when statically
+    # linked.  (See man pages for getpwuid, for example.)
+    noconfigdirs="$noconfigdirs ld"
+    ;;
+  i[34]86-*-sysv4*)
+    # The SYSV4 C compiler doesn't handle Emacs correctly
+    case "${CC}" in
+	"" | cc*) noconfigdirs="$noconfigdirs emacs" ;;
+        *) ;;
+    esac
+    # but that's okay since emacs doesn't work anyway
+    noconfigdirs="$noconfigdirs emacs"
+
+    # static versions of several key libraries are not available, 
+    # so building our entire toolchain is impossible until 
+    # the GNU linker supports shared libraries
+    noconfigdirs="$noconfigdirs ld"
+    ;;
   rs6000-*-*)
-    configdirs=`echo ${configdirs} | sed -e 's/ld//;s/binutils//;s/gas //;s/gprof//'`
+    # a gcc built textutils will cause the linker to hang on 'join'
+    # The CVS server code doesn't work on the RS/6000
+    noconfigdirs="$noconfigdirs ld binutils gas gprof textutils cvs"
+    ;;
+  m68k-apollo-*)
+    noconfigdirs="$noconfigdirs ld binutils gprof"
     ;;
-  mips-*-*)
-    configdirs=`echo ${configdirs} | sed -e 's/gprof//'`
+  mips*-*-irix5*)
+    # The GNU linker does not support shared libraries.
+    noconfigdirs="$noconfigdirs ld gprof"
+    ;;
+  mips*-*-*)
+    noconfigdirs="$noconfigdirs gprof"
     ;;
   sh-*-*)
     case "${host}" in
-      i[34]86-*-go32) ;; # don't add gprof
+      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
     ;;
   sparc-*-sunos4*)
     use_gnu_ld=no
     ;;
+  sparc-*-solaris2*)
+    # See i386-*-solaris2* above.
+    noconfigdirs="$noconfigdirs ld"
+    ;;
   i[34]86-*-sco*)
-    configdirs=`echo ${configdirs} | sed -e 's/gprof//'`
+    noconfigdirs="$noconfigdirs gprof"
     ;;
   *-*-sysv4)
     use_gnu_ld=no
     ;;
   *-*-vms)
-    configdirs=`echo ${configdirs} | sed -e 's/bfd//;s/ld//;s/binutils//'`
+    noconfigdirs="$noconfigdirs bfd ld binutils gdb"
     ;;
 esac
 
+notsupp=""
+for dir in . $noconfigdirs ; do
+  if [ $dir != . ] && echo "# ${configdirs} #" | grep "${dir} " >/dev/null 2>&1 ; then
+    configdirs=`echo $configdirs | sed -e "s/${dir} / /"`
+    if [ -r $srcdir/$dir/configure ] || [ -r $srcdir/$dir/configure.in ]; then
+      notsupp="$notsupp $dir"
+    fi
+  fi
+done
+
+# Produce a warning message for the subdirs we can't configure.
+# This isn't especially interesting in the Cygnus tree, but in the individual
+# 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 [ -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
+fi
+
 # Set with_gnu_as and with_gnu_ld as appropriate.
 #
 # This is done by determining whether or not the appropriate directory
@@ -244,14 +301,14 @@ esac
 # --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