--- configure.ac~	2006-02-14 16:50:44.000000000 +0000
+++ configure.ac	2006-02-20 19:43:06.000000000 +0000
@@ -132,11 +132,15 @@
 *)	gcc_gxx_include_dir=$with_gxx_include_dir ;;
 esac])
 
+
+libstdcxx_incdir_base=c++
+AC_SUBST(libstdcxx_incdir_base)
+
 if test x${gcc_gxx_include_dir} = x; then
   if test x${enable_version_specific_runtime_libs} = xyes; then
-    gcc_gxx_include_dir='${libsubdir}/include/c++'
+    gcc_gxx_include_dir='${libsubdir}/include/$(libstdcxx_incdir_base)'
   else
-    libstdcxx_incdir='c++/$(version)'
+    libstdcxx_incdir='$(libstdcxx_incdir_base)/$(version)'
 changequote(<<, >>)dnl
     gcc_gxx_include_dir="\$(libsubdir)/\$(unlibsubdir)/..\`echo \$(exec_prefix) | sed -e 's|^\$(prefix)||' -e 's|/[^/]*|/..|g'\`/include/"${libstdcxx_incdir}
 changequote([, ])dnl