diff options
author | BtbN <btbn@btbn.de> | 2013-10-07 01:58:57 +0200 |
---|---|---|
committer | BtbN <btbn@btbn.de> | 2013-10-07 02:01:16 +0200 |
commit | 8d40ddf41727a9022f32531c0a1cc85536db9836 (patch) | |
tree | d1c0089e3bbd6d103ca07ece70d9c17cbd7a39dd /configure.ac | |
parent | 94691bfe0ed198b282a6cdf49ad8c718fd45afa1 (diff) |
Some configuration/build fixes, so building basicaly everything else than the library can be disabled
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 16 |
1 files changed, 14 insertions, 2 deletions
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 |