configure.in (gcc_gxx_include_dir): Simplify.

2000-12-18  Benjamin Kosnik  <bkoz@redhat.com>

	* configure.in (gcc_gxx_include_dir): Simplify.
	(libstdcxx_incdir): Export.
	* configure: Regenerate.
	* Makefile.in (PREPROCESSOR_DEFINES): Add in
	GPLUSPLUS_TOOL_INCLUDE_DIR bits here..
	(libstdcxx_incdir): Add.
	* cppdefault.c (GPLUSPLUS_TOOL_INCLUDE_DIR): Add search path.

From-SVN: r38356

gcc/ChangeLog

+2000-12-18  Benjamin Kosnik  <bkoz@redhat.com>
+
+	* configure.in (gcc_gxx_include_dir): Simplify.
+	(libstdcxx_incdir): Export.
+	* configure: Regenerate.
+	* Makefile.in (PREPROCESSOR_DEFINES): Add in
+	GPLUSPLUS_TOOL_INCLUDE_DIR bits here..
+	(libstdcxx_incdir): Add.
+	* cppdefault.c (GPLUSPLUS_TOOL_INCLUDE_DIR): Add search path.
+
 2000-12-18  Neil Booth  <neil@daikokuya.demon.co.uk>
 
         * c-lex.c (lex_lineno): Remove.

gcc/Makefile.in

@@ -314,8 +314,10 @@ dollar = @dollar@
 gcc_tooldir = @gcc_tooldir@
 # Since tooldir does not exist at build-time, use -B$(build_tooldir)/bin/
 build_tooldir = $(exec_prefix)/$(target_alias)
-# Directory in which the compiler finds g++ includes.
-gcc_gxx_include_dir= @gcc_gxx_include_dir@
+# Directory in which the compiler finds target-independent g++ includes.
+gcc_gxx_include_dir = @gcc_gxx_include_dir@
+# Directory where the compiler finds target-dependent files.
+libstdcxx_incdir = @libstdcxx_incdir@
 # Directory to search for site-specific includes.
 includedir = $(local_prefix)/include
 # assertdir is overridden in cross-make.
@@ -1866,6 +1868,7 @@ intl.all intl.install intl.uninstall \
 PREPROCESSOR_DEFINES = \
   -DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \
   -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \
+  -DGPLUSPLUS_TOOL_INCLUDE_DIR=\"$(gcc_tooldir)/include/$(libstdcxx_incdir)\" \
   -DLOCAL_INCLUDE_DIR=\"$(includedir)\" \
   -DCROSS_INCLUDE_DIR=\"$(gcc_tooldir)/sys-include\" \
   -DTOOL_INCLUDE_DIR=\"$(gcc_tooldir)/include\"

gcc/configure.in

@@ -188,7 +188,7 @@ if test x${gcc_gxx_include_dir} = x; then
   else
     topsrcdir=${srcdir}/.. . ${srcdir}/../config.if
 changequote(<<, >>)dnl
-    gcc_gxx_include_dir="\$(libsubdir)/\$(unlibsubdir)/..\`echo \$(exec_prefix) | sed -e 's|^\$(prefix)||' -e 's|/[^/]*|/..|g'\`/include/g++"-${libstdcxx_interface}
+    gcc_gxx_include_dir="\$(libsubdir)/\$(unlibsubdir)/..\`echo \$(exec_prefix) | sed -e 's|^\$(prefix)||' -e 's|/[^/]*|/..|g'\`/include/"${libstdcxx_incdir}
 changequote([, ])dnl
   fi
 fi
@@ -1820,6 +1820,7 @@ AC_SUBST(extra_programs)
 AC_SUBST(float_h_file)
 AC_SUBST(gcc_config_arguments)
 AC_SUBST(gcc_gxx_include_dir)
+AC_SUBST(libstdcxx_incdir)
 AC_SUBST(gcc_version)
 AC_SUBST(gcc_version_full)
 AC_SUBST(gcc_version_trigger)

gcc/cppdefault.c

@@ -32,9 +32,13 @@ const struct default_include cpp_include_defaults[]
 #else
 = {
 #ifdef GPLUSPLUS_INCLUDE_DIR
-    /* Pick up GNU C++ specific include files.  */
+    /* Pick up GNU C++ generic include files.  */
     { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1 },
 #endif
+#ifdef GPLUSPLUS_TOOL_INCLUDE_DIR
+    /* Pick up GNU C++ target-dependent include files.  */
+    { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1 },
+#endif
 #ifdef LOCAL_INCLUDE_DIR
     /* /usr/local/include comes before the fixincluded header files.  */
     { LOCAL_INCLUDE_DIR, 0, 0, 1 },