give ATS disjoint ports/paths

[oweals/gnunet.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index a68b28820adf9cf918f05a32dc537301b28af5e6..c714c11506f0502980bc5fbc5fa98735986b2d42 100644 (file)
--- 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])
@@ -250,29 +260,27 @@ LIBCURL_CHECK_CONFIG(,7.20.1,,AC_MSG_ERROR([GNUnet requires libcurl >= 7.20.1]))
 # restore LIBS
 LIBS=$SAVE_LIBS
 
-USE_ATS=false
-
-if test x$USE_ATS = xtrue
+AC_ARG_ENABLE([ats],
+  [AS_HELP_STRING([--enable-ats], [enable ATS code])],
+  [enable_ats=${enableval}],
+  [enable_ats=no])
+if test x${enable_ats} = xyes
 then
-       glpk=true
-       AC_MSG_WARN([ATS enabled])
-       AC_CHECK_HEADERS(glpk.h, ,[gplk=false])
-       AC_CHECK_LIB([glpk],[glp_create_prob], , [gplk=false])
+       AC_CHECK_HEADERS([glpk.h],[glpk=true],[gplk=false])
+       AC_CHECK_LIB([glpk],[glp_create_prob],,[gplk=false])
        # GLPK must support atm MLP presolving, version >= 4.32
-       AC_CHECK_MEMBERS(glp_iocp.presolve, ,[gplk=false],[[#include <glpk.h>]])
+       AC_CHECK_MEMBERS(glp_iocp.presolve,,[gplk=false],[[#include <glpk.h>]])
        if test x$gplk = xfalse
        then
-               AM_CONDITIONAL(HAVE_GLPK, [test x$gplk = xtrue])
-               AM_CONDITIONAL(HAVE_LIBGLPK, [test x$gplk != x$gplk])
+               AM_CONDITIONAL(HAVE_LIBGLPK, false)
                AC_MSG_WARN([GNUnet requires GLPK  >= 4.32])
        else
-               AM_CONDITIONAL(HAVE_GLPK, [test x$gplk = xtrue])
-               AM_CONDITIONAL(HAVE_LIBGLPK, [test x$gplk = x$gplk])
+               AM_CONDITIONAL(HAVE_LIBGLPK, true)
+               AC_DEFINE([HAVE_LIBGLPK],[1],[Have GLPK])
        fi
 else
-       AC_MSG_WARN([ATS disabled])
-       AM_CONDITIONAL(HAVE_GLPK, false)
        AM_CONDITIONAL(HAVE_LIBGLPK, false)
+       AC_MSG_RESULT([no])
 fi
 
 # test for kvm and kstat (for CPU stats under BSD/Solaris)
@@ -687,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"
@@ -743,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
@@ -757,6 +751,7 @@ src/include/gnunet_directories.h
 src/hostlist/Makefile
 src/mesh/Makefile
 src/nat/Makefile
+src/nse/Makefile
 src/peerinfo/Makefile
 src/peerinfo-tool/Makefile
 src/statistics/Makefile
@@ -779,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,5 +834,6 @@ configuration file:
        mkdir $HOME/.gnunet/
        touch $HOME/.gnunet/gnunet.conf
        
-Optionally, download and compile gnunet-gtk to get a GUI.
+Optionally, download and compile:
+- gnunet-gtk to get a GUI for file-sharing and configuration.
 ********************************************])