From 3bad820e690d798f21af0574da2fcf4ec6673303 Mon Sep 17 00:00:00 2001
From: John Maddock <john@johnmaddock.co.uk>
Date: Sat, 4 Dec 2004 13:40:11 +0000
Subject: [PATCH] Added support for user settable BOOST_LIB_TOOLSET

[SVN r26428]
---
 config.htm                         | 11 +++++++++++
 include/boost/config/auto_link.hpp |  5 ++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/config.htm b/config.htm
index d11b88f7..5f644d03 100644
--- a/config.htm
+++ b/config.htm
@@ -288,6 +288,17 @@ export LIBS=
                   off.</P>
             </TD>
          </TR>
+         <TR>
+            <TD vAlign="top">BOOST_LIB_DIAGNOSTIC</TD>
+            <TD>Causes the auto-linking code to output diagnostic messages indicating the name 
+               of the library that is selected for linking.</TD>
+         </TR>
+         <TR>
+            <TD vAlign="top">BOOST_LIB_TOOLSET</TD>
+            <TD>Overrides the name of the toolset part of the name of library being linked to; 
+               note if defined this must be defined to a quoted string literal, for example 
+               "abc".</TD>
+         </TR>
       </table>
       <h4><a name="advanced_config"></a>Advanced configuration usage</h4>
       <p>By setting various macros on the compiler command line or by editing &lt;<a href="../../boost/config/user.hpp">boost/config/user.hpp</a>&gt;, 
diff --git a/include/boost/config/auto_link.hpp b/include/boost/config/auto_link.hpp
index b4e580ff..cf5e56e9 100644
--- a/include/boost/config/auto_link.hpp
+++ b/include/boost/config/auto_link.hpp
@@ -19,6 +19,7 @@ Before including this header you must define one or more of define the following
 
 BOOST_LIB_NAME:       Required: A string containing the basename of the library,
                       for example boost_regex.
+BOOST_LIB_TOOLSET:    Optional: the base name of the toolset.
 BOOST_DYN_LINK:       Optional: when set link to dll rather than static library.
 BOOST_LIB_DIAGNOSTIC: Optional: when set the header will print out the name
                       of the library selected (useful for debugging).
@@ -103,8 +104,9 @@ BOOST_LIB_VERSION:    The Boost version, in the form x_y, for Boost version x.y.
 #  error "Incompatible build options"
 #endif
 //
-// select toolset:
+// select toolset if not defined already:
 //
+#ifndef BOOST_LIB_TOOLSET
 #if defined(BOOST_MSVC) && (BOOST_MSVC == 1200)
 
    // vc6:
@@ -146,6 +148,7 @@ BOOST_LIB_VERSION:    The Boost version, in the form x_y, for Boost version x.y.
 #  define BOOST_LIB_TOOLSET "cw9"
 
 #endif
+#endif // BOOST_LIB_TOOLSET
 
 //
 // select thread opt: