]>
Commit | Line | Data |
---|---|---|
377da81e | 1 | --- libtorrent-rasterbar-0.15.0/configure.ac~ 2010-02-08 06:18:10.000000000 +0100 |
2 | +++ libtorrent-rasterbar-0.15.0/configure.ac 2010-03-22 09:59:00.075165939 +0100 | |
3 | @@ -390,7 +390,7 @@ | |
4 | ["yes"|"default"], [ | |
5 | AC_MSG_RESULT([yes]) | |
6 | AC_DEFINE([TORRENT_LOGGING],[1],[Define to enable logging of the session events.]) | |
7 | - COMPILETIME_OPTIONS+="-DTORRENT_LOGGING " | |
8 | + COMPILETIME_OPTIONS="${COMPILETIME_OPTIONS} -DTORRENT_LOGGING " | |
9 | ], | |
10 | ["no"|"none"], [ | |
11 | AC_MSG_RESULT([no]) | |
12 | @@ -398,12 +398,12 @@ | |
13 | ["verbose"], [ | |
14 | AC_MSG_RESULT([verbose]) | |
15 | AC_DEFINE([TORRENT_VERBOSE_LOGGING],[1],[Define to enable logging of the session events and every peer connection.]) | |
16 | - COMPILETIME_OPTIONS+="-DTORRENT_VERBOSE_LOGGING " | |
17 | + COMPILETIME_OPTIONS="${COMPILETIME_OPTIONS} -DTORRENT_VERBOSE_LOGGING " | |
18 | ], | |
19 | ["errors"], [ | |
20 | AC_MSG_RESULT([errors]) | |
21 | AC_DEFINE([TORRENT_ERROR_LOGGING],[1],[Define to enable logging of the session events and every peer connection limited to errors.]) | |
22 | - COMPILETIME_OPTIONS+="-DTORRENT_ERROR_LOGGING " | |
23 | + COMPILETIME_OPTIONS+="${COMPILETIME_OPTIONS} -DTORRENT_ERROR_LOGGING " | |
24 | ], | |
25 | [AC_MSG_RESULT([$ARG_ENABLE_LOGGING]) | |
26 | AC_MSG_ERROR([Unknown option "$ARG_ENABLE_LOGGING". Use either "yes", "no", "verbose" or "errors".])] | |
27 | @@ -446,7 +446,7 @@ | |
28 | ||
29 | AX_CHECK_OPENSSL([ | |
30 | AC_DEFINE([TORRENT_USE_OPENSSL],[1],[Define to use OpenSSL support.]) | |
31 | - COMPILETIME_OPTIONS+="-DTORRENT_USE_OPENSSL " | |
32 | + COMPILETIME_OPTIONS="${COMPILETIME_OPTIONS} -DTORRENT_USE_OPENSSL " | |
33 | ], [ | |
34 | AC_MSG_ERROR([OpenSSL library not found. Try using --with-openssl=DIR or disabling encryption at all.]) | |
35 | ]) | |
36 | @@ -454,7 +454,7 @@ | |
37 | ["no"|"off"], [ | |
38 | AC_MSG_RESULT([no]) | |
39 | AC_DEFINE([TORRENT_DISABLE_ENCRYPTION],[1],[Define to disable any encryption support and avoid linking against OpenSSL.]) | |
40 | - COMPILETIME_OPTIONS+="-DTORRENT_DISABLE_ENCRYPTION " | |
41 | + COMPILETIME_OPTIONS="${COMPILETIME_OPTIONS} -DTORRENT_DISABLE_ENCRYPTION " | |
42 | ], | |
43 | [AC_MSG_RESULT([$ARG_ENABLE_ENCRYPTION]) | |
44 | AC_MSG_ERROR([Unknown option "$ARG_ENABLE_ENCRYPTION". Use either "yes" or "no".])] | |
45 | @@ -468,7 +468,7 @@ | |
46 | ["no"], [ | |
47 | AC_MSG_RESULT([no]) | |
48 | AC_DEFINE([TORRENT_DISABLE_GEO_IP],[1],[Define to disable the GeoIP support and avoid linking against LGPLed code.]) | |
49 | - COMPILETIME_OPTIONS+="-DTORRENT_DISABLE_GEO_IP " | |
50 | + COMPILETIME_OPTIONS+="${COMPILETIME_OPTIONS} -DTORRENT_DISABLE_GEO_IP " | |
51 | ], | |
52 | [AC_MSG_RESULT([$ARG_ENABLE_GEOIP]) | |
53 | AC_MSG_ERROR([Unknown option "$ARG_ENABLE_GEOIP". Use either "yes" or "no".])] | |
54 | @@ -482,12 +482,12 @@ | |
55 | ["no"|"off"], [ | |
56 | AC_MSG_RESULT([no]) | |
57 | AC_DEFINE([TORRENT_DISABLE_DHT],[1],[Define to disable the DHT support.]) | |
58 | - COMPILETIME_OPTIONS+="-DTORRENT_DISABLE_DHT " | |
59 | + COMPILETIME_OPTIONS="${COMPILETIME_OPTIONS} -DTORRENT_DISABLE_DHT " | |
60 | ], | |
61 | ["logging"], [ | |
62 | AC_MSG_RESULT([logging]) | |
63 | AC_DEFINE([TORRENT_DHT_VERBOSE_LOGGING],[1],[Define to enable DHT support with verbose logging.]) | |
64 | - COMPILETIME_OPTIONS+="-DTORRENT_DHT_VERBOSE_LOGGING " | |
65 | + COMPILETIME_OPTIONS="${COMPILETIME_OPTIONS} -DTORRENT_DHT_VERBOSE_LOGGING " | |
66 | ], | |
67 | [AC_MSG_RESULT([$ARG_ENABLE_DHT]) | |
68 | AC_MSG_ERROR([Unknown option "$ARG_ENABLE_DHT". Use either "yes", "no" or "logging".])] | |
69 | @@ -627,10 +627,10 @@ | |
6873d9da AF |
70 | # this works around a bug in asio in boost-1.39 |
71 | # see: https://svn.boost.org/trac/boost/ticket/3095 | |
377da81e | 72 | AC_DEFINE([BOOST_ASIO_HASH_MAP_BUCKETS],[1021],[Define to fix a wrong behavior in boost 1.39.]) |
6873d9da AF |
73 | -COMPILETIME_OPTIONS+="-DBOOST_ASIO_HASH_MAP_BUCKETS=1021 " |
74 | +COMPILETIME_OPTIONS="${COMPILETIME_OPTIONS} -DBOOST_ASIO_HASH_MAP_BUCKETS=1021 " | |
75 | ||
377da81e | 76 | AC_DEFINE([BOOST_EXCEPTION_DISABLE],[1],[Define to disable the boost.exception features.]) |
77 | -COMPILETIME_OPTIONS+="-DBOOST_EXCEPTION_DISABLE " | |
78 | +COMPILETIME_OPTIONS+="${COMPILETIME_OPTIONS} -DBOOST_EXCEPTION_DISABLE " | |
6873d9da | 79 | |
377da81e | 80 | dnl Use possibly specific python install params |
81 | AC_ARG_VAR([PYTHON_INSTALL_PARAMS], [Set specific install parameters for python bindings.]) | |
82 | @@ -640,7 +640,7 @@ | |
6873d9da | 83 | dnl Set some defines if we are building a shared library |
377da81e | 84 | AS_IF([test "x$enable_shared" = "xyes"], |
85 | [AC_DEFINE([TORRENT_BUILDING_SHARED],[1],[Define to exports functions and classes with default visibility in GCC.]) | |
86 | - COMPILETIME_OPTIONS+="-DTORRENT_LINKING_SHARED "]) | |
87 | + COMPILETIME_OPTIONS="${COMPILETIME_OPTIONS} -DTORRENT_LINKING_SHARED "]) | |
6873d9da | 88 | |
6873d9da | 89 | AC_SUBST(DEBUGFLAGS) |
377da81e | 90 | AC_SUBST(PYTHON_INSTALL_PARAMS) |