--- STLport-4.6.1/stlport/config/stl_gcc.h.orig	2003-11-02 09:59:11.000000000 +0100
+++ STLport-4.6.1/stlport/config/stl_gcc.h	2004-02-27 18:51:56.250671472 +0100
@@ -263,18 +263,13 @@
 
 # if (__GNUC__ >= 3)
 
-#  if ((__GNUC_MINOR__ == 0) || (__APPLE__))
-#   define _STLP_NATIVE_INCLUDE_PATH ../g++-v3
-#   define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward
-#  else
 #   if defined(__GNUC_PATCHLEVEL__) && (__GNUC_PATCHLEVEL__ > 0)
-#     define _STLP_NATIVE_INCLUDE_PATH ../__GNUC__.__GNUC_MINOR__.__GNUC_PATCHLEVEL__
-#     define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../__GNUC__.__GNUC_MINOR__.__GNUC_PATCHLEVEL__/backward
+#     define _STLP_NATIVE_INCLUDE_PATH /usr/include/c++/__GNUC__.__GNUC_MINOR__.__GNUC_PATCHLEVEL__
+#     define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH /usr/include/c++/__GNUC__.__GNUC_MINOR__.__GNUC_PATCHLEVEL__/backward
 #   else
-#     define _STLP_NATIVE_INCLUDE_PATH ../__GNUC__.__GNUC_MINOR__
-#     define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../__GNUC__.__GNUC_MINOR__/backward
+#     define _STLP_NATIVE_INCLUDE_PATH /usr/include/c++/__GNUC__.__GNUC_MINOR__.0
+#     define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH /usr/include/c++/__GNUC__.__GNUC_MINOR__.0/backward
 #   endif
-#  endif
 
 # elif (__GNUC_MINOR__ < 8)
 
--- STLport-4.6.1/stlport/stl/_config.h.orig	2004-02-05 00:29:55.000000000 +0100
+++ STLport-4.6.1/stlport/stl/_config.h	2004-02-27 19:06:50.711692728 +0100
@@ -89,6 +89,8 @@
  */
 // # include <stl/_check_config.h>
 
+#define _STLP_DONT_USE_NESTED_TCLASS_THROUGHT_TPARAM
+
 /* SGI terms */
 
 # if !defined (_STLP_NO_MEMBER_TEMPLATES) && !defined (_STLP_MEMBER_TEMPLATES)