C++ include path

[Joerg Sonnenberger]

Attached patch adds /usr/include/c++ as include directory for both compiler
versions. It should be used for all in-tree C++ headers which are itself
version independent [currently only lex].

Joerg
Index: contrib/gcc/cccp.c
===================================================================
RCS file: /extern/Daten/Sources/repository/dragonflybsd/src/contrib/gcc/cccp.c,v
retrieving revision 1.2
diff -u -r1.2 cccp.c
--- contrib/gcc/cccp.c	17 Jun 2003 04:23:59 -0000	1.2
+++ contrib/gcc/cccp.c	5 Apr 2004 17:19:52 -0000
@@ -396,6 +396,7 @@
   = {
     /* Pick up GNU C++ specific include files.  */
     { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1, 0 },
+    { GPLUSPLUS_INCLUDE_DIR2, "G++", 1, 1, 0 },
 #ifdef CROSS_COMPILE
     /* This is the dir for fixincludes.  Put it just before
        the files that we fix.  */
Index: contrib/gcc/cppinit.c
===================================================================
RCS file: /extern/Daten/Sources/repository/dragonflybsd/src/contrib/gcc/cppinit.c,v
retrieving revision 1.1
diff -u -r1.1 cppinit.c
--- contrib/gcc/cppinit.c	17 Jun 2003 02:43:58 -0000	1.1
+++ contrib/gcc/cppinit.c	5 Apr 2004 17:20:00 -0000
@@ -129,6 +129,7 @@
 = {
     /* Pick up GNU C++ specific include files.  */
     { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1 },
+    { GPLUSPLUS_INCLUDE_DIR2, "G++", 1, 1 },
 #ifdef CROSS_COMPILE
     /* This is the dir for fixincludes.  Put it just before
        the files that we fix.  */
Index: contrib/gcc/install.texi
===================================================================
RCS file: /extern/Daten/Sources/repository/dragonflybsd/src/contrib/gcc/install.texi,v
retrieving revision 1.1
diff -u -r1.1 install.texi
--- contrib/gcc/install.texi	17 Jun 2003 02:44:02 -0000	1.1
+++ contrib/gcc/install.texi	5 Apr 2004 17:21:06 -0000
@@ -2442,6 +2442,10 @@
 is where @code{g++} looks first for header files.  The C++ library
 installs only target independent header files in that directory.
 
+ at code{GPLUSPLUS_INCLUDE_DIR2} means the same thing for native and cross.  It
+is where @code{g++} looks for version independent C++ header files.  GNU CC
+doesn't install anything there.
+
 @code{LOCAL_INCLUDE_DIR} is used only for a native compiler.  It is
 normally @file{/usr/local/include}.  GNU CC searches this directory so
 that users can install header files in @file{/usr/local/include}.
Index: contrib/gcc/protoize.c
===================================================================
RCS file: /extern/Daten/Sources/repository/dragonflybsd/src/contrib/gcc/protoize.c,v
retrieving revision 1.1
diff -u -r1.1 protoize.c
--- contrib/gcc/protoize.c	17 Jun 2003 02:44:03 -0000	1.1
+++ contrib/gcc/protoize.c	5 Apr 2004 17:21:17 -0000
@@ -246,6 +246,7 @@
   = {
     /* Pick up GNU C++ specific include files.  */
     { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1 },
+    { GPLUSPLUS_INCLUDE_DIR2, "G++", 1, 1 },
 #ifdef CROSS_COMPILE
     /* This is the dir for fixincludes.  Put it just before
        the files that we fix.  */
Index: contrib/gcc/tm.texi
===================================================================
RCS file: /extern/Daten/Sources/repository/dragonflybsd/src/contrib/gcc/tm.texi,v
retrieving revision 1.1
diff -u -r1.1 tm.texi
--- contrib/gcc/tm.texi	17 Jun 2003 02:44:05 -0000	1.1
+++ contrib/gcc/tm.texi	5 Apr 2004 17:21:56 -0000
@@ -390,11 +390,13 @@
 Define this macro if you wish to override the entire default search path
 for include files.  For a native compiler, the default search path
 usually consists of @code{GCC_INCLUDE_DIR}, @code{LOCAL_INCLUDE_DIR},
- at code{SYSTEM_INCLUDE_DIR}, @code{GPLUSPLUS_INCLUDE_DIR}, and
+ at code{SYSTEM_INCLUDE_DIR}, @code{GPLUSPLUS_INCLUDE_DIR},
+ at code{GPLUSPLUS_INCLUDE_DIR2}, and
 @code{STANDARD_INCLUDE_DIR}.  In addition, @code{GPLUSPLUS_INCLUDE_DIR}
 and @code{GCC_INCLUDE_DIR} are defined automatically by @file{Makefile},
-and specify private search areas for GCC.  The directory
- at code{GPLUSPLUS_INCLUDE_DIR} is used only for C++ programs.
+and specify private search areas for GCC.  The directories
+ at code{GPLUSPLUS_INCLUDE_DIR} and @code{GPLUSPLUS_INCLUDE_DIR2} are used only
+for C++ programs.
 
 The definition should be an initializer for an array of structures.
 Each array element should have four elements: the directory name (a
Index: gnu/usr.bin/cc/cc_tools/dragonfly-native.h
===================================================================
RCS file: /extern/Daten/Sources/repository/dragonflybsd/src/gnu/usr.bin/cc/cc_tools/dragonfly-native.h,v
retrieving revision 1.4
diff -u -r1.4 dragonfly-native.h
--- gnu/usr.bin/cc/cc_tools/dragonfly-native.h	22 Mar 2004 20:57:48 -0000	1.4
+++ gnu/usr.bin/cc/cc_tools/dragonfly-native.h	5 Apr 2004 17:22:19 -0000
@@ -14,6 +14,7 @@
 
 /* Look for the include files in the system-defined places.  */
 #define GPLUSPLUS_INCLUDE_DIR		PREFIX2"/include/c++/2.95"
+#define GPLUSPLUS_INCLUDE_DIR2		PREFIX2"/include/c++"
 #define GCC_INCLUDE_DIR			PREFIX2"/include"
 #ifdef CROSS_COMPILE
 #define CROSS_INCLUDE_DIR		PREFIX2"/include"
Index: gnu/usr.bin/cc/cc_tools/freebsd-native.h
===================================================================
RCS file: /extern/Daten/Sources/repository/dragonflybsd/src/gnu/usr.bin/cc/cc_tools/freebsd-native.h,v
retrieving revision 1.2
diff -u -r1.2 freebsd-native.h
--- gnu/usr.bin/cc/cc_tools/freebsd-native.h	17 Jun 2003 04:25:45 -0000	1.2
+++ gnu/usr.bin/cc/cc_tools/freebsd-native.h	5 Apr 2004 17:22:30 -0000
@@ -14,6 +14,7 @@
 
 /* Look for the include files in the system-defined places.  */
 #define GPLUSPLUS_INCLUDE_DIR		PREFIX"/include/g++"
+#define GPLUSPLUS_INCLUDE_DIR2		PREFIX"/include/g++"
 #define GCC_INCLUDE_DIR			PREFIX"/include"
 #ifdef CROSS_COMPILE
 #define CROSS_INCLUDE_DIR		PREFIX"/include"
Index: gnu/usr.bin/cc3/cc_tools/dragonfly-native.h
===================================================================
RCS file: /extern/Daten/Sources/repository/dragonflybsd/src/gnu/usr.bin/cc3/cc_tools/dragonfly-native.h,v
retrieving revision 1.5
diff -u -r1.5 dragonfly-native.h
--- gnu/usr.bin/cc3/cc_tools/dragonfly-native.h	22 Mar 2004 20:57:54 -0000	1.5
+++ gnu/usr.bin/cc3/cc_tools/dragonfly-native.h	5 Apr 2004 17:31:08 -0000
@@ -17,7 +17,8 @@
 #undef LOCAL_INCLUDE_DIR		/* We don't wish to support one. */
 
 /* Look for the include files in the system-defined places.  */
-#define GPLUSPLUS_INCLUDE_DIR		PREFIX2"/include/c++/3.3"
+#define GPLUSPLUS_INCLUDE_DIR		PREFIX2"/include/c++"
+#define GPLUSPLUS_TOOL_INCLUDE_DIR	PREFIX2"/include/c++/3.3"
 #define	GPLUSPLUS_BACKWARD_INCLUDE_DIR	PREFIX2"/include/c++/3.3/backward"
 #define GCC_INCLUDE_DIR			PREFIX2"/include"
 #ifdef CROSS_COMPILE