--- STLport-4.5.3/stlport/config/stl_gcc.h.orig Sun May 11 22:22:12 2003 +++ STLport-4.5.3/stlport/config/stl_gcc.h Sun May 11 23:05:46 2003 @@ -250,8 +250,22 @@ # if (__GNUC__ >= 3) -# define _STLP_NATIVE_INCLUDE_PATH ../g++-v3 -# define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward +# if (__GNUC_MINOR__ >= 2) + +# if (__GNUC_PATCHLEVEL__ != 0) +# define _STLP_NATIVE_INCLUDE_PATH /usr/include/c++/__GNUC__.__GNUC_MINOR__.__GNUC_PATCHLEVEL__ +# define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../c++/__GNUC__.__GNUC_MINOR__.__GNUC_PATCHLEVEL__/backward +# else +# define _STLP_NATIVE_INCLUDE_PATH /usr/include/c++/__GNUC__.__GNUC_MINOR__ +# define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../c++/__GNUC__.__GNUC_MINOR__/backward +# endif + +# else + +# define _STLP_NATIVE_INCLUDE_PATH ../g++-v3 +# define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward + +# endif # elif (__GNUC_MINOR__ < 8)