X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=configure.in;h=92ffae3e720ec19f96e4a24a28283278da05064f;hb=543d88e4fd1853fdcd6083e2a5028d5a5b44baa4;hp=e36e83af94082e1deb1284ba3f3129b107373268;hpb=4d1e5a4e87d2fcd48d53c01aa4fa9aab0c72a98f;p=deliverable%2Fbinutils-gdb.git

diff --git a/configure.in b/configure.in
index e36e83af94..92ffae3e72 100644
--- a/configure.in
+++ b/configure.in
@@ -1,9 +1,81 @@
-# This file is a shell script fragment that supplies the information
-# necessary to tailor a template configure script into the configure
-# script appropriate for this directory.  For more information, check
-# any existing configure script.
+##############################################################################
+
+## This file is a shell script fragment that supplies the information
+## necessary to tailor a template configure script into the configure
+## script appropriate for this directory.  For more information, check
+## any existing configure script.  
+
+## Be warned, there are two types of configure.in files.  There are those
+## used by Autoconf, which are macros which are expanded into a configure
+## script by autoconf.  The other sort, of which this is one, is executed
+## by Cygnus configure.  
+
+## For more information on these two systems, check out the documentation
+## for 'Autoconf' (autoconf.texi) and 'Configure' (configure.texi).  
+
+##############################################################################
+
+### To add a new directory to the tree, first choose whether it is a target
+### or a host dependent tool.  Then put it into the appropriate list
+### (library or tools, host or target), doing a dependency sort.  For
+### example, gdb requires that byacc (or bison) be built first, so it is in
+### the ${host_tools} list after byacc and bison.  
+
+
+# these libraries are used by various programs built for the host environment
+#
+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 dejagnu sim
+            m4 autoconf ispell grep diff rcs cvs fileutils shellutils
+	    textutils wdiff find emacs uudecode hello tar gzip indent
+	    recode package2 package"
+
+
+# these libraries are built for the target environment, and are built after
+# the host libraries and the host tools (which may be a cross compiler)
+#
+target_libs="libm xiberty newlib libg++"
+
+## 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.
+#
+# note: any program that *uses* libraries that are in the "target_libs"
+# list belongs in this list.  those programs are also very likely
+# candidates for the "native_only" list which follows
+#
+target_tools="groff"
+
+################################################################################
+
+## These two lists are of directories that are to be removed from the
+## ${configdirs} list for either cross-compilations or for native-
+## compilations.  For example, it doesn't make that much sense to
+## cross-compile Emacs, nor is it terribly useful to compile xiberty in
+## a native environment.  
+
+# directories to be built in the native environment only
+#
+native_only="autoconf cvs diff emacs fileutils find grep groff ispell m4
+             rcs sed shellutils textutils wdiff"
+
+# directories to be built in a cross environment only
+#
+cross_only="xiberty newlib"
+
+## All tools belong in one of the four categories, and are assigned above
+#
+configdirs="${host_libs} ${host_tools} ${target_libs} ${target_tools}"
+
+################################################################################
 
-configdirs="autoconf mmalloc libiberty texinfo flex byacc bison opcodes bfd binutils gcc readline glob ld gas gdb emacs ispell make grep diff rcs cvs patch send_pr libg++ newlib gprof gdbtest libm tgas etc tcl expect tk deja-gnu z8ksim"
 srctrigger=move-if-change
 srcname="gnu development package"
 
@@ -15,17 +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:
@@ -41,41 +118,85 @@ case "${target}" in
 esac
 
 
-# remove various programs from consideration.  some of these are not
-# reasonable to build for a native compilation (eg newlib).  some of these
-# aren't built for each cross compiler toolchain (eg emacs).
+# 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
+# cross-compiler.
 
 if [ x"${host}" = x"${target}" ] ; then
-	# remove from native toolchains
-	configdirs=`echo ${configdirs} | sed -e 's/newlib//'`
+	# when doing a native toolchain, don't build the targets
+	# that are in the 'cross only' list
+	for i in ${cross_only} ; do
+	  configdirs=`echo ${configdirs} | sed -e "s/$i//"`
+	done
 else
-	# remove from cross compilers in general
-	configdirs=`echo ${configdirs} | sed -e 's/emacs//;s/ispell//;s/rcs//;s/cvs//'`
+	# similarly, don't build the targets in the 'native only' 
+	# list when building a cross compiler
+	for i in ${native_only} ; do
+	  configdirs=`echo ${configdirs} | sed -e "s/$i//"`
+	done
 fi	
 
+
 # remove more programs from consideration, based on the host or 
 # 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//'`
     ;;
   hppa*-*-*)
-    configdirs=`echo ${configdirs} | sed -e 's/ld//;s/binutils//;s/gas//;s/bfd//;s/gdb//'`
-    ;;
-  *-*-solaris2)
     configdirs=`echo ${configdirs} | sed -e 's/ld//;s/binutils//;s/gas//'`
     ;;
+  *-*-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