Add a separate configure switch for DHT_bootstrap

closes #319

3 files changed, 19 insertions, 0 deletions

diff --git a/INSTALL.md b/INSTALL.md
index db6a85f0..0ed6d881 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -498,6 +498,7 @@ While [Toxic](https://github.com/tox/toxic) is no longer in core, a list of Tox
   - --disable-av disable A/V support (default: auto) see: [libtoxav](#libtoxav)
   - --enable-ntox build nTox client (default: no) see: [nTox](#ntox)
   - --enable-daemon build DHT bootstrap daemon (default=no) see: [Bootstrap daemon](#bootstrapd)
+  - --enable-dht-bootstrap build DHT bootstrap utility (default=disabled)
   - --enable-shared[=PKGS]  build shared libraries [default=yes]
   - --enable-static[=PKGS]  build static libraries [default=yes]
 
diff --git a/configure.ac b/configure.ac
index 407b59c6..2dbed474 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,6 +27,7 @@ if test "x${prefix}" = "xNONE"; then
 fi
 
 BUILD_DHT_BOOTSTRAP_DAEMON="no"
+BUILD_DHT_BOOTSTRAP="no"
 BUILD_NTOX="no"
 BUILD_TESTS="yes"
 BUILD_AV="yes"
@@ -177,6 +178,18 @@ AC_ARG_ENABLE([daemon],
     ]
 )
 
+AC_ARG_ENABLE([dht-bootstrap],
+    [AC_HELP_STRING([--enable-dht-bootstrap], [build DHT bootstrap utility (default: disabled)]) ],
+    [
+        if test "x$enableval" = "xno"; then
+            BUILD_DHT_BOOTSTRAP="no"
+        elif test "x$enableval" = "xyes"; then
+            BUILD_DHT_BOOTSTRAP="yes"
+        fi
+    ]
+)
+
+
 AC_ARG_ENABLE([rt],
     [AC_HELP_STRING([--disable-rt], [Disables the librt check (default: auto)]) ],
     [
@@ -688,6 +701,7 @@ if test "x$WIN32" = "xyes"; then
 fi
 
 AM_CONDITIONAL(BUILD_DHT_BOOTSTRAP_DAEMON, test "x$BUILD_DHT_BOOTSTRAP_DAEMON" = "xyes")
+AM_CONDITIONAL(BUILD_DHT_BOOTSTRAP, test "x$BUILD_DHT_BOOTSTRAP" = "xyes")
 AM_CONDITIONAL(BUILD_TESTS, test "x$BUILD_TESTS" = "xyes")
 AM_CONDITIONAL(BUILD_NTOX, test "x$BUILD_NTOX" = "xyes")
 AM_CONDITIONAL(BUILD_AV, test "x$BUILD_AV" = "xyes")
diff --git a/other/Makefile.inc b/other/Makefile.inc
index c86b7922..10cd48b4 100644
--- a/other/Makefile.inc
+++ b/other/Makefile.inc
@@ -1,3 +1,5 @@
+if BUILD_DHT_BOOTSTRAP
+
 bin_PROGRAMS += DHT_bootstrap
 
 DHT_bootstrap_SOURCES = ../other/DHT_bootstrap.c \
@@ -18,5 +20,7 @@ DHT_bootstrap_LDADD =   $(LIBSODIUM_LDFLAGS) \
                         $(NACL_LIBS) \
                         $(WINSOCK2_LIBS)
 
+endif
+
 EXTRA_DIST +=           $(top_srcdir)/other/DHTnodes \
                         $(top_srcdir)/other/tox.png