Forward fit sky-branch updates to devo.

[deliverable/binutils-gdb.git] / configure.in

diff --git a/configure.in b/configure.in
index 636e0ef0291b9aa1f3c5aa6e3233a8eb9ce6a1f8..b4db9fb0c9747b27834b17166bbd1440028ebbca 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -60,6 +60,9 @@ host_tools="texinfo byacc flex bison binutils ld gas gcc sim gdb make patch prms
 # start-sanitize-ide
 host_tools="${host_tools} ilu vmake jstools"
 # end-sanitize-ide
+# start-sanitize-cygnus
+host_tools="${host_tools} cgen"
+# end-sanitize-cygnus
 
 # 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)
@@ -398,12 +401,12 @@ if [ x"${host}" = x"${target}" ] ; then
        # that are in the 'cross only' list
        skipdirs="${skipdirs} ${cross_only}"
        is_cross_compiler=no
-       target_subdir=.
-       case "${host}" in
-          # We need multilib support for irix6, to get libiberty built
-         #  properly for o32 and n32.
-          mips-sgi-irix6*) target_subdir=${host} ;;
-       esac
+       # Default to --enable-multilib.  See similar code below.
+       if [ x${enable_multilib} = xno ]; then
+         target_subdir=.
+       else
+         target_subdir=${target_alias}
+       fi
 else
        # similarly, don't build the targets in the 'native only' 
        # list when building a cross compiler
@@ -573,6 +576,11 @@ case "${host}" in
      noconfigdirs="$noconfigdirs flexlm"
 # end-sanitize-cygnus
     ;;
+# start-sanitize-beos
+  i[3456]86-*-beos)
+     noconfigdirs="$noconfigdirs tk itcl tix libgui gdb"
+     ;;
+# end-sanitize-beos
 esac
 
 
@@ -712,10 +720,16 @@ case "${target}" in
     noconfigdirs="$noconfigdirs emacs emacs19 target-libgloss"
     ;;
   mn10200-*-*)
-    noconfigdirs="$noconfigdirs target-libgloss"
+    noconfigdirs="$noconfigdirs"
+    if [ x${is_cross_compiler} != xno ] ; then
+          target_configdirs="${target_configdirs} target-libstub target-cygmon"
+    fi
     ;;
   mn10300-*-*)
     noconfigdirs="$noconfigdirs"
+    if [ x${is_cross_compiler} != xno ] ; then
+          target_configdirs="${target_configdirs} target-libstub target-cygmon"
+    fi
     ;;
   powerpc-*-aix*)
     # copied from rs6000-*-* entry
@@ -777,6 +791,10 @@ case "${target}" in
   mips*-*-bsd*)
     noconfigdirs="$noconfigdirs gprof target-libgloss"
     ;;
+   mipstx39-*-*)
+   noconfigdirs="$noconfigdirs gprof"   # same as generic mips
+    target_configdirs="${target_configdirs} target-libstub target-cygmon"
+   ;;
   mips*-*-*)
     noconfigdirs="$noconfigdirs gprof"
     ;;
@@ -851,6 +869,11 @@ case "${target}" in
     # Macs want a resource compiler.
     configdirs="$configdirs grez"
     ;;    
+# start-sanitize-beos
+  i[3456]86-*-beos)
+     noconfigdirs="$noconfigdirs target-gperf"
+     ;;
+# end-sanitize-beos
 esac
 
 # If we aren't building newlib, then don't build libgloss, since libgloss
@@ -860,6 +883,13 @@ case "${noconfigdirs}" in
   *target-newlib*) noconfigdirs="$noconfigdirs target-libgloss" ;;
 esac
 
+# start-sanitize-cygnus
+# Only configure cgen if --enable-cgen-maint.
+if [ x$"enable_cgen_maint" != xyes ] ; then
+  noconfigdirs="$noconfigdirs cgen"
+fi
+
+# end-sanitize-cygnus
 # Make sure we don't let GNU ld be added if we didn't want it.
 if [ x$with_gnu_ld = xno ]; then
   use_gnu_ld=no
@@ -1099,21 +1129,10 @@ if [ "${shared}" = "yes" ]; then
   esac
 fi
 
-# If we are building for a win32 host, then set INSTALL_PROGRAM_ARGS to
-# -x.  This will cause programs to be installed with .exe extensions.
-case "${host}" in
-*-*-cygwin32* | i[3456]86-*-mingw32)
-    sed -e 's/^INSTALL_PROGRAM_ARGS[   ]*=.*$/INSTALL_PROGRAM_ARGS = -x/' \
-       Makefile > Makefile.tem
-    rm -f Makefile
-    mv -f Makefile.tem Makefile
-    ;;
-esac
-
 # Record target_configdirs and the configure arguments in Makefile.
 target_configdirs=`echo "${target_configdirs}" | sed -e 's/target-//g'`
 targargs=`echo "${arguments}" | \
-       sed -e 's/--norecursion//' \
+       sed -e 's/--no[^        ]*//' \
            -e 's/--cache[a-z-]*=[^     ]*//' \
            -e 's/--ho[a-z-]*=[^        ]*//' \
            -e 's/--bu[a-z-]*=[^        ]*//' \