updated makefiles to hopefully install the headers in the correct place. Updated docs to use boost 1.33.1 in examples. Changed libtorrent version to 0.10 and updated ChangeLog to prepare for release.

ChangeLog

@@ -1,3 +1,5 @@
+release 0.10
+
 	* fixed a bug in storage that would, in rare cases, fail to do a
 	  complete check.
 	* exposed more settings for tweaking parameters in the piece-picker,

Jamfile

@@ -23,7 +23,7 @@ project torrent
 	: requirements
 
 	<include>./include
-	<include>./asio/include
+	<include>./include/libtorrent
 	<include>./zlib
 	<include>$(BOOST_ROOT)
 	<variant>release:<define>NDEBUG

configure.in

@@ -1,7 +1,7 @@
 AC_PREREQ(2.59)
 
 AC_INIT(src/torrent.cpp)
-AM_INIT_AUTOMAKE(libtorrent, 0.9.2)
+AM_INIT_AUTOMAKE(libtorrent, 0.10)
 
 AM_CONFIG_HEADER(config.h)
 

docs/manual.html

@@ -270,20 +270,20 @@ enough (and even if it is enough, the necessary environment variables are
 usually not set by the package installer).</p>
 <div class="section">
 <h3><a id="step-1-download-boost" name="step-1-download-boost">Step 1: Download boost</a></h3>
-<p>You'll find boost <a class="reference" href="http://sourceforge.net/project/showfiles.php?group_id=7586">here</a>.</p>
+<p>You'll find boost <a class="reference" href="http://sourceforge.net/project/showfiles.php?group_id=7586&amp;package_id=8041&amp;release_id=376197">here</a>.</p>
 <p>Extract the archive to some directory where you want it. For the sake of this
-guide, let's assume you extract the package to <tt class="docutils literal"><span class="pre">c:\boost_1_33_0</span></tt> (I'm using
+guide, let's assume you extract the package to <tt class="docutils literal"><span class="pre">c:\boost_1_33_1</span></tt> (I'm using
 a windows path in this example since if you're on linux/unix you're more likely
 to use the autotools). You'll need at least version 1.32 of the boost library
 in order to build libtorrent.</p>
 <p>If you use 1.32, you need to download BBv2 separately, so for now, let's
-assume you will use version 1.33.</p>
+assume you will use version 1.33.1.</p>
 </div>
 <div class="section">
 <h3><a id="step-2-setup-bbv2" name="step-2-setup-bbv2">Step 2: Setup BBv2</a></h3>
 <p>First you need to build <tt class="docutils literal"><span class="pre">bjam</span></tt>. You do this by opening a terminal (In
 windows, run <tt class="docutils literal"><span class="pre">cmd</span></tt>). Change directory to
-<tt class="docutils literal"><span class="pre">c:\boost_1_33_0\tools\build\jam_src</span></tt>. Then run the script called
+<tt class="docutils literal"><span class="pre">c:\boost_1_33_1\tools\build\jam_src</span></tt>. Then run the script called
 <tt class="docutils literal"><span class="pre">build.bat</span></tt> or <tt class="docutils literal"><span class="pre">build.sh</span></tt> on a unix system. This will build <tt class="docutils literal"><span class="pre">bjam</span></tt> and
 place it in a directory starting with <tt class="docutils literal"><span class="pre">bin.</span></tt> and then have the name of your
 platform. Copy the <tt class="docutils literal"><span class="pre">bjam.exe</span></tt> (or <tt class="docutils literal"><span class="pre">bjam</span></tt> on a unix system) to a place
@@ -297,9 +297,14 @@ set the environment variable <tt class="docutils literal"><span class="pre">BOOS
 <tt class="docutils literal"><span class="pre">bjam</span></tt> where it can find boost-build, your configuration file and all the
 toolsets (descriptions used by boost-build to know how to use different
 compilers on different platforms). Assuming the boost install path above, set
-it to <tt class="docutils literal"><span class="pre">c:\boost_1_33_0\tools\build\v2</span></tt>.</p>
+it to <tt class="docutils literal"><span class="pre">c:\boost_1_33_1\tools\build\v2</span></tt>.</p>
+<p>To set an environment variable in windows, type for example:</p>
+<pre class="literal-block">
+set BOOST_BUILD_PATH=c:\boost_1_33_1\tools\build\v2
+</pre>
+<p>In a terminal window.</p>
 <p>The last thing to do to complete the setup of BBv2 is to modify your
-<tt class="docutils literal"><span class="pre">user-config.jam</span></tt> file. It is located in <tt class="docutils literal"><span class="pre">c:\boost_1_33\tools\build\v2</span></tt>.
+<tt class="docutils literal"><span class="pre">user-config.jam</span></tt> file. It is located in <tt class="docutils literal"><span class="pre">c:\boost_1_33_1\tools\build\v2</span></tt>.
 Depending on your platform and which compiler you're using, you should add a
 line for each compiler and compiler version you have installed on your system
 that you want to be able to use with BBv2. For example, if you're using
@@ -331,7 +336,7 @@ using darwin : 4.0 : g++-4.0 ;
 <p>When building libtorrent, the <tt class="docutils literal"><span class="pre">Jamfile</span></tt> expects the environment variable
 <tt class="docutils literal"><span class="pre">BOOST_ROOT</span></tt> to be set to the boost installation directory. It uses this to
 find the boost libraries it depends on, so they can be built and their headers
-files found. So, set this to <tt class="docutils literal"><span class="pre">c:\boost_1_33_0</span></tt>.</p>
+files found. So, set this to <tt class="docutils literal"><span class="pre">c:\boost_1_33_1</span></tt>.</p>
 <p>Then the only thing left is simply to invoke <tt class="docutils literal"><span class="pre">bjam</span></tt>. If you want to specify
 a specific toolset to use (compiler) you can just add that to the commandline.
 For example:</p>
@@ -368,8 +373,8 @@ from a cygwin terminal, you'll have to run it from a <tt class="docutils literal
 cygwin, if you're building with gcc in cygwin you'll have to run it from a cygwin terminal.
 Also, make sure the paths are correct in the different environments. In cygwin, the paths
 (<tt class="docutils literal"><span class="pre">BOOST_BUILD_PATH</span></tt> and <tt class="docutils literal"><span class="pre">BOOST_ROOT</span></tt>) should be in the typical unix-format (e.g.
-<tt class="docutils literal"><span class="pre">/cygdrive/c/boost_1_33_0</span></tt>). In the windows environment, they should have the typical
+<tt class="docutils literal"><span class="pre">/cygdrive/c/boost_1_33_1</span></tt>). In the windows environment, they should have the typical
-windows format (<tt class="docutils literal"><span class="pre">c:/boost_1_33_0</span></tt>).</p>
+windows format (<tt class="docutils literal"><span class="pre">c:/boost_1_33_1</span></tt>).</p>
 <p>The <tt class="docutils literal"><span class="pre">Jamfile</span></tt> will define <tt class="docutils literal"><span class="pre">NDEBUG</span></tt> when it's building a release build.
 There are two other build variants available in the <tt class="docutils literal"><span class="pre">Jamfile</span></tt>. debug_log
 and release_log, these two variants inherits from the debug and release

docs/manual.rst

@@ -144,16 +144,16 @@ Step 1: Download boost
 
 You'll find boost here__.
 
-__ http://sourceforge.net/project/showfiles.php?group_id=7586
+__ http://sourceforge.net/project/showfiles.php?group_id=7586&package_id=8041&release_id=376197
 
 Extract the archive to some directory where you want it. For the sake of this
-guide, let's assume you extract the package to ``c:\boost_1_33_0`` (I'm using
+guide, let's assume you extract the package to ``c:\boost_1_33_1`` (I'm using
 a windows path in this example since if you're on linux/unix you're more likely
 to use the autotools). You'll need at least version 1.32 of the boost library
 in order to build libtorrent.
 
 If you use 1.32, you need to download BBv2 separately, so for now, let's
-assume you will use version 1.33.
+assume you will use version 1.33.1.
 
 
 Step 2: Setup BBv2
@@ -161,7 +161,7 @@ Step 2: Setup BBv2
 
 First you need to build ``bjam``. You do this by opening a terminal (In
 windows, run ``cmd``). Change directory to
-``c:\boost_1_33_0\tools\build\jam_src``. Then run the script called
+``c:\boost_1_33_1\tools\build\jam_src``. Then run the script called
 ``build.bat`` or ``build.sh`` on a unix system. This will build ``bjam`` and
 place it in a directory starting with ``bin.`` and then have the name of your
 platform. Copy the ``bjam.exe`` (or ``bjam`` on a unix system) to a place
@@ -176,10 +176,16 @@ set the environment variable ``BOOST_BUILD_PATH``. This is the path that tells
 ``bjam`` where it can find boost-build, your configuration file and all the
 toolsets (descriptions used by boost-build to know how to use different
 compilers on different platforms). Assuming the boost install path above, set
-it to ``c:\boost_1_33_0\tools\build\v2``.
+it to ``c:\boost_1_33_1\tools\build\v2``.
+
+To set an environment variable in windows, type for example::
+
+  set BOOST_BUILD_PATH=c:\boost_1_33_1\tools\build\v2
+
+In a terminal window.
 
 The last thing to do to complete the setup of BBv2 is to modify your
-``user-config.jam`` file. It is located in ``c:\boost_1_33\tools\build\v2``.
+``user-config.jam`` file. It is located in ``c:\boost_1_33_1\tools\build\v2``.
 Depending on your platform and which compiler you're using, you should add a
 line for each compiler and compiler version you have installed on your system
 that you want to be able to use with BBv2. For example, if you're using
@@ -213,7 +219,7 @@ Step 3: Building libtorrent
 When building libtorrent, the ``Jamfile`` expects the environment variable
 ``BOOST_ROOT`` to be set to the boost installation directory. It uses this to
 find the boost libraries it depends on, so they can be built and their headers
-files found. So, set this to ``c:\boost_1_33_0``.
+files found. So, set this to ``c:\boost_1_33_1``.
 
 Then the only thing left is simply to invoke ``bjam``. If you want to specify
 a specific toolset to use (compiler) you can just add that to the commandline.
@@ -256,8 +262,8 @@ from a cygwin terminal, you'll have to run it from a ``cmd`` terminal. The same
 cygwin, if you're building with gcc in cygwin you'll have to run it from a cygwin terminal.
 Also, make sure the paths are correct in the different environments. In cygwin, the paths
 (``BOOST_BUILD_PATH`` and ``BOOST_ROOT``) should be in the typical unix-format (e.g.
-``/cygdrive/c/boost_1_33_0``). In the windows environment, they should have the typical
+``/cygdrive/c/boost_1_33_1``). In the windows environment, they should have the typical
-windows format (``c:/boost_1_33_0``).
+windows format (``c:/boost_1_33_1``).
 
 The ``Jamfile`` will define ``NDEBUG`` when it's building a release build.
 There are two other build variants available in the ``Jamfile``. debug_log

examples/Makefile.am

@@ -14,5 +14,5 @@ make_torrent_LDADD = $(top_builddir)/src/libtorrent.la
 simple_client_SOURCES = simple_client.cpp
 simple_client_LDADD = $(top_builddir)/src/libtorrent.la
 
-AM_CXXFLAGS=-ftemplate-depth-50 -I$(top_srcdir)/include @DEBUGFLAGS@ @PTHREAD_CFLAGS@
+AM_CXXFLAGS=-ftemplate-depth-50 -I$(top_srcdir)/include -I$(top_srcdir)/include/libtorrent @DEBUGFLAGS@ @PTHREAD_CFLAGS@
 AM_LDFLAGS= ${LDLAGS} -L./ -l@BOOST_DATE_TIME_LIB@ -l@BOOST_FILESYSTEM_LIB@ -l@BOOST_THREAD_LIB@ @PTHREAD_LIBS@

include/Makefile.am

@@ -40,142 +40,142 @@ libtorrent/udp_tracker_connection.hpp \
 libtorrent/utf8.hpp \
 libtorrent/version.hpp \
 \
-asio/basic_datagram_socket.hpp \
+libtorrent/asio/basic_datagram_socket.hpp \
-asio/basic_deadline_timer.hpp \
+libtorrent/asio/basic_deadline_timer.hpp \
-asio/basic_io_object.hpp \
+libtorrent/asio/basic_io_object.hpp \
-asio/basic_resolver.hpp \
+libtorrent/asio/basic_resolver.hpp \
-asio/basic_socket.hpp \
+libtorrent/asio/basic_socket.hpp \
-asio/basic_socket_acceptor.hpp \
+libtorrent/asio/basic_socket_acceptor.hpp \
-asio/basic_socket_iostream.hpp \
+libtorrent/asio/basic_socket_iostream.hpp \
-asio/basic_socketbuf.hpp \
+libtorrent/asio/basic_socketbuf.hpp \
-asio/basic_strand.hpp \
+libtorrent/asio/basic_strand.hpp \
-asio/basic_stream_socket.hpp \
+libtorrent/asio/basic_stream_socket.hpp \
-asio/basic_streambuf.hpp \
+libtorrent/asio/basic_streambuf.hpp \
-asio/buffer.hpp \
+libtorrent/asio/buffer.hpp \
-asio/buffered_read_stream.hpp \
+libtorrent/asio/buffered_read_stream.hpp \
-asio/buffered_read_stream_fwd.hpp \
+libtorrent/asio/buffered_read_stream_fwd.hpp \
-asio/buffered_stream.hpp \
+libtorrent/asio/buffered_stream.hpp \
-asio/buffered_stream_fwd.hpp \
+libtorrent/asio/buffered_stream_fwd.hpp \
-asio/buffered_write_stream.hpp \
+libtorrent/asio/buffered_write_stream.hpp \
-asio/buffered_write_stream_fwd.hpp \
+libtorrent/asio/buffered_write_stream_fwd.hpp \
-asio/completion_condition.hpp \
+libtorrent/asio/completion_condition.hpp \
-asio/datagram_socket_service.hpp \
+libtorrent/asio/datagram_socket_service.hpp \
-asio/deadline_timer.hpp \
+libtorrent/asio/deadline_timer.hpp \
-asio/deadline_timer_service.hpp \
+libtorrent/asio/deadline_timer_service.hpp \
-asio/detail/bind_handler.hpp \
+libtorrent/asio/detail/bind_handler.hpp \
-asio/detail/buffer_resize_guard.hpp \
+libtorrent/asio/detail/buffer_resize_guard.hpp \
-asio/detail/buffered_stream_storage.hpp \
+libtorrent/asio/detail/buffered_stream_storage.hpp \
-asio/detail/call_stack.hpp \
+libtorrent/asio/detail/call_stack.hpp \
-asio/detail/const_buffers_iterator.hpp \
+libtorrent/asio/detail/const_buffers_iterator.hpp \
-asio/detail/consuming_buffers.hpp \
+libtorrent/asio/detail/consuming_buffers.hpp \
-asio/detail/epoll_reactor.hpp \
+libtorrent/asio/detail/epoll_reactor.hpp \
-asio/detail/epoll_reactor_fwd.hpp \
+libtorrent/asio/detail/epoll_reactor_fwd.hpp \
-asio/detail/event.hpp \
+libtorrent/asio/detail/event.hpp \
-asio/detail/fd_set_adapter.hpp \
+libtorrent/asio/detail/fd_set_adapter.hpp \
-asio/detail/handler_alloc_helpers.hpp \
+libtorrent/asio/detail/handler_alloc_helpers.hpp \
-asio/detail/hash_map.hpp \
+libtorrent/asio/detail/hash_map.hpp \
-asio/detail/io_control.hpp \
+libtorrent/asio/detail/io_control.hpp \
-asio/detail/kqueue_reactor.hpp \
+libtorrent/asio/detail/kqueue_reactor.hpp \
-asio/detail/kqueue_reactor_fwd.hpp \
+libtorrent/asio/detail/kqueue_reactor_fwd.hpp \
-asio/detail/mutex.hpp \
+libtorrent/asio/detail/mutex.hpp \
-asio/detail/noncopyable.hpp \
+libtorrent/asio/detail/noncopyable.hpp \
-asio/detail/null_event.hpp \
+libtorrent/asio/detail/null_event.hpp \
-asio/detail/null_mutex.hpp \
+libtorrent/asio/detail/null_mutex.hpp \
-asio/detail/null_signal_blocker.hpp \
+libtorrent/asio/detail/null_signal_blocker.hpp \
-asio/detail/null_thread.hpp \
+libtorrent/asio/detail/null_thread.hpp \
-asio/detail/null_tss_ptr.hpp \
+libtorrent/asio/detail/null_tss_ptr.hpp \
-asio/detail/old_win_sdk_compat.hpp \
+libtorrent/asio/detail/old_win_sdk_compat.hpp \
-asio/detail/pipe_select_interrupter.hpp \
+libtorrent/asio/detail/pipe_select_interrupter.hpp \
-asio/detail/pop_options.hpp \
+libtorrent/asio/detail/pop_options.hpp \
-asio/detail/posix_event.hpp \
+libtorrent/asio/detail/posix_event.hpp \
-asio/detail/posix_mutex.hpp \
+libtorrent/asio/detail/posix_mutex.hpp \
-asio/detail/posix_signal_blocker.hpp \
+libtorrent/asio/detail/posix_signal_blocker.hpp \
-asio/detail/posix_thread.hpp \
+libtorrent/asio/detail/posix_thread.hpp \
-asio/detail/posix_tss_ptr.hpp \
+libtorrent/asio/detail/posix_tss_ptr.hpp \
-asio/detail/push_options.hpp \
+libtorrent/asio/detail/push_options.hpp \
-asio/detail/reactive_deadline_timer_service.hpp \
+libtorrent/asio/detail/reactive_deadline_timer_service.hpp \
-asio/detail/reactive_socket_service.hpp \
+libtorrent/asio/detail/reactive_socket_service.hpp \
-asio/detail/reactor_op_queue.hpp \
+libtorrent/asio/detail/reactor_op_queue.hpp \
-asio/detail/reactor_timer_queue.hpp \
+libtorrent/asio/detail/reactor_timer_queue.hpp \
-asio/detail/resolver_service.hpp \
+libtorrent/asio/detail/resolver_service.hpp \
-asio/detail/scoped_lock.hpp \
+libtorrent/asio/detail/scoped_lock.hpp \
-asio/detail/select_interrupter.hpp \
+libtorrent/asio/detail/select_interrupter.hpp \
-asio/detail/select_reactor.hpp \
+libtorrent/asio/detail/select_reactor.hpp \
-asio/detail/select_reactor_fwd.hpp \
+libtorrent/asio/detail/select_reactor_fwd.hpp \
-asio/detail/service_registry.hpp \
+libtorrent/asio/detail/service_registry.hpp \
-asio/detail/signal_blocker.hpp \
+libtorrent/asio/detail/signal_blocker.hpp \
-asio/detail/signal_init.hpp \
+libtorrent/asio/detail/signal_init.hpp \
-asio/detail/socket_holder.hpp \
+libtorrent/asio/detail/socket_holder.hpp \
-asio/detail/socket_ops.hpp \
+libtorrent/asio/detail/socket_ops.hpp \
-asio/detail/socket_option.hpp \
+libtorrent/asio/detail/socket_option.hpp \
-asio/detail/socket_select_interrupter.hpp \
+libtorrent/asio/detail/socket_select_interrupter.hpp \
-asio/detail/socket_types.hpp \
+libtorrent/asio/detail/socket_types.hpp \
-asio/detail/strand_service.hpp \
+libtorrent/asio/detail/strand_service.hpp \
-asio/detail/task_io_service.hpp \
+libtorrent/asio/detail/task_io_service.hpp \
-asio/detail/task_io_service_fwd.hpp \
+libtorrent/asio/detail/task_io_service_fwd.hpp \
-asio/detail/thread.hpp \
+libtorrent/asio/detail/thread.hpp \
-asio/detail/tss_ptr.hpp \
+libtorrent/asio/detail/tss_ptr.hpp \
-asio/detail/win_event.hpp \
+libtorrent/asio/detail/win_event.hpp \
-asio/detail/win_iocp_io_service.hpp \
+libtorrent/asio/detail/win_iocp_io_service.hpp \
-asio/detail/win_iocp_io_service_fwd.hpp \
+libtorrent/asio/detail/win_iocp_io_service_fwd.hpp \
-asio/detail/win_iocp_operation.hpp \
+libtorrent/asio/detail/win_iocp_operation.hpp \
-asio/detail/win_iocp_socket_service.hpp \
+libtorrent/asio/detail/win_iocp_socket_service.hpp \
-asio/detail/win_local_free_on_block_exit.hpp \
+libtorrent/asio/detail/win_local_free_on_block_exit.hpp \
-asio/detail/win_mutex.hpp \
+libtorrent/asio/detail/win_mutex.hpp \
-asio/detail/win_signal_blocker.hpp \
+libtorrent/asio/detail/win_signal_blocker.hpp \
-asio/detail/win_thread.hpp \
+libtorrent/asio/detail/win_thread.hpp \
-asio/detail/win_tss_ptr.hpp \
+libtorrent/asio/detail/win_tss_ptr.hpp \
-asio/detail/winsock_init.hpp \
+libtorrent/asio/detail/winsock_init.hpp \
-asio/detail/wrapped_handler.hpp \
+libtorrent/asio/detail/wrapped_handler.hpp \
-asio/error.hpp \
+libtorrent/asio/error.hpp \
-asio/error_handler.hpp \
+libtorrent/asio/error_handler.hpp \
-asio/handler_alloc_hook.hpp \
+libtorrent/asio/handler_alloc_hook.hpp \
-asio/impl/io_service.ipp \
+libtorrent/asio/impl/io_service.ipp \
-asio/impl/read.ipp \
+libtorrent/asio/impl/read.ipp \
-asio/impl/read_until.ipp \
+libtorrent/asio/impl/read_until.ipp \
-asio/impl/write.ipp \
+libtorrent/asio/impl/write.ipp \
-asio/io_service.hpp \
+libtorrent/asio/io_service.hpp \
-asio/ip/address.hpp \
+libtorrent/asio/ip/address.hpp \
-asio/ip/address_v4.hpp \
+libtorrent/asio/ip/address_v4.hpp \
-asio/ip/address_v6.hpp \
+libtorrent/asio/ip/address_v6.hpp \
-asio/ip/basic_endpoint.hpp \
+libtorrent/asio/ip/basic_endpoint.hpp \
-asio/ip/basic_resolver_entry.hpp \
+libtorrent/asio/ip/basic_resolver_entry.hpp \
-asio/ip/basic_resolver_iterator.hpp \
+libtorrent/asio/ip/basic_resolver_iterator.hpp \
-asio/ip/basic_resolver_query.hpp \
+libtorrent/asio/ip/basic_resolver_query.hpp \
-asio/ip/detail/socket_option.hpp \
+libtorrent/asio/ip/detail/socket_option.hpp \
-asio/ip/host_name.hpp \
+libtorrent/asio/ip/host_name.hpp \
-asio/ip/multicast.hpp \
+libtorrent/asio/ip/multicast.hpp \
-asio/ip/resolver_query_base.hpp \
+libtorrent/asio/ip/resolver_query_base.hpp \
-asio/ip/tcp.hpp \
+libtorrent/asio/ip/tcp.hpp \
-asio/ip/udp.hpp \
+libtorrent/asio/ip/udp.hpp \
-asio/is_read_buffered.hpp \
+libtorrent/asio/is_read_buffered.hpp \
-asio/is_write_buffered.hpp \
+libtorrent/asio/is_write_buffered.hpp \
-asio/placeholders.hpp \
+libtorrent/asio/placeholders.hpp \
-asio/read.hpp \
+libtorrent/asio/read.hpp \
-asio/read_until.hpp \
+libtorrent/asio/read_until.hpp \
-asio/resolver_service.hpp \
+libtorrent/asio/resolver_service.hpp \
-asio/socket_acceptor_service.hpp \
+libtorrent/asio/socket_acceptor_service.hpp \
-asio/socket_base.hpp \
+libtorrent/asio/socket_base.hpp \
-asio/ssl/basic_context.hpp \
+libtorrent/asio/ssl/basic_context.hpp \
-asio/ssl/context.hpp \
+libtorrent/asio/ssl/context.hpp \
-asio/ssl/context_base.hpp \
+libtorrent/asio/ssl/context_base.hpp \
-asio/ssl/context_service.hpp \
+libtorrent/asio/ssl/context_service.hpp \
-asio/ssl/detail/openssl_context_service.hpp \
+libtorrent/asio/ssl/detail/openssl_context_service.hpp \
-asio/ssl/detail/openssl_init.hpp \
+libtorrent/asio/ssl/detail/openssl_init.hpp \
-asio/ssl/detail/openssl_operation.hpp \
+libtorrent/asio/ssl/detail/openssl_operation.hpp \
-asio/ssl/detail/openssl_stream_service.hpp \
+libtorrent/asio/ssl/detail/openssl_stream_service.hpp \
-asio/ssl/detail/openssl_types.hpp \
+libtorrent/asio/ssl/detail/openssl_types.hpp \
-asio/ssl/stream.hpp \
+libtorrent/asio/ssl/stream.hpp \
-asio/ssl/stream_base.hpp \
+libtorrent/asio/ssl/stream_base.hpp \
-asio/ssl/stream_service.hpp \
+libtorrent/asio/ssl/stream_service.hpp \
-asio/ssl.hpp \
+libtorrent/asio/ssl.hpp \
-asio/strand.hpp \
+libtorrent/asio/strand.hpp \
-asio/strand_service.hpp \
+libtorrent/asio/strand_service.hpp \
-asio/stream_socket_service.hpp \
+libtorrent/asio/stream_socket_service.hpp \
-asio/streambuf.hpp \
+libtorrent/asio/streambuf.hpp \
-asio/system_exception.hpp \
+libtorrent/asio/system_exception.hpp \
-asio/thread.hpp \
+libtorrent/asio/thread.hpp \
-asio/time_traits.hpp \
+libtorrent/asio/time_traits.hpp \
-asio/write.hpp \
+libtorrent/asio/write.hpp \
-asio.hpp
+libtorrent/asio.hpp
 

include/libtorrent/session.hpp

@@ -343,7 +343,7 @@ namespace libtorrent
 	{
 	public:
 
-		session(fingerprint const& print = fingerprint("LT", 0, 9, 2, 0));
+		session(fingerprint const& print = fingerprint("LT", 0, 10, 0, 0));
 		session(
 			fingerprint const& print
 			, std::pair<int, int> listen_port_range

include/libtorrent/version.hpp

@@ -33,6 +33,6 @@ POSSIBILITY OF SUCH DAMAGE.
 #ifndef TORRENT_VERSION_HPP_INCLUDED
 #define TORRENT_VERSION_HPP_INCLUDED
 
-#define LIBTORRENT_VERSION "0.9.2.0"
+#define LIBTORRENT_VERSION "0.10.0.0"
 
 #endif

libtorrent.pc.in

@@ -11,4 +11,4 @@ Name: libtorrent
 Description: Bittorrent library.
 Version: @VERSION@
 Libs: -L${libdir} @LIBS@ -l@BOOST_DATE_TIME_LIB@ -l@BOOST_FILESYSTEM_LIB@ -l@BOOST_THREAD_LIB@ @ZLIB@ -ltorrent
-Cflags: -I${includedir} @CPPFLAGS@
+Cflags: -I${includedir} -I${includedir}/libtorrent @CPPFLAGS@

src/Makefile.am

@@ -55,5 +55,5 @@ $(top_srcdir)/include/libtorrent/version.hpp
 libtorrent_la_LDFLAGS = $(LDFLAGS) -version-info 1:0:1
 libtorrent_la_LIBADD = @ZLIB@ -l@BOOST_DATE_TIME_LIB@ -l@BOOST_FILESYSTEM_LIB@ -l@BOOST_THREAD_LIB@ @PTHREAD_LIBS@ 
 
-AM_CXXFLAGS= -ftemplate-depth-50 -I$(top_srcdir)/include @ZLIBINCL@ @DEBUGFLAGS@ @PTHREAD_CFLAGS@ 
+AM_CXXFLAGS= -ftemplate-depth-50 -I$(top_srcdir)/include -I$(top_srcdir)/include/libtorrent @ZLIBINCL@ @DEBUGFLAGS@ @PTHREAD_CFLAGS@ 
 AM_LDFLAGS= $(LDFLAGS) -L./ -l@BOOST_DATE_TIME_LIB@ -l@BOOST_FILESYSTEM_LIB@ -l@BOOST_THREAD_LIB@ @PTHREAD_LIBS@ 

test/Makefile.am

@@ -24,5 +24,5 @@ test_metadata_extension_LDADD = $(top_builddir)/src/libtorrent.la
 
 noinst_HEADERS = test.hpp setup_transfer.hpp
 
-AM_CXXFLAGS=-ftemplate-depth-50 -I$(top_srcdir)/include @DEBUGFLAGS@ @PTHREAD_CFLAGS@
+AM_CXXFLAGS=-ftemplate-depth-50 -I$(top_srcdir)/include -I$(top_srcdir)/include/libtorrent @DEBUGFLAGS@ @PTHREAD_CFLAGS@
 AM_LDFLAGS= -L./ -l@BOOST_DATE_TIME_LIB@ -l@BOOST_FILESYSTEM_LIB@ -l@BOOST_THREAD_LIB@ @PTHREAD_LIBS@