merged boost.date_time linking from RC_0_16

Jamfile

@@ -305,6 +305,9 @@ feature.compose <ipv6>off : <define>TORRENT_USE_IPV6=0 ;
 
 feature need-librt : no yes : composite propagated link-incompatible ;
 
+feature boost-date-time : off on : composite propagated link-incompatible ;
+feature.compose <boost-date-time>off : <define>TORRENT_NO_BOOST_DATE_TIME ;
+
 feature fiemap : off on : composite propagated ;
 feature.compose <fiemap>on : <define>HAVE_LINUX_FIEMAP_H ;
 

docs/building.rst

@@ -367,6 +367,16 @@ Build features:
 |                          |   trace of the assert and some more information.   |
 |                          | * ``system`` use the libc assert macro             |
 +--------------------------+----------------------------------------------------+
+| ``i2p``                  | * ``on`` - build with I2P support                  |
+|                          | * ``off`` - build without I2P support              |
++--------------------------+----------------------------------------------------+
+| ``boost-date-time``      | * ``off`` - don't build asio types that depend     |
+|                          |   on boost.date_time. libtorrent doesn't use them  |
+|                          |   but if the client does, you need these to be     |
+|                          |   built.                                           |
+|                          | * ``on`` - build asio types that depend on         |
+|                          |   boost.date_time.                                 |
++--------------------------+----------------------------------------------------+
 
 .. _MaxMind: http://www.maxmind.com/app/api
 

src/asio.cpp

@@ -5,7 +5,7 @@
 #define BOOST_ASIO_SOURCE
 #endif
 
-#if _MSC_VER > 1310
+#if _MSC_VER > 1310 && defined TORRENT_NO_BOOST_DATE_TIME
 
 // on windows; including timer_queue.hpp results in an
 // actual link-time dependency on boost.date_time, even
@@ -15,6 +15,9 @@
 // works, at least across windows, Linux and Mac OS X.
 // In the future this hack can be fixed by disabling
 // use of boost.date_time in boost.asio
+// if TORRENT_NO_BOOST_DATE_TIME is not defined, it's
+// fine to include everything, including pulling in
+// the boost.date_time dependency via asio
 
 #include <boost/asio/detail/config.hpp>