From ecdf83547eb45939af2c467d96695546d688a40d Mon Sep 17 00:00:00 2001 From: cg25 Date: Thu, 30 Apr 2009 05:28:22 +0000 Subject: [PATCH] Revert changeset introduced in r3424 and add a specific define to disable boost.serialization for python bindings build. --- bindings/python/setup.py.in | 2 +- configure.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bindings/python/setup.py.in b/bindings/python/setup.py.in index b5bd74936..be61fe7a1 100644 --- a/bindings/python/setup.py.in +++ b/bindings/python/setup.py.in @@ -79,6 +79,6 @@ setup( name='python-libtorrent', include_dirs = ['@top_srcdir@/include','@top_srcdir@/include/libtorrent'] + parse_cmd(extra_cmd, '-I'), library_dirs = ['@top_builddir@/src/.libs'] + parse_cmd(extra_cmd, '-L'), extra_link_args = '@LDFLAGS@'.split() + arch(), - extra_compile_args = parse_cmd(extra_cmd, '-D', True) + arch(), + extra_compile_args = parse_cmd(extra_cmd, '-D', True) + arch() + ['-DBOOST_MULTI_INDEX_DISABLE_SERIALIZATION'], libraries = ['torrent-rasterbar','@BOOST_PYTHON_LIB@'] + parse_cmd(extra_cmd, '-l'))], ) diff --git a/configure.in b/configure.in index 97172d98a..62ff1a4ed 100644 --- a/configure.in +++ b/configure.in @@ -172,7 +172,7 @@ AC_ARG_WITH( [[logging=none]] ) -COMPILETIME_OPTIONS="-DBOOST_MULTI_INDEX_DISABLE_SERIALIZATION " +COMPILETIME_OPTIONS="" dnl Check the value for the --with-logging switch AC_MSG_CHECKING([what form of logging to use]) case "$logging" in