* configure.in: Produce warning message for subdirectories not

	configurable for this host/target combination.  Don't try to
	configure gdb for vms.
(Needed for FSF releases.  Should be harmless for ours.)

1 files changed, 45 insertions, 28 deletions

diff --git a/configure.in b/configure.in
index 4ed6fac..909e600 100644
--- a/configure.in
+++ b/configure.in
@@ -165,36 +165,26 @@ fi
 # where we want the configure scripts in the subdirectories to
 # complain if the target or host isn't supported.
 
+noconfigdirs=""
+
 case "${host}" in
   alpha-dec-osf1*)
-    configdirs=`echo ${configdirs} | sed -e 's/gdb//'`
+    noconfigdirs="gdb"
     ;;
   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/gas //'`
-    configdirs=`echo ${configdirs} | sed -e 's/gdb//;s/emacs//;s/fileutils//'`
-    configdirs=`echo ${configdirs} | sed -e 's/grep//;s/libg++//;s/libio//'`
+    noconfigdirs="$noconfigdirs gas gdb emacs fileutils grep libg++ libio"
     ;;	
-  h8300*-*-*)
-    configdirs=`echo ${configdirs} | sed -e 's/libg++//;s/libio//'`
-## start-sanitize-chill
-    configdirs=`echo ${configdirs} | sed -e 's/chillrt//'`
-## end-sanitize-chill
-    ;;
+  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)
@@ -205,10 +195,16 @@ case "${target}" in
     # 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*) configdirs=`echo ${configdirs} | sed -e 's/emacs//'` ;;
+	"" | cc*) noconfigdirs="$noconfigdirs emacs" ;;
         *) ;;
     esac
-    configdirs=`echo ${configdirs} | sed -e 's/ld//;s/binutils//;s/gas /pagas /;s/shellutils//'`
+    noconfigdirs="$noconfigdirs ld binutils shellutils"
+    if [ -r pagas/configure.in ]; then
+      configdirs=`echo ${configdirs} | sed -e 's/gas /pagas /'`
+    else
+      # It'll still DTRT if "gas" directory isn't here either.
+      noconfigdirs="$noconfigdirs gas"
+    fi
     gasdir=pagas
     ;;
   i[34]86-*-go32)
@@ -218,22 +214,22 @@ case "${target}" in
   i[34]86-*-sysv4*)
     # The SYSV4 C compiler doesn't handle Emacs correctly
     case "${CC}" in
-	"" | cc*) configdirs=`echo ${configdirs} | sed -e 's/emacs//'` ;;
+	"" | cc*) noconfigdirs="$noconfigdirs emacs" ;;
         *) ;;
     esac
     # but that's okay since emacs doesn't work anyway
-    configdirs=`echo ${configdirs} | sed -e 's/emacs//'`
+    noconfigdirs="$noconfigdirs emacs"
     ;;
   rs6000-*-*)
     # a gcc built textutils will cause the linker to hang on 'join'
-    configdirs=`echo ${configdirs} | sed -e 's/ld//;s/binutils//;s/gas //;s/gprof//;s/textutils//'`
+    noconfigdirs="$noconfigdirs ld binutils gas gprof textutils"
     ;;
   mips-*-*)
-    configdirs=`echo ${configdirs} | sed -e 's/gprof//'`
+    noconfigdirs="$noconfigdirs gprof"
     ;;
   sh-*-*)
     case "${host}" in
-      i[34]86-*-go32) ;; # don't add gprof
+      i[34]86-*-go32) ;; # don't add gprof back in
       *) configdirs=`echo gprof ${configdirs}` ;;
     esac
     ;;
@@ -241,19 +237,40 @@ case "${target}" in
     use_gnu_ld=no
     ;;
   sparc-*-solaris2*)
-    configdirs=`echo ${configdirs} | sed -e 's/ld//'`
+    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 [ x"${notsupp}" != x ]; 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
+
 ## end-sanitize-for-fsf
 
 # Set with_gnu_as and with_gnu_ld as appropriate.