Index: configure
===================================================================
RCS file: /cvsroot/boost/boost/configure,v
retrieving revision 1.11
diff -u -r1.11 configure
--- configure	9 May 2007 22:09:46 -0000	1.11
+++ configure	11 Jul 2007 16:06:21 -0000
@@ -185,7 +185,28 @@
 
 # Determine the toolset, if not already decided
 if test "x$TOOLSET" = x; then
-  TOOLSET=`$my_dir/tools/jam/src/build.sh --guess-toolset`
+  guessed_toolset=`$my_dir/tools/jam/src/build.sh --guess-toolset`
+  case $guessed_toolset in
+    acc | darwin | gcc | como | mipspro | pathscale | pgi | qcc | vacpp )
+    TOOLSET=$guessed_toolset
+    ;;
+    
+    intel-* )
+    TOOLSET=intel
+    ;;
+    
+    mingw )
+    TOOLSET=gcc
+    ;;
+    
+    sun* )
+    TOOLSET=sun
+    ;;
+    
+    * )
+    # Not supported by Boost.Build
+    ;;
+  esac
 fi
 
 rm -f config.log