* configure.in: For *-*-cygwin32*, add a -I for winsup to both

	XCINCLUDES and XCXXINCLUDES.
	* config.shared: Use ${host_includes} when setting CXXINCLUDES in
	the DOING_LIBGXX case.
	* Makefile.in (_G_config.h): Pass $(CINCLUDES) in CC and
	$(CXXINCLUDES) in CXX when running gen-params.
	* config.shared (THIS_FILE): Really found via TOLIBIO instead
	of TOLIBCXX, which is empty when configuring gperf.
	(LIBS): When linking gperf, find libstdc++ relative to TO_TOPDIR
	instead of hardcoded "../".


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@18168 138bc75d-0d04-0410-961f-82ee72b054a4

4 files changed, 44 insertions, 9 deletions

diff --git a/libio/ChangeLog b/libio/ChangeLog
index 98dac951e52..85026d0ca0e 100644
--- a/libio/ChangeLog
+++ b/libio/ChangeLog
@@ -1,3 +1,9 @@
+Sun Feb 22 17:24:53 1998  Jeffrey A Law  (law@cygnus.com)
+
+	* config.shared: Bring back changes from Ian and Fred that were
+	accidentally clobbered.  Should eliminate the need for Dave's
+	recent change.
+
 Tue Feb 17 21:56:25 1998  H.J. Lu  (hjl@gnu.org)
 
 	* config/linux.mt (IO_OBJECTS): Add iogetline.o.
@@ -34,6 +40,11 @@ Fri Feb  6 01:35:56 1998  Manfred Hollstein  <manfred@s-direktnet.de>
 	(.cc.o): Dito.
 	(stamp-picdir): Dito.
 
+Thu Feb  5 17:41:26 1998  Dave Brolley  <brolley@cygnus.com>
+
+	* config.shared (LIBS): Change to -L../../libstdc++ (was -L../libstdc++)
+	if ${DOING_GPERF} is true.
+
 1998-01-20  Andreas Schwab  (schwab@issan.informatik.uni-dortmund.de)
 
 	* iostream.cc (istream::operator>>(long double&))
@@ -107,7 +118,16 @@ Fri Jan 16 00:48:03 1998  Manfred Hollstein  <manfred@lts.sel.alcatel.de>
 
 	* config.shared (FLAGS_TO_PASS): Add SHELL.
 
-Tue Jan 13 21:30:33 1998  H.J. Lu  (hjl@gnu.org)
+Thu Jan 15 00:21:58 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure.in: For *-*-cygwin32*, add a -I for winsup to both
+	XCINCLUDES and XCXXINCLUDES.
+	* config.shared: Use ${host_includes} when setting CXXINCLUDES in
+	the DOING_LIBGXX case.
+	* Makefile.in (_G_config.h): Pass $(CINCLUDES) in CC and
+	$(CXXINCLUDES) in CXX when running gen-params.
+
+Tue Jan 13 21:32:08 1998  H.J. Lu  (hjl@gnu.org)
 
 	* configure.in (CHECK_SUBDIRS): Set to testsuite only if
 	${srcdir}/../gcc exists.
@@ -118,6 +138,13 @@ Tue Jan 13 21:30:33 1998  H.J. Lu  (hjl@gnu.org)
 	* tests/configure.in (CHECK): Set to "check-iostream
 	check-stdio" if ${srcdir}/../../gcc doesn't exists.
 
+Thu Jan  8 18:09:03 1998  Fred Fish  <fnf@cygnus.com>
+
+	* config.shared (THIS_FILE): Really found via TOLIBIO instead
+	of TOLIBCXX, which is empty when configuring gperf.
+	(LIBS): When linking gperf, find libstdc++ relative to TO_TOPDIR
+	instead of hardcoded "../".
+
 1997-12-12  Brendan Kehoe  <brendan@lisa.cygnus.com>
 
 	Don't make gperf depend upon libg++.
diff --git a/libio/Makefile.in b/libio/Makefile.in
index 8117c7fd477..ed597cc1520 100644
--- a/libio/Makefile.in
+++ b/libio/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 1993, 1995 Free Software Foundation
+# Copyright (C) 1993, 1995, 1996, 1997, 1998 Free Software Foundation
 # 
 # This file is part of the GNU IO Library.  This library is free
 # software; you can redistribute it and/or modify it under the
@@ -97,8 +97,8 @@ stmp-stdio:
 
 _G_config.h: ${srcdir}/gen-params
 	rootme=`pwd`/ ; export rootme; \
-	CC="$(CC)"; export CC; \
-	CXX="$(CXX) $(NOSTDINC) $(CXXFLAGS)"; export CXX; \
+	CC="$(CC) $(CINCLUDES)"; export CC; \
+	CXX="$(CXX) $(CXXINCLUDES) $(NOSTDINC) $(CXXFLAGS)"; export CXX; \
 	CONFIG_NM="$(NM)"; export CONFIG_NM; \
 	$(SHELL) ${srcdir}/gen-params LIB_VERSION=$(VERSION) $(G_CONFIG_ARGS) >tmp-params.h
 	mv tmp-params.h _G_config.h
diff --git a/libio/config.shared b/libio/config.shared
index 9dcfb551d9d..cbaf2900dfb 100644
--- a/libio/config.shared
+++ b/libio/config.shared
@@ -33,7 +33,7 @@ else
   TO_REAL_TOPDIR="${TO_TOPDIR}"
 fi
 DOING_LIBGXX=${DOING_LIBGXX-false}
-THIS_FILE="${srcdir}/${TOLIBGXX}config.shared"
+THIS_FILE="${srcdir}/${TOLIBIO}config.shared"
 
 echo "# Start of package fragment generated by ${THIS_FILE}."
 echo ""
@@ -164,7 +164,7 @@ if test "${DOING_LIBGXX}" = "true" ; then
   echo '# IO_DIR = no-stream'
 elif test "${DOING_GPERF}" = "true" ; then
   echo "IO_DIR = libio"
-  echo "LIBS = -L../libstdc++ -lstdc++"
+  echo "LIBS = -L${TO_TOPDIR}libstdc++ -lstdc++"
 fi
 
 if [ -z "${ALL}" ] ; then
@@ -241,7 +241,7 @@ echo >&2 'NOSTDINC = -nostdinc++'
 if test -n "${XCXXINCLUDES}" ; then
   echo >&2 "CXXINCLUDES = ${XCXXINCLUDES} "'$(NOSTDINC)'
 elif test "${DOING_LIBGXX}" = "true" ; then
-  echo >&2 'CXXINCLUDES = $(NOSTDINC) -I. -I'"${TO_TOPDIR}libio"' -I$(srcdir) -I$(srcdir)/'"${TOLIBGXX}"'$(IO_DIR) -I$(srcdir)/'"${TOLIBGXX}"'../libstdc++ -I$(srcdir)/'"${TOLIBGXX}src"' $(WRAP_C_INCLUDES)'
+  echo >&2 'CXXINCLUDES = $(NOSTDINC) -I. -I'"${TO_TOPDIR}libio"' -I$(srcdir) -I$(srcdir)/'"${TOLIBGXX}"'$(IO_DIR) -I$(srcdir)/'"${TOLIBGXX}"'../libstdc++ -I$(srcdir)/'"${TOLIBGXX}src"' '"${host_includes}"' $(WRAP_C_INCLUDES)'
 fi
 if test -n "${XCINCLUDES}" ; then
   echo >&2 "CINCLUDES = ${XCINCLUDES}"
diff --git a/libio/configure.in b/libio/configure.in
index 6594559f71d..cbe04c914c9 100644
--- a/libio/configure.in
+++ b/libio/configure.in
@@ -107,8 +107,16 @@ ${moveifchange} temp.mt target-mkfrag
 LIBDIR=yes
 TO_TOPDIR=../
 ALL='$(_G_CONFIG_H) libio.a libiostream.a iostream.list'
-XCINCLUDES='-I. -I$(srcdir)'
-XCXXINCLUDES='-I. -I$(srcdir)'
+case "${target}" in
+  *-*-cygwin32*)
+    XCINCLUDES='-I. -I$(srcdir) -I$(srcdir)/../winsup/include'
+    XCXXINCLUDES='-I. -I$(srcdir) -I$(srcdir)/../winsup/include'
+    ;;
+  *)
+    XCINCLUDES='-I. -I$(srcdir)'
+    XCXXINCLUDES='-I. -I$(srcdir)'
+    ;;
+esac
 MOSTLYCLEAN='*.o pic stamp-picdir core iostream.list'
 DISTCLEAN='config.status Makefile *~ Make.pack target-mkfrag multilib.out'
 CLEAN='_G_config.h *.a'