From 06004319d789417cfef3e7e8a52972ec4e684cbb Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles@transmissionbt.com>
Date: Sat, 14 Nov 2009 14:43:31 +0000
Subject: [PATCH] (trunk) #2222: revert r8967, as foreshadowed in
 http://trac.transmissionbt.com/ticket/2222#comment:20

---
 configure.ac              | 15 ++-------------
 gtk/tr-prefs.c            |  2 --
 libtransmission/session.c |  8 --------
 libtransmission/tr-dht.c  | 31 -------------------------------
 third-party/Makefile.am   |  8 +-------
 5 files changed, 3 insertions(+), 61 deletions(-)

diff --git a/configure.ac b/configure.ac
index 359d60092..a366aabcc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -208,19 +208,8 @@ dnl
 dnl  dht
 
 
-AC_ARG_ENABLE([dht], 
-              AS_HELP_STRING([--disable-dht],[omit DHT support]), 
-              [enable_dht=${enableval}], 
-              [enable_dht=yes]) 
-if test "x$enable_dht" = "xno" ; then 
-    AC_DEFINE([WITHOUT_DHT], 1) 
-    DHT_CFLAGS=""
-    DHT_LIBS=""
-else
-    DHT_CFLAGS="-I\$(top_srcdir)/third-party/dht"
-    DHT_LIBS="\$(top_builddir)/third-party/dht/libdht.a"
-fi
-AM_CONDITIONAL(DHT, test "x$enable_dht" = "xyes") 
+DHT_CFLAGS="-I\$(top_srcdir)/third-party/dht"
+DHT_LIBS="\$(top_builddir)/third-party/dht/libdht.a"
 AC_SUBST(DHT_CFLAGS)
 AC_SUBST(DHT_LIBS)
 
diff --git a/gtk/tr-prefs.c b/gtk/tr-prefs.c
index baa112063..31b21b4d6 100644
--- a/gtk/tr-prefs.c
+++ b/gtk/tr-prefs.c
@@ -540,13 +540,11 @@ privacyPage( GObject * core )
     gtr_widget_set_tooltip_text( w, s );
     hig_workarea_add_wide_control( t, &row, w );
 
-#ifndef WITHOUT_DHT
     s = _( "Use _DHT to find more peers" );
     w = new_check_button( s, TR_PREFS_KEY_DHT_ENABLED, core );
     s = _( "DHT is a tool for finding peers without a tracker." );
     gtr_widget_set_tooltip_text( w, s );
     hig_workarea_add_wide_control( t, &row, w );
-#endif
 
     hig_workarea_finish( t, &row );
     g_object_weak_ref( G_OBJECT( t ), privacyPageDestroyed, data );
diff --git a/libtransmission/session.c b/libtransmission/session.c
index b6284e9f4..625f230f7 100644
--- a/libtransmission/session.c
+++ b/libtransmission/session.c
@@ -700,11 +700,7 @@ tr_sessionInitImpl( void * vdata )
 
     if( session->isDHTEnabled )
     {
-#ifdef WITHOUT_DHT
-        tr_inf( "DHT disabled by packager." );
-#else
         tr_dhtInit( session, &session->public_ipv4->addr );
-#endif
     }
 
     /* cleanup */
@@ -1704,11 +1700,7 @@ tr_sessionIsPexEnabled( const tr_session * session )
 tr_bool
 tr_sessionAllowsDHT( const tr_session * session UNUSED )
 {
-#ifdef WITHOUT_DHT
-    return 0;
-#else
     return tr_sessionIsDHTEnabled( session );
-#endif
 }
 
 tr_bool
diff --git a/libtransmission/tr-dht.c b/libtransmission/tr-dht.c
index 46be697ac..4d1f56a8b 100644
--- a/libtransmission/tr-dht.c
+++ b/libtransmission/tr-dht.c
@@ -50,35 +50,6 @@ THE SOFTWARE.
 #include "utils.h"
 #include "version.h"
 
-#ifdef WITHOUT_DHT
-
-  /**
-  *** These are the stubs for when we're building without DHT support
-  **/
-
-  int tr_dhtInit( tr_session * session UNUSED,
-                  tr_address * address UNUSED ) { return TR_DHT_STOPPED; }
-
-  void tr_dhtUninit( tr_session * session UNUSED ) { }
-
-  tr_bool tr_dhtEnabled( const tr_session * session UNUSED ) { return FALSE; }
-
-  tr_port tr_dhtPort ( const tr_session * sesssion UNUSED ) { return 0; }
-
-  int tr_dhtStatus( tr_session * session     UNUSED,
-                    int        * setmeCount  UNUSED ) { return TR_DHT_STOPPED; }
-
-  int tr_dhtAddNode( tr_session       * session    UNUSED,
-                     const tr_address * addr       UNUSED,
-                     tr_port            port       UNUSED,
-                     tr_bool            bootstrap  UNUSED ) { return 0; }
-
-  int tr_dhtAnnounce( tr_torrent * session UNUSED,
-                      tr_bool announce UNUSED ) { return -1; }
-
-
-#else
-
 static int dht_socket;
 static struct event dht_event;
 static tr_port dht_port;
@@ -470,5 +441,3 @@ dht_random_bytes( void * buf, size_t size )
     tr_cryptoRandBuf( buf, size );
     return size;
 }
-
-#endif
diff --git a/third-party/Makefile.am b/third-party/Makefile.am
index 0130aebe5..677a2bb70 100644
--- a/third-party/Makefile.am
+++ b/third-party/Makefile.am
@@ -1,10 +1,4 @@
-if DHT
-  DHT_DIR = dht
-else
-  DHT_DIR =
-endif
-
-SUBDIRS = libnatpmp miniupnp libevent $(DHT_DIR)
+SUBDIRS = libnatpmp miniupnp libevent dht
 
 EXTRA_DIST = \
   macosx-libevent-config.h \