From 8d40ddf41727a9022f32531c0a1cc85536db9836 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Mon, 7 Oct 2013 01:58:57 +0200
Subject: Some configuration/build fixes, so building basicaly everything else
 than the library can be disabled

---
 configure.ac | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 762736df..81f15eca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,6 +28,7 @@ fi
 BUILD_DHT_BOOTSTRAP_DAEMON="yes"
 BUILD_NTOX="yes"
 BUILD_TESTS="yes"
+BUILD_TESTING="yes"
 
 NCURSES_FOUND="no"
 LIBCONFIG_FOUND="no"
@@ -35,7 +36,7 @@ LIBCHECK_FOUND="no"
 WANT_NACL="no"
 
 AC_ARG_ENABLE([nacl],
-    [AC_HELP_STRING([--enable-tests], [use nacl instead of libsodium (default: disabled)]) ],
+    [AC_HELP_STRING([--enable-nacl], [use nacl instead of libsodium (default: disabled)]) ],
     [
         if test "x$enableval" = "xno"; then
             WANT_NACL="no"
@@ -78,6 +79,17 @@ AC_ARG_ENABLE([dht-bootstrap-daemon],
     ]
 )
 
+AC_ARG_ENABLE([testing],
+    [AC_HELP_STRING([--disable-testing], [build various testing tools (default: auto)]) ],
+    [
+        if test "x$enableval" = "xno"; then
+            BUILD_TESTING="no"
+        elif test "x$enableval" = "xyes"; then
+            BUILD_TESTING="yes"
+        fi
+    ]
+)
+
 DEPSEARCH=
 LIBSODIUM_SEARCH_HEADERS=
 LIBSODIUM_SEARCH_LIBS=
@@ -460,9 +472,9 @@ if test "x$WIN32" = "xyes"; then
 fi
 
 AM_CONDITIONAL(BUILD_DHT_BOOTSTRAP_DAEMON, test "x$BUILD_DHT_BOOTSTRAP_DAEMON" = "xyes")
-
 AM_CONDITIONAL(BUILD_TESTS, test "x$BUILD_TESTS" = "xyes")
 AM_CONDITIONAL(BUILD_NTOX, test "x$BUILD_NTOX" = "xyes")
+AM_CONDITIONAL(BUILD_TESTING, test "x$BUILD_TESTING" = "xyes")
 
 AC_CONFIG_FILES([Makefile
                  build/Makefile
-- 
cgit v1.2.3