* configure.in: canonicalize all instances to *-*-solaris2*,

	also strip out a number of tools to not build for go32 host

diff --git a/ChangeLog b/ChangeLog
index 59a45bd600fd3a48b5377261517d627ad27e7fed..c5bd8bea5707e8b7b569015e5febec1cb9fe698d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Mar 12 18:30:14 1993  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+       * configure.in: canonicalize all instances to *-*-solaris2*,
+       also strip out a number of tools to not build for go32 host
+
 Wed Mar 10 12:08:27 1993  K. Richard Pixley  (rich@rtl.cygnus.com)
 
        * config.guess: add GPL.

diff --git a/configure.in b/configure.in
index 4b567fef8e9fb93a1656d6489d4a13df020780cb..237fc399dd3ccaea3c41a26c8563b505fd09b2c0 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -98,7 +98,7 @@ case "${host}" in
   vax-*-ultrix2*)         host_makefile_frag=config/mh-vaxult2 ;;
   *-ibm-aix*)             host_makefile_frag=config/mh-aix ;;
   *-bull-bosx*)           host_makefile_frag=config/mh-aix ;;
-  *-sun-solaris*)         host_makefile_frag=config/mh-solaris ;;
+  *-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 ;;
@@ -118,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
@@ -142,11 +157,13 @@ 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*)
@@ -162,7 +179,7 @@ case "${target}" in
   hppa*-*-*)
     configdirs=`echo ${configdirs} | sed -e 's/ld//;s/binutils//;s/gas//'`
     ;;
-  *-*-solaris2)
+  *-*-solaris2*)
     configdirs=`echo ${configdirs} | sed -e 's/ld//;s/gas//'`
     ;;
   *-*-vms)