diff options
-rw-r--r-- | INSTALL | 15 | ||||
-rwxr-xr-x[-rw-r--r--] | autogen.sh | 0 | ||||
-rw-r--r-- | configure.ac | 16 | ||||
-rw-r--r-- | other/Makefile.inc | 6 | ||||
-rw-r--r-- | testing/Makefile.inc | 4 |
5 files changed, 33 insertions, 8 deletions
@@ -1,8 +1,8 @@ | |||
1 | Installation Instructions | 1 | Installation Instructions |
2 | ************************* | 2 | ************************* |
3 | 3 | ||
4 | Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, | 4 | Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation, |
5 | 2006, 2007, 2008, 2009 Free Software Foundation, Inc. | 5 | Inc. |
6 | 6 | ||
7 | Copying and distribution of this file, with or without modification, | 7 | Copying and distribution of this file, with or without modification, |
8 | are permitted in any medium without royalty provided the copyright | 8 | are permitted in any medium without royalty provided the copyright |
@@ -226,6 +226,11 @@ order to use an ANSI C compiler: | |||
226 | 226 | ||
227 | and if that doesn't work, install pre-built binaries of GCC for HP-UX. | 227 | and if that doesn't work, install pre-built binaries of GCC for HP-UX. |
228 | 228 | ||
229 | HP-UX `make' updates targets which have the same time stamps as | ||
230 | their prerequisites, which makes it generally unusable when shipped | ||
231 | generated files such as `configure' are involved. Use GNU `make' | ||
232 | instead. | ||
233 | |||
229 | On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot | 234 | On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot |
230 | parse its `<wchar.h>' header file. The option `-nodtk' can be used as | 235 | parse its `<wchar.h>' header file. The option `-nodtk' can be used as |
231 | a workaround. If GNU CC is not installed, it is therefore recommended | 236 | a workaround. If GNU CC is not installed, it is therefore recommended |
@@ -304,9 +309,10 @@ causes the specified `gcc' to be used as the C compiler (unless it is | |||
304 | overridden in the site shell script). | 309 | overridden in the site shell script). |
305 | 310 | ||
306 | Unfortunately, this technique does not work for `CONFIG_SHELL' due to | 311 | Unfortunately, this technique does not work for `CONFIG_SHELL' due to |
307 | an Autoconf bug. Until the bug is fixed you can use this workaround: | 312 | an Autoconf limitation. Until the limitation is lifted, you can use |
313 | this workaround: | ||
308 | 314 | ||
309 | CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash | 315 | CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash |
310 | 316 | ||
311 | `configure' Invocation | 317 | `configure' Invocation |
312 | ====================== | 318 | ====================== |
@@ -362,4 +368,3 @@ operates. | |||
362 | 368 | ||
363 | `configure' also accepts some other, not widely useful, options. Run | 369 | `configure' also accepts some other, not widely useful, options. Run |
364 | `configure --help' for more details. | 370 | `configure --help' for more details. |
365 | |||
diff --git a/autogen.sh b/autogen.sh index 9de319ec..9de319ec 100644..100755 --- a/autogen.sh +++ b/autogen.sh | |||
diff --git a/configure.ac b/configure.ac index 762736df..81f15eca 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -28,6 +28,7 @@ fi | |||
28 | BUILD_DHT_BOOTSTRAP_DAEMON="yes" | 28 | BUILD_DHT_BOOTSTRAP_DAEMON="yes" |
29 | BUILD_NTOX="yes" | 29 | BUILD_NTOX="yes" |
30 | BUILD_TESTS="yes" | 30 | BUILD_TESTS="yes" |
31 | BUILD_TESTING="yes" | ||
31 | 32 | ||
32 | NCURSES_FOUND="no" | 33 | NCURSES_FOUND="no" |
33 | LIBCONFIG_FOUND="no" | 34 | LIBCONFIG_FOUND="no" |
@@ -35,7 +36,7 @@ LIBCHECK_FOUND="no" | |||
35 | WANT_NACL="no" | 36 | WANT_NACL="no" |
36 | 37 | ||
37 | AC_ARG_ENABLE([nacl], | 38 | AC_ARG_ENABLE([nacl], |
38 | [AC_HELP_STRING([--enable-tests], [use nacl instead of libsodium (default: disabled)]) ], | 39 | [AC_HELP_STRING([--enable-nacl], [use nacl instead of libsodium (default: disabled)]) ], |
39 | [ | 40 | [ |
40 | if test "x$enableval" = "xno"; then | 41 | if test "x$enableval" = "xno"; then |
41 | WANT_NACL="no" | 42 | WANT_NACL="no" |
@@ -78,6 +79,17 @@ AC_ARG_ENABLE([dht-bootstrap-daemon], | |||
78 | ] | 79 | ] |
79 | ) | 80 | ) |
80 | 81 | ||
82 | AC_ARG_ENABLE([testing], | ||
83 | [AC_HELP_STRING([--disable-testing], [build various testing tools (default: auto)]) ], | ||
84 | [ | ||
85 | if test "x$enableval" = "xno"; then | ||
86 | BUILD_TESTING="no" | ||
87 | elif test "x$enableval" = "xyes"; then | ||
88 | BUILD_TESTING="yes" | ||
89 | fi | ||
90 | ] | ||
91 | ) | ||
92 | |||
81 | DEPSEARCH= | 93 | DEPSEARCH= |
82 | LIBSODIUM_SEARCH_HEADERS= | 94 | LIBSODIUM_SEARCH_HEADERS= |
83 | LIBSODIUM_SEARCH_LIBS= | 95 | LIBSODIUM_SEARCH_LIBS= |
@@ -460,9 +472,9 @@ if test "x$WIN32" = "xyes"; then | |||
460 | fi | 472 | fi |
461 | 473 | ||
462 | AM_CONDITIONAL(BUILD_DHT_BOOTSTRAP_DAEMON, test "x$BUILD_DHT_BOOTSTRAP_DAEMON" = "xyes") | 474 | AM_CONDITIONAL(BUILD_DHT_BOOTSTRAP_DAEMON, test "x$BUILD_DHT_BOOTSTRAP_DAEMON" = "xyes") |
463 | |||
464 | AM_CONDITIONAL(BUILD_TESTS, test "x$BUILD_TESTS" = "xyes") | 475 | AM_CONDITIONAL(BUILD_TESTS, test "x$BUILD_TESTS" = "xyes") |
465 | AM_CONDITIONAL(BUILD_NTOX, test "x$BUILD_NTOX" = "xyes") | 476 | AM_CONDITIONAL(BUILD_NTOX, test "x$BUILD_NTOX" = "xyes") |
477 | AM_CONDITIONAL(BUILD_TESTING, test "x$BUILD_TESTING" = "xyes") | ||
466 | 478 | ||
467 | AC_CONFIG_FILES([Makefile | 479 | AC_CONFIG_FILES([Makefile |
468 | build/Makefile | 480 | build/Makefile |
diff --git a/other/Makefile.inc b/other/Makefile.inc index 736678fd..5308c45d 100644 --- a/other/Makefile.inc +++ b/other/Makefile.inc | |||
@@ -1,4 +1,6 @@ | |||
1 | noinst_PROGRAMS += DHT_bootstrap | 1 | if BUILD_DHT_BOOTSTRAP_DAEMON |
2 | |||
3 | bin_PROGRAMS += DHT_bootstrap | ||
2 | 4 | ||
3 | DHT_bootstrap_SOURCES = ../other/DHT_bootstrap.c \ | 5 | DHT_bootstrap_SOURCES = ../other/DHT_bootstrap.c \ |
4 | ../toxcore/DHT.h \ | 6 | ../toxcore/DHT.h \ |
@@ -15,5 +17,7 @@ DHT_bootstrap_LDADD = $(LIBSODIUM_LDFLAGS) \ | |||
15 | $(NACL_LIBS) \ | 17 | $(NACL_LIBS) \ |
16 | $(WINSOCK2_LIBS) | 18 | $(WINSOCK2_LIBS) |
17 | 19 | ||
20 | endif | ||
21 | |||
18 | EXTRA_DIST += $(top_srcdir)/other/DHTservers \ | 22 | EXTRA_DIST += $(top_srcdir)/other/DHTservers \ |
19 | $(top_srcdir)/other/tox.png | 23 | $(top_srcdir)/other/tox.png |
diff --git a/testing/Makefile.inc b/testing/Makefile.inc index 65f9f64c..de3995be 100644 --- a/testing/Makefile.inc +++ b/testing/Makefile.inc | |||
@@ -19,6 +19,8 @@ nTox_LDADD = $(LIBSODIUM_LDFLAGS) \ | |||
19 | endif | 19 | endif |
20 | 20 | ||
21 | 21 | ||
22 | if BUILD_TESTING | ||
23 | |||
22 | noinst_PROGRAMS += DHT_test \ | 24 | noinst_PROGRAMS += DHT_test \ |
23 | Lossless_UDP_testclient \ | 25 | Lossless_UDP_testclient \ |
24 | Lossless_UDP_testserver \ | 26 | Lossless_UDP_testserver \ |
@@ -116,3 +118,5 @@ tox_sync_LDADD = \ | |||
116 | $(WINSOCK2_LIBS) | 118 | $(WINSOCK2_LIBS) |
117 | 119 | ||
118 | EXTRA_DIST += $(top_srcdir)/testing/misc_tools.c | 120 | EXTRA_DIST += $(top_srcdir)/testing/misc_tools.c |
121 | |||
122 | endif | ||