various changes for lynx.rs, ericsson, BNR.

1 files changed, 19 insertions, 30 deletions

diff --git a/configure.in b/configure.in
index c682d46..e91c29f 100644
--- a/configure.in
+++ b/configure.in
@@ -79,9 +79,6 @@ configdirs=`echo ${host_libs} ${host_tools} ${target_libs} ${target_tools}`
 srctrigger=move-if-change
 srcname="gnu development package"
 
-# This gets set non-empty for some net releases of packages.
-appdirs=""
-
 # per-host:
 
 # Work in distributions that contain no compiler tools, like Autoconf.
@@ -113,7 +110,7 @@ case "${host}" in
   *-sun-*)		  host_makefile_frag=config/mh-sun ;;
   *-hp-hpux*)             host_makefile_frag=config/mh-hpux ;;
   *-*-hiux*)              host_makefile_frag=config/mh-hpux ;;
-  rs6000-*-lynxos*)	  host_makefile_frag=config/mh-lynxrs6k ;;
+  rs6000-*-lynxos*)	  host_makefile_frag=config/mh-lynxosrs6k ;;
   *-*-lynxos*)	  	  host_makefile_frag=config/mh-lynxos ;;
   *-*-sysv4*)             host_makefile_frag=config/mh-sysv4 ;;
   *-*-sysv*)              host_makefile_frag=config/mh-sysv ;;
@@ -147,18 +144,22 @@ esac
 # toolchains, we add some directories that should only be useful in a
 # cross-compiler.
 
+is_cross_compiler=
+
 if [ x"${host}" = x"${target}" ] ; then
 	# 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
+	is_cross_compiler=no
 else
 	# 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
+	is_cross_compiler=yes
 fi	
 
 # Configure extra directories which are host specific
@@ -245,6 +246,14 @@ case "${target}" in
     # copied from rs6000-*-* entry
     noconfigdirs="$noconfigdirs ld binutils gprof textutils cvs"
     ;;
+  rs6000-*-lynxos*)
+    # a gcc built textutils will cause the linker to hang on 'join'
+    # The CVS server code doesn't work on the RS/6000
+    # Newlib makes problems for libg++ in crosses.
+    noconfigdirs="$noconfigdirs gas ld newlib binutils gprof textutils cvs diff make tcl expect texinfo"
+    use_gnu_ld=no
+    use_gnu_as=no
+    ;;
   rs6000-*-*)
     # a gcc built textutils will cause the linker to hang on 'join'
     # The CVS server code doesn't work on the RS/6000
@@ -257,12 +266,6 @@ case "${target}" in
     # The GNU linker does not support shared libraries.
     noconfigdirs="$noconfigdirs ld gprof"
     ;;
-  mips*-dec-bsd*)
-    noconfigdirs="$noconfigdirs gprof"
-    ;;
-  mips*-*-bsd*)
-    noconfigdirs="$noconfigdirs gprof ld"
-    ;;
   mips*-*-*)
     noconfigdirs="$noconfigdirs gprof"
     ;;
@@ -278,8 +281,12 @@ case "${target}" in
     esac
     ;;
   sparc-*-sunos4*)
-    use_gnu_ld=no
-    ;;
+    if [ x${is_cross_compiler} != xno ] ; then
+           noconfigdirs="$noconfigdirs gdb gdbtest newlib sim dejagnu expect tcl"
+    else
+           use_gnu_ld=no
+    fi
+  ;;
   sparc-*-solaris2*)
     # See i386-*-solaris2* above.
     noconfigdirs="$noconfigdirs ld"
@@ -315,24 +322,6 @@ done
 # supported by the one or two programs in a package.
 
 if [ -n "${notsupp}" ] && [ -z "${norecursion}" ]; then
-  # If $appdirs is non-empty, at least one of those directories must still
-  # be configured, or we error out.  (E.g., if the gas release supports a
-  # specified target in some subdirs but not the gas subdir, we shouldn't
-  # pretend that all is well.)
-  if [ -n "$appdirs" ]; then
-    for dir in $appdirs ; do
-      if [ -r $dir/Makefile.in ] && echo "# ${configdirs} #" | grep "${dir} " >/dev/null 2>&1 ; then
-	appdirs=""
-	break
-      fi
-    done
-    if [ -n "$appdirs" ]; then
-      echo "*** This configuration is not supported by this package." 1>&2
-      exit 1
-    fi
-  fi
-  # Okay, some application will build, or we don't care to check.  Still
-  # notify of subdirs not getting built.
   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