Changeset 8888


Ignore:
Timestamp:
Aug 10, 2009, 4:09:25 PM (11 years ago)
Author:
charles
Message:

(trunk) remove the option to build without DHT. This is because of new & improved information wrt ticket #2222

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/configure.ac

    r8887 r8888  
    204204dnl  dht
    205205
    206 
    207 AC_ARG_ENABLE([dht],
    208               AS_HELP_STRING([--disable-dht],[omit DHT support]),
    209               [enable_dht=${enableval}],
    210               [enable_dht=yes])
    211 if test "x$enable_dht" = "xno" ; then
    212     AC_DEFINE([WITHOUT_DHT], 1)
    213     DHT_CFLAGS=""
    214     DHT_LIBS=""
    215 else
    216     DHT_CFLAGS="-I\$(top_srcdir)/third-party/dht"
    217     DHT_LIBS="\$(top_builddir)/third-party/dht/libdht.a"
    218 fi
    219 AM_CONDITIONAL(DHT, test "x$enable_dht" = "xyes")
     206DHT_CFLAGS="-I\$(top_srcdir)/third-party/dht"
     207DHT_LIBS="\$(top_builddir)/third-party/dht/libdht.a"
    220208AC_SUBST(DHT_CFLAGS)
    221209AC_SUBST(DHT_LIBS)
     
    428416        Compiler:                      ${CXX}
    429417        System or bundled libevent:    ${libevent_source}
    430         DHT support:                   ${enable_dht}
    431418
    432419        Build Mac client:              ${build_mac}
  • trunk/libtransmission/session.c

    r8881 r8888  
    846846    if( session->isDHTEnabled )
    847847    {
    848 #ifdef WITHOUT_DHT
    849         tr_inf( "DHT disabled by packager." );
    850 #else
    851848        tr_dhtInit( session, &session->public_ipv4->addr );
    852 #endif
    853849    }
    854850}
     
    16071603tr_sessionAllowsDHT( const tr_session * session UNUSED )
    16081604{
    1609 #ifdef WITHOUT_DHT
    1610     return 0;
    1611 #else
    16121605    return tr_sessionIsDHTEnabled( session );
    1613 #endif
    16141606}
    16151607
  • trunk/libtransmission/tr-dht.c

    r8881 r8888  
    5050#include "utils.h"
    5151#include "version.h"
    52 
    53 #ifdef WITHOUT_DHT
    54 
    55   /* These are the stubs for when we're building without DHT support */
    56   int tr_dhtInit( tr_session * session UNUSED ) { return TR_DHT_STOPPED; }
    57   void tr_dhtUninit( tr_session * session UNUSED ) { }
    58   tr_bool tr_dhtEnabled( const tr_session * session UNUSED ) { return FALSE; }
    59   tr_port tr_dhtPort ( const tr_session * sesssion UNUSED ) { return 0; }
    60   int tr_dhtStatus( tr_session * session     UNUSED,
    61                     int        * setmeCount  UNUSED ) { return TR_DHT_STOPPED; }
    62   int tr_dhtAddNode( tr_session * session    UNUSED,
    63                      tr_address * addr       UNUSED,
    64                      tr_port      port       UNUSED,
    65                      tr_bool      bootstrap  UNUSED ) { return 0; }
    66   int tr_dhtAnnounce( tr_torrent * session UNUSED,
    67                       tr_bool announce UNUSED ) { return -1; }
    68 
    69 
    70 #else
    7152
    7253static int dht_socket;
     
    459440    return size;
    460441}
    461 
    462 #endif
  • trunk/third-party/Makefile.am

    r8752 r8888  
    1 if DHT
    2   DHT_DIR = dht
    3 else
    4   DHT_DIR =
    5 endif
    6 
    7 SUBDIRS = libnatpmp miniupnp libevent $(DHT_DIR)
     1SUBDIRS = libnatpmp miniupnp libevent dht
    82
    93EXTRA_DIST = \
Note: See TracChangeset for help on using the changeset viewer.