summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey 'Jin' Bostandzhyan <jin at mediatomb dot cc>2016-12-13 23:27:29 +0100
committeriphydf <iphydf@users.noreply.github.com>2017-01-03 20:42:07 +0000
commit4c9ed8f5a05c790405ce6119eff189abdb26f299 (patch)
treebe4d82d89db347996b0d52aef4668f07f01eece9
parent2ad3ad61b84f3d7c7785a044d582ca6daf49b3ee (diff)
Add a separate configure switch for DHT_bootstrap
closes #319
-rw-r--r--INSTALL.md1
-rw-r--r--configure.ac14
-rw-r--r--other/Makefile.inc4
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
498 - --disable-av disable A/V support (default: auto) see: [libtoxav](#libtoxav) 498 - --disable-av disable A/V support (default: auto) see: [libtoxav](#libtoxav)
499 - --enable-ntox build nTox client (default: no) see: [nTox](#ntox) 499 - --enable-ntox build nTox client (default: no) see: [nTox](#ntox)
500 - --enable-daemon build DHT bootstrap daemon (default=no) see: [Bootstrap daemon](#bootstrapd) 500 - --enable-daemon build DHT bootstrap daemon (default=no) see: [Bootstrap daemon](#bootstrapd)
501 - --enable-dht-bootstrap build DHT bootstrap utility (default=disabled)
501 - --enable-shared[=PKGS] build shared libraries [default=yes] 502 - --enable-shared[=PKGS] build shared libraries [default=yes]
502 - --enable-static[=PKGS] build static libraries [default=yes] 503 - --enable-static[=PKGS] build static libraries [default=yes]
503 504
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
27fi 27fi
28 28
29BUILD_DHT_BOOTSTRAP_DAEMON="no" 29BUILD_DHT_BOOTSTRAP_DAEMON="no"
30BUILD_DHT_BOOTSTRAP="no"
30BUILD_NTOX="no" 31BUILD_NTOX="no"
31BUILD_TESTS="yes" 32BUILD_TESTS="yes"
32BUILD_AV="yes" 33BUILD_AV="yes"
@@ -177,6 +178,18 @@ AC_ARG_ENABLE([daemon],
177 ] 178 ]
178) 179)
179 180
181AC_ARG_ENABLE([dht-bootstrap],
182 [AC_HELP_STRING([--enable-dht-bootstrap], [build DHT bootstrap utility (default: disabled)]) ],
183 [
184 if test "x$enableval" = "xno"; then
185 BUILD_DHT_BOOTSTRAP="no"
186 elif test "x$enableval" = "xyes"; then
187 BUILD_DHT_BOOTSTRAP="yes"
188 fi
189 ]
190)
191
192
180AC_ARG_ENABLE([rt], 193AC_ARG_ENABLE([rt],
181 [AC_HELP_STRING([--disable-rt], [Disables the librt check (default: auto)]) ], 194 [AC_HELP_STRING([--disable-rt], [Disables the librt check (default: auto)]) ],
182 [ 195 [
@@ -688,6 +701,7 @@ if test "x$WIN32" = "xyes"; then
688fi 701fi
689 702
690AM_CONDITIONAL(BUILD_DHT_BOOTSTRAP_DAEMON, test "x$BUILD_DHT_BOOTSTRAP_DAEMON" = "xyes") 703AM_CONDITIONAL(BUILD_DHT_BOOTSTRAP_DAEMON, test "x$BUILD_DHT_BOOTSTRAP_DAEMON" = "xyes")
704AM_CONDITIONAL(BUILD_DHT_BOOTSTRAP, test "x$BUILD_DHT_BOOTSTRAP" = "xyes")
691AM_CONDITIONAL(BUILD_TESTS, test "x$BUILD_TESTS" = "xyes") 705AM_CONDITIONAL(BUILD_TESTS, test "x$BUILD_TESTS" = "xyes")
692AM_CONDITIONAL(BUILD_NTOX, test "x$BUILD_NTOX" = "xyes") 706AM_CONDITIONAL(BUILD_NTOX, test "x$BUILD_NTOX" = "xyes")
693AM_CONDITIONAL(BUILD_AV, test "x$BUILD_AV" = "xyes") 707AM_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 @@
1if BUILD_DHT_BOOTSTRAP
2
1bin_PROGRAMS += DHT_bootstrap 3bin_PROGRAMS += DHT_bootstrap
2 4
3DHT_bootstrap_SOURCES = ../other/DHT_bootstrap.c \ 5DHT_bootstrap_SOURCES = ../other/DHT_bootstrap.c \
@@ -18,5 +20,7 @@ DHT_bootstrap_LDADD = $(LIBSODIUM_LDFLAGS) \
18 $(NACL_LIBS) \ 20 $(NACL_LIBS) \
19 $(WINSOCK2_LIBS) 21 $(WINSOCK2_LIBS)
20 22
23endif
24
21EXTRA_DIST += $(top_srcdir)/other/DHTnodes \ 25EXTRA_DIST += $(top_srcdir)/other/DHTnodes \
22 $(top_srcdir)/other/tox.png 26 $(top_srcdir)/other/tox.png