From 42f428f7769ddd0c5c667b7199a47ca14a36fcc6 Mon Sep 17 00:00:00 2001
From: Arvid Norberg <arvid@libtorrent.org>
Date: Wed, 7 Jan 2009 01:58:43 +0000
Subject: [PATCH] define BOOST_MULTI_INDEX_DISABLE_SERIALIZATION in
 CMakeLists.txt and configure.in. Also define BOOST_EXCEPTION_DISABLE to
 disable boost.exception

---
 CMakeLists.txt | 2 ++
 Jamfile        | 1 +
 configure.in   | 5 +++++
 3 files changed, 8 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2dae0b6b0..42002cd04 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -191,6 +191,8 @@ if (MSVC)
 endif(MSVC)
 
 add_definitions(-D_FILE_OFFSET_BITS=64)
+add_definitions(-DBOOST_MULTI_INDEX_DISABLE_SERIALIZATION)
+add_definitions(-DBOOST_DISABLE_EXCEPTION)
 
 if (tcmalloc)
 	target_link_libraries(torrent-rasterbar tcmalloc)
diff --git a/Jamfile b/Jamfile
index 6b6449649..022b554d4 100755
--- a/Jamfile
+++ b/Jamfile
@@ -395,6 +395,7 @@ local usage-requirements =
 	<variant>debug:<define>TORRENT_DEBUG
 	<define>_FILE_OFFSET_BITS=64
 	<define>BOOST_MULTI_INDEX_DISABLE_SERIALIZATION
+	<define>BOOST_EXCEPTION_DISABLE
 	<conditional>@linking
 	<zlib>system:<library>zlib-target
 # these compiler settings just makes the compiler standard conforming
diff --git a/configure.in b/configure.in
index b5dc1ab8e..b54421942 100644
--- a/configure.in
+++ b/configure.in
@@ -413,6 +413,11 @@ if [[ "x$enable_shared" == "xyes" ]]; then
 	COMPILETIME_OPTIONS+="-DTORRENT_LINKING_SHARED "
 fi
 
+AC_DEFINE(BOOST_MULTI_INDEX_DISABLE_SERIALIZATION,,[Don't depend on boost.serialization headers])
+COMPILETIME_OPTIONS+="-DBOOST_MULTI_INDEX_DISABLE_SERIALIZATION "
+AC_DEFINE(BOOST_EXCEPTION_DISABLE,,[We don't need boost.exception features])
+COMPILETIME_OPTIONS+="-DBOOST_EXCEPTION_DISABLE "
+
 dnl want some debugging symbols with that?
 AC_ARG_ENABLE(
 	[debug],