X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=configure.ac;h=2e2b90321cbdcd7fe8203fd81f0a98a959bc6ad7;hb=7fb21027ff8726fec229ef0a55b84263be0c18d0;hp=9817a4f3473cf39ed88300417449d4d898631e7d;hpb=9aa22137e2427e1f44c7fca2f30005ba8b22195d;p=oweals%2Fgnunet.git

diff --git a/configure.ac b/configure.ac
index 9817a4f34..2e2b90321 100644
--- a/configure.ac
+++ b/configure.ac
@@ -705,14 +705,14 @@ AC_SUBST(EXT_LIB_PATH)
 
 
 # should 'make check' run tests?
-AC_MSG_CHECKING(whether to disable running tests)
+AC_MSG_CHECKING(whether to run tests)
 AC_ARG_ENABLE(testruns,
-   [AS_HELP_STRING([--enable-test-suppression],
-               [disable running tests on make check])],
-   [disable_tests_run=$enableval],
-   [disable_tests_run="no"])
-AC_MSG_RESULT($disable_test_run)
-AM_CONDITIONAL([DISABLE_TEST_RUN], [test "x$disable_tests_run" = "xyes"])
+   [AS_HELP_STRING([--enable-testruns=yes/no],
+               [disable running tests on make check (default is YES)])],
+   [enable_tests_run=$enableval],
+   [enable_tests_run="yes"])
+AC_MSG_RESULT($enable_test_run)
+AM_CONDITIONAL([DISABLE_TEST_RUN], [test "x$enable_tests_run" = "xno"])
 
 # should experimental code be compiled (code that may not yet compile)?
 disable_experimental=yes
@@ -725,6 +725,18 @@ AC_ARG_ENABLE(experimental,
 AC_MSG_RESULT($enable_experimental)
 AM_CONDITIONAL([HAVE_EXPERIMENTAL], [test "x$enable_experimental" = "xyes"])
 
+# should malicious code be compiled (code used for testing with malicious peers)
+enable_malicious=0
+AC_MSG_CHECKING(whether to compile malicious code)
+AC_ARG_ENABLE(malicious,
+   [AS_HELP_STRING([--enable-malicious],
+               [enable compiling malicious code (only for developers for testing)])],
+   [enable_malicious=1],
+   [enable_malicious=0])
+AC_MSG_RESULT($enable_malicious)
+AM_CONDITIONAL([HAVE_MALICIOUS], [test "x$enable_malicious" = "x1"])
+AC_DEFINE_UNQUOTED([HAVE_MALICIOUS], $enable_malicious, [Compile malicious code])
+
 # gcov compilation
 use_gcov=no
 AC_ARG_ENABLE([coverage], AS_HELP_STRING([--enable-coverage],
@@ -753,8 +765,6 @@ src/include/gnunet_directories.h
 src/hostlist/Makefile
 src/monkey/Makefile
 src/nat/Makefile
-src/nat/libnatpmp/Makefile
-src/nat/miniupnp/Makefile
 src/peerinfo/Makefile
 src/peerinfo-tool/Makefile
 src/statistics/Makefile