* ldwrite.c (build_link_order): Handle lang_data_statement_enum by

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

diff --git a/configure.in b/configure.in
index 93701e8b0ef6ba9f8243f4eb0f015bc3f8948fef..b772da957679e76381a7cc6d9d3a863fd589217f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -40,9 +40,6 @@ host_tools="texinfo byacc flex bison binutils ld gas gcc gdb make patch
 #
 target_libs="libm xiberty newlib libio 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.
@@ -72,8 +69,10 @@ native_only="autoconf cvs emacs fileutils find grep groff gzip hello indent
 cross_only="xiberty newlib"
 
 ## All tools belong in one of the four categories, and are assigned above
+## We assign ${configdirs} this way to remove all embedded newlines.  This
+## is important because configure will choke if they ever get through.
 #
-configdirs="${host_libs} ${host_tools} ${target_libs} ${target_tools}"
+configdirs=`echo ${host_libs} ${host_tools} ${target_libs} ${target_tools}`
 
 ################################################################################
 
@@ -128,7 +127,7 @@ case ${with_x} in
   yes | "")  # the default value for this tree is that X11 is available
        ;;
   no)
-       configdirs=`echo ${configdirs} | sed -e 's/tk//;/gash//'`
+       configdirs=`echo " ${configdirs} " | sed -e 's/ tk / /;/ gash / /'`
        ;;
   *)
        echo "*** bad value \"${with_x}\" for -with-x flag; ignored" 1>&2
@@ -146,13 +145,13 @@ 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//"`
+         configdirs=`echo " ${configdirs} " | sed -e "s/ $i / /"`
        done
 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//"`
+         configdirs=`echo " ${configdirs} " | sed -e "s/ $i / /"`
        done
 fi     
 
@@ -176,19 +175,16 @@ esac
 
 case "${target}" in
   alpha-dec-osf1*)
-    noconfigdirs="$noconfigdirs emacs fileutils grep gas libg++ libio newlib"
+    noconfigdirs="$noconfigdirs emacs fileutils grep newlib"
     ;; 
   alpha*-*-*)
-    noconfigdirs="$noconfigdirs gas libg++ libio newlib"
+    noconfigdirs="$noconfigdirs newlib"
     ;;    
   h8300*-*-* | \
   h8500-*-*)
     noconfigdirs="$noconfigdirs libg++ libio"
-## start-sanitize-chill
-    noconfigdirs="$noconfigdirs chillrt"
-## end-sanitize-chill
     ;;
-  hppa*-*-osf)
+  hppa*-*-*elf*)
     # Do configure ld/binutils/gas for this case.
     ;;
   hppa*-*-*)
@@ -199,7 +195,7 @@ case "${target}" in
        "" | cc*) noconfigdirs="$noconfigdirs emacs" ;;
         *) ;;
     esac
-    noconfigdirs="$noconfigdirs ld binutils shellutils"
+    noconfigdirs="$noconfigdirs ld shellutils"
     ;;
   i[34]86-*-go32)
     # add the go32 support tools to the list
@@ -228,7 +224,7 @@ case "${target}" in
   rs6000-*-*)
     # a gcc built textutils will cause the linker to hang on 'join'
     # The CVS server code doesn't work on the RS/6000
-    noconfigdirs="$noconfigdirs ld binutils gas gprof textutils cvs"
+    noconfigdirs="$noconfigdirs ld binutils gprof textutils cvs"
     ;;
   m68k-apollo-*)
     noconfigdirs="$noconfigdirs ld binutils gprof"
@@ -269,7 +265,7 @@ 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} / /"`
+    configdirs=`echo " ${configdirs} " | sed -e "s/ ${dir} / /"`
     if [ -r $srcdir/$dir/configure ] || [ -r $srcdir/$dir/configure.in ]; then
       notsupp="$notsupp $dir"
     fi