First round ld support for PPC PE

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

diff --git a/configure.in b/configure.in
index 9301f89da3ef098d21c52ac7cd908a545607bb7c..94f88867df3f79ad502d29c019b4164ccc15e7fb 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -52,7 +52,7 @@ target_libs="target-libiberty target-libgloss target-newlib target-libio target-
 # list belongs in this list.  those programs are also very likely
 # candidates for the "native_only" list which follows
 #
-target_tools="examples groff"
+target_tools="target-examples target-groff"
 
 ################################################################################
 
@@ -64,9 +64,9 @@ target_tools="examples groff"
 
 # directories to be built in the native environment only
 #
-native_only="autoconf cvs emacs emacs19 fileutils find grep groff gzip hello
+native_only="autoconf cvs emacs emacs19 fileutils find grep gzip hello
             indent ispell m4 rcs recode sed shellutils tar textutils gash
-            uudecode wdiff gprof"
+            uudecode wdiff gprof target-groff"
 
 # directories to be built in a cross environment only
 #
@@ -117,7 +117,7 @@ case "${host}" in
   i[345]86-*-win32)      host_makefile_frag=config/mh-i386win32 ;;
   vax-*-ultrix2*)         host_makefile_frag=config/mh-vaxult2 ;;
   *-*-solaris2*)          host_makefile_frag=config/mh-solaris ;;
-  m68k-sun-*)            host_makefile_frag=config/mh-sun3 ;;
+  m68k-sun-sunos*)       host_makefile_frag=config/mh-sun3 ;;
   *-hp-hpux[78]*)         host_makefile_frag=config/mh-hpux8 ;;
   *-hp-hpux*)             host_makefile_frag=config/mh-hpux ;;
   *-*-hiux*)              host_makefile_frag=config/mh-hpux ;;
@@ -251,7 +251,7 @@ fi
 copy_dirs=
 
 # Handle --with-headers=XXX.  The contents of the named directory are
-# copied to $(tooldir)/include.
+# copied to $(tooldir)/sys-include.
 if [ x"${with_headers}" != x ]; then
   if [ x${is_cross_compiler} = xno ]; then
     echo 1>&2 '***' --with-headers is only supported when cross compiling
@@ -261,7 +261,7 @@ if [ x"${with_headers}" != x ]; then
   "") x=${prefix} ;;
   *) x=${exec_prefix} ;;
   esac
-  copy_dirs="${copy_dirs} ${with_headers} $x/${target_alias}/include"
+  copy_dirs="${copy_dirs} ${with_headers} $x/${target_alias}/sys-include"
 fi
 
 # Handle --with-libs=XXX.  Multiple directories are permitted.  The
@@ -513,9 +513,11 @@ esac
 
 notsupp=""
 for dir in . $skipdirs $noconfigdirs ; do
+  dirname=`echo $dir | sed -e s/target-//g`
   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
+    if [ -r $srcdir/$dirname/configure ] \
+       || [ -r $srcdir/$dirname/configure.in ]; then
       if echo " ${skipdirs} " | grep " ${dir} " >/dev/null 2>&1; then
        true
       else
@@ -525,7 +527,8 @@ for dir in . $skipdirs $noconfigdirs ; do
   fi
   if [ $dir != . ]  && echo " ${target_configdirs} " | grep " ${dir} " >/dev/null 2>&1; then
     target_configdirs=`echo " ${target_configdirs} " | sed -e "s/ ${dir} / /"`
-    if [ -r $srcdir/$dir/configure ] || [ -r $srcdir/$dir/configure.in ]; then
+    if [ -r $srcdir/$dirname/configure ] \
+       || [ -r $srcdir/$dirname/configure.in ]; then
       if echo " ${skipdirs} " | grep " ${dir} " >/dev/null 2>&1; then
        true
       else
@@ -535,16 +538,33 @@ for dir in . $skipdirs $noconfigdirs ; do
   fi
 done
 
+# Sometimes the tools are distributed with libiberty but with no other
+# libraries.  In that case, we don't want to build target-libiberty.
+if [ -n "${target_configdirs}" ]; then
+  others=
+  for i in `echo ${target_configdirs} | sed -e s/target-//g` ; do
+    if [ "$i" != "libiberty" ]; then
+      if [ -r $srcdir/$i/configure ] || [ -r $srcdir/$i/configure.in ]; then
+       others=yes;
+       break;
+      fi
+    fi
+  done
+  if [ -z "${others}" ]; then
+    target_configdirs=
+  fi
+fi
+
 # Deconfigure all subdirectories, in case we are changing the
 # configuration from one where a subdirectory is supported to one where it
 # is not.
 if [ -z "${norecursion}" -a -n "${configdirs}" ]; then
-  for i in ${configdirs} ; do
+  for i in `echo ${configdirs} | sed -e s/target-//g` ; do
     rm -f $i/Makefile
   done
 fi
 if [ -z "${norecursion}" -a -n "${target_configdirs}" ]; then
-  for i in ${target_configdirs} ; do
+  for i in `echo ${target_configdirs} | sed -e s/target-//` ; do
     rm -f ${target_subdir}/$i/Makefile
   done
 fi