* Makefile.in: add EXTRA_INCS

* configure.in: if with-newlib, point to it for includes
rather than using the installed includes, for target builds.
If cygwin, override function list only for target builds.
* configure: regenerate
Note from DJ: I waited a week for gcc approval and got none, but
we need this patch for cygwin builds *now*.  I'll fix it later if
need be.

1 files changed, 15 insertions, 4 deletions

diff --git a/libiberty/configure.in b/libiberty/configure.in
index cc1b2c2..cc30251 100644
--- a/libiberty/configure.in
+++ b/libiberty/configure.in
@@ -216,6 +216,11 @@ if test -n "${with_target_subdir}"; then
 
     setobjs=yes
 
+    if test -d ${libiberty_topdir}/newlib
+    then
+      EXTRA_INCS="-I${libiberty_topdir}/newlib/libc/include"
+    fi
+
   fi
 
 else
@@ -225,6 +230,7 @@ else
 
 fi
 
+AC_SUBST(EXTRA_INCS)
 AC_SUBST(CHECK)
 
 if test -z "${setobjs}"; then
@@ -277,10 +283,15 @@ if test -z "${setobjs}"; then
     # provides from our shell variables, so that they appear to be
     # missing.
 
-    funcs="`echo $funcs | sed -e 's/random//'`"
-    LIBOBJS="$LIBOBJS random.o"
-    vars="`echo $vars | sed -e 's/sys_siglist//'`"
-    checkfuncs="`echo $checkfuncs | sed -e 's/strsignal//' -e 's/psignal//'`"
+    # DJ - only if we're *building* cygwin, not just building *with* cygwin
+
+    if test -n "${with_target_subdir}"
+    then
+      funcs="`echo $funcs | sed -e 's/random//'`"
+      LIBOBJS="$LIBOBJS random.o"
+      vars="`echo $vars | sed -e 's/sys_siglist//'`"
+      checkfuncs="`echo $checkfuncs | sed -e 's/strsignal//' -e 's/psignal//'`"
+    fi
     ;;
 
   *-*-mingw32*)