X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=configure.ac;h=c714c11506f0502980bc5fbc5fa98735986b2d42;hb=44adbb44cbb171ccaf7b42b7c62b48e986c04306;hp=fe414b31ed0d60fa73c7ac2026bf0e150b10a9d7;hpb=f53e991a59f4befa47b0ce90d8b68318dcd23864;p=oweals%2Fgnunet.git

diff --git a/configure.ac b/configure.ac
index fe414b31e..c714c1150 100644
--- a/configure.ac
+++ b/configure.ac
@@ -193,6 +193,16 @@ then
   AC_MSG_ERROR([GNUnet needs libgcrypt])
 fi
 
+extra_logging=GNUNET_NO
+AC_ARG_ENABLE([logging],
+   AS_HELP_STRING([--enable-logging@<:@=value@:>@],[Enable logging calls. Possible values: yes,no,verbose,veryverbose ('yes' is the default)]),
+   [AS_IF([test "x$enableval" = "xyes"], [],
+          [test "x$enableval" = "xno"], [AC_DEFINE([GNUNET_CULL_LOGGING],[],[Define to cull all logging calls])],
+          [test "x$enableval" = "xverbose"], [extra_logging=GNUNET_YES]
+          [test "x$enableval" = "xveryverbose"], [extra_logging=\(GNUNET_YES+1\)])
+   ], [])
+AC_DEFINE_UNQUOTED([GNUNET_EXTRA_LOGGING],[$extra_logging],[1 if extra logging is enabled, 2 for very verbose extra logging, 0 otherwise])
+
 if test $build = $target
 then
 AC_MSG_CHECKING([for working HMAC])
@@ -685,21 +695,6 @@ 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)
-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=${enableval}],
-   [enable_malicious=no])
-AC_MSG_RESULT($enable_malicious)
-AM_CONDITIONAL([HAVE_MALICIOUS], [test "x$enable_malicious" = "xyes"])
-if test "$enable_malicious" = "yes"
-then
- AC_DEFINE([HAVE_MALICIOUS],[1],[include malicious code])
-else
- AC_DEFINE([HAVE_MALICIOUS],[0],[disable malicious code])
-fi
-
 # should code be enabled that works around missing OS functionality on Windows?
 # used for test cases
 if test $build_target = "mingw"
@@ -741,6 +736,7 @@ m4/Makefile
 po/Makefile.in 
 src/Makefile
 src/arm/Makefile
+src/ats/Makefile
 src/block/Makefile
 src/core/Makefile
 src/datacache/Makefile
@@ -778,6 +774,8 @@ pkgconfig/gnunetdv.pc
 pkgconfig/gnunetfragmentation.pc
 pkgconfig/gnunetfs.pc
 pkgconfig/gnunethello.pc
+pkgconfig/gnunetnat.pc
+pkgconfig/gnunetnse.pc
 pkgconfig/gnunetpeerinfo.pc
 pkgconfig/gnunetstatistics.pc
 pkgconfig/gnunettesting.pc
@@ -837,6 +835,5 @@ configuration file:
 	touch $HOME/.gnunet/gnunet.conf
 	
 Optionally, download and compile:
-- gnunet-gtk to get a GUI for file-sharing.
-- gnunet-setup to get a GUI for configuration.
+- gnunet-gtk to get a GUI for file-sharing and configuration.
 ********************************************])